release/5.3.0_cvs

16341 files changed, 16497 insertions, 17291 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index a8fe822f075fa..65087a477745c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/COPYRIGHT,v 1.5 2003/12/31 22:35:22 imp Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 The compilation of software known as FreeBSD is distributed under the
diff --git a/MAINTAINERS b/MAINTAINERS
index 469e85e273a99..90c6fce132bbd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/MAINTAINERS,v 1.99 2004/08/16 10:43:41 pjd Exp $
 
 subsystem	login	notes
 -----------------------------
diff --git a/Makefile b/Makefile
index 51bd582efda09..9e122157df9c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile,v 1.306 2004/08/09 11:38:41 harti Exp $
 #
 # The user-driven targets are:
 #
diff --git a/Makefile.inc1 b/Makefile.inc1
index 77decfcb110a4..27df657d59e94 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile.inc1,v 1.438.2.4.2.1 2004/10/24 09:24:25 scottl Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
diff --git a/README b/README
index 70402b9973a93..30638285b53d0 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 d1f767f410528..3152ac8dbdb86 100644
--- a/UPDATING
+++ b/UPDATING
@@ -1895,4 +1895,4 @@ author a beer.
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD$
+$FreeBSD: src/UPDATING,v 1.342.2.13.2.3 2004/11/04 19:12:41 scottl Exp $
diff --git a/UPDATING.64BTT b/UPDATING.64BTT
index 6b04d250c1d46..47d1db0357d5e 100644
--- a/UPDATING.64BTT
+++ b/UPDATING.64BTT
@@ -28,7 +28,7 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 # -------+---------+---------+---------+---------+---------+---------+---------+
-# $FreeBSD$
+# $FreeBSD: src/UPDATING.64BTT,v 1.5 2004/03/17 01:59:47 gad Exp $
 # -------+---------+---------+---------+---------+---------+---------+---------+
 
 If you are in too much of a hurry to read this file, then this is not the
diff --git a/bin/Makefile b/bin/Makefile
index 86998bd4ff7b9..67a2d3bf7a09a 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.24 2004/01/16 15:23:18 ru Exp $
 
 SUBDIR= cat \
 	chflags \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 108488faf84ee..0a73a070f9214 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.21 2004/08/06 00:07:26 gordon Exp $
 
 BINDIR?=	/bin
 WARNS?=		6
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 672a4eeeeff50..aea110c9ddb3a 100644
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cat/Makefile,v 1.7 2001/12/04 01:57:37 obrien Exp $
 
 PROG=	cat
 
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index d27ac1eefa10d..e80f43f03df2d 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cat/cat.1,v 1.22 2004/04/06 20:06:44 markm Exp $
 .\"
 .Dd March 21, 2004
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 8c433f14d5960..0db8f932f49b9 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.31 2004/07/20 05:47:06 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
index 4457505380f33..1be7761e31b40 100644
--- a/bin/chflags/Makefile
+++ b/bin/chflags/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chflags/Makefile,v 1.17 2003/02/19 16:56:30 obrien Exp $
 
 PROG=	chflags
 
diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index a76df31edb89a..0880330866989 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.18 2004/04/06 20:06:44 markm Exp $
 .\"
 .Dd March 24, 2003
 .Dt CHFLAGS 1
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 8741d7a313912..c0f354ae8c064 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.20 2004/04/06 20:06:44 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index 172032832c7a1..b3e534d0e5ea1 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/chio/Makefile,v 1.11 2001/12/04 01:57:38 obrien Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 280eed015247e..16009ecec21c5 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.24 2004/07/02 21:04:17 ru Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index 02cb32f3c9b31..54361437a126a 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.26 2003/05/01 16:58:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/chio.h> 
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index 17d2abf33a288..b9c98899f1920 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/defs.h,v 1.4 2002/02/02 06:15:21 imp Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index 9a9b74a548156..990709906c8cc 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/pathnames.h,v 1.2 1999/08/27 23:13:35 peter Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index 71006d00a5232..b6c1065b2e443 100644
--- a/bin/chmod/Makefile
+++ b/bin/chmod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chmod/Makefile,v 1.10 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 23e12f7e27b83..ca43ca6bab23b 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.36 2004/04/06 20:06:44 markm Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 516df930ebe9f..c5552c421c479 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.32 2004/04/06 20:06:44 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 9180efe26c3fe..21fe9d1024d2c 100644
--- a/bin/cp/Makefile
+++ b/bin/cp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cp/Makefile,v 1.11 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index abec6901ab31b..45cf38c4406ab 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.29 2004/07/02 21:04:17 ru Exp $
 .\"
 .Dd July 23, 2002
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 1cc6110299ed3..3f36a8090b6f3 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.50 2004/04/06 20:06:44 markm Exp $");
 
 /*
  * Cp copies source files to target files.
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index a6b53c240d3ad..ed4d897dec8dd 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 7ad8788cae501..fedc6b32ba3c6 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.44 2004/06/05 02:32:21 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 90ce918ae76a8..ac29a0cda23f7 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/csh/Makefile,v 1.35 2004/02/23 20:05:14 johan 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 e741c7013bfd1..ac0cbd58be9cb 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.12 2004/04/06 20:06:45 markm 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 d61a7306abaee..1519e1984c2bd 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.9 2004/04/06 20:06:45 markm Exp $
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index 4b96d2f861b75..7199820cf373d 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.8 2004/04/06 20:06:45 markm Exp $
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index cc478f28ad63f..74a2ca73357df 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.6 2004/04/06 20:06:45 markm Exp $
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index dec7886fd7453..4b58448382dc3 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.7 2004/04/06 20:06:45 markm Exp $
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index 6950069663a70..35abd9ffcbcfe 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.8 2004/04/06 20:06:45 markm Exp $
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 94076f8d69c59..3b30d0ab18387 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -26,6 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.6 2004/04/06 20:06:45 markm 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 e82478ecafa4e..4543c7e9ca851 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -7,7 +7,7 @@
  * Edit this to match your system type.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config.h,v 1.8 2004/07/11 02:23:38 mp Exp $ */
 
 #ifndef _h_config
 #define _h_config
diff --git a/bin/csh/host.defs b/bin/csh/host.defs
index 5eb251ace0eee..f91b3f438a1af 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 8a1dc85793307..d5ba10f545855 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index c588489603dee..ec414a4f448c3 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/date/date.1,v 1.68 2004/08/09 13:43:39 yar Exp $
 .\"
 .Dd August 9, 2004
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index 91628405e94fa..c950b869f4c1f 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.46 2004/04/06 20:06:45 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/extern.h b/bin/date/extern.h
index 76b8d5e16105a..fe2baee4effc8 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 77e07882f19c1..4f7852a492ee9 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 5f0123110ee32..82a6cea2ad2dc 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 b39306a2bb233..27eddf7e74fe0 100644
--- a/bin/date/vary.h
+++ b/bin/date/vary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/vary.h,v 1.4 1999/08/27 23:14:00 peter Exp $
  */
 
 struct vary {
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index 3dd185ce8b4a8..5b38616f33526 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 161fbfcb0d488..4e519f9b13294 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 cd66258c29452..fc17369f6b372 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 9bfd10921823e..e29abb67bacf9 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 6f3298e2ada07..d1acd5be0451e 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.25 2004/08/15 19:10:05 rwatson Exp $
 .\"
 .Dd March 5, 2004
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 0bb43f789b1ae..135fe4b5d8ac3 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 ad283fd516a17..cc9e79b115e38 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 9c540ad36546c..4f4f3150d27e8 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 1eb76dc5b625c..6dafe7cb90319 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.1 2004/03/05 19:30:13 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index 4f538bc4bfbda..26f3e21637bb7 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 a638597707ddb..fac9af59506e0 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 7ff13e5a80ed1..43f0c4b7cc407 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 605716552cab3..650e88c096439 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 4836baf221aa5..f9f6339f81807 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 9f95672964684..78348e89d4939 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 bb1ad0a7242b0..1006223e6f697 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 4a7fde7e65b6b..d72bd11b78dd4 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 4836baf221aa5..b439939ed41e5 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 c64e63e30660d..b6c3933e24db3 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 fba31c1424481..bd3823f04c38b 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 f0bc449e36486..f53618bf14b41 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 baa1c57163a25..462805e350252 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 79e57b79b738f..0836ca7950afe 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 70d8a903c3545..7d99f5f0bf373 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 df6574ce2adbd..767c3f69434f4 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 8deaefc15bc2f..fbb259b3b7f17 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/df/df.1,v 1.36 2004/07/20 18:24:47 csjp Exp $
 .\"
 .Dd April 22, 2004
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index dfff6aef42658..b412336ed5eee 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.63 2004/07/20 18:24:47 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 724bd06f6a39f..575dac3e0f405 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/domainname/Makefile,v 1.7 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index f017feeb3b5af..aead59ad064c9 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.17 2004/07/02 21:04:17 ru Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 2c084cf4e34d7..413cbc6429cb8 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.18 2004/04/06 20:06:46 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index d00d4679d7ac8..bcb27de4d0274 100644
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/echo/Makefile,v 1.8 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 6fdf213240df8..3778c64bfcd33 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.17 2004/07/02 21:04:18 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index d859cf881d763..82ab37f5de7c0 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.17 2004/04/06 20:06:46 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 608d1cdca6d89..3e09e96b119dd 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/Makefile,v 1.30 2004/08/06 07:27:03 cperciva Exp $
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index f81bb0ce1a14b..0a363d650692a 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/POSIX,v 1.8 2000/07/17 10:40:48 sheldonh Exp $
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,
diff --git a/bin/ed/README b/bin/ed/README
index 478e7af07c701..1f50f106fdb55 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/README,v 1.7 1999/08/27 23:14:12 peter Exp $
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index db1f0e981bfbe..93c1b92441a83 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/buf.c,v 1.22 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 52e99998d67c9..22dd0d25f2a06 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 fe5f067889530..25638370689f0 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.34 2004/07/03 02:03:43 tjr Exp $
 .Dd July 3, 2004
 .Dt ED 1
 .Os
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index c40f57374b69d..ea66edf6b23c8 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- * $FreeBSD$
+ * $FreeBSD: src/bin/ed/ed.h,v 1.19 2003/06/02 19:06:28 markm Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 11dcc19fcc859..01594c5b21340 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/glbl.c,v 1.13 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 85ba0de0812e9..7a0e7a20adcff 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/io.c,v 1.14 2003/01/01 18:48:39 schweikh Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index bea272494ad0d..566b93f557f85 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -35,7 +35,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.26 2003/05/01 16:58:55 obrien Exp $");
 
 /*
  * CREDITS
diff --git a/bin/ed/re.c b/bin/ed/re.c
index f89ecf94cd6b5..43f67ae50a020 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 1c44328cc79c6..f774776ca6356 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/sub.c,v 1.15 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index aedfb698f131d..c6265ea518a56 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/Makefile,v 1.9 1999/08/27 23:14:17 peter Exp $
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
diff --git a/bin/ed/test/README b/bin/ed/test/README
index 74c4826a269d9..e360c4fe86ddc 100644
--- a/bin/ed/test/README
+++ b/bin/ed/test/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/README,v 1.7 1999/08/27 23:14:17 peter Exp $
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
index deab47555f7ad..2c57449fc3a77 100644
--- a/bin/ed/test/ckscripts.sh
+++ b/bin/ed/test/ckscripts.sh
@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/ckscripts.sh,v 1.6 1999/08/27 23:14:18 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/test/mkscripts.sh b/bin/ed/test/mkscripts.sh
index 1b8b3ee531827..2d1a06f14a7aa 100644
--- a/bin/ed/test/mkscripts.sh
+++ b/bin/ed/test/mkscripts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # This script generates ed test scripts (.ed) from .t files
 #	
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/mkscripts.sh,v 1.6 1999/08/27 23:14:20 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 6a8ca9e90137b..28374956b7233 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/undo.c,v 1.12 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 544853e10a257..7daa1c20d3836 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/expr/Makefile,v 1.18 2003/06/13 07:04:02 markm Exp $
 
 PROG=	expr
 SRCS=	expr.y
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index fbd1a0d416a1d..473580112c2a6 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.25 2004/07/12 10:46:55 tjr Exp $
 .\"
 .Dd July 12, 2004
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 74a33033d2222..f829243b56f94 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/expr/expr.y,v 1.23 2002/10/28 00:15:42 wollman Exp $
  */
 
 #include <sys/types.h>
diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile
index b7b5e983a530e..f5d942796f50c 100644
--- a/bin/getfacl/Makefile
+++ b/bin/getfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/getfacl/Makefile,v 1.6 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	getfacl
 
diff --git a/bin/getfacl/getfacl.1 b/bin/getfacl/getfacl.1
index 6ac280f87469a..719a2611a99de 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.8 2004/05/16 21:34:31 ru Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
index 75ad1dad4e43f..7e9087a47cf74 100644
--- a/bin/getfacl/getfacl.c
+++ b/bin/getfacl/getfacl.c
@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.9 2002/12/30 15:36:29 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index 3c7997f862fc5..95036b30e09cf 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/hostname/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 060c5092523bc..e45df8ec15a22 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.16 2004/07/02 21:04:18 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 820699c69c5a1..c1eee1a5b98c3 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.16 2004/04/06 20:06:47 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
index 33a6dfc3bff5c..b63400916250e 100644
--- a/bin/kenv/Makefile
+++ b/bin/kenv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/kenv/Makefile,v 1.4 2003/06/13 07:04:02 markm Exp $
 
 PROG=	kenv
 
diff --git a/bin/kenv/kenv.1 b/bin/kenv/kenv.1
index 4d314f3627e99..15b812f4bc10a 100644
--- a/bin/kenv/kenv.1
+++ b/bin/kenv/kenv.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.10 2003/01/20 17:56:25 obrien Exp $
 .\"
 .Dd July 8, 2000
 .Dt KENV 1
diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
index 6e1a759361696..a8199256d4356 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.6 2004/04/28 01:27:36 das Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 55ef16dfce2c9..47b2d5b934424 100644
--- a/bin/kill/Makefile
+++ b/bin/kill/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/kill/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index 99d7d3d5af2b6..378ba4c3d9882 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kill/kill.1,v 1.18 2004/07/03 00:03:25 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 6f7a8537f6d6a..6210f914c473f 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.19 2004/04/06 20:06:47 markm Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index b541f8bd3be09..072ec41ac051d 100644
--- a/bin/ln/Makefile
+++ b/bin/ln/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ln/Makefile,v 1.11 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	ln
 MAN=	ln.1 symlink.7
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 66b42050decfb..312763d842fb1 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.28 2004/07/03 00:03:26 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index a75785872d07b..e6c7996543af4 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.31 2004/04/06 20:06:47 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index f637d33e9119c..68d19684cc342 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/symlink.7,v 1.28 2004/07/02 21:04:18 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 2af1203b1d384..7c835b253d485 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 41f5b8da1f767..e3783184f07d8 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.15 2004/06/23 08:26:31 dwmalone Exp $");
 
 
 #include <sys/types.h>
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 52b6a857c3ed4..a858f4ea11c1b 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.23 2004/05/02 11:25:37 tjr Exp $
  */
 
 int	 acccmp(const FTSENT *, const FTSENT *);
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 3fe48cd4c7319..6de1453fade6a 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.82 2004/07/02 21:04:18 ru Exp $
 .\"
 .Dd May 2, 2004
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 123084a5ce0ff..9318a8fd8e45d 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.78 2004/06/08 09:30:10 das Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index dfb7771a3dd76..a914344b9da18 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/ls.h,v 1.20 2004/04/06 20:06:47 markm Exp $
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 075cc5f130340..602ffb7a1d79e 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.73 2004/06/08 09:27:42 das Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 36122df4db78a..4379fb62080a4 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.35 2004/05/03 11:48:55 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index fadc6b294ef72..854888ea3962b 100644
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/mkdir/Makefile,v 1.7 2001/12/04 01:57:45 obrien Exp $
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 0aeea939f522a..5f91b58a3fad1 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.19 2004/07/03 00:03:26 ru Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index c0a9ffd0d9cd0..ccf12f9bf93e1 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.28 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 840578276d5a3..1530f6169c761 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/bin/mv/Makefile,v 1.8 2001/12/04 01:57:45 obrien Exp $
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 85552830d99a4..d2054dc8d3778 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.26 2004/04/06 20:06:48 markm Exp $
 .\"
 .Dd July 9, 2002
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 795a25c6f412a..4b79943203ef6 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.43 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index de76e6cf07545..9923ee714ac46 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 0ae50421ed08a..8cd0a04cee9ed 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.25 2004/06/25 05:27:59 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 f16facf98d56e..edfc3a8ab6233 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.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 1d01d4e5090a0..1e422ddfd5ecf 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 358707d362c30..c07192e675199 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 36d59ca7b12cb..9d0ddcba0df5b 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 5a383257d3100..80cecaa1181c8 100644
--- a/bin/pax/cpio.1
+++ b/bin/pax/cpio.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/bin/pax/cpio.1,v 1.3 2002/04/20 11:56:11 charnier Exp $
 .\"	$OpenBSD: cpio.1,v 1.16 2001/05/01 17:58:01 aaron Exp $
 .\"
 .Dd February 16, 1997
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 1909f8eaf7123..09ca6a259564c 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 2f4c37cb688a9..66d3d0d583488 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 b0d0237280b94..9109adab8f746 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.15 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 79782f46eb9be..1660ea90989b4 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 36c0de51c6935..bec962b07b7df 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.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 4538977754e47..fe18dcee9abea 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 ce2041985a1d2..7db1d3b6829ed 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 94611a6aedca4..8e55cd85b7850 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.4 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 6f43940d1e47c..c366aa0eedcbb 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 948e012671e8f..86351e859c968 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 667aa8f66a24c..90433d0630b1d 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 0eedd679caaec..3254583150532 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 c4dbb667974a9..8df49bd8f8dd7 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.33 2004/07/03 02:03:44 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index cb19b99b175ee..e043aa2628b52 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 c80ae7e0e11dc..e4a6b1912d286 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 98deccd435b1a..791f69356dc86 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 eed4641a17d59..32c07b7df4aa1 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 efdc68b49781d..05ea88ca707cb 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 ba59f913e7ab6..9d0c5d8d72dfd 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 ff940e5ba8a89..d01148ffb49ca 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/bin/pax/tar.1,v 1.7 2003/05/01 02:37:46 tjr Exp $
 .\"	$OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $
 .\"
 .Dd February 7, 2001
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index e0f5e1a234638..6a48abf2f7bb0 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.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 856e26c8336ae..ae767ba2a3e0d 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 b3d140eb41ccb..b6e22d5d88ad1 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 82b5a60e27c58..008fa9f710146 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ps/Makefile,v 1.25 2004/02/23 20:05:14 johan Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 08b6d9bce630e..526ace98bf414 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 1e9fed8710f07..26ba3dc1868e3 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 60e9e2e1eb59a..6e055095e9034 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.70 2004/06/23 23:48:09 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index f5e600b839597..b2fe0cffa92f4 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 1870c53ca0ddf..1d3422ab509cf 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 7ec5a4beec055..7d156c3c30d43 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.79 2004/06/22 01:59:54 gad Exp $
 .\"
 .Dd March 27, 2004
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index bafbfa14bb614..c536aae198932 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.106 2004/06/27 22:56:58 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 03adc0a35c181..8018011064765 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 4a8e66ac8320d..aa2f8e79cc9b2 100644
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pwd/Makefile,v 1.11 2002/02/11 18:38:54 mike Exp $
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index ee561c67bf545..887c237c43379 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.24 2004/07/03 00:03:26 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 94871191d1067..74ab558d35312 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.23 2004/04/06 20:06:50 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index a9a4da5886bba..2e0df09303c29 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rcp/Makefile,v 1.22 2002/10/16 16:06:46 markm Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index db69959234a5d..62e55b874f67d 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 ba0e36ac031b2..dea051c205dbf 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.18 2004/07/03 00:03:26 ru Exp $
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index f70a35134d6bc..e548f14604c9e 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.43 2003/10/14 20:42:13 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 3296fe0cbe96c..c016c8d203c23 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 acf62c76cb3a5..ce3d8ae718f5f 100644
--- a/bin/realpath/Makefile
+++ b/bin/realpath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/realpath/Makefile,v 1.1 2002/02/11 07:32:17 mike Exp $
 
 PROG=	realpath
 
diff --git a/bin/realpath/realpath.1 b/bin/realpath/realpath.1
index 51ecaef71a89c..f00b257d2a579 100644
--- a/bin/realpath/realpath.1
+++ b/bin/realpath/realpath.1
@@ -30,7 +30,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.8 2004/04/06 20:06:50 markm Exp $
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index b0a2c9e353498..5fe90de3b5815 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 7b85cdf90fc03..5797804da94a7 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rm/Makefile,v 1.17 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	rm
 SRCS=	rm.c
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 7a7437a5d87ed..6aa411d2f0b9d 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.29 2004/07/02 21:04:19 ru Exp $
 .\"
 .Dd January 28, 1999
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 89145c8185224..e89db07403185 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.47 2004/04/06 20:06:50 markm Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index f76781b848ec4..46f68b9c86362 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.20 2004/03/22 03:17:36 obrien Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index c2c7f301ce492..e596b0a84c08f 100644
--- a/bin/rmdir/Makefile
+++ b/bin/rmdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmdir/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index a3747f98504b0..9a2486627b142 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.11 2004/04/06 20:06:51 markm Exp $
 .\"
 .Dd March 21, 2004
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 0317d07eae94a..01526602e6cb6 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.17 2004/05/16 20:41:11 ru Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile
index 3f6b78e54e111..eb060104491a0 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 c9d21d61d5eec..b6c96d8229dc7 100644
--- a/bin/setfacl/file.c
+++ b/bin/setfacl/file.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/file.c,v 1.4 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
index e4d18f73bdfd0..81740264e7238 100644
--- a/bin/setfacl/mask.c
+++ b/bin/setfacl/mask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.7 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
index b9d45f8c188da..97b184ac75b0b 100644
--- a/bin/setfacl/merge.c
+++ b/bin/setfacl/merge.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.7 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index dc0c3a8f784ae..fa36cbc3b0969 100644
--- a/bin/setfacl/remove.c
+++ b/bin/setfacl/remove.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.5 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index d5787eaf861eb..c81f6249f3143 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.10 2004/07/02 21:04:19 ru Exp $
 .\"
 .Dd January 7, 2001
 .Dt SETFACL 1
diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
index 7350654612300..964f436de6536 100644
--- a/bin/setfacl/setfacl.c
+++ b/bin/setfacl/setfacl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.9 2003/08/07 14:43:43 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/setfacl/setfacl.h b/bin/setfacl/setfacl.h
index 91b4f00330415..c9fd96fdad45c 100644
--- a/bin/setfacl/setfacl.h
+++ b/bin/setfacl/setfacl.h
@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.4 2002/12/30 15:36:29 rwatson Exp $
  */
 
 #ifndef _SETFACL_H
diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c
index 4976301bd5c44..0e6e39561dcc8 100644
--- a/bin/setfacl/util.c
+++ b/bin/setfacl/util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.5 2002/06/30 05:15:03 obrien Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 7337d98773e98..1c01b55edd4ed 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 5a0b76b7ea909..66605d2902931 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/TOUR,v 1.6 1999/08/27 23:15:07 peter Exp $
 
 NOTE -- This is the original TOUR paper distributed with ash and
 does not represent the current state of the shell.  It is provided anyway
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index dd613515a2e80..62664aad44518 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 a6bd23d79cafd..2cd73409a7693 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 079f957bf6a1c..0200dcd501ab7 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 a7b514d1b8807..e77e284abcda7 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 4e7b7fbcf8576..04ee19177585a 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 66c616412e6c3..417b6bc000b84 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 f2501b8bf807d..34fdc526fb03b 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.2 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/bltin/echo.1,v 1.14 2004/07/03 00:03:26 ru Exp $
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 457a4c7aefc8d..5a07a0d12ce64 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 6b8bd11c1bd6f..22b868b2ab590 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/builtins.def,v 1.14 2004/04/06 20:06:51 markm 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 24af3e1bc084d..652348e5c45f1 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 0a2d48999e7ba..618236c810ba3 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 c30b1a6db6bc3..43ce6020f4a7a 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 4611821644ddb..608ecec01f6f0 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 18bcd1c8e688e..377525170feaf 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 2f8471ef1c99b..8e80b587fa124 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 03c6162b8154f..7a3ec28d3f0ef 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.24.2.1 2004/09/30 04:41:55 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 7542a534b4d06..0c48d2bb3060d 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 eccefd0a17b6e..7c40cdd14ed01 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.46 2004/04/06 20:06:51 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 2b895193d57a5..eefdf5538b5c1 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 3bba20c362e70..092b8d547375a 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/cmv,v 1.7 2004/04/06 20:06:53 markm Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index cda88d28b86b2..e425d96d14b23 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/dirs,v 1.7 2004/04/06 20:06:53 markm 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 7a0bf1f7375c0..aa7eb2008fb6c 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/kill,v 1.7 2004/04/06 20:06:53 markm 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 4be356e5b3751..6d1059070cf5f 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/login,v 1.7 2004/04/06 20:06:53 markm 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 5206b4bc4971b..5285079e6ac59 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -29,6 +29,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/newgrp,v 1.7 2004/04/06 20:06:53 markm Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index c8ceb6c4dbc34..d969e2a0ba0c3 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/popd,v 1.7 2004/04/06 20:06:53 markm 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 e063d1401e4d3..3633e8f848deb 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/pushd,v 1.7 2004/04/06 20:06:53 markm 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 93f6c651e5c09..ca9336c6d10b6 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/suspend,v 1.7 2004/04/06 20:06:53 markm Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 7e052323354c3..357b4fdfa38ff 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 2004/04/06 20:06:51 markm Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 1ec8343747800..83dd62fa65a78 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 f4bb7039a1581..ad8352a768d6a 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 0d188c5850dcc..0dd8167a72ef2 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 3c9ebeab6f72d..1bb0caa9d823f 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.67 2004/04/06 20:06:51 markm Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 54894e950e3cd..93a4eee520cd7 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 3056fad3f3eb2..ed4895d42b5bb 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 f88324c628bdb..bc4c1de03b24d 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 cfdfe9db553a8..7e68cbb9c0473 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 7f8c3940b6024..4c707e0dface5 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 60f9203d7da13..83c0790bc52c6 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 254d27ba44c00..04936c441b97b 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 8384b8d56b958..713937bb4d42e 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 35546b2ac47a7..29b538a31a484 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.13 2004/04/06 20:06:51 markm Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index 27c97107091ca..210d117e3f4e7 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 53086bd44ac81..ac95f25f85906 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 505c359ec4576..13473bade8d33 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 6776bb2c6196d..276ea6d02ed14 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mktokens,v 1.9 2004/04/06 20:06:51 markm 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 5d96587cdba22..c755798977ea2 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 6eaacb35dc9b8..37bf6d77e2ae3 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 1b27a1b008a80..2998c6b843577 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 10dab26d2ac8c..4bc1747af5a60 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 b7a6db4a3a47c..75ef3c57933a8 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.9 2004/04/06 20:06:51 markm 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 df30c190552d1..201ca065169e3 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.21 2004/04/06 20:06:51 markm Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 3b827d16016df..6adf22a665db7 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 3550cb7ecb7dc..9cd2d0c0adef0 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 bafd8687b1590..dc02c57410d40 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 c3dc7290e6366..16a198cc72576 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.51 2004/04/06 20:06:51 markm Exp $");
 
 #include <stdlib.h>
 
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index b0bd99ec57025..f60975c95b746 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 bc18975c0e939..d0b442fdc4803 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 ad44c4eddd8c8..e2bb74f99b4d8 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 fd4ee9d97ba1e..a8ed9ffd13a0d 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 58a25feb53cf7..80190ca567d71 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 8cfc35659fd82..4a9a9dd461835 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 83f84afcc8af8..6f8d398ccdf5e 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 ca327b26396a2..605182af904d4 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 ccc1ffd4f4d16..35069cfd3d414 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 94d6feeb3ccb7..1fae22b7f5051 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.26.2.1 2004/09/30 04:41:55 des Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 90074b941ac0c..93bbb049f5928 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 4ff73308c45b6..c05223b94e123 100644
--- a/bin/sleep/Makefile
+++ b/bin/sleep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sleep/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index 14aba49071c23..8d1189d3f78c7 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.20 2004/04/06 20:06:53 markm Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index c73df99921c23..dab95d1ca7e9c 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.18 2004/04/06 20:06:53 markm Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index 82b15eb7fcae5..263322db07fdb 100644
--- a/bin/stty/Makefile
+++ b/bin/stty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/stty/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 37617ce83a8d5..252a543396c79 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 8d0657cd0a9f0..2949b887415f6 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 c35a6fc4604db..932005da051d2 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 413f4d58dfa9b..d0ec2055f812d 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.18 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index e72e2dfc3ea58..1236233e42b87 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 e659bca833339..bfd5a346394cd 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.19 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 6e213baadb14c..e777a195267ef 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/stty/stty.1,v 1.30 2004/07/03 00:03:26 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 383691a737598..3a33ad211b230 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.22 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 77b85225f6cb4..64810bf6b67a2 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 5a4f0cfa47d07..6f9c0c76cdf99 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 72c664f4afdd0..1e24647e9b8b4 100644
--- a/bin/sync/Makefile
+++ b/bin/sync/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sync/Makefile,v 1.10 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sync
 MAN=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index 09beed02ff049..1feeaa87a6664 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sync/sync.8,v 1.15 2004/04/06 20:06:54 markm Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 5e00513990f26..3f6bb37cbc00c 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.15 2004/04/06 20:06:54 markm Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/test/Makefile b/bin/test/Makefile
index 7c64b40347eff..11301f60d03cf 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,5 +1,5 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/Makefile,v 1.10 2003/09/07 12:52:17 ru Exp $
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
diff --git a/bin/test/TEST.README b/bin/test/TEST.README
index 4fe3524876053..baeefb6f108e4 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 afa1c91f158a2..f3e0237926d10 100644
--- a/bin/test/TEST.csh
+++ b/bin/test/TEST.csh
@@ -1,5 +1,5 @@
 #	@(#)TEST.csh	5.2 (Berkeley) 4/30/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.csh,v 1.6 1999/08/27 23:15:47 peter Exp $
 
 #alias t '/usr/src/bin/test/obj/test \!*; echo $status'
 alias t '/bin/test \!*; echo $status'
diff --git a/bin/test/TEST.sh b/bin/test/TEST.sh
index d3aa83cccecdd..ac035d1ada90a 100644
--- a/bin/test/TEST.sh
+++ b/bin/test/TEST.sh
@@ -26,7 +26,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.sh,v 1.7 2000/05/07 08:56:21 kris Exp $
 
 # force a specified test program, e.g. `env test=/bin/test sh TEST.sh'
 : ${test=test}		
diff --git a/bin/test/test.1 b/bin/test/test.1
index 017454c5ee636..af7389462b127 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/test/test.1,v 1.22 2004/07/03 01:49:17 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index e81bdd56e4dcd..9e9077eae7a9d 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.52 2002/08/19 09:19:31 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/contrib/amd/FREEBSD-Xlist b/contrib/amd/FREEBSD-Xlist
index 474cf53b7d695..dfadcf44bd342 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 a8e6d531c7aef..cafb1f6af39dd 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 d09fb5a3ba430..19025d91a47f4 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.19 2004/07/06 13:16:44 mbr Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index f724bd833f121..fc6b3d5d91e86 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 a5c7f247c68eb..49e733bc8ac50 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 e5c3edf09359e..a278309322c80 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 8d67d1bc14cbd..58602a25061d1 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 5552c4302cd1b..224d386cc3093 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 67d1724707fbc..749b3c0ea990c 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 614550817c6e1..1080a60fb58c2 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.11 2004/07/06 13:16:44 mbr Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
diff --git a/contrib/amd/amq/amq.c b/contrib/amd/amq/amq.c
index d9828ac742212..36e6ef4517ef7 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 393836a384549..87829bba1c593 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.6 2004/07/06 13:16:44 mbr 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 24bc9b37fe4e7..aa11ef5a140ff 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 27c535db11fa0..1fdcc11375551 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 f671c419959e2..1ba1b5930305c 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 c2e92f305ec7d..210063c54b445 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.10 2004/07/06 13:16:46 mbr Exp $
 .\"
 .Dd February 26, 1993
 .Dt FIXMOUNT 8
diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c
index 3e0078620a4a9..5be0aa596b8ad 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 113c1ad057d41..fa73061e8451e 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.10 2004/07/06 13:16:46 mbr Exp $
 .\"
 .Dd June 26, 1999
 .Dt FSINFO 8
diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c
index 21f8038280075..6f5cc3530de86 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 8db06d2344687..87898d6a6f476 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.13 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@smarts.com>
diff --git a/contrib/amd/hlfsd/hlfsd.c b/contrib/amd/hlfsd/hlfsd.c
index 17ee61f43b9b5..5c98f701c3946 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 ab0a94e9a2dfa..2cd0c59da48f7 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 eef883a8fd9e8..f1fc1e3328a52 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 19d2a3bc415e2..d980361470191 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 e134c901ce621..05cd7758561b7 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 fe7af50593f49..a7080bf79b6c9 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.6 2004/07/06 13:16:49 mbr 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 d72850eeba946..6014dfe6a17b1 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 7a5060df40bd8..d9ff4586b1e10 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.16 2004/07/06 13:16:49 mbr 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 d3247f749beb9..626258fe32f11 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.5 2004/07/06 13:16:49 mbr 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 593cf45387868..2f5ee1603509e 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 0174d7bbbe922..ffbc18ec5c593 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 4170bb58b8748..f957157684fdc 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 8910c66f4c8a2..88c9ae1099764 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 bb19594421f25..0b34d15b722cc 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 adaf5d0cc0581..d294d062b6ed4 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 c0ea0f5a20a9d..6a673527ae98e 100644
--- a/contrib/bind9/FREEBSD-Upgrade
+++ b/contrib/bind9/FREEBSD-Upgrade
@@ -96,4 +96,4 @@ C) Commit when everything builds cleanly and works properly.
 
 					-- des@FreeBSD.org
 
-$FreeBSD$
+$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.1.2.2 2004/09/27 00:29:59 des Exp $
diff --git a/contrib/bind9/FREEBSD-Xlist b/contrib/bind9/FREEBSD-Xlist
index 6575c49f47c5c..6676a25da0172 100644
--- a/contrib/bind9/FREEBSD-Xlist
+++ b/contrib/bind9/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/bind9/FREEBSD-Xlist,v 1.2.2.1 2004/09/26 03:09:30 des Exp $
 
 # Misc. stuff
 .cvsignore
diff --git a/contrib/binutils/FREEBSD-Xlist b/contrib/binutils/FREEBSD-Xlist
index af18d97b09674..d0313c85a11c4 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 89020f423b82d..bef56a9577a47 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 ab7c24117f743..66212f92714f1 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 2b16f86cd45e9..3969528fa855e 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 5b0ede1acb56e..b845da863e6ee 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 020064b54c399..3cf8046916fee 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 4a31b48f65986..fa89123ad60d6 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 4bc0fe0482643..d1be8b2eed882 100644
--- a/contrib/bsnmp/FREEBSD-Xlist
+++ b/contrib/bsnmp/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.2 2004/08/06 13:41:55 harti Exp $
 */Makefile.in
 */acinclude.m4
 */aclocal.m4
diff --git a/contrib/bsnmp/FREEBSD-upgrade b/contrib/bsnmp/FREEBSD-upgrade
index 4fb31fd9153ce..99dda121b277a 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-upgrade b/contrib/bzip2/FREEBSD-upgrade
index eebf2febc34d6..d241ce4ed7de5 100644
--- a/contrib/bzip2/FREEBSD-upgrade
+++ b/contrib/bzip2/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.1 2002/02/01 16:34:13 sobomax Exp $
 
 Julian Seward's bzip2
 	originals can be found at: 	http://sources.redhat.com/bzip2/
diff --git a/contrib/com_err/com_err.3 b/contrib/com_err/com_err.3
index e6eeea13b8525..7f6685e4a63c4 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 f00c602646bb3..fe4c09bcef655 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 6c1faa4bd5bd8..eeef78e90950a 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 09e95fa0251c3..b9325c0b829ac 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 f43265521e1eb..1949bdd30130c 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.3 2001/02/16 11:35:39 ru Exp $
 .\"
 .Dd	November 22, 1988
 .Os
diff --git a/contrib/com_err/compile_et.c b/contrib/com_err/compile_et.c
index 59d9de996d630..8cb8183c9ee85 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 35e4863989ff7..0d56bfaa5c28f 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 80f76ab4a5ec6..d2de05ac91e2a 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 b5f8db1e1e436..27e5b441f7368 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 960bcfa8f1e49..40e3b4e0adbc4 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 949705bb2b23a..acccdc0c986f2 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 c3cc7997608f9..ae1f171927be7 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 993d720456df0..4fb8f1124c59d 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 20829ef50e1a3..6309973999e4e 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 832ad4f378685..0590e1872427c 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.1.1.1.32.1 2004/09/02 04:18:17 kientzle Exp $ */
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/contrib/cvs/FREEBSD-Xlist b/contrib/cvs/FREEBSD-Xlist
index 535030f7f7d6a..c599c32261632 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 d884b289228bb..5cef883e3ead5 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 b00ca88373c22..5606bcda2fc4a 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 109e66ee021c1..7cc66c1b11d06 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 3b5ba05891f27..f9d886b61a8cc 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 c11c6fd6cc991..2ae3ba28eba53 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 2004/04/15 01:17:26 peter Exp $
 .de Id
 .ds Rv \\$3
 .ds Dt \\$4
diff --git a/contrib/cvs/man/cvsbug.8 b/contrib/cvs/man/cvsbug.8
index 460ca4640d951..3f38ed57af7ff 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 d53a5c6d61bf5..452c59130b1fd 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 57933ee02ad6e..4efd1755cc12f 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 aae404a584887..ec3353e51db13 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 1edb95d94c917..2d4958dfe6fd1 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 c47cdcf335f25..8138ebe199b8b 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 7faaae86297ba..395237c4ba26d 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 1ab7c7e5a5d9e..8f6359499c8f7 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 b9f9bd5765b11..a2a92685a7117 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 b962ebc1257ea..f7b536432fa23 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 36cbf7d3f46fa..8159e9613bed9 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 88e5bb7672f7c..4339e595e53fa 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 2b8bbea2c612a..ff04b33337bdf 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.8 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/logmsg.c b/contrib/cvs/src/logmsg.c
index fbbcc3c4061db..08dde145519e9 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 932dbd2af7312..33b268d071955 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 0c913872f0a9b..0be25c44885a5 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 38a11c6d2c11c..46ddb92ad98b0 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/rcs.c b/contrib/cvs/src/rcs.c
index f60d02e971ef5..2741fb34d880a 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.27 2004/07/06 08:10:38 des Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h
index d40d1781b755c..6e5be6d8c147a 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 df91ff8498c3e..ebaa4165a1935 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 20a0f9b41da8c..2f4e50c7914f3 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 e186c34becca6..2f8591dc91cc3 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 903f3579078d9..af47f934b5d7c 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 0ddf3bc41b3f0..fb5761ceceba8 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 c886b4c8f1b7d..849e942655c33 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 198c1d2371469..fdabac0a1c3b4 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 4400642ac88ea..8cbea0afc72d0 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.4 2002/05/19 10:40:15 ache Exp $ */
 
 #define GDIFF_MAIN
 #include "diff.h"
diff --git a/contrib/diff/diff.h b/contrib/diff/diff.h
index 9a92e0d9f1844..562f4e5477666 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 5dee55efccc1b..7bbeab5d40dac 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 3f72cc2fd1120..a46de62ff1ebe 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 5b5759ededcdb..828f734d24cc4 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 35b28eae7f40e..8a0a715448907 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 8fd9a57804ff7..025df2f9a8b0b 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 d89921897ae6b..0000000000000
--- a/contrib/file/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-autom4te.cache
diff --git a/contrib/file/FREEBSD-upgrade b/contrib/file/FREEBSD-upgrade
index ac3290c68c81a..0f43028f04508 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 96080bc59e23a..336210a137845 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 f5bc81750db97..a058b972f45f0 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 1b8c24940c4b6..e6683dc7c1ab6 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 922f8eb4d0d0d..b8378da44bdd0 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 63253dbd3fa05..9533dc5757aa2 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.11 2004/07/28 03:53:20 kan 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 5ca1607cd7de6..44cb60ecf0919 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.9 2004/07/28 03:57:21 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/c-opts.c b/contrib/gcc/c-opts.c
index 9977f3a4580e9..dc764ebc92446 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.2 2004/07/29 02:04:58 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/c.opt b/contrib/gcc/c.opt
index 5343289a22838..1fd11d98e24fe 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.2 2004/07/29 02:04:58 kan Exp $
 
 Language
 C
diff --git a/contrib/gcc/cccp.1 b/contrib/gcc/cccp.1
index 442f0ab748e97..a056a7e10f64e 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 7f33f83ff600b..3f20d913dc6f4 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 97b15fe1eeeb9..4bc9c30fef43d 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 b00798936dba8..7a0d55a2b2d69 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 ac12da601c42c..2e4c2ba8c764e 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.17.2.1 2004/08/23 03:28:01 obrien 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 53a2e30754999..d11a311a90d83 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.39 2004/07/28 04:34:05 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 12f513e751b24..8649b27ee611e 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.69 2004/07/29 21:49:34 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 473ef2f22b1b9..bf35da46ca974 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 2e6b4112c3ee4..6cfb8cfa18901 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.21 2004/07/28 04:47:35 kan Exp $ */
 
 
 #include "config.h"
diff --git a/contrib/gcc/config/i386/x86-64.h b/contrib/gcc/config/i386/x86-64.h
index 6d1b811806e04..1f9fb1c6e179f 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 b0774236441a7..65c26273e7371 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 057add68a8629..b7f7e184e6deb 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 6ea1ca21d2244..792b8bc1af430 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 10b7d1f4358f4..e263b419899a9 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 0ecde22223be5..569ec23c8e710 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.21 2004/07/28 04:01:01 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 857c588deeb67..f88a2df904975 100644
--- a/contrib/gcc/gcc.1
+++ b/contrib/gcc/gcc.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.19 2003/06/25 16:12:05 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 80d40ff2bea7e..a7719859489a1 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.39 2004/07/28 04:05:09 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 563bd46c91eec..2b3cbb66a97c2 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 4fbec2896b94f..0b6ac37f55b66 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 0f232ca703d7a..48334bf74c235 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 c67b2f58dfd62..a6ccc3086f853 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.24 2004/07/28 04:20:36 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 24f54529ef263..c1d628391411c 100644
--- a/contrib/gcc/version.c
+++ b/contrib/gcc/version.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/version.c,v 1.11 2004/07/28 04:27:06 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 4dce63deaf033..9bd4a3a5f8061 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 ac98f9c8f7fce..c0e4feca4cbb9 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 0c4a93631ec46..745043a2d7537 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.6 2003/06/21 08:20:14 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 5cb5371d0b1fb..113295b75b6d8 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 45b7d05dded01..3b2d4cd3e2d2c 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 ccc135be8cb84..93b3ee41e1ffe 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.3.2.1 2004/09/02 04:32:26 kientzle Exp $ */
 
 /* Written by Jim Meyering. */
 
diff --git a/contrib/gnu-sort/src/sort.c b/contrib/gnu-sort/src/sort.c
index 0b9d33fcf4c6d..2c42d2ec9f785 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 393d55c838d25..1e73580c2ce9c 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 4549878106eab..4ef31c9a836d3 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 65154f14a29a9..35d73f42a9fc4 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 7e59569db77f5..2f1b7c04a5098 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 a6379913b8321..5d1ed7798cf4c 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 68564c4a02cc6..61fa4009305f5 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 63b3cc2d8af68..d0cc474a78a2a 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 dcea2ff3e7b3a..5cca3bfe89f47 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 347fec2f96e3c..5b37019158841 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 4b81a784f3a2e..a251494f16ae8 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 e8feb045def08..97f015ebc325e 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 e23db463a68c1..20677da6bc327 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 231a66c766452..57b51b73940b3 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/ipfilter/INSTALL.xBSD b/contrib/ipfilter/INSTALL.xBSD
index 2f933ffc7018a..bbf9320d2dbd9 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 c415800edddff..05350757261fa 100644
--- a/contrib/ipfilter/Makefile
+++ b/contrib/ipfilter/Makefile
@@ -3,7 +3,7 @@
 #
 # See the IPFILTER.LICENCE file for details on licencing.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.3 2004/06/21 22:53:02 darrenr Exp $
 # $Id: Makefile,v 2.11.2.15 2002/12/02 04:22:56 darrenr Exp $
 #
 BINDEST=/usr/local/bin
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index 5b7608b29e8a8..72d41a53b56f2 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/contrib/ipfilter/iplang/iplang_y.y
@@ -7,7 +7,7 @@
  * to the original author and the contributors.
  *
  * $Id: iplang_y.y,v 2.2 1999/12/04 03:37:04 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.5 2003/02/15 06:32:47 darrenr Exp $
  */
 
 #if defined(__sgi) && (IRIX > 602)
diff --git a/contrib/ipfilter/ipmon.c b/contrib/ipfilter/ipmon.c
index 79194307fe517..2a9783d6d2a36 100644
--- a/contrib/ipfilter/ipmon.c
+++ b/contrib/ipfilter/ipmon.c
@@ -70,7 +70,7 @@
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipmon.c	1.21 6/5/96 (C)1993-2000 Darren Reed";
 /* static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.13 2001/07/19 12:24:59 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.18 2004/06/21 22:53:02 darrenr Exp $";
 #endif
 
 
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/contrib/ipfilter/ipsend/ipsend.5
index 40b186a2b19e7..a58ed500bc3b5 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.3 2004/06/21 22:53:03 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 80faef2302398..7d9756ac8953f 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.11 2004/06/21 22:53:03 darrenr Exp $ */
 /*
  * ipsend.c (C) 1995-1998 Darren Reed
  *
@@ -38,7 +38,7 @@
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipsend.c	1.5 12/10/95 (C)1995 Darren Reed";
 /* static const char rcsid[] = "@(#)$Id: ipsend.c,v 2.2.2.3 2001/07/15 22:00:14 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.11 2004/06/21 22:53:03 darrenr Exp $";
 #endif
 
 
diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c
index 4805cafbddfee..86d779e9b2561 100644
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/contrib/ipfilter/ipsend/iptests.c
@@ -87,7 +87,7 @@ static const char rcsid[] = "@(#)$Id: iptests.c,v 2.1.4.8 2002/12/06 11:40:35 da
 #endif
 #endif
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.9 2003/02/15 06:32:48 darrenr Exp $");
 
 
 #ifdef	USE_NANOSLEEP
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index 82db7caddeb33..d1afd46c32089 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.5 2002/03/19 11:48:15 darrenr Exp $ */
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
  *
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index 988da4ce55e15..760f88cd46f1e 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.14 2003/02/15 06:32:48 darrenr Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
diff --git a/contrib/ipfilter/man/ipf.4 b/contrib/ipfilter/man/ipf.4
index b1188c81226b6..17a95a4824c1b 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.6 2002/03/19 11:48:16 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 2f998b539d973..e1b8098886afa 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.8 2004/06/21 22:53:03 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 661375a52e3ac..8d0765c0988af 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.6 2004/06/21 22:53:03 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.5 b/contrib/ipfilter/man/ipfilter.5
index 97e504df15fa3..e1f5446444ab7 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/ipfstat.8 b/contrib/ipfilter/man/ipfstat.8
index e2f38a0157578..7cf7dfe71ae97 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.8 2004/06/21 22:53:03 darrenr 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 936445caab49a..8eef24479d683 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.5 2003/02/15 06:32:48 darrenr Exp $
 .TH ipftest 1
 .SH NAME
 ipftest \- test packet filter rules with arbitrary input.
diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index d7f94dfab3630..0d92bc4013044 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.14 2004/06/21 22:53:03 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 095e4e5e1904b..94d1a727364f0 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/test/logtest b/contrib/ipfilter/test/logtest
index 16abed9cbd07c..5ba5961a41638 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.3 2002/04/25 03:36:26 darrenr Exp $
 if [ -f /usr/ucb/touch ] ; then
 	TOUCH=/usr/ucb/touch
 else
diff --git a/contrib/isc-dhcp/FREEBSD-upgrade b/contrib/isc-dhcp/FREEBSD-upgrade
index 562b25a4d998e..68d862e3092a5 100644
--- a/contrib/isc-dhcp/FREEBSD-upgrade
+++ b/contrib/isc-dhcp/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.23 2004/08/16 21:31:34 mbr Exp $
 
 ISC DHCP client 3.0.1
 	originals can be found at: ftp://ftp.isc.org/isc/dhcp/
diff --git a/contrib/isc-dhcp/client/clparse.c b/contrib/isc-dhcp/client/clparse.c
index e610bb2f3afa7..cc3c3d2ceb44b 100644
--- a/contrib/isc-dhcp/client/clparse.c
+++ b/contrib/isc-dhcp/client/clparse.c
@@ -35,7 +35,7 @@
 #ifndef lint
 static char copyright[] =
 "$Id: clparse.c,v 1.62.2.6 2004/06/10 17:59:11 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n"
-"$FreeBSD$\n";
+"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.12 2004/06/26 10:37:41 mbr Exp $\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
diff --git a/contrib/isc-dhcp/client/dhclient-script.8 b/contrib/isc-dhcp/client/dhclient-script.8
index 6b106dd803924..8ed622bdeb177 100644
--- a/contrib/isc-dhcp/client/dhclient-script.8
+++ b/contrib/isc-dhcp/client/dhclient-script.8
@@ -29,7 +29,7 @@
 .\" ``http://www.nominum.com''.
 .\"
 .\" $Id: dhclient-script.8,v 1.8.2.4 2002/11/17 02:25:43 dhankins Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.11 2004/06/26 10:37:41 mbr Exp $
 .\"
 .TH dhclient-script 8
 .SH NAME
diff --git a/contrib/isc-dhcp/client/dhclient.8 b/contrib/isc-dhcp/client/dhclient.8
index dbbc385f84be7..cac603971e0bb 100644
--- a/contrib/isc-dhcp/client/dhclient.8
+++ b/contrib/isc-dhcp/client/dhclient.8
@@ -25,7 +25,7 @@
 .\"
 .\" Portions copyright (c) 2000 David E. O'Brien.
 .\" All rights reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.15 2004/06/26 10:37:41 mbr Exp $
 .\"
 .TH dhclient 8
 .SH NAME
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c
index 9d0682fdd6e8c..c33045e2889ff 100644
--- a/contrib/isc-dhcp/client/dhclient.c
+++ b/contrib/isc-dhcp/client/dhclient.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$FreeBSD$\n"
+"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.43 2004/08/16 22:35:56 mbr Exp $\n"
 "$Id: dhclient.c,v 1.129.2.19 2004/07/10 00:11:16 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
diff --git a/contrib/isc-dhcp/client/dhclient.conf.5 b/contrib/isc-dhcp/client/dhclient.conf.5
index 3098efd9afd21..7eac5ee6742bb 100644
--- a/contrib/isc-dhcp/client/dhclient.conf.5
+++ b/contrib/isc-dhcp/client/dhclient.conf.5
@@ -29,7 +29,7 @@
 .\" ``http://www.nominum.com''.
 .\"
 .\" $Id: dhclient.conf.5,v 1.12.2.9 2003/02/23 03:27:26 dhankins Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.conf.5,v 1.14 2004/06/26 10:37:41 mbr Exp $
 .\"
 .TH dhclient.conf 5
 .SH NAME
diff --git a/contrib/isc-dhcp/client/dhclient.leases.5 b/contrib/isc-dhcp/client/dhclient.leases.5
index 921653f93eb40..f726f0f0404f2 100644
--- a/contrib/isc-dhcp/client/dhclient.leases.5
+++ b/contrib/isc-dhcp/client/dhclient.leases.5
@@ -28,7 +28,7 @@
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
 .\" $Id: dhclient.leases.5,v 1.2.4.3 2002/11/17 02:25:44 dhankins Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.leases.5,v 1.6 2004/06/26 10:37:41 mbr Exp $
 .\"
 .TH dhclient.leases 5
 .SH NAME
diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd
index 4beba054fe06f..aa7efab212836 100755
--- a/contrib/isc-dhcp/client/scripts/freebsd
+++ b/contrib/isc-dhcp/client/scripts/freebsd
@@ -2,7 +2,7 @@
 #
 # $Id: freebsd,v 1.13.2.6 2003/09/12 19:31:03 dhankins Exp $
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.28 2004/06/26 10:47:38 mbr Exp $
 
 if [ -x /usr/bin/logger ]; then
 	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
diff --git a/contrib/isc-dhcp/common/dhcp-options.5 b/contrib/isc-dhcp/common/dhcp-options.5
index 9bb7f94d96871..8cd2eb9967e18 100644
--- a/contrib/isc-dhcp/common/dhcp-options.5
+++ b/contrib/isc-dhcp/common/dhcp-options.5
@@ -29,7 +29,7 @@
 .\" ``http://www.nominum.com''.
 .\"
 .\" $Id: dhcp-options.5,v 1.19.2.10 2003/02/23 03:27:42 dhankins Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/isc-dhcp/common/dhcp-options.5,v 1.7 2004/06/26 10:37:41 mbr Exp $
 .\"
 .TH dhcpd-options 5
 .SH NAME
diff --git a/contrib/isc-dhcp/common/dispatch.c b/contrib/isc-dhcp/common/dispatch.c
index 326ed1f07028b..798403ed986d5 100644
--- a/contrib/isc-dhcp/common/dispatch.c
+++ b/contrib/isc-dhcp/common/dispatch.c
@@ -35,7 +35,7 @@
 #ifndef lint
 static char copyright[] =
 "$Id: dispatch.c,v 1.63.2.4 2004/06/10 17:59:16 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n"
-"$FreeBSD$\n";
+"$FreeBSD: src/contrib/isc-dhcp/common/dispatch.c,v 1.6 2004/07/06 15:15:14 des Exp $\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
diff --git a/contrib/isc-dhcp/common/parse.c b/contrib/isc-dhcp/common/parse.c
index 90f01c3f78998..61099b414e40e 100644
--- a/contrib/isc-dhcp/common/parse.c
+++ b/contrib/isc-dhcp/common/parse.c
@@ -35,7 +35,7 @@
 #ifndef lint
 static char copyright[] =
 "$Id: parse.c,v 1.104.2.17 2004/06/17 20:54:38 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n"
-"$FreeBSD$";
+"$FreeBSD: src/contrib/isc-dhcp/common/parse.c,v 1.2 2004/06/26 23:17:27 mbr Exp $";
 #endif /* not lint */
 
 #include "dhcpd.h"
diff --git a/contrib/isc-dhcp/common/tables.c b/contrib/isc-dhcp/common/tables.c
index 6de6d6f091bde..9e6b29a41b80b 100644
--- a/contrib/isc-dhcp/common/tables.c
+++ b/contrib/isc-dhcp/common/tables.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$FreeBSD$"
+"$FreeBSD: src/contrib/isc-dhcp/common/tables.c,v 1.11 2004/06/26 10:37:41 mbr Exp $"
 "$Id: tables.c,v 1.51.2.8 2004/06/10 17:59:21 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
diff --git a/contrib/isc-dhcp/includes/cf/freebsd.h b/contrib/isc-dhcp/includes/cf/freebsd.h
index d929c0da3b217..99ff472cc0574 100644
--- a/contrib/isc-dhcp/includes/cf/freebsd.h
+++ b/contrib/isc-dhcp/includes/cf/freebsd.h
@@ -31,7 +31,7 @@
  * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
  * ``http://www.nominum.com''.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/isc-dhcp/includes/cf/freebsd.h,v 1.7 2004/06/26 10:37:42 mbr Exp $
  */
 
 #include <syslog.h>
diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h
index 37f9a8e874c1e..dfc96847c17de 100644
--- a/contrib/isc-dhcp/includes/dhcpd.h
+++ b/contrib/isc-dhcp/includes/dhcpd.h
@@ -31,7 +31,7 @@
  * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
  * ``http://www.nominum.com''.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.10 2004/07/06 15:15:14 des Exp $
  */
 
 #ifndef __CYGWIN32__
diff --git a/contrib/isc-dhcp/omapip/dispatch.c b/contrib/isc-dhcp/omapip/dispatch.c
index e10a76afbebcb..0fc05c2163a6d 100644
--- a/contrib/isc-dhcp/omapip/dispatch.c
+++ b/contrib/isc-dhcp/omapip/dispatch.c
@@ -31,7 +31,7 @@
  * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
  * ``http://www.nominum.com''.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/isc-dhcp/omapip/dispatch.c,v 1.2 2004/07/06 15:15:14 des Exp $
  */
 
 #include <omapip/omapip_p.h>
diff --git a/contrib/isc-dhcp/omapip/mrtrace.c b/contrib/isc-dhcp/omapip/mrtrace.c
index 4e599d4d350c8..739340509ef92 100644
--- a/contrib/isc-dhcp/omapip/mrtrace.c
+++ b/contrib/isc-dhcp/omapip/mrtrace.c
@@ -29,7 +29,7 @@
  * about Internet Systems Consortium, see http://www.isc.org/.  To
  * learn more about Nominum, Inc., see ``http://www.nominum.com''.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/isc-dhcp/omapip/mrtrace.c,v 1.2 2004/07/06 15:15:14 des Exp $
  */
 
 #include <omapip/omapip_p.h>
diff --git a/contrib/less/command.c b/contrib/less/command.c
index 9bc966c7a97db..3a915629e1e93 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 ebad6ae09e61b..3a8af666a8bb8 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 9747520b4eabc..f6445fe57c193 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 18353db36b67c..7419208bf7990 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 c745603b80215..4ff0047e248ab 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 df478fb134e4e..8ca4adca10bed 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 1645a5503163f..b62c7a99f2bbd 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 c32e7a11ae73a..ca1e349006beb 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 e919f546f5529..448db9023401b 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 138c28814a089..0000000000000
--- 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 78d134cfe52b4..98abbe87c3dac 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 41957af5078ee..de5feff069ca5 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.13 2004/03/31 09:13:37 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h
index fccdf3c961bfe..9ce54486eaa25 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.6 2004/03/31 09:13:37 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.58.2.1 2004/03/28 21:45:31 fenner Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index 63ca863112420..a16cf590b552b 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.8 2004/03/31 09:13:37 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 678163e314497..5f0fc6c98a31f 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.10 2004/03/31 09:13:37 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libpcap/nlpid.h b/contrib/libpcap/nlpid.h
index 7ea2963f108df..e5ff50c4333ea 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 9da493bb89ad6..e9e62373d1b96 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.9 2004/03/31 18:15:37 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.55.2.4 2003/12/15 01:42:24 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h
index 43fe1edf55e43..02772be531c77 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.4 2001/04/03 04:32:48 fenner Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.8 2000/07/29 07:36:43 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap.3 b/contrib/libpcap/pcap.3
index 807d1c790d8e7..594d1c018c7cd 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.12 2004/03/31 09:13:37 bms Exp $
 .\"
 .TH PCAP 3 "27 February 2004"
 .SH NAME
diff --git a/contrib/libpcap/pcap.h b/contrib/libpcap/pcap.h
index 34a93d1edfe3b..e47a2a239d898 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.9 2004/03/31 10:21:28 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.45.2.4 2004/01/27 22:56:20 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index 21e800277cebd..9db6d6fd513c7 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.10 2004/03/31 09:13:37 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libreadline/FREEBSD-upgrade b/contrib/libreadline/FREEBSD-upgrade
index a6bf6f888cd4a..37d6f583bcc86 100644
--- a/contrib/libreadline/FREEBSD-upgrade
+++ b/contrib/libreadline/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.5 2004/02/13 01:16:12 ache Exp $
 #
 # Official patches 001-005 imported as v4_3_p1_p5
 #
diff --git a/contrib/libreadline/readline.h b/contrib/libreadline/readline.h
index c142bb4644024..970f472efc562 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.15 2004/01/15 19:37:45 obrien Exp $ */
 #if !defined (_READLINE_H_)
 #define _READLINE_H_
 
diff --git a/contrib/lukemftpd/src/ftpd.c b/contrib/lukemftpd/src/ftpd.c
index 858036efe12ee..a20328d749902 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.3.6.1 2004/08/21 03:45:51 obrien Exp $");
 
 /*
  * FTP server.
diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c
index 7e08fc034e86e..e0e4c7a0435f0 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 2269b5bdb76e5..5303b06a58a74 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 911f89c736361..9df30936cb6ea 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/ngatm/FREEBSD-Xlist b/contrib/ngatm/FREEBSD-Xlist
index 32e28ddb55fb4..6646b935d09c3 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 4557bf72bad28..610aedb32b6ec 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/ngatm/sscop/common.c b/contrib/ngatm/sscop/common.c
index e9a76acad16ae..8af734ae1b301 100644
--- a/contrib/ngatm/sscop/common.c
+++ b/contrib/ngatm/sscop/common.c
@@ -25,7 +25,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/contrib/ngatm/sscop/common.c,v 1.1.1.2.2.1 2004/09/26 03:10:09 des Exp $
  * $Begemot: libunimsg/sscop/common.c,v 1.4 2004/07/08 08:22:27 brandt Exp $
  */
 
diff --git a/contrib/ngatm/sscop/common.h b/contrib/ngatm/sscop/common.h
index 2f549cd847e3b..fd921c2d92dad 100644
--- a/contrib/ngatm/sscop/common.h
+++ b/contrib/ngatm/sscop/common.h
@@ -25,7 +25,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/contrib/ngatm/sscop/common.h,v 1.1.1.2.2.1 2004/09/26 03:10:09 des Exp $
  * $Begemot: libunimsg/sscop/common.h,v 1.4 2004/07/08 08:22:27 brandt Exp $
  *
  * Common declaration for the SAAL programs.
diff --git a/contrib/ngatm/sscop/sscop_main.c b/contrib/ngatm/sscop/sscop_main.c
index 497d9610d0bd8..c572f9f59a1fc 100644
--- a/contrib/ngatm/sscop/sscop_main.c
+++ b/contrib/ngatm/sscop/sscop_main.c
@@ -25,7 +25,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/contrib/ngatm/sscop/sscop_main.c,v 1.1.1.2.2.1 2004/09/26 03:10:09 des Exp $
  * $Begemot: libunimsg/sscop/sscop_main.c,v 1.4 2004/07/08 08:22:28 brandt Exp $
  */
 
diff --git a/contrib/ntp/FREEBSD-upgrade b/contrib/ntp/FREEBSD-upgrade
index feea467046436..7921072262a98 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 713685799c9c1..7005c1f23d24a 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 cbcc837556760..05d00e3d5cbe3 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 7f28aaaf66703..9710d2e53acdf 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 e332f4700e718..b4c5beac4b441 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 4d8c08db54ff7..3c57fb4b35484 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/ex/ex.c b/contrib/nvi/ex/ex.c
index ecdae4b869343..714b23a3932ad 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 3b89ea44cc921..45b93ba1db64f 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 495e75e8f1b69..abcd6e3799159 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 f69d3820db7f5..9671317ba8adc 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 730194e1c5b23..5df05dfc43c09 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.8 2004/02/08 21:39:18 ru Exp $
 
 Import of the 2004/02/07 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 abcffdc69568c..1002be1437396 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 fc836aa6cc5db..f2fcca95125c9 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 d4888f990e3bc..4a7fbdf5e4a66 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 babcbfae3aa97..cffe2aa9218c8 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 29d855deaa3b8..cff9748edc72f 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 bc61c5457ea39..e3de96999754f 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 865d270bb5271..e1022f7dde95e 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 2965b0efc6a7f..38683d60f0d8d 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 3ac19324a39d1..c86ee03646670 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 be508c77f73d9..a3fe84f28b4c1 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 bd000ae60a330..1ae098acf094e 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 41b1ec0e03b76..f0c7d9e86dfe4 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 eb6015f4130e1..943d9c5c88d7a 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 41cdebe8dec47..b5fc7ad82b761 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 09f9784241d82..04a0b8887528d 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 1f6e35ec02ff4..609af9beb68ce 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 20ba658710ee9..48bb250d7b893 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 26f08ed06ff8a..72b492b133fc6 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 5ce6cb010b4fe..3333923c2e479 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 2e2358ada07a3..63619c77c1dd7 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 99aad17025a6f..833ee798059a7 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 097e8f085ddab..4bc073f6b558b 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.5 2004/06/16 23:39:30 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 db043cd91fc4e..9a0adf3d2c010 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.3 2004/06/16 23:39:30 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 344ca27ec9d5b..da05ff3a8e101 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.5 2004/06/16 23:39:31 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 f9dd36137b815..df7f752ac37b2 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.3.2.1 2004/10/05 20:44:24 mlaier Exp $
 .\"
 .Dd September 26, 2001
 .Dt PF 4
diff --git a/contrib/pf/man/pf.conf.5 b/contrib/pf/man/pf.conf.5
index da7b24ebf9210..8bfa482e7972d 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.1.1.2.2.3 2004/10/09 15:29:14 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 6fc278e099383..eae17883bf300 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.3 2004/06/16 23:39:31 mlaier Exp $
 .\"
 .Dd December 10, 2001
 .Dt PFLOG 4
diff --git a/contrib/pf/man/pfsync.4 b/contrib/pf/man/pfsync.4
index 5375a52c44664..5880535d41b89 100644
--- a/contrib/pf/man/pfsync.4
+++ b/contrib/pf/man/pfsync.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/pfsync.4,v 1.3 2004/06/16 23:39:31 mlaier Exp $
 .\"
 .Dd November 29, 2002
 .Dt PFSYNC 4
diff --git a/contrib/pf/pfctl/parse.y b/contrib/pf/pfctl/parse.y
index 2c82bcd10602f..86890f538dcf1 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.6 2004/06/16 23:39:31 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 318bde756f316..fee70fe2f53ea 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.2 2004/06/16 23:39:31 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/pf/pfctl/pfctl.c b/contrib/pf/pfctl/pfctl.c
index 6abbbeca020d1..9b1eb218170c1 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.5 2004/06/16 23:39:31 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 2776f5e943102..01b9a2e257854 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.5 2004/06/16 23:39:31 mlaier Exp $
  */
 
 #ifndef _PFCTL_H_
diff --git a/contrib/pf/pfctl/pfctl_altq.c b/contrib/pf/pfctl/pfctl_altq.c
index eeed6483a8ab7..bdf8d525ce3f2 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.6 2004/06/16 23:39:31 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_parser.c b/contrib/pf/pfctl/pfctl_parser.c
index c02f7da33bbc0..8ba25916d7432 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.6 2004/06/17 15:23:51 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 0756cc867b122..e74d19cd4a5fb 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.5 2004/06/16 23:39:31 mlaier Exp $
  */
 
 #ifndef _PFCTL_PARSER_H_
diff --git a/contrib/pf/pfctl/pfctl_qstats.c b/contrib/pf/pfctl/pfctl_qstats.c
index a46603cdb3eff..830274d5ffc68 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.5 2004/06/16 23:39:31 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 7b838b042ae13..1afe35e2467b1 100644
--- a/contrib/pf/pfctl/pfctl_table.c
+++ b/contrib/pf/pfctl/pfctl_table.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_table.c,v 1.5.2.1 2004/08/29 11:51:07 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c
index a8c3863fb935b..78385574cddb9 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.5.2.2 2004/10/08 15:53:34 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pidfile.c b/contrib/pf/pflogd/pidfile.c
index db6007f1f339e..6b706c26361fe 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.3 2004/06/16 23:39:32 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 3dfba32689bd7..030c079f83044 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.2 2004/06/16 23:39:32 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/contrib/pnpinfo/pnpinfo.8 b/contrib/pnpinfo/pnpinfo.8
index f85b16430bdf0..a7f730dd96fbc 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.5 2001/04/18 15:54:10 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt PNPINFO 8
diff --git a/contrib/pnpinfo/pnpinfo.c b/contrib/pnpinfo/pnpinfo.c
index 8bf6fa4f2326f..d45510832ad11 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 abe14271d9d9b..6cb8dc3939bab 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 8462da7aaa510..295c948f9cdee 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.26 2004/08/01 01:18:40 gshapiro Exp $
 
 sendmail 8.13.1
 	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 dc1d8ba65614e..eef2e346c8b67 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 e7b0cd101fced..3eee645842e5e 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 7811451c5c309..c0d819bc8f582 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 d623ac9e30281..b045ed46d1cf6 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.25 2004/08/01 01:16:15 gshapiro Exp $
  *
  */
 
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c
index 5cdc9bb14213b..10770848545f9 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 040aa31225e60..117e0226d8b7b 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.12 2004/08/01 01:16:15 gshapiro Exp $
diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c
index 67f6bff9ae8ab..87ad70eda7510 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.18 2004/08/01 01:16:15 gshapiro Exp $
  */
 
 #include <sm/gen.h>
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index c8989a0044503..b2fb60751bbfc 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.26 2004/08/01 01:16:16 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c
index 59bbf56d2f5e2..b2e9e5f0b2428 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.20 2004/08/01 01:16:16 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index 8cdd12f9e244d..b62bd9277a636 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.17 2004/08/01 01:16:16 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8
index 65d37b0b86a26..fd080b976b99c 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 6fad7c6d729ec..ce75fcb7cf32e 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 d92d8e44e593c..fa2c4ec433348 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 7a8d85892f965..a425a80284e89 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.3 2003/07/27 11:41:38 tjr 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 2ac3300155c7b..2ed78d2e83aad 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 3ec9fea4772d1..52885da4218a5 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.2 2003/07/26 04:03:18 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/smbfs/lib/smb/nb_net.c b/contrib/smbfs/lib/smb/nb_net.c
index 62390efbc66f5..24a4e8c95c3bf 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/rap.c b/contrib/smbfs/lib/smb/rap.c
index e595bc1e1c288..b48f9d69d3b1f 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/rq.c b/contrib/smbfs/lib/smb/rq.c
index fccbc4632fc91..d5c4daeab7725 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.2 2004/07/28 05:33:58 kan 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 41e12a24c5819..662448d937ba0 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 487e9cd72da6f..2aee4bfca3606 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.4.2.1 2004/09/08 04:47:56 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 00843943600ca..869d6225dbeb1 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/tar/FREEBSD-Xlist b/contrib/tar/FREEBSD-Xlist
index a5afe0887b1e3..0872bd4716e34 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 b319f706d6393..a333e94017436 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 f0e60308e48b6..e9a76233042bb 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 ae6eb5d9f1b56..eb05de5c858e4 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 40e0ab61d78fd..e6dc4b2019328 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 da9dc33b35691..aede172ae43cb 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 e1f2dda2daf3f..6f0076c976937 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 3032da06ceb34..9a37016f2c98c 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 9c68ae985147b..1ae79f29334d8 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 8ece9c6ffd3ff..60fac61fc14de 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 26425159fe603..c6793838ef4a2 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 295974ed7a578..a81c5f071bd65 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 7d872faf11a3f..f0cb915996be1 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 10ede819e4de4..bc3cddbcd7d78 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 4983a55a47a1c..0a5ce2cbeaafa 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 27ab2ae648b6d..7c67a4e5208ba 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 24f5753fa3bca..e3892a379a962 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.4 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/inetcf.c b/contrib/tcp_wrappers/inetcf.c
index 1ace3527fc7c6..49910d862e14e 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 8f04f870e1b4f..4f80679166cb5 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 97d3127039244..ca93ce09282a7 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 fd04e08ae9bf3..af5ee6d7c8b5b 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 e7fb3d1d12942..03dde995a97ab 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 8da9df0c68611..b01b52a3a1ed0 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 ea568b7225077..044af6db3743f 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 82595c6aab171..05c5a1be065bf 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.7 2003/12/27 14:58:00 ceri Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tcpd.c b/contrib/tcp_wrappers/tcpd.c
index 55c6853c18811..8d0696c947c8d 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 fec20a262baf1..07ef87ef1d822 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 99ec495253008..73351d5cda62f 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 94f3e70096064..f6e49ca00d624 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 36d6f7eff398c..1efd807c8f71b 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 b612d5e02466b..8ba12653c2cc0 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 1ad2c6471ef32..e1aa5c504c45d 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 f07c8e4d037b0..0000000000000
--- a/contrib/tcpdump/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-version.c
-Makefile
-Makefile-devel.in
-config.status
-config.log
-config.cache
-config.h
-.devel
-stamp-h
-stamp-h.in
-tcpdump
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index 5995d23464e32..112224c018761 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.12 2004/03/31 14:57:24 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h
index 63c0c291e0f67..f233796b91bd6 100644
--- a/contrib/tcpdump/ethertype.h
+++ b/contrib/tcpdump/ethertype.h
@@ -20,7 +20,7 @@
  *
  * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.20 2003/07/01 19:10:26 guy Exp $ (LBL)
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ethertype.h,v 1.8 2004/03/31 14:57:24 bms Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h
index a53e59fb37c6c..b3bf2407120ba 100644
--- a/contrib/tcpdump/interface.h
+++ b/contrib/tcpdump/interface.h
@@ -20,7 +20,7 @@
  *
  * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.217.2.5 2004/03/17 19:47:48 guy Exp $ (LBL)
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/interface.h,v 1.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef tcpdump_interface_h
diff --git a/contrib/tcpdump/ipproto.h b/contrib/tcpdump/ipproto.h
index b73cc200ae904..9ae3656a58b11 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.1 2004/03/31 09:16:32 bms Exp $
  */
 
 #ifndef IPPROTO_IP
diff --git a/contrib/tcpdump/nfs.h b/contrib/tcpdump/nfs.h
index 82c8dd3f1f954..3d7ba2d1ef1a1 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 8a337ba156ec8..c4b67931efd32 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 c81803251cca0..bad35523dba83 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.8 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/ppp.h b/contrib/tcpdump/ppp.h
index 6c69ce83eba41..885b7b47dba57 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.6 2004/03/31 14:57:24 bms Exp $
  */
 #define PPP_HDRLEN	4	/* length of PPP header */
 
diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index e56df75eeaa43..df07a7fee4f80 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.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-atalk.c b/contrib/tcpdump/print-atalk.c
index ce6178ad90dd1..3d01cc7de8ebe 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.12 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
index 549af0e8c6b7d..654a670d9332b 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.9 2004/03/31 14:57:24 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c
index aedda0cff946e..630fcad7ed668 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.9 2004/03/31 14:57:24 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c
index 0aaef01b6739b..e42d3cd7203b2 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.10 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index 223a08588e375..b3ad9ba89e688 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.14 2004/03/31 14:57:24 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-fddi.c b/contrib/tcpdump/print-fddi.c
index e9aedddabc965..cc900f196ccf9 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.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c
index 4e568b1e16f49..8cc81fd056b49 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.4 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-icmp.c b/contrib/tcpdump/print-icmp.c
index ddaf2803d6358..653149f565434 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.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c
index ca4c96d0f4a10..f56eae83ee8cc 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.11 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c
index 58a0f268d7852..2443a029ad76e 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.5 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c
index 6a6dfb9a51639..b1e2754d481aa 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.7 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
index 5dc660f1eee34..afe3e7facb6ab 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 support.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-isoclns.c,v 1.12 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-llc.c b/contrib/tcpdump/print-llc.c
index 49655b88881c0..a9c8f72ff67c8 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.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c
index 208faa184ada3..18c3e8fe10f83 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.10 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c
index a97719f14ea50..269bf16feb83b 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.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c
index a9f08bac0cc54..ab0417af880e5 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.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-pim.c b/contrib/tcpdump/print-pim.c
index 4aa4983899b93..92b2d0ed9a93e 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.6 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index 01febb85b6cb1..737ad3652a491 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.13 2004/03/31 14:57:24 bms Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c
index 87f31bba19a50..a899ee16f8c75 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.8 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
index 83e16f03395b2..48c4887236927 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.9 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-token.c b/contrib/tcpdump/print-token.c
index 4d067061cbf81..9be2bdb8fd82f 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.6 2004/03/31 14:57:24 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-udp.c b/contrib/tcpdump/print-udp.c
index 7d910cb7fc3cc..4ad3b40c5f4a1 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.8 2004/03/31 14:57:24 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/tcpdump.1 b/contrib/tcpdump/tcpdump.1
index daa1dc0d9b560..469e344c6c757 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.13 2004/03/31 14:57:24 bms Exp $
 .\"
 .TH TCPDUMP 1  "7 January 2004"
 .SH NAME
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index 4314a1a8b3904..456996a95b2af 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.216.2.10 2004/03/17 19:47:48 guy Exp $ (LBL)";
 #endif
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.8 2004/03/31 14:57:24 bms Exp $ */
 
 /*
  * tcpdump - monitor tcp/ip traffic on an ethernet.
diff --git a/contrib/tcpdump/token.h b/contrib/tcpdump/token.h
index e466c843630f0..4765cd28b7d87 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 daed825b1d634..c5d9af989a8be 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 b7fbfe84761dc..dc4f4a8f21904 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 c937f03eacded..b152601861610 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 6d3ba7f074932..dace1797f63e5 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 46426559e0883..a39588ed5ad9c 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 a8ee04831d678..edd47083d3502 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 46663c7789e21..3f6626be3e480 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 2f7fe6e744024..f727c2e75587d 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 8bdf672ab3bae..7227006ceb525 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 eda8d57e03286..afe05eb505682 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 e24bb44584551..f740c7a45dfc0 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 d6e8d9c884752..8f4a3978fe4f4 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 2380c27daa5e2..c941fdeb127d8 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 ab7b2dce47b81..7c6bd7f225555 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 2f3f3466daa5d..ba80d42bcf5ed 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 e0530f6e63c39..95ef529c18825 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 aea753c3ff93c..c3f0a838379af 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 97299ad53b77d..ac958849ad74e 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 044e9b9e8ffac..b7a0773d01ef8 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 555d8ebdeb78c..7827c001bca76 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 badf21417dcc5..d479589ae6f38 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 fba0c6b61735a..aad79b8ec608b 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 194048532b4e5..8104aaee08cd7 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 85f389b2e55db..8d1ab6348d16c 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 906a875ee2b31..8582df018889e 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.33 2003/10/24 18:26:28 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/un.h>
diff --git a/contrib/telnet/telnet/defines.h b/contrib/telnet/telnet/defines.h
index 840666deacb6a..d49cb2d0a07c3 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 e9be27e1634fb..86babbb9377b7 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 e3fe643ebc7fc..dbc23611e4334 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.18 2003/05/11 18:17:00 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/telnet/telnet/network.c b/contrib/telnet/telnet/network.c
index bb75d6309f90e..e93345fa68011 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 6c2b7efc5a511..07061338865b6 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 516b7a5d806a8..6b8d11d2c603c 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 45ef1e2aa3cdf..cd6f8545066b5 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 2bbc0b77ff33e..4db8f8cb595d6 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.16 2001/08/20 12:28:40 markm Exp $
 .\"
 .Dd January 27, 2000
 .Dt TELNET 1
diff --git a/contrib/telnet/telnet/telnet.c b/contrib/telnet/telnet/telnet.c
index 82ee4649b703c..d94099602de1b 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.14 2003/05/11 18:17:00 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/contrib/telnet/telnet/terminal.c b/contrib/telnet/telnet/terminal.c
index 3dda1c5bf8865..c1c88daa74b05 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 b0cfe37bbabd8..d5fa43a9d9fbd 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 9377b522c9722..7c42dd9596926 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 d727f367c0450..31ef2fb0a958a 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 448ba68b92fd0..4e45206b8155c 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 2ed82d0b6aeea..eefd1294c7329 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 ed8ee887a39e5..43fce7e400064 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 ad034418d3133..a3b6cd6143504 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 9db4516096a01..64cdddaa0add8 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 151c5b45215d3..bbdd14b581f8e 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 b11fbac76059c..3d38fc9b60b30 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.18 2001/12/14 14:41:07 ru Exp $
 .\"
 .Dd January 27, 2000
 .Dt TELNETD 8
diff --git a/contrib/telnet/telnetd/telnetd.c b/contrib/telnet/telnetd/telnetd.c
index 118957465f548..254cfe060e496 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.25 2003/08/13 11:02:37 harti Exp $");
 
 #include "telnetd.h"
 #include "pathnames.h"
diff --git a/contrib/telnet/telnetd/telnetd.h b/contrib/telnet/telnetd/telnetd.h
index 5bfc572f518d3..e99a7c93efd14 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 88425206da56b..533eb1554576a 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 54e23270be181..c360834b84b1d 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 52799e6caa992..6efe764dd32dc 100644
--- a/contrib/texinfo/FREEBSD-Xlist
+++ b/contrib/texinfo/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/texinfo/FREEBSD-Xlist,v 1.5 2004/02/17 02:09:53 ache Exp $
 */ABOUT-NLS
 */INSTALL.generic
 */Makefile.am
diff --git a/contrib/texinfo/FREEBSD-upgrade b/contrib/texinfo/FREEBSD-upgrade
index e2843edf0fe3e..df3148d270291 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.5 2003/06/18 13:30:44 ru Exp $
 
 GNU Texinfo 4.6
 	originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/
diff --git a/contrib/texinfo/config.h b/contrib/texinfo/config.h
index 420b55e9d1db9..82495f7992c47 100644
--- a/contrib/texinfo/config.h
+++ b/contrib/texinfo/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/texinfo/config.h,v 1.6 2003/06/18 13:02:27 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 2bd8cf6a94e0f..d4b62ddb715a6 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.15 2003/06/18 13:02:02 ru Exp $ */
 /* install-info -- create Info directory entry(ies) for an Info file.
    $Id: install-info.c,v 1.9 2003/05/19 13:10:59 karl Exp $
 
diff --git a/contrib/top/commands.c b/contrib/top/commands.c
index b79e19afc69e2..45f73cb7bea0c 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.10 2004/08/16 07:51:21 alfred Exp $
  */
 
 /*
diff --git a/contrib/top/display.c b/contrib/top/display.c
index b1b643577ff8a..e34cee4195c02 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.7 2002/08/11 18:37:25 dwmalone Exp $
  */
 
 /*
diff --git a/contrib/top/machine.h b/contrib/top/machine.h
index 62b321c4c37ae..c49856b85bd9b 100644
--- a/contrib/top/machine.h
+++ b/contrib/top/machine.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/machine.h,v 1.6 2003/07/17 23:56:40 julian Exp $
  */
 
 /*
diff --git a/contrib/top/screen.c b/contrib/top/screen.c
index 348304cc2836f..a3f19a36201ca 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 97ec76a8b440a..d25dc4068cedb 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.11 2004/07/12 03:00:50 alfred Exp $
 .nr N %topn%
 .nr D %delay%
 .TH TOP 1 Local
diff --git a/contrib/top/top.c b/contrib/top/top.c
index d3e1c5698ab5f..4d533e936451b 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.15 2004/08/16 07:51:21 alfred Exp $
  */
 
 /*
diff --git a/contrib/top/top.h b/contrib/top/top.h
index 59cdeed2d7d7c..db89760aa510c 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 23591866eb83e..2cc45ed1db66d 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 906170ad67a33..93a4ae7820772 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 bc4918eb146f2..b0b42ef8ddea0 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 26e2f76091975..b2ba46879efe8 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 00af84366c52f..7a3d5d3e31e69 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 5646be938b9fc..228af95eb6aae 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.10 2002/12/13 22:26:10 fenner Exp $
 .\"
 .TH TRACEROUTE 8 "21 September 2000"
 .UC 6
diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c
index cfb3af41b44e1..1891a520b3434 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 2004/04/17 18:44:23 pb Exp $";
 #endif
 
 /*
diff --git a/crypto/README b/crypto/README
index a3c5ccf50a1c4..d385e8b8aa75f 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 6415adc6e6c8d..ff74c9a899df8 100644
--- a/crypto/heimdal/FREEBSD-Xlist
+++ b/crypto/heimdal/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/heimdal/FREEBSD-Xlist,v 1.1 2003/10/09 19:35:38 nectar Exp $
 TODO*
 *.info*
 *.cat[0-9]
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h
index cf6a6f3548da9..69805faf5bc1b 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 f371ca1e1edff..d6d88b727c6dd 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 a98456d305e2e..6ec00c4105083 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 3621d307a4251..619a40f68050c 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/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h
index 0b36127db0d58..55b0112062de1 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 96db9248bebb2..dd7f88622909c 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 c4f1ea2d30f10..e1834683a572b 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 d1c1c9d3d79ff..50165e6ce5794 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 be7997e28c903..f4258ab01b86c 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/.cvsignore b/crypto/openssh/.cvsignore
deleted file mode 100644
index 12de9ef50509b..0000000000000
--- a/crypto/openssh/.cvsignore
+++ /dev/null
@@ -1,24 +0,0 @@
-ssh
-scp
-sshd
-ssh-add
-ssh-keygen
-ssh-keyscan
-ssh-keysign
-ssh-agent
-sftp-server
-sftp
-configure
-config.h.in
-config.h
-config.status
-config.cache
-config.log
-stamp-h.in
-Makefile
-ssh_prng_cmds
-*.out
-*.0
-buildit.sh
-autom4te.cache
-ssh-rand-helper
diff --git a/crypto/openssh/FREEBSD-Xlist b/crypto/openssh/FREEBSD-Xlist
index 6d8ac040866f5..5064ba5271e02 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 4ae543986b3f4..7f138deeda853 100644
--- a/crypto/openssh/FREEBSD-tricks
+++ b/crypto/openssh/FREEBSD-tricks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.4 2003/09/19 11:29:51 des Exp $
 
 # Shell code to remove FreeBSD tags before merging
 grep -rl '\$Fre.BSD:' . >tags
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 331d83add1db6..b50213d004a40 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.8 2004/02/26 10:57:28 des Exp $
diff --git a/crypto/openssh/acconfig.h b/crypto/openssh/acconfig.h
index 02e9e4f96ba5e..82aa84689819a 100644
--- a/crypto/openssh/acconfig.h
+++ b/crypto/openssh/acconfig.h
@@ -1,5 +1,5 @@
 /* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/acconfig.h,v 1.9 2004/04/20 09:46:39 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 dbe04cdf2d409..12cddf508cd7d 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.8 2004/02/26 10:52:30 des Exp $");
 
 #include "auth.h"
 #include "log.h"
diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c
index 42b802678d7ff..ce10c4d38374e 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.17 2004/04/20 09:46:39 des Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c
index 9e30219fb8abe..e78e37d900692 100644
--- a/crypto/openssh/auth-pam.c
+++ b/crypto/openssh/auth-pam.c
@@ -32,7 +32,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.100 2004/04/18 01:00:26 dtucker Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-pam.c,v 1.14 2004/04/20 09:46:39 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 ff4b6f6bd2086..4095426952242 100644
--- a/crypto/openssh/auth-pam.h
+++ b/crypto/openssh/auth-pam.h
@@ -1,5 +1,5 @@
 /* $Id: auth-pam.h,v 1.25 2004/03/08 12:04:07 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/auth-pam.h,v 1.9 2004/04/20 09:46:39 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 38f610ab5a959..b0042c2f78413 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.31 2004/01/30 09:48:57 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-passwd.c,v 1.17 2004/04/20 09:46:39 des Exp $");
 
 #include "packet.h"
 #include "log.h"
diff --git a/crypto/openssh/auth-skey.c b/crypto/openssh/auth-skey.c
index 331e9a7571ada..b8bcf2c5dbfb3 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 2004/04/20 09:46:39 des Exp $");
 
 #ifdef SKEY
 
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c
index 6bed01c9685f9..2c80bad7201c8 100644
--- a/crypto/openssh/auth.c
+++ b/crypto/openssh/auth.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth.c,v 1.51 2003/11/21 11:57:02 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth.c,v 1.15 2004/02/26 10:52:30 des Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
diff --git a/crypto/openssh/auth.h b/crypto/openssh/auth.h
index 83841b6591aa1..9b3026db9a150 100644
--- a/crypto/openssh/auth.h
+++ b/crypto/openssh/auth.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: auth.h,v 1.49 2004/01/30 09:48:57 markus Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/auth.h,v 1.13 2004/04/20 09:46:39 des Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/auth1.c b/crypto/openssh/auth1.c
index 7dd3a4a5044b6..e526411364ab0 100644
--- a/crypto/openssh/auth1.c
+++ b/crypto/openssh/auth1.c
@@ -11,7 +11,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth1.c,v 1.55 2003/11/08 16:02:40 jakob Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth1.c,v 1.30 2004/04/20 09:46:39 des Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c
index 4e2a0f91785d8..05c46a4a0f7fc 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.20 2002/06/30 21:59:45 deraadt Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2-chall.c,v 1.8 2004/01/07 11:16:23 des Exp $");
 
 #include "ssh2.h"
 #include "auth.h"
diff --git a/crypto/openssh/auth2-kbdint.c b/crypto/openssh/auth2-kbdint.c
index 15c20b33921e7..8e75d224bbc63 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.2 2002/12/14 13:48:13 des Exp $");
 
 #include "packet.h"
 #include "auth.h"
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c
index 756f33c4d04cd..7fb6f4e9156b1 100644
--- a/crypto/openssh/auth2.c
+++ b/crypto/openssh/auth2.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth2.c,v 1.104 2003/11/04 08:54:09 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.23 2004/04/20 09:46:39 des Exp $");
 
 #include "canohost.h"
 #include "ssh2.h"
diff --git a/crypto/openssh/bufaux.c b/crypto/openssh/bufaux.c
index adbb4bdd58877..1657824dc107b 100644
--- a/crypto/openssh/bufaux.c
+++ b/crypto/openssh/bufaux.c
@@ -38,7 +38,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: bufaux.c,v 1.32 2004/02/23 15:12:46 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/bufaux.c,v 1.15 2004/02/26 10:52:30 des Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
diff --git a/crypto/openssh/compat.c b/crypto/openssh/compat.c
index 482caba8f7584..6648efca37063 100644
--- a/crypto/openssh/compat.c
+++ b/crypto/openssh/compat.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: compat.c,v 1.70 2003/11/02 11:01:03 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/compat.c,v 1.11 2004/02/26 10:52:30 des Exp $");
 
 #include "buffer.h"
 #include "packet.h"
diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
index ddf231e09f28f..db67ec2c2fe50 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.177 2004/04/15 23:22:40 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/config.h,v 1.9 2004/04/20 09:49:37 des Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac
index 41fdc34bde398..85688a084d675 100644
--- a/crypto/openssh/configure.ac
+++ b/crypto/openssh/configure.ac
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/configure.ac,v 1.9 2004/04/20 09:46:39 des Exp $
 # $Id: configure.ac,v 1.202 2004/02/24 05:47:04 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h
index 32e9b8420bbdb..2a14893d0c233 100644
--- a/crypto/openssh/includes.h
+++ b/crypto/openssh/includes.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: includes.h,v 1.17 2002/01/26 16:44:22 stevesk Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/includes.h,v 1.17 2004/02/26 10:52:30 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h
index ca4d7bf6da976..6fb01e8a1a55e 100644
--- a/crypto/openssh/log.h
+++ b/crypto/openssh/log.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: log.h,v 1.10 2003/09/23 20:17:11 markus Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/log.h,v 1.5 2004/02/26 10:52:30 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/loginrec.c b/crypto/openssh/loginrec.c
index 90f9f7474c76f..10e49699b0bbe 100644
--- a/crypto/openssh/loginrec.c
+++ b/crypto/openssh/loginrec.c
@@ -158,7 +158,7 @@
 #include "log.h"
 #include "atomicio.h"
 
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.7 2004/04/20 09:46:39 des Exp $");
 RCSID("$Id: loginrec.c,v 1.54 2004/02/10 05:49:35 dtucker Exp $");
 
 #ifdef HAVE_UTIL_H
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c
index c04d1f78553b7..883af8709acdd 100644
--- a/crypto/openssh/monitor.c
+++ b/crypto/openssh/monitor.c
@@ -26,7 +26,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.15 2004/04/20 09:46:39 des Exp $");
 
 #include <openssl/dh.h>
 
diff --git a/crypto/openssh/monitor.h b/crypto/openssh/monitor.h
index feab93fbd1f37..d651bb48ca26e 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.5 2004/02/26 10:52:31 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 b4f2a89cd6941..1935a37cf01d1 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.35 2003/11/17 11:06:07 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/monitor_wrap.c,v 1.8 2004/04/20 09:46:39 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 a7c9edd1f10cd..e860d9a065b1c 100644
--- a/crypto/openssh/monitor_wrap.h
+++ b/crypto/openssh/monitor_wrap.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: monitor_wrap.h,v 1.13 2003/11/17 11:06:07 markus Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/monitor_wrap.h,v 1.6 2004/04/20 09:46:39 des Exp $	*/
 
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/crypto/openssh/myproposal.h b/crypto/openssh/myproposal.h
index 065dd4483fefd..8e99d48efa8f0 100644
--- a/crypto/openssh/myproposal.h
+++ b/crypto/openssh/myproposal.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: myproposal.h,v 1.15 2003/05/17 04:27:52 markus Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/myproposal.h,v 1.6 2004/01/07 11:16:23 des Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/openbsd-compat/.cvsignore b/crypto/openssh/openbsd-compat/.cvsignore
deleted file mode 100644
index f3c7a7c5da688..0000000000000
--- a/crypto/openssh/openbsd-compat/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/crypto/openssh/openbsd-compat/fake-rfc2553.h b/crypto/openssh/openbsd-compat/fake-rfc2553.h
index a19a42f3f906c..a558d851ae2a3 100644
--- a/crypto/openssh/openbsd-compat/fake-rfc2553.h
+++ b/crypto/openssh/openbsd-compat/fake-rfc2553.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/openbsd-compat/fake-rfc2553.h,v 1.4 2004/04/20 09:46:41 des Exp $ */
 /* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */
 
 /*
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index c62b9432b2951..c745c5044b1ea 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/readconf.c,v 1.23 2004/04/20 09:47:13 des Exp $");
 RCSID("$OpenBSD: readconf.c,v 1.127 2003/12/16 15:49:51 markus Exp $");
 
 #include "ssh.h"
diff --git a/crypto/openssh/scard/.cvsignore b/crypto/openssh/scard/.cvsignore
deleted file mode 100644
index 5349d34aeabdf..0000000000000
--- a/crypto/openssh/scard/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Ssh.bin
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 2afd6eb947cb1..10c0bf75f2d88 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -11,7 +11,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: servconf.c,v 1.130 2003/12/23 16:12:10 jakob Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.44 2004/02/26 10:52:31 des Exp $");
 
 #include "ssh.h"
 #include "log.h"
diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h
index 7b1ba7f81ebc1..47d8ea421600e 100644
--- a/crypto/openssh/servconf.h
+++ b/crypto/openssh/servconf.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: servconf.h,v 1.67 2003/12/23 16:12:10 jakob Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/servconf.h,v 1.15 2004/02/26 10:52:31 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 3f9049f3593ef..da2d204bb5450 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -34,7 +34,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: session.c,v 1.172 2004/01/30 09:48:57 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.44 2004/04/20 09:46:40 des Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c
index 29aa7dd8f971c..aeb5c6ed4017b 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.117 2003/12/02 17:01:15 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/ssh-agent.c,v 1.22 2004/04/20 09:46:40 des Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1
index da812d6a0bdb8..d70ea9206865f 100644
--- a/crypto/openssh/ssh.1
+++ b/crypto/openssh/ssh.1
@@ -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/crypto/openssh/ssh.1,v 1.29 2004/04/20 09:46:40 des Exp $
 .\" $OpenBSD: ssh.1,v 1.181 2003/12/16 15:49:51 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index d4535b8737ef9..e511ce99940a6 100644
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/ssh.c,v 1.26 2004/04/20 09:46:40 des Exp $");
 RCSID("$OpenBSD: ssh.c,v 1.206 2003/12/16 15:49:51 markus Exp $");
 
 #include <openssl/evp.h>
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index 31daf59790b58..b776003c25ab3 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -1,5 +1,5 @@
 #	$OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25 2004/04/20 09:37:28 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 ee8baea8d3ad6..1436c7986c6ab 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -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/crypto/openssh/ssh_config.5,v 1.15 2004/04/20 09:46:40 des Exp $
 .\" $OpenBSD: ssh_config.5,v 1.28 2003/12/16 15:49:51 markus Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index 2ed44cca7f136..6d06d587ce097 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.200 2003/10/08 08:27:36 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.29 2004/02/26 10:52:31 des Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 22c2e3d0a535d..1b0fd6bd91b2f 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.37 2004/04/20 09:46:40 des Exp $");
 RCSID("$OpenBSD: sshd.c,v 1.286 2004/02/23 12:02:33 markus Exp $");
 
 #include <openssl/dh.h>
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 2f7c103b68d9b..4f2c7e5de9667 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -1,5 +1,5 @@
 #	$OpenBSD: sshd_config,v 1.68 2003/12/29 16:39:50 millert Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/crypto/openssh/sshd_config,v 1.40 2004/04/20 09:37:29 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 1e6210422e584..39fb45abfd8a7 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -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/crypto/openssh/sshd_config.5,v 1.21 2004/04/20 09:46:40 des Exp $
 .\" $OpenBSD: sshd_config.5,v 1.28 2004/02/17 19:35:21 jmc Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
diff --git a/crypto/openssh/version.c b/crypto/openssh/version.c
index a6614397fd35b..fd2394910caad 100644
--- a/crypto/openssh/version.c
+++ b/crypto/openssh/version.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/crypto/openssh/version.c,v 1.4 2002/10/29 10:16:02 des Exp $
  */
 
 #include "includes.h"
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 7acdecb522307..30f943eafdb1f 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/version.h,v 1.27 2004/04/20 09:46:40 des Exp $ */
 /* $OpenBSD: version.h,v 1.40 2004/02/23 15:16:46 markus Exp $ */
 
 #ifndef SSH_VERSION
diff --git a/crypto/openssl/FREEBSD-Xlist b/crypto/openssl/FREEBSD-Xlist
index 47a1a4ccf9f64..0d290f4682f43 100644
--- a/crypto/openssl/FREEBSD-Xlist
+++ b/crypto/openssl/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.5 2003/10/01 12:21:16 nectar Exp $
 INSTALL.DJGPP
 INSTALL.MacOS
 INSTALL.OS2
diff --git a/crypto/openssl/apps/openssl.cnf b/crypto/openssl/apps/openssl.cnf
index 9256b4debda78..a1954b97628f3 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.6 2004/03/17 17:44:38 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 1ea0fe10a5351..f0f86b8467e64 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.10 2003/10/01 12:37:50 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 5f7a1f20a3592..ac207c2400396 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.12 2003/10/01 12:37:50 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 1ed3b3bc0a06c..2397171a6d25e 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 20a15095023cb..bde4d88e1e0e7 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.6 2003/10/01 12:37:51 nectar Exp $
 #
 # Mingw32.pl -- Mingw
 #
diff --git a/etc/Makefile b/etc/Makefile
index 0900b53c9f9b2..3c8090a4bd738 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.327.2.2 2004/10/09 18:38:57 dougb Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
diff --git a/etc/amd.map b/etc/amd.map
index d34adc9697901..4fbd9c691258d 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 be4a6c3ddd4c5..0522793758241 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 08b6f7a3271fa..989c42b033043 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 540dcd5701d9c..df128020983ea 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 71a22d45655b5..70a7ed1027f1d 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 4ad0a0484b90b..b3607c79ee70f 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 222798bb28f15..2a188c330bc87 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 2e538a823e55e..9f5e75c3b6591 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 f4f775ae6ada0..14d67e11932a6 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 62deb32f86de9..9e96c4e04711a 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 6b0584f499845..7255a0076adbd 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 9e100922978d5..62829e63ecf9d 100644
--- a/etc/defaults/Makefile
+++ b/etc/defaults/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/Makefile,v 1.3 2003/08/24 03:24:54 mtm Exp $
 
 FILES=	devfs.rules pccard.conf periodic.conf rc.conf
 NOOBJ=	noobj
diff --git a/etc/defaults/devfs.rules b/etc/defaults/devfs.rules
index d8a77519dd255..675a4e9bb694e 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 93e72bcc8268c..b2a6a73154ee2 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.269 2004/06/06 11:46:28 schweikh 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 682692de59505..bddf5ee0d00b2 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -10,7 +10,7 @@
 # values set in this file.  This eases the upgrade path when defaults
 # are changed and new features are added.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.29 2004/05/19 09:18:07 joe Exp $
 #
 
 # What files override these defaults ?
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 5ad32388046df..d5e63a81ee5e4 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.212.2.4.2.1 2004/10/28 13:59:44 keramida Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
diff --git a/etc/devd.conf b/etc/devd.conf
index 4468c87c34999..9c46899eec548 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/devd.conf,v 1.14.2.3 2004/09/14 21:22:32 wpaul 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 f7869fe894bb6..f32c00252b1b8 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 a7639d904aad5..5bdbb8b9e875c 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 8f002996c13cb..85ec02bc0cd85 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 0a6551460ae66..59592586a5ce0 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 fe6a7b1c9bed3..bc291275cea28 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 f56bd2d805a4c..8857a9f6918aa 100644
--- a/etc/etc.arm/ttys
+++ b/etc/etc.arm/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.arm/ttys,v 1.1 2004/06/11 15:37:49 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 fe6a7b1c9bed3..ec01a3d6b92bf 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 d8bdb7e3f534b..b4e7665b7c5b7 100644
--- a/etc/etc.ia64/ttys
+++ b/etc/etc.ia64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.ia64/ttys,v 1.4 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.powerpc/ttys b/etc/etc.powerpc/ttys
index 47d9ef08ee4bb..190642213a63b 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 2004/02/04 01:44:34 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 0b56ae82a554f..40504ea665143 100644
--- a/etc/etc.sparc64/ttys
+++ b/etc/etc.sparc64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.6.4.1 2004/10/07 22:07:31 kensmith 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 83ac65ddcdb81..06d2d61271cb0 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 1d03fc42f1b85..88db4565b3f23 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/ftpusers,v 1.13 2004/06/30 16:47:08 maxim Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
diff --git a/etc/gettytab b/etc/gettytab
index ed667505f87bd..0dc16695e41c3 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 9337ab7f4adbb..7cc6dd52f302f 100644
--- a/etc/group
+++ b/etc/group
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/group,v 1.31 2004/06/23 01:32:28 mlaier Exp $
 #
 wheel:*:0:root
 daemon:*:1:
diff --git a/etc/hosts b/etc/hosts
index 2690a9ad48e1a..3b84faae084ee 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 47d57d11f2ac0..953f5ea22cc5d 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 d8a71c1ebc7f6..7b7adb0e29593 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 b53202ab18e57..7e0233257008e 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 27b93f74260eb..9e5c0b7caa504 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/inetd.conf,v 1.69 2004/06/06 11:46:27 schweikh Exp $
 #
 # Internet server configuration database
 #
diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile
index e3cfddfac247f..7c0fcf460730f 100644
--- a/etc/isdn/Makefile
+++ b/etc/isdn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/Makefile,v 1.12 2004/01/19 13:40:50 ru Exp $
 
 NOOBJ=
 
diff --git a/etc/isdn/answer b/etc/isdn/answer
index d39a983312065..36c212f5c4c29 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 80b725910846b..7a55a2969f77b 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 fa25b22e9e493..67e3e81c397d7 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 388770ea07702..a8a5bbd3ec0f3 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 6a73b75f2c42a..308cb72ee77ef 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 d3992b052d386..c7e96f72442f5 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 c4d34ec3a6d68..f73bb9c69c707 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 3878e7c80f06c..78a6d41d479bd 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 c06bc1942a082..bd8178a26fb3f 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 14f528a80927b..5ed5fcb331a72 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 61591fbfe6e6e..aec785b895c7e 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 047c834b51f6c..82db77fdd2d96 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 ae4c8176de1a7..f8e14c691ac69 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 5debe21fe0e09..0ad9aa9fc5795 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 ffe5fff0abea7..55d031a2afcd5 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 7b105ffc1d5e7..e306d0ae43075 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 2004/06/06 11:46:27 schweikh Exp $
 #
 
 # Default settings effectively disable resource limits, see the
diff --git a/etc/mac.conf b/etc/mac.conf
index 2e1b9a24cf7de..2ada6dd0fbb18 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 3f085cc2d7809..8604fcb779c36 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 fd7c8f6ed8128..d10884995a606 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 81c7c3f852373..15382b904b151 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 2cc90835cb547..4c6218bd19578 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/aliases,v 1.20 2004/06/30 16:47:08 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 3fa69223046c3..6f63b9008a91e 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 d2c45e09c36ec..bce93827249a7 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 43e2bbbe4103e..fb6162ed9c564 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 0268403efffc0..36a2d62462704 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 c21e25d9125da..8a034e5670969 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/master.passwd,v 1.39 2004/08/01 21:33:47 markm 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 2f828eeb960a4..0393c59c14d35 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.5.2.1 2004/09/30 23:36:07 dougb 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 534794af5eb50..07b7d69eb5c94 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.2.1 2004/09/30 23:36:07 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 a7cef970c5bc3..6e98c78d8dbab 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.88.2.2 2004/09/30 23:36:07 dougb 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 658c828fc04ec..25c8979ad7ed7 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.112 2004/05/31 07:34:40 kris 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 952aacea6a949..6b864f04e2249 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 874b13663d22e..357e7afff6024 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.68.2.2 2004/09/30 23:36:07 dougb 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 138606b7c44d7..a3dc4c62a0663 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 95bd06c0f2e15..4f7a84986bee1 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.304.2.2.2.1 2004/10/23 03:10:48 kensmith 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 2b5b37e013669..7e5c4a5f9f9eb 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.69.2.1 2004/09/30 23:36:07 dougb 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 c293627de21c7..e6266108b110e 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.24 2004/05/31 07:34:40 kris 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 ef3378153cba8..b878ddd0704d7 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 cbd5d376b9fef..6537a4b771dc4 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/Makefile,v 1.1.8.1 2004/09/30 23:36:07 dougb Exp $
 
 FILES=	${_BIND.chroot.dist} \
 	${_BIND.include.dist} \
diff --git a/etc/mtree/README b/etc/mtree/README
index 0e803a000c5ec..5a88abc81cbb7 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 db52d470a7f84..962b9a912c8cf 100644
--- a/etc/namedb/Makefile
+++ b/etc/namedb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/namedb/Makefile,v 1.2 2002/02/06 04:46:07 ume 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 1616771235d51..4289a4a7fc970 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 046868305455b..0bece5c7aaa48 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 60fbe49441abd..5ac32c9b64b2e 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.6.8.1 2004/09/30 23:36:07 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 d0d44494ea24c..f326bd0f222ec 100644
--- a/etc/namedb/named.conf
+++ b/etc/namedb/named.conf
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/etc/namedb/named.conf,v 1.15.2.1 2004/09/30 23:36:07 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 a6cd043d466c0..bcf7e27764d07 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 109f2e36ad434..4dc463654a120 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 dfa94efc8a6a3..f37a610d5d1cb 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.64 2004/02/10 19:10:34 des Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 #
 
diff --git a/etc/network.subr b/etc/network.subr
index b413e014331de..cfc78c39abf19 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.154.2.1 2004/09/09 11:46:07 yar Exp $
 #
 
 #
diff --git a/etc/networks b/etc/networks
index a6b15d4519b77..92982b5b2e10b 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 ad1e4b495c36a..dec1eb019d5da 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.49 2004/04/03 17:52:29 mlaier 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 805c34ab6b8ad..a13c121394cc1 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 e5f225849191f..d6f8c224dd196 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 ed57ef13a33a0..b30bf78df836d 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 604e1a88a2ddf..9e0d683838e39 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/Makefile,v 1.10 2003/06/14 12:35:05 des Exp $
 
 NOOBJ=	noobj
 FILES=	README ftpd gdm imap kde login other passwd pop3 \
diff --git a/etc/pam.d/README b/etc/pam.d/README
index 7b8f9582124ea..f83dda74b1111 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 f4c0676e1c4ad..e505237de8875 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 d248f00ad86f5..4234d8aad2317 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 08391e68a9497..f9252f89cd5a0 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 cba8af9f9d873..acb76e04171d7 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 539018363f11b..92937c6fdff62 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 a4c66285adb52..5b67c8e310b9c 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 e4ddf7ee4a9f6..55eccf68e4f58 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 e65508326ab26..37b681f0cfa5e 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 34d6cc055fe97..cdd04631a48d4 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/rexecd b/etc/pam.d/rexecd
index 532348ee92788..d55511b9fa1e7 100644
--- a/etc/pam.d/rexecd
+++ b/etc/pam.d/rexecd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/rexecd,v 1.2 2003/02/10 00:50:03 des Exp $
 #
 # PAM configuration for the "rexecd" service
 #
diff --git a/etc/pam.d/rsh b/etc/pam.d/rsh
index 02c0048eabf1e..a0f7bd959c4ee 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 cf3e0f0acd754..e1ba2971dacd9 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 834c27e08b8e5..babd642980e5e 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 c2f4d8b3fdaca..a4ac703d02b32 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 3ebee202accba..c0e987b766fe1 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 404b2310a3d43..0481201494bd6 100644
--- a/etc/pam.d/xdm
+++ b/etc/pam.d/xdm
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/xdm,v 1.9 2004/02/20 21:59:51 des Exp $
 #
 # PAM configuration for the "xdm" service
 #
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 100185ea55feb..2209369fe8ec5 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pccard_ether,v 1.41 2004/06/06 11:46:27 schweikh Exp $
 #
 # pccard_ether interfacename [start|stop] [ifconfig option]
 #
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile
index 8fb56dff051a1..2427cedd2f3ca 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 07b4348fe5c72..4a86a355bcdc5 100644
--- a/etc/periodic/Makefile.inc
+++ b/etc/periodic/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.6 2002/07/18 12:32:57 ru Exp $
 
 BINDIR=	/etc/periodic/${.CURDIR:T}
 NOOBJ=
diff --git a/etc/periodic/daily/100.clean-disks b/etc/periodic/daily/100.clean-disks
index 5884664cd3b3b..4494ff2ec94ad 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 eef3bc6545b5e..611d635e3e07a 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 d5b34a12c3859..1e2fef247fd6d 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 b7890db6d954c..cda67e5095316 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 9645d7e60bf79..753219b5d5310 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 460d1a2679086..c330e34c92407 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 5c585aff5f3c7..875c4784eeaf5 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 fe170389ef037..118572cdd759b 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 cc12097162e54..0be139edc4c63 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 ceb140c76b9a6..f3337e8044f17 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 ec064376d78f0..39c727cde8a88 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 63b2b6bef6765..2c79c47b3ab9d 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 f2178390e76c7..71c73175b2f44 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 8399cf720effb..c5b480cd68c35 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 44761368c9338..7cb6eac1c10f7 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 0aad05359ebfa..f24f0ac2cbe17 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 c0eb46c43024e..56980fa0b486b 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 34f1df24beccf..849e2ec5918e9 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.16 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/470.status-named b/etc/periodic/daily/470.status-named
index 5607bfb97bfce..179bf304d4af1 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 f46c24614b2c4..24db8c1d34180 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 317347526e795..6725009ea061e 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 04ea0e8a3788c..ecc165e71a906 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 0be8c326abf59..06e069de8f88d 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 4e7c2b991b90c..36b6a1acc47df 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 c21323058fd2e..510affba0552c 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 f5b5f82f208fb..56e388b6e0410 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.7 2002/10/25 15:14:16 thomas 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 3b72c5282b5a7..d7c672e4b2fbe 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 32cc16c846c3c..0dc38a4a87420 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 42ece0453ccd3..21ca297812105 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 22c63e967bd55..971181c09de38 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.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/510.ipfdenied b/etc/periodic/security/510.ipfdenied
index 2058d2b1cb94b..c420293ecce8f 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/550.ipfwlimit b/etc/periodic/security/550.ipfwlimit
index 65e8bd2c502a0..6e39199ef4676 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.6 2003/06/30 22:06:26 mtm 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 418ba17563388..12300cf4dec7a 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 6c64d92eee7e1..be2b9dfd93822 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 eaf4b10ec69f4..f0770548c4e6e 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 fb5ed633f461e..94eff501966e8 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 dd02a4e4e791f..945fcfd9ff16a 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 55f77099bb7c8..7050752679513 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 48e7303d79aa9..83983233d9c1e 100644
--- a/etc/periodic/security/Makefile
+++ b/etc/periodic/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/Makefile,v 1.3 2002/10/25 15:23:26 thomas Exp $
 
 FILES=	100.chksetuid \
 	200.chkmounts \
diff --git a/etc/periodic/security/security.functions b/etc/periodic/security/security.functions
index 29c61aa4e3925..899b06566f1a6 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.3 2003/06/30 22:06:26 mtm Exp $
 #
 
 #
diff --git a/etc/periodic/weekly/120.clean-kvmdb b/etc/periodic/weekly/120.clean-kvmdb
index 603e70b0d0179..50b1fbd601d5d 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 e6921ab56e829..374880e155065 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 dfc218ae008c3..5dacbe8de15d4 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 9fed4e5e2c33a..d4d5ee0bbd2a4 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.9 2002/03/05 19:13:05 cjc 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 11a5f53ea25d6..bc86bfc87a901 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 785c2fffd7563..2141b77677ac8 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 3951bb584d273..1a34e722889be 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 090fa6bdcd8e4..21b2e44cf297a 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 d79f87e64e221..a7dc3bce5ae77 100644
--- a/etc/pf.conf
+++ b/etc/pf.conf
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/etc/pf.conf,v 1.1.2.1 2004/09/17 18:27:14 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 a72c9cf5fcf4a..42a794a404bad 100644
--- a/etc/pf.os
+++ b/etc/pf.os
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/pf.os,v 1.2 2004/06/06 11:46:27 schweikh Exp $
 # $OpenBSD: pf.os,v 1.10 2003/09/06 01:37:07 frantzen Exp $
 # passive OS fingerprinting
 # -------------------------
diff --git a/etc/phones b/etc/phones
index 536ac20195972..205488664d161 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/ppp/ppp.conf b/etc/ppp/ppp.conf
index 209afa866bc2b..5281f70f68e8d 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.8 2001/06/21 15:42:26 brian Exp $
 #################################################################
 
 default:
diff --git a/etc/printcap b/etc/printcap
index 5319a0ec2b932..1b768da964892 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 665b61a36aed7..631ebeef6bbec 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 f79362b564613..052df8aebd11a 100644
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet protocols
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/protocols,v 1.19 2004/03/08 22:03:27 mlaier 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 ffd48488bfe48..e6af658bfd50c 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.333.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # System startup script run by init on autoboot
diff --git a/etc/rc.bsdextended b/etc/rc.bsdextended
index 69ecd545cf23a..7bb7253bd0cbc 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.2.1 2004/10/14 04:36:14 trhodes Exp $
 #
 
 ####
diff --git a/etc/rc.d/DAEMON b/etc/rc.d/DAEMON
index 95413803018be..9271c284844d3 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.4.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: DAEMON
diff --git a/etc/rc.d/LOGIN b/etc/rc.d/LOGIN
index bf84a33fadcde..7acacdbabb3f8 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.4.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: LOGIN
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 2d6f59d818680..51a990bce2f87 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.41.2.1 2004/10/14 04:36:15 trhodes Exp $
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
index d74c0b13f0817..a5c23004a8253 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.8.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: NETWORKING NETWORK
diff --git a/etc/rc.d/SERVERS b/etc/rc.d/SERVERS
index 48b19a51298d0..b4854fd00ea21 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.4.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: SERVERS
diff --git a/etc/rc.d/abi b/etc/rc.d/abi
index 53c54472b3d1b..b4ff1640b7699 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: abi
diff --git a/etc/rc.d/accounting b/etc/rc.d/accounting
index 777555db474b2..518dcbca770ac 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.8.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: accounting
diff --git a/etc/rc.d/addswap b/etc/rc.d/addswap
index 8213a9077cdd7..a6d3fb4f0dffd 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: addswap
diff --git a/etc/rc.d/adjkerntz b/etc/rc.d/adjkerntz
index b420653daed66..a3eef875a7ba3 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.4.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: adjkerntz
diff --git a/etc/rc.d/altqd b/etc/rc.d/altqd
index c7e626e13baee..91ca8543aa753 100644
--- a/etc/rc.d/altqd
+++ b/etc/rc.d/altqd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: altqd,v 1.2 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/altqd,v 1.1 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: altqd
diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index e445cf35d3bbe..466409735d6dc 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.13.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: amd
diff --git a/etc/rc.d/apm b/etc/rc.d/apm
index 3d15701956ed6..08867c4600d7d 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.5.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: apm
diff --git a/etc/rc.d/apmd b/etc/rc.d/apmd
index 22410e139727d..69f649f7c761b 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.11.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: apmd
diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep
index da93e8ba860cd..b82fefe99c73b 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.6.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: archdep
diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1
index dc91700ed2419..4db9ea1b505b2 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.14.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: atm1
diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2
index ffb63c35aef53..c7f671568c0c8 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.15.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: atm2
diff --git a/etc/rc.d/atm3 b/etc/rc.d/atm3
index 4dbd128b8e858..9ad02a228a4bc 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.13.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # Start ATM daemons
diff --git a/etc/rc.d/bgfsck b/etc/rc.d/bgfsck
index 4b41bcd7face4..98cc7ed25464c 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.5.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: bgfsck
diff --git a/etc/rc.d/bootconf.sh b/etc/rc.d/bootconf.sh
index 24803bcaeecfd..bca48d3db1930 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 bcef34651bdf1..3f606efdb8694 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.6.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: bootparams
diff --git a/etc/rc.d/ccd b/etc/rc.d/ccd
index ce58ac72cebea..ba4d7576f0c10 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.4.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar
index f2b396f0390c0..e9615b932ae61 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.6.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: cleanvar
diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp
index 7bde18b24f0ba..b6b09207e6e13 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.10.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: cleartmp
diff --git a/etc/rc.d/cron b/etc/rc.d/cron
index f33264f44d088..7d88f9200af05 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.5.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: cron
diff --git a/etc/rc.d/devd b/etc/rc.d/devd
index c282f3b1d0a27..0827d58c50c10 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.6.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: devd
diff --git a/etc/rc.d/devfs b/etc/rc.d/devfs
index 76c271012a3eb..435c43357e88b 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.8.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: devfs
diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient
index a317f32aa99ce..549e5aee3625f 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.16.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: dhclient
diff --git a/etc/rc.d/dhcpd b/etc/rc.d/dhcpd
index 55b1f4ade4f93..adbd817468411 100755
--- a/etc/rc.d/dhcpd
+++ b/etc/rc.d/dhcpd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: dhcpd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dhcpd,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: dhcpd
diff --git a/etc/rc.d/dhcrelay b/etc/rc.d/dhcrelay
index d78afa6442af8..ebb0264fce34a 100755
--- a/etc/rc.d/dhcrelay
+++ b/etc/rc.d/dhcrelay
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: dhcrelay,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dhcrelay,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: dhcrelay
diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg
index 6e2d552c01d38..6959424f570ed 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: dmesg
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index 870990dcb56d4..37d2424e4a074 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: dumpon
diff --git a/etc/rc.d/early.sh b/etc/rc.d/early.sh
index aaebe33e234aa..f72969f797a52 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.1.6.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: early
diff --git a/etc/rc.d/fsck b/etc/rc.d/fsck
index 7d329d28c258b..6cf32a332d305 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.9.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: fsck
diff --git a/etc/rc.d/gbde b/etc/rc.d/gbde
index 8842d46981e72..b36fab66c77a6 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.5.2.2 2004/10/15 06:14:43 pjd Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/gbde_swap b/etc/rc.d/gbde_swap
index 82ac8da45f1a0..36353d7e85d43 100644
--- a/etc/rc.d/gbde_swap
+++ b/etc/rc.d/gbde_swap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.4.2.2 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/hostname b/etc/rc.d/hostname
index 3db4e770d0a7f..659be31e8a707 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.7.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: hostname
diff --git a/etc/rc.d/ike b/etc/rc.d/ike
index 2d727a33a2e8b..6dac6e04c9645 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.2.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ike
diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd
index d5b3b4415e44c..31073d978816c 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: inetd
diff --git a/etc/rc.d/initdiskless b/etc/rc.d/initdiskless
index 23d7d56927156..7bca6fa03327e 100644
--- a/etc/rc.d/initdiskless
+++ b/etc/rc.d/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.d/initdiskless,v 1.38.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 # REQUIRE: preseedrandom
 # PROVIDE: initdiskless
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
index 62f7b7558a476..a0891d6af0709 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: initrandom
diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl
index 910580ed238cd..998fba501f6f1 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ip6addrctl
diff --git a/etc/rc.d/ip6fw b/etc/rc.d/ip6fw
index 36aa295032623..363e0308c37e6 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.5.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ip6fw
diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter
index 4fb17fcdb8253..c9c9b8fb27e7d 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.21.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ipfilter
diff --git a/etc/rc.d/ipfs b/etc/rc.d/ipfs
index 0adddacf44623..0e43a9c70de70 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.5.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ipfs
diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw
index eda4437900e09..a7298c6575435 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.8.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ipfw
diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon
index a3ef8131817e8..d3e6c48cafd4e 100755
--- a/etc/rc.d/ipmon
+++ b/etc/rc.d/ipmon
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipmon,v 1.11.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ipmon
diff --git a/etc/rc.d/ipnat b/etc/rc.d/ipnat
index 4298f8e5726ed..408eb2387b672 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.13.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ipnat
diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec
index 788ff3a01bf80..f95b9070008a2 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.10.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ipsec
diff --git a/etc/rc.d/ipxrouted b/etc/rc.d/ipxrouted
index 04d3586daa39c..7b879fde6c4c0 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.2.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ipxrouted
diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd
index 94765057c2587..d1ef45a751dca 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.18.2.1 2004/10/10 09:50:53 mtm 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 bdb797adacc7c..35b9e5eaf7edf 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.15.2.2 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: jail
diff --git a/etc/rc.d/kadmind b/etc/rc.d/kadmind
index 1e07938ffcd64..0bb50d23139e4 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.3.6.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: kadmin
diff --git a/etc/rc.d/kdc b/etc/rc.d/kdc
index 43a5005d02680..5a0565a304fea 100755
--- a/etc/rc.d/kdc
+++ b/etc/rc.d/kdc
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: kdc,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kdc,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: kdc
diff --git a/etc/rc.d/kerberos b/etc/rc.d/kerberos
index 6e101e3e6ed50..671730357ffd5 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.3.6.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: kerberos
diff --git a/etc/rc.d/keyserv b/etc/rc.d/keyserv
index 6be21278e5373..51dbeba3dfeb0 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.2.8.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # Start keyserv if we are running Secure RPC
diff --git a/etc/rc.d/kldxref b/etc/rc.d/kldxref
index 866321396379c..8e627d7249fc3 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: kldxref
diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd
index d7f40ac4ad7d8..b6c4f555e6255 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.2.6.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: kpasswdd
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 507118c59dbff..2351af4acc649 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.11.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: ldconfig
diff --git a/etc/rc.d/lkm1 b/etc/rc.d/lkm1
index e252909bd7ca9..f332586d7ed96 100755
--- a/etc/rc.d/lkm1
+++ b/etc/rc.d/lkm1
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: lkm1,v 1.6 2000/10/09 06:11:38 nisimura Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/lkm1,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: beforenetlkm
diff --git a/etc/rc.d/lkm2 b/etc/rc.d/lkm2
index 23608df5fc2e9..dc0ce229742d4 100755
--- a/etc/rc.d/lkm2
+++ b/etc/rc.d/lkm2
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: lkm2,v 1.4 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/lkm2,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: beforemountlkm
diff --git a/etc/rc.d/lkm3 b/etc/rc.d/lkm3
index a9d6efdfef4e1..52e5a23dbdc99 100755
--- a/etc/rc.d/lkm3
+++ b/etc/rc.d/lkm3
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: lkm3,v 1.6 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/lkm3,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: aftermountlkm
diff --git a/etc/rc.d/local b/etc/rc.d/local
index da163f6d9cbb2..07bdb87229b8e 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.5.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: local
diff --git a/etc/rc.d/localpkg b/etc/rc.d/localpkg
index fb429c9ace162..6db9daec55d73 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.4.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: localpkg
diff --git a/etc/rc.d/lomac b/etc/rc.d/lomac
index 84b571816f816..a4ba71fa13e45 100644
--- a/etc/rc.d/lomac
+++ b/etc/rc.d/lomac
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/lomac,v 1.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: lomac
diff --git a/etc/rc.d/lpd b/etc/rc.d/lpd
index 8ab3a8c88b6b1..6e033c4533c17 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.5.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: lpd
diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer
index e5aafeab15e36..0a85d45c9d66b 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: mixer
diff --git a/etc/rc.d/mopd b/etc/rc.d/mopd
index f6a6710e0271f..c7d3de97d0d06 100755
--- a/etc/rc.d/mopd
+++ b/etc/rc.d/mopd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: mopd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mopd,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: mopd
diff --git a/etc/rc.d/motd b/etc/rc.d/motd
index 2b675b51409a4..bcaf9e430aad1 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.8.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: motd
diff --git a/etc/rc.d/mountall b/etc/rc.d/mountall
index 6ce01f7f23e30..47798f34ca312 100755
--- a/etc/rc.d/mountall
+++ b/etc/rc.d/mountall
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: mountall,v 1.3 2000/05/13 08:45:07 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountall,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: mountall
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 49f1ba9bdef82..0bcd65ffa19b4 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.11.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: mountcritlocal
diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote
index 67e60f0749411..874443be963f9 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.9.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: mountcritremote
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd
index df012429b0e31..426097dcf044e 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.14.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: mountd
diff --git a/etc/rc.d/moused b/etc/rc.d/moused
index 9ef5ee57f4bc9..ab8d393327245 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.6.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: moused
diff --git a/etc/rc.d/mroute6d b/etc/rc.d/mroute6d
index d733092df145e..bccaaf9f2d971 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.3.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: mroute6d
diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted
index c3772766bcfb0..43c56e87ff6c2 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.7.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: mrouted
diff --git a/etc/rc.d/msgs b/etc/rc.d/msgs
index 6031acc7337d9..159d8638dfb27 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.1.8.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: msgs
diff --git a/etc/rc.d/named b/etc/rc.d/named
index 808d253cbe333..0376296671026 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.9.2.4 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: named
diff --git a/etc/rc.d/natd b/etc/rc.d/natd
index 4bfdcfc3cb616..9783479f636ea 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.1.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: natd
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index 029076c1dd96b..94a028923d343 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.10.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: netif
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index f9329644decbc..6e4863f3102c5 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.140.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # PROVIDE: netoptions
diff --git a/etc/rc.d/network b/etc/rc.d/network
index ce3336be0a97b..cdb47ea13404d 100755
--- a/etc/rc.d/network
+++ b/etc/rc.d/network
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: network,v 1.29 2001/01/11 17:56:16 itojun Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/network,v 1.4 2004/04/02 12:18:40 krion Exp $
 
 # PROVIDE: network
 # REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index d47416449778d..3f64559979f7d 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.36.2.1 2004/10/10 09:50:54 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 5a3927e125af8..e6def7b4f7bd1 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.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: newsyslog
diff --git a/etc/rc.d/nfsclient b/etc/rc.d/nfsclient
index b6d4bf1af04cc..20190df564e5d 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.4.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: nfsclient
diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd
index 62b3e7cfc0cb0..567dd6dc49017 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.12.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: nfsd
diff --git a/etc/rc.d/nfslocking b/etc/rc.d/nfslocking
index f8a77e8afa7ae..cf93681202693 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.10.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: nfslocking
diff --git a/etc/rc.d/nfsserver b/etc/rc.d/nfsserver
index 76531ffd79219..47f7fb25e0a33 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: nfsserver
diff --git a/etc/rc.d/nisdomain b/etc/rc.d/nisdomain
index a24f107d15136..099a6eda24906 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.2.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: nisdomain
diff --git a/etc/rc.d/nsswitch b/etc/rc.d/nsswitch
index 3ba233b00fb5c..4ea9e914498b9 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: nsswitch
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index e54100988bbb1..de45448dd5c0a 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.8.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ntpd
diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate
index 4e76047448a5e..6004ba0515247 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.9.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ntpdate
diff --git a/etc/rc.d/othermta b/etc/rc.d/othermta
index 7ab3e63649ac1..d54fe0e6b64a0 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.2.8.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: mail
diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
index 67604bd066f86..0cd0cc0549cd7 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.29.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: pccard
diff --git a/etc/rc.d/pcvt b/etc/rc.d/pcvt
index dd84b0fcebff0..5c99caf4115c2 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.4.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: pcvt
diff --git a/etc/rc.d/pf b/etc/rc.d/pf
index 76b702bbd5a1a..e821679e38416 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: pf
diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog
index fc3e305395a8b..39b142578eee1 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.1.2.2 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: pflog
diff --git a/etc/rc.d/poffd b/etc/rc.d/poffd
index 5b5668a641e7e..39c76ca3ce365 100644
--- a/etc/rc.d/poffd
+++ b/etc/rc.d/poffd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: poffd,v 1.1 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/poffd,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: poffd
diff --git a/etc/rc.d/postfix b/etc/rc.d/postfix
index 807072bece112..78bba010cf21f 100755
--- a/etc/rc.d/postfix
+++ b/etc/rc.d/postfix
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: postfix,v 1.6 2002/02/12 02:19:27 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/postfix,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: mail
diff --git a/etc/rc.d/power_profile b/etc/rc.d/power_profile
index 45c341a10f402..46885eed543ac 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: power_profile
diff --git a/etc/rc.d/ppp b/etc/rc.d/ppp
new file mode 100755
index 0000000000000..5e5a6f2aff7a6
--- /dev/null
+++ b/etc/rc.d/ppp
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# $NetBSD: ppp,v 1.6 2002/03/22 04:33:59 thorpej Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.2 2002/06/13 22:14:36 gordon Exp $
+#
+
+# PROVIDE: ppp
+# REQUIRE: mountcritremote syslogd
+# BEFORE:  SERVERS
+#
+#	Note that this means that syslogd will not be listening on
+#	any PPP addresses.  This is considered a feature.
+#
+
+. /etc/rc.subr
+
+name="ppp"
+start_cmd="ppp_start"
+stop_cmd="ppp_stop"
+sig_stop="-INT"
+sig_hup="-HUP"
+hup_cmd="ppp_hup"
+extra_commands="hup"
+
+ppp_start()
+{
+	#	/etc/ppp/peers and $ppp_peers contain boot configuration
+	#	information for pppd.  each value in $ppp_peers that has a
+	#	file in /etc/ppp/peers of the same name, will be run as
+	#	`pppd call <peer>'.
+	#
+	if [ -n "$ppp_peers" ]; then
+		set -- $ppp_peers
+		echo -n "Starting pppd:"
+		while [ $# -ge 1 ]; do
+			peer=$1
+			shift
+			if [ -f /etc/ppp/peers/$peer ]; then
+				pppd call $peer
+				echo -n " $peer"
+			fi
+		done
+		echo "."
+	fi
+}
+
+ppp_hup()
+{
+	pids="`check_process pppd`"
+	if [ -n "$pids" ]; then
+		for pid in $pids; do
+			kill $sig_hup $pid
+		done
+	fi
+}
+
+ppp_stop()
+{
+	pids="`check_process pppd`"
+	if [ -n "$pids" ]; then
+		for pid in $pids; do
+			kill $sig_stop $pid
+		done
+	fi
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/etc/rc.d/ppp-user b/etc/rc.d/ppp-user
index 305ee1cc50acc..16a52c0602ef1 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.5.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ppp-user
diff --git a/etc/rc.d/pppoed b/etc/rc.d/pppoed
index b9cfb142a5cf8..6a81960507344 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.2.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: pppoed
diff --git a/etc/rc.d/preseedrandom b/etc/rc.d/preseedrandom
index a563189816acc..08d438fe7bd68 100644
--- a/etc/rc.d/preseedrandom
+++ b/etc/rc.d/preseedrandom
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/preseedrandom,v 1.4.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: preseedrandom
diff --git a/etc/rc.d/pwcheck b/etc/rc.d/pwcheck
index b07c993a7dffd..e4de2cc0237f5 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: pwcheck
diff --git a/etc/rc.d/quota b/etc/rc.d/quota
index 8a81f83ab974b..57eef152a2d9f 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.4.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # Enable/Check the quotas (must be after ypbind if using NIS)
diff --git a/etc/rc.d/racoon b/etc/rc.d/racoon
index aaa264a9c3758..16c6763b7744b 100755
--- a/etc/rc.d/racoon
+++ b/etc/rc.d/racoon
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: racoon,v 1.3 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/racoon,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: ike
diff --git a/etc/rc.d/raidframe b/etc/rc.d/raidframe
index 53156dcab1082..c36de09ae6383 100755
--- a/etc/rc.d/raidframe
+++ b/etc/rc.d/raidframe
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: raidframe,v 1.6 2002/01/27 14:16:33 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/raidframe,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/ramdisk b/etc/rc.d/ramdisk
index 3ac0c42a3b218..3e3c9ba46b7c1 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ramdisk
diff --git a/etc/rc.d/ramdisk-own b/etc/rc.d/ramdisk-own
index f1fe11038ebdc..8bb92b7e0fd5f 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.2.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ramdisk-own
diff --git a/etc/rc.d/random b/etc/rc.d/random
index 823db6de77e5c..1a9bfe55daa24 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.6.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: random
diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd
index ea518508f25c5..30b13f02cff6a 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.4.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: rarpd
diff --git a/etc/rc.d/rbootd b/etc/rc.d/rbootd
index 423c5c04b32cf..0948d92828f92 100755
--- a/etc/rc.d/rbootd
+++ b/etc/rc.d/rbootd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: rbootd,v 1.6 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rbootd,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: rbootd
diff --git a/etc/rc.d/rcconf.sh b/etc/rc.d/rcconf.sh
index a4a3745b388d8..5137428716f60 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.2.6.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: rcconf
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index 8e2c269412436..0fa17311c0547 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.33.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: resolv
diff --git a/etc/rc.d/root b/etc/rc.d/root
index aeb9a980742cd..38fbd2bb6bc0a 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.9.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: root
diff --git a/etc/rc.d/route6d b/etc/rc.d/route6d
index e9861b47a9f81..b98f45f63bd64 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.8.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: route6d
diff --git a/etc/rc.d/routed b/etc/rc.d/routed
index 6ecab4fe360f8..c1866e55255b3 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.10.2.2 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: routed
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index dc6da0fea6c74..bd1b816decd47 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.140.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: routing
diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index 84595354cf8c4..4a59ae08c4814 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.9.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: rpcbind
diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd
index c21106af388b8..18ea8b9a58458 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.9.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: rtadvd
diff --git a/etc/rc.d/rtsold b/etc/rc.d/rtsold
index 8645816efb39c..5d911c4ab060f 100755
--- a/etc/rc.d/rtsold
+++ b/etc/rc.d/rtsold
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: rtsold,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rtsold,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: rtsold
diff --git a/etc/rc.d/rwho b/etc/rc.d/rwho
index 9a319bbe1cb94..31d9ab820c7fd 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: rwho
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index e6904b5c57771..37f40c175fe04 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.7.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: savecore
diff --git a/etc/rc.d/screenblank b/etc/rc.d/screenblank
index de2af4f562c2a..31aa0f2d3f22b 100755
--- a/etc/rc.d/screenblank
+++ b/etc/rc.d/screenblank
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: screenblank,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/screenblank,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: screenblank
diff --git a/etc/rc.d/securelevel b/etc/rc.d/securelevel
index 8bd5ee1a9cd55..7b5a81e987440 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.9.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: securelevel
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index b7ac600c58bec..b851ed9bc66eb 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.12.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: mail
diff --git a/etc/rc.d/serial b/etc/rc.d/serial
index 17d725b10f8b6..1074e1b227605 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.21.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: serial
diff --git a/etc/rc.d/sppp b/etc/rc.d/sppp
index d4a183bf3fb5b..15df977f68445 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: sppp
diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd
index e77ddab033523..82dcb1f8832f9 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.6.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: sshd
diff --git a/etc/rc.d/swap1 b/etc/rc.d/swap1
index ad816ddfebc3e..b592d041267c9 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.6.2.3 2004/10/16 08:13:19 pjd Exp $
 #
 
 # PROVIDE: localswap
diff --git a/etc/rc.d/swap2 b/etc/rc.d/swap2
index 5f3bd6f31f428..495dc8d8732cb 100755
--- a/etc/rc.d/swap2
+++ b/etc/rc.d/swap2
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: swap2,v 1.6 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/swap2,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: nonlocalswap
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons
index 9d7caf521f121..c251ac0452fec 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.12.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: syscons
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index 67d3e063a69e6..ab2b8488198ff 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.15.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: sysctl
diff --git a/etc/rc.d/sysdb b/etc/rc.d/sysdb
index 7d072357ebaf4..8187c53bb17f3 100755
--- a/etc/rc.d/sysdb
+++ b/etc/rc.d/sysdb
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: sysdb,v 1.9 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sysdb,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: sysdb
diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd
index ac3c4dbf938d4..0dda87e8d9a7d 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.9.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: syslogd
diff --git a/etc/rc.d/timed b/etc/rc.d/timed
index 016c831eead18..b428a853f4ede 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.4.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: timed
diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp
index 0c7a460a0c305..e257133327898 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.32.2.2 2004/10/14 14:38:49 brooks Exp $
 #
 
 # PROVIDE: tmp
diff --git a/etc/rc.d/ugidfw b/etc/rc.d/ugidfw
index 74170357393e9..170a3a8d33f05 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.1.2.1 2004/10/14 04:36:15 trhodes Exp $
 
 # PROVIDE: ugidfw
 # REQUIRE:
diff --git a/etc/rc.d/usbd b/etc/rc.d/usbd
index 979589cacc8d4..48778487b793a 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.2.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: usbd
diff --git a/etc/rc.d/var b/etc/rc.d/var
index 7a4baf425db0e..2ab49eb734a62 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.32.2.2 2004/10/14 14:38:49 brooks Exp $
 #
 
 # PROVIDE: var
diff --git a/etc/rc.d/vinum b/etc/rc.d/vinum
index af1b0956d8a5a..212a862d677ca 100644
--- a/etc/rc.d/vinum
+++ b/etc/rc.d/vinum
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/vinum,v 1.2.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/virecover b/etc/rc.d/virecover
index 9af4151ad3aa7..85e503272a520 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.8.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: virecover
diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd
index 9dc22a59c7692..e05cf020d1072 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.3.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: watchdogd
diff --git a/etc/rc.d/wscons b/etc/rc.d/wscons
index 36fd1b1a88cf8..d37de2bf68573 100755
--- a/etc/rc.d/wscons
+++ b/etc/rc.d/wscons
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: wscons,v 1.9 2002/04/26 00:06:54 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/wscons,v 1.4 2002/10/12 10:31:31 schweikh Exp $
 #
 
 # PROVIDE: wscons
diff --git a/etc/rc.d/xfs b/etc/rc.d/xfs
index a0692fa66d774..c89fdfb78e473 100755
--- a/etc/rc.d/xfs
+++ b/etc/rc.d/xfs
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: xfs,v 1.6 2002/03/22 04:34:01 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/xfs,v 1.2 2002/06/13 22:14:36 gordon Exp $
 #
 
 # PROVIDE: xfs
diff --git a/etc/rc.d/ypbind b/etc/rc.d/ypbind
index 0ed5cd5ec4266..faa31fc566e7f 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.8.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ypbind
diff --git a/etc/rc.d/yppasswdd b/etc/rc.d/yppasswdd
index 4e805f5f704d0..65ba25ed02f8c 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.9.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: yppasswdd
diff --git a/etc/rc.d/ypserv b/etc/rc.d/ypserv
index 54ddd5bff611e..cabad785dd3d5 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.10.2.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ypserv
diff --git a/etc/rc.d/ypset b/etc/rc.d/ypset
index bf091c168d7fb..21246612a16d6 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.5.4.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ypset
diff --git a/etc/rc.d/ypupdated b/etc/rc.d/ypupdated
index 106db0f4bf166..c7577185cbb69 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.4.4.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ypupdated
diff --git a/etc/rc.d/ypxfrd b/etc/rc.d/ypxfrd
index 100092e0fee1b..2d7ea48ecae73 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.5.4.1 2004/10/10 09:50:54 mtm Exp $
 #
 
 # PROVIDE: ypxfrd
diff --git a/etc/rc.firewall b/etc/rc.firewall
index 05a1a6aaec95d..40cdf124f9356 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 289b7dc64f943..144207730390c 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 2004/08/03 08:58:34 ume Exp $
 
 # Suck in the configuration variables.
 if [ -z "${source_rc_confs_defined}" ]; then
diff --git a/etc/rc.resume b/etc/rc.resume
index 4e133e0926d4a..fbb2eb88ced08 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 b025bc0bd62cb..f9343a56e05d9 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 2f5a753225a80..3bec2994eb914 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.27.2.1 2004/10/10 09:50:53 mtm Exp $
 #
 
 # Site-specific closing actions for daemons run by init on shutdown,
diff --git a/etc/rc.subr b/etc/rc.subr
index bce54916583fa..ee40fcc48075e 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.31 2004/07/30 17:19:35 mtm Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
diff --git a/etc/rc.suspend b/etc/rc.suspend
index 26fe198ceda17..c673457e876a6 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 f7290f6874fba..2e0cffdf5671a 100644
--- a/etc/remote
+++ b/etc/remote
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/remote,v 1.15 2004/06/06 11:46:27 schweikh Exp $
 #
 #	@(#)remote	5.2 (Berkeley) 6/30/90
 #
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 313af8e2507df..35b0ba9a8fe3a 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 e01b9417fdbe1..6736182501e9d 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 3032ef97c762d..813654cb44e11 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 bcf606d1047ec..0beab0e55e9b8 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 935ea2f1b5924..3b42b0a39e3ab 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 b79e722a4bf47..42723081e964d 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 2bb6a1a2c1388..5f602cb342da5 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.29 2003/12/24 21:15:09 gshapiro Exp $')
 OSTYPE(freebsd5)
 DOMAIN(generic)
 
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
index bfc98a2bbfc7a..d5cd98a3ef89c 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 ffc29f8d92ceb..a068c545f5b42 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.19 2002/03/26 13:00:03 ru Exp $')
 
 OSTYPE(freebsd5)
 FEATURE(nullclient, hub.$m)
diff --git a/etc/services b/etc/services
index d50cf12614aaf..257c060f2ce05 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 fe1e0294a0103..673332a82fd3b 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/sysctl.conf b/etc/sysctl.conf
index 0c9e796a7ac8f..21fb8e77d3dfd 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 db88242c02ee4..06028f6c0f6d6 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/syslog.conf,v 1.26 2003/04/23 13:08:31 des 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 f8a68a7d1748d..2156843cc7378 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 03c3f4f69baa2..71f0ad06d5711 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.12 2003/05/03 10:16:55 akiyama 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 214a394f44959..720cd71d5e9a4 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 b81af5e0f2463..5886b3851a96f 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 5698c121d638a..5ef7a419a2a96 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 dc64317908882..c4af8df310753 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 27f483ec6313f..9e7a84b8ab07b 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 68a37ddf41701..28c422807a1ee 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.9 2001/06/22 21:38:27 dd Exp $
 
 PROG=	caesar
 DPADD=	${LIBM}
diff --git a/games/caesar/caesar.6 b/games/caesar/caesar.6
index 4f6ac172a9ca4..a95ecff512a12 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 54275ce84e35f..bc833f5667ef9 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.13 2003/05/05 09:52:25 obrien Exp $");
 
 #include <errno.h>
 #include <math.h>
diff --git a/games/factor/Makefile b/games/factor/Makefile
index fa21ca52c2f53..ff42f95aa05f3 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.8 2004/02/05 22:44:20 ru Exp $
 
 PROG=	factor
 SRCS=	factor.c pr_tbl.c
diff --git a/games/factor/factor.6 b/games/factor/factor.6
index 07fc7b98a6971..3163d29eb549f 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 e3aa90cb8bee6..0d6370c48c149 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 83b062defa30e..3641de35ada70 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 31b96a2535fb8..50d18f1808786 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 38cf7dfab3b15..018ab3cdc13dd 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.32 2003/08/04 21:31:53 ache Exp $
 
 FILES=	fortunes fortunes2 freebsd-tips murphy startrek zippy
 BLDS=	fortunes.dat fortunes2.dat murphy.dat startrek.dat zippy.dat \
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index 93a37479fb485..9e75234ed13b9 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.141 2004/08/15 19:24:17 rwatson Exp $
 
 %
 			-- Gifts for Children --
diff --git a/games/fortune/datfiles/fortunes-o.real b/games/fortune/datfiles/fortunes-o.real
index 301ac0bd3dde3..246cd73e17801 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 e5eed4075fa79..ecc471f32f328 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 b/games/fortune/datfiles/fortunes2
index b657865d737fd..45d0524c3e894 100644
--- a/games/fortune/datfiles/fortunes2
+++ b/games/fortune/datfiles/fortunes2
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.76 2004/07/20 08:32:42 le Exp $
 %
 =======================================================================
 ||								     ||
diff --git a/games/fortune/datfiles/fortunes2-o b/games/fortune/datfiles/fortunes2-o
index 59958d5c4785f..2aecf6690591a 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.28 2004/08/14 06:29:17 schweikh Exp $
 %
 						PLAYGIRL, Inc.
 						Philadelphia, Pa.  19369
diff --git a/games/fortune/datfiles/freebsd-tips b/games/fortune/datfiles/freebsd-tips
index ed1db5daedf57..0410cf326a2d2 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.33 2004/02/18 05:18:27 cperciva 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 cd0b87fb068cb..8ff27cd91556c 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 83e58bdf23b5f..722d530010b74 100644
--- a/games/fortune/datfiles/limerick
+++ b/games/fortune/datfiles/limerick
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.5 2003/10/12 11:37:15 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 a7dd3a9ac7124..841c3f799e485 100644
--- a/games/fortune/datfiles/murphy
+++ b/games/fortune/datfiles/murphy
@@ -1,4 +1,4 @@
-%%$FreeBSD$
+%%$FreeBSD: src/games/fortune/datfiles/murphy,v 1.9 2004/06/01 00:16:32 dougb 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 f0a6829d5c634..5fc17c7c0a9ea 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 dbc9510fe9bbe..2ef11db08f217 100644
--- a/games/fortune/datfiles/startrek
+++ b/games/fortune/datfiles/startrek
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.6 2003/12/26 21:32:47 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 5d1180e0230b1..34ee9328cbb97 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 5cfd6372c0b17..3f205293d3503 100644
--- a/games/fortune/datfiles/zippy
+++ b/games/fortune/datfiles/zippy
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/zippy,v 1.3 2002/04/28 21:59:07 dougb 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 adf48faa32f3d..2a7a4d2288be0 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.7 2004/06/21 16:07:30 phk Exp $
 
 PROG=	fortune
 MAN=	fortune.6
diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index 727f8fafa4636..ceb1ceebfb952 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.17 2004/07/02 21:15:48 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt FORTUNE 6
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index 63cfd3e7951dc..54580b2875d59 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.25 2004/06/21 16:07:30 phk Exp $");
 
 # include	<sys/stat.h>
 
diff --git a/games/fortune/strfile/Makefile b/games/fortune/strfile/Makefile
index 18dce099c7009..c36c75890ee84 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.6 2004/07/23 11:36:35 le Exp $
 
 PROG=	strfile
 MAN=	strfile.8
diff --git a/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index 115d97fff04c5..754e995cfeecf 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.10 2004/07/02 21:16:38 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRFILE 8
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index bd8ee44f53de4..007927769ed45 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.26 2004/07/23 11:36:35 le Exp $");
 
 # include	<sys/param.h>
 # include	<arpa/inet.h>
diff --git a/games/fortune/strfile/strfile.h b/games/fortune/strfile/strfile.h
index 24c94e9edc3df..c6cb63144a9f5 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.3 1999/10/02 12:33:37 dcs Exp $ */
 
 #define	STR_ENDSTRING(line,tbl) \
 	(((unsigned char)(line)[0]) == (tbl).str_delim && (line)[1] == '\n')
diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile
index c5469abea6fe0..48c49744299a9 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.3 2001/02/21 06:12:38 bde Exp $
 
 PROG=	unstr
 NOMAN=	noman
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index 44c7a9f23a1d0..dce04038a3d9e 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.9 2003/05/05 09:52:25 obrien Exp $");
 
 /*
  *	This program un-does what "strfile" makes, thereby obtaining the
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 0aeea1e2ab2e9..1dfcf0b4252d5 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 5226a6b2a9c76..84b2ea0ccf92e 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 d27b10ed79160..d9a9b628bcb5a 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 44b20bab668b4..dd85b551e470c 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 e6a723a1f2c37..708dea1d004c9 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.14 2004/05/16 21:52:48 ru Exp $
 .\"
 .Dd May 11, 2004
 .Dt MORSE 6
diff --git a/games/morse/morse.c b/games/morse/morse.c
index f04f1b5c365c5..d220912ce6d3f 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.19 2004/05/16 21:49:23 ru Exp $";
 #endif /* not lint */
 
 #include <sys/time.h>
diff --git a/games/number/Makefile b/games/number/Makefile
index 8e75f71a78587..cebde90fa5f96 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 c5081e8464030..4e2356e978760 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.5 2000/11/20 12:06:18 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt NUMBER 6
diff --git a/games/number/number.c b/games/number/number.c
index 715de8ac4430e..dbf6cecca3093 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.14 2004/03/14 05:28:29 bde Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/pom/Makefile b/games/pom/Makefile
index 0831496813b77..9da1f3a0a5c2b 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.6 2001/06/22 21:38:27 dd Exp $
 
 PROG=	pom
 MAN=	pom.6
diff --git a/games/pom/pom.6 b/games/pom/pom.6
index 1a5325b4b5a00..67f27c1e43066 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 ea8a608d8161c..e2f714695cb88 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.12 2003/05/05 09:52:25 obrien Exp $");
 
 /*
  * Phase of the Moon.  Calculates the current phase of the moon.
diff --git a/games/ppt/Makefile b/games/ppt/Makefile
index 9dedd3a95b495..6178f8be282a2 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.3 2004/08/01 18:52:40 stefanf Exp $
 
 PROG=	ppt
 NOMAN=	noman
diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c
index e0ae5e137c544..9a902e91da274 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/pattern.c b/games/primes/pattern.c
index 66b2dc8071513..1e08b75038498 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 6447916daad32..e615439aa6d97 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 c89817d7da68a..52c32b35fcb80 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 fde2b83f3fa90..3f12e4dfbffef 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 7db5a8f8f85a5..6b8fe1ee860cb 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 9854b8131f279..b16908ac4dbbf 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.7 2003/02/23 01:44:14 ru Exp $
 .\"
 .Dd February 8, 2003
 .Dt RANDOM 6
diff --git a/games/random/random.c b/games/random/random.c
index e7c85bb59ac59..8ca43bfdc3704 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.15 2003/05/05 09:52:25 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/games/random/randomize_fd.c b/games/random/randomize_fd.c
index 33588b14c6cdd..24ac1d9736d8d 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 5b50e62655045..6e4c19f611b15 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 6656adfbdfad6..5f2502f6d3049 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 63395eba3b771..b956bb612f327 100644
--- a/gnu/Makefile.inc
+++ b/gnu/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/Makefile.inc,v 1.4 2002/09/25 09:55:19 markm 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 0e5b51c2641c9..92ce27a522bb7 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 265f86d1ed55a..7fa85248ad1b2 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 14be4c1249545..d2bd4b19e18db 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.22 2004/07/28 05:27:18 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 CCDIR=	${.CURDIR}/../../usr.bin/cc
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 179fa18b0ba4d..a5837c366ed81 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.39 2004/02/05 22:44:20 ru Exp $
 
 LIB=    dialog
 INCS=	dialog.h
diff --git a/gnu/lib/libdialog/TESTS/Makefile b/gnu/lib/libdialog/TESTS/Makefile
index 65e3d71c1f6a8..c2ba8592e8e20 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 a2bec62606aca..775aa1ce76488 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 3608261caf8fe..60013a748174e 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 d97b8048415cc..d44933881d86f 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 11103791f680d..78dc60d2727d4 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 6cefaf3f4b8ff..c14174bca7dd1 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 f21e0e50bf6d4..638a91201675d 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 aa4663adf2cd0..97245c1adc7a8 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 bf0cfc9894bc3..c351010a5639e 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 37510712d7ea1..d14bf2244d85a 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 827c0522b4df3..26ab24665f73e 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 640157a896921..34d30f9861fb5 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 1545cd828b125..cb348ae5b10f8 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 4a29074b36d89..8196d25640f72 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 c6f590fc7a046..d6667d20d7b62 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 2da4611ce0156..0419d3ebab1ea 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 afcac1e0bddbc..2086a9b942994 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 15e353cc82940..81386bbad3c05 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 e11011cffd9cd..57b3976414225 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 e071937e30f55..79346cc47d43f 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 c69b52e7d04f0..2a5072a424d68 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 647b51c44fe8c..d0c386169713d 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 39b36ab8c4dd2..14bbe66799a8b 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.39 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3
index 7693366ea1036..ea1c1922c1a5b 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.24 2004/07/02 21:53:39 ru Exp $
 .\"
 .Dd January 1, 2000
 .Dt DIALOG 3
diff --git a/gnu/lib/libdialog/dialog.h b/gnu/lib/libdialog/dialog.h
index 94675a4592c34..21534312b3d3d 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 d8138f6327400..68ae1684fb658 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 9ed5eac6fccc6..4e41d137eb637 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 a01acd5760880..e4abb95b0bc8d 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 41d78c8284141..295ece87aacd3 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 7fc22eb355a38..cf1d834fe6b2d 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 bcafacfc059fe..b885592a479fd 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 4b865a63be326..dfe5da11b2f15 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 163c09a6a1481..af2f4cab7b08d 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 19a13bbc650e1..147011cd436bb 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 ceacf05f0e597..2a94c470e4768 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 24eb41a27a016..ab6f5c4041350 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 9c6f895b3ae25..09bbd6d71882e 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 dc71a21102d87..e317bf25731a0 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.14 2004/07/28 05:27:18 kan Exp $
 
 SRCDIR=	${.CURDIR}/../../../contrib/libf2c
 
diff --git a/gnu/lib/libg2c/config.h b/gnu/lib/libg2c/config.h
index c4d0c2860cc37..90f00ca6f0ef0 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 48eee7a655c1a..61028e144eb40 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.52 2004/08/04 03:13:51 kan Exp $
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
diff --git a/gnu/lib/libgcc_r/Makefile b/gnu/lib/libgcc_r/Makefile
index 501549c464308..a5c4794014601 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 04ad011becd0f..af1e774b128a1 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.1 2004/08/14 03:23:24 kan Exp $
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
diff --git a/gnu/lib/libiberty/Makefile b/gnu/lib/libiberty/Makefile
index 17228f85b94f7..dde139d0a2109 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 3db0e3ee7dba7..8ff81744de1cf 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 213e90430e33c..f5906eb3fd426 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.20 2004/07/28 05:27:18 kan Exp $
 
 OBJCDIR=${.CURDIR}/../../../contrib/libobjc
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 637dcc8a57336..273f41d5cd169 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 84b31d8e1e0ce..a7906eefbfc24 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.9.4.1 2004/10/01 16:32:05 kensmith Exp $
 
 SHLIB_MAJOR=5
 RL_LIBRARY_VERSION=4.3
diff --git a/gnu/lib/libreadline/config.h b/gnu/lib/libreadline/config.h
index 999bba094b0eb..107ceaf7d8122 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.6 2003/08/31 19:15:34 ache Exp $ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Maintained by hand. */
 
diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
index 7c8349653c80f..4227026ab82d8 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 4fdf229fc98dd..13f0dffa14ddc 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.2 1999/08/27 23:32:55 peter Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index 6d69300d0f1ad..0ec4ea3fe717b 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.12 2003/08/31 19:15:35 ache Exp $
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
index 6602de54abdc2..ed2fd5e29a03d 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.4 2000/03/19 23:07:39 ache Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libregex/FREEBSD-upgrade b/gnu/lib/libregex/FREEBSD-upgrade
index 78239e3fc9a70..2072b26d1742d 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.2 2004/07/06 00:10:40 ache Exp $
 
 GNU regex (from grep):
 
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 6525bffa0b501..0f2778ce94049 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.28.2.1 2004/10/06 23:36:20 peter Exp $
 
 SUBDIR=		doc
 
diff --git a/gnu/lib/libregex/doc/Makefile b/gnu/lib/libregex/doc/Makefile
index b812f4445df70..e4c4959330eae 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 7356f9ffbe422..6767df4fa934f 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 1d7c8b0e76000..6b7b6a033eff4 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.14 2004/07/04 02:46:55 tjr Exp $ */
 /* Extended regular expression matching and search library,
    version 0.12.
    (Implements POSIX draft P1003.2/D11.2, except for some of the
diff --git a/gnu/lib/libregex/regex.h b/gnu/lib/libregex/regex.h
index 364966d3606bf..240d752464d54 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 fc45048226526..5f64b486734d8 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.51 2004/07/28 05:27:18 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
diff --git a/gnu/lib/libstdc++/config.h b/gnu/lib/libstdc++/config.h
index a34d4daeb55d4..8ff27796b70fd 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.8 2004/07/28 05:27:18 kan 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 b0285199e051d..9c7d0004fc367 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 4abeed41d3d51..7cb685ae10824 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 2004/07/28 05:27:19 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++/libsupc++
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index bb2f137d023fd..89e7948327ffc 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.82 2004/07/07 17:24:30 ru Exp $
 
 SUBDIR= bc \
 	${_binutils} \
diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc
index 4cec6fe01a452..398952b0f1b9e 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 4786ebfeb5849..d92192232d7f2 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 b9e3520ac551f..599feef96c2fd 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 80c9d29114228..b1e888c6777a6 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 393b2b925952f..9d02b22ac54ce 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 bda5ebf03a0d2..1d8f27383a510 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 958afa65d7b05..e12aca5440600 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 0d4f20ce56fe8..e3c9c3cc82aa5 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.12 2004/06/16 07:09:33 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index 2d522848f9079..d98e2d46b3ed0 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.14 2004/07/28 05:39:04 kan 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 a0fe73b3c8df2..ef18309db6a81 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 34219a5293f8e..66a236cbe62c9 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 35986130f1942..a8639296e2c59 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 a0a6360d68e08..35172e8432423 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 02a3030e1ad34..773a26a71628c 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 b55da9afd1aa9..2719c1d0580e0 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 891bd6cabaf1b..ee364d8370ed2 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 46e43130fc111..199ca9a0d565e 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 8e14d63ff12d4..00894448e63b3 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 b271f19b0a622..5b9638702eb75 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 51ea9d9ec4791..36d3fb370742e 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 39428f17c15c6..33f27197d8514 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.3 2001/04/18 15:51:07 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 80b7961d934ff..3fbb9a1ac08f8 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.81.2.1 2004/08/23 07:13:51 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.alpha b/gnu/usr.bin/binutils/gdb/Makefile.alpha
index e05dd278a82a7..038d3bd6f37dd 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 3a8bcff9b135e..c70b9e03d8a26 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 14e7a3fe78564..1358dd774d38b 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 08283c7344b09..a591d6e6bdbc8 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 b5f9778667a39..9d076ee9e61ed 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 5eb0f2ec7dfe1..08802720202a6 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 a5731261b088f..4b6c77e1972e1 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 6b5cf20a8527d..dae50b1619aa0 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 ee62200abb770..6f69176b955a9 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 5896125f03c8b..99dad1bb37b06 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 3196316d83b91..ba91221d7fe83 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 8f198fdfa1b3f..78ab8801a3f8b 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 c6821e109e55e..7279bace3741b 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 56fd480deffab..c2b243d0d2b77 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 e7744363106f5..818cb86b4b7d1 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 0974c3ee04fc6..6cb9579cca822 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 b6cd3cc47d763..31f7c7f1d3e89 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 11260acec53a4..e89736562677c 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 b7e4a204108de..d4de0223eb7d6 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 52ed91cf09381..31f1f9c5aeeeb 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 93395a7f9040c..6401c20f3a3ce 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 190e6e6687164..b986b547bee80 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 ef1ff5369dd73..851c2b2bb80cf 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.13 2002/07/09 17:29:37 sheldonh Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdbserver/Makefile b/gnu/usr.bin/binutils/gdbserver/Makefile
index bb620a9d89014..78ca140c4803b 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 2f1af940838f2..71a18547054ba 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 00fba272c7b53..16e0864985391 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.30 2004/07/08 17:05:32 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 59afdb6d3d7d5..8add4345ebed3 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 bac730d57b204..702e956d9ed07 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 24a06d7be7aa7..01433ffe66494 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 44e3cb32f6501..27aae45a7d3e8 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 4eaac084d9e46..7ff98c2f63b03 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 14126e38387d4..6722c62cd0493 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 c645f91ea2ec2..08cc1f42a9524 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 181a96c375156..fb5e44c6edf93 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 84dfdff51b867..fc764f41bbec5 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.32 2004/07/08 17:05:32 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 5d413fa78f62f..83b9370e2b826 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 abe8d6be36b04..ed96e16b11234 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 7ab33ddb04043..be5916d54ee12 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 d45f7913f80c5..d49f3f3e7ed54 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 75f06aecda1c3..deb9375a12bb3 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 9a3fc03d4f2b1..246cd5a98272a 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 1e65701f17b6f..ea3c37b3433a5 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 1864ef5f3dfee..0dd687841af40 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 526ba8cfb2c11..fd885b9061e62 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 03909292858e1..d92d2ef4bbab9 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.21 2004/06/16 07:09:40 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libbinutils/config.h b/gnu/usr.bin/binutils/libbinutils/config.h
index 1b35139f1c667..1d76a4f21b958 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 f7bcd36645196..37cecdc0c5170 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.22 2004/06/19 22:22:42 marcel Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libiberty/config.h b/gnu/usr.bin/binutils/libiberty/config.h
index 13bc9aa6aeb62..e7ab503a58860 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 f740e867fc449..bdd84f74bcd4a 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.9 2004/06/16 07:09:41 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
index 03d911dbd73be..5dee51c5c1770 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 5b1ce3a96896d..21e5fd601561b 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 5b1ce3a96896d..889c076e92364 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 98198cdea1095..ca4238b74e929 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 927e2a1ea5cb2..e0e1f6aa45427 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 cc010ec4a3060..72345b269b806 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 190b76621cc0f..ac2e8b4b6ba70 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 e795ad494bba7..28d1abce36206 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 9ad1fc8c3bb35..4b70bbc6598e2 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 4da4bb2d04235..b7b0def22326f 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 977e1d86aece3..2d90148ab233f 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 e86d9cac5ec94..39d139bf7131a 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 ddbf3f2009308..0bc7e2ccb17fc 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.13 2004/06/16 07:09:43 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index 8a50e06304e0e..bc32402c95479 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 dc1f896fb7e6e..1c6d4ea35db84 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 0f80db4a4a8bf..04128cf91d04f 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 a3ed45aeafe0b..40f0619481cd5 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 976cf3ec61c66..1042226bb8ccd 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 69b4eb93e275d..47928dc5b8290 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.36 2004/07/28 05:27:19 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 a7057b162bace..c5961375cd2bf 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 aeeba7379813d..51ee6f57a3059 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.8.1 2004/08/23 07:13:51 obrien Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 6182b69a4d5ec..3e6ea6234d230 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 a681f673e677f..b2bee16e2315a 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.21 2004/07/28 05:27:19 kan 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 045d33f820ec4..fa40bf425fc3e 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.17 2004/02/05 22:44:21 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 0df2e6ee527b8..098521619466c 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.30 2004/07/28 05:27:19 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index ec116518f12cb..fead836ddf7e7 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.31 2004/07/28 05:27:19 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index c0257438a74ee..90643f354e542 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.24 2004/07/28 05:27:19 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index c26703d6b599b..6773a41696b40 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.35 2004/07/28 05:27:19 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 4e74082361782..374b88e60aa64 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.44 2004/08/12 16:36:51 kan 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 2c5078099b560..25cfd9b47d3e6 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 797434acb1b95..9f5e6443095a2 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.79.2.1 2004/09/22 07:11:46 ru 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 5470788543ab3..f8a5bb2fd6178 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 2997e25ed5c65..ea9d0efc07c9f 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 2004/07/28 05:27:20 kan 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 23f14d1e088d7..bbdca350d29cb 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 7ddcee5295c51..459f3b59d6901 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.8 2004/07/28 05:27:20 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index f8e52f370250f..2d1801ea3ddfe 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 af2054117102e..f0836a08eb6fe 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 3b76bc591a718..1d51713454b71 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 5f2d86fd419d4..73d826b2afc78 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.12 2004/07/28 05:27:20 kan Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/f77doc/Makefile b/gnu/usr.bin/cc/f77doc/Makefile
index 5e0808d355f5c..618aa7420244a 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 adb2ac1cfbc24..25c198b40dc7b 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 b0b4b302b02fa..d21438e722a61 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.7 2004/07/28 05:27:21 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/protoize/Makefile b/gnu/usr.bin/cc/protoize/Makefile
index 500dd03fa4980..62d34456155f0 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.2 2002/05/10 08:54:49 obrien Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index cc8a8f3088e4f..dee3e460cb3a1 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 5ccf5da50a852..ea77c415c64e2 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 e8ed2e5e33224..c4c3341abc5f2 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.15 2001/08/10 10:47:28 peter Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 8cce7cd63702e..e0eea240c074c 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.17 2001/12/17 13:59:29 ru Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl
index d2669578fdb9d..cece2c0c50ff3 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 fcdc75408aff4..5f48099fdd496 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.48 2004/08/06 07:27:03 cperciva Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.c b/gnu/usr.bin/cvs/cvs/prepend_args.c
index 12322ce48bdf9..fa1c47d8ef4e7 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 6708442ec1240..b4cfb042f003a 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 0dff9c0cdd150..5cc8d863279e9 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.19.4.1 2004/10/06 23:40:48 peter Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index 761b10a5245d5..7b2187576ed10 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.14 2002/09/02 05:59:02 peter Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index d09550d1e2847..ce06de72866d6 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.25.2.1 2004/10/06 23:40:48 peter Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
index adea88889770f..4623c9579f46f 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 edf4ebc95f3da..4aacad481a6ba 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.8 2004/02/17 05:38:45 ache Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/dc/Makefile b/gnu/usr.bin/dc/Makefile
index 12de718b8f8fe..1ec66d504e035 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 2b3d553efb8af..3cc009d42e701 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 c30dff7631f6b..05773ace8834b 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 314a3ae07024a..67b014e552e72 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.3 2001/12/17 13:59:29 ru Exp $
 
 NOOBJ=		noobj
 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 951fe3b597d6d..79cea96b02b79 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 ecb4f1d414a90..783b3079f5361 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 f9f329b28a87c..5c1353f542d9d 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 f04d90f934986..81cdf02983c40 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 973dbcc87675c..7f67bb20853a5 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 f5f9c89a839b7..8c983a89e1005 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 74a35982d92ad..3e9c6beac90e4 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 ebb6b15a5f444..889a384ae552c 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.10 2004/07/06 21:55:11 obrien 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 f66a970f272f7..722a8ca0d8250 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.1 2004/06/25 06:48:53 marcel Exp $
 
 LIBSRCS+= core-regset.c solib-legacy.c
 LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-nat.c alphabsd-tdep.c \
diff --git a/gnu/usr.bin/gdb/arch/alpha/config.h b/gnu/usr.bin/gdb/arch/alpha/config.h
index c598b2a3bba24..7406c196a5bdf 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.2 2004/07/16 05:03:41 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 153c9752240e6..0144a844a8831 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.1 2004/06/25 06:48:53 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 3e4616559a03d..969ec8ed9ce4f 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.1 2004/06/25 06:48:53 marcel Exp $
 
 GENSRCS+= xm.h
 LIBSRCS+= fbsd-proc.c gcore.c
diff --git a/gnu/usr.bin/gdb/arch/amd64/config.h b/gnu/usr.bin/gdb/arch/amd64/config.h
index ce352dbecc99d..e169a5838b008 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.2 2004/07/16 05:03:42 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 39b9eacb6ebf7..3c325ed6c2a81 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.2 2004/08/10 12:20:00 davidxu 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 46962337700a9..c763d66a0bc12 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.1 2004/06/25 06:48:53 marcel Exp $
 
 GENSRCS+= xm.h
 LIBSRCS+= fbsd-proc.c gcore.c
diff --git a/gnu/usr.bin/gdb/arch/i386/config.h b/gnu/usr.bin/gdb/arch/i386/config.h
index 07d800f182c3c..d6b4145bbed69 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.2 2004/07/16 05:03:42 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/i386/init.c b/gnu/usr.bin/gdb/arch/i386/init.c
index dcce7ce116ac1..ff417554277dc 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.2 2004/08/08 22:46:22 davidxu 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 aa86790979277..478f8cb9a8f87 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.1 2004/06/25 06:48:53 marcel Exp $
 
 LIBSRCS+= fbsd-proc.c gcore.c
 LIBSRCS+= ia64-fbsd-nat.c ia64-fbsd-tdep.c ia64-tdep.c
diff --git a/gnu/usr.bin/gdb/arch/ia64/config.h b/gnu/usr.bin/gdb/arch/ia64/config.h
index f912b8a6b62af..0d7ac7fb3e03a 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.2 2004/07/16 05:03:42 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 5e3ec189c0842..b98c70c59f76e 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.1 2004/06/25 06:48:53 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 d1e46c5aeb467..b7a8ee7a7a7cb 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.1 2004/06/25 06:48:54 marcel Exp $
 
 LIBSRCS+= solib-legacy.c
 LIBSRCS+= sparc-nat.c sparc-tdep.c sparc64-nat.c sparc64-tdep.c		\
diff --git a/gnu/usr.bin/gdb/arch/sparc64/config.h b/gnu/usr.bin/gdb/arch/sparc64/config.h
index bf0c408e201f3..1a33311297054 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.2 2004/07/16 05:03:42 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 0dfed1d230000..256b7850417c9 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.1 2004/06/25 06:48:54 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 9ad867204fd52..2d224692ada40 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.12 2004/06/25 06:48:54 marcel 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 923f97322641d..a176df364f98b 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 4269d8a6ea3e8..db5999f3ecb08 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.42 2004/06/26 08:48:50 bde Exp $
 
 PROG=	gdb
 SRCS=	gdb.c
diff --git a/gnu/usr.bin/gdb/gdb/gdb.1 b/gnu/usr.bin/gdb/gdb/gdb.1
index b6cd3cc47d763..d0178c9576be6 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.8 2004/06/25 06:48:54 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 c627aefc8d20b..e393e43bd147e 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.2 2004/06/26 08:48:50 bde Exp $
 
 PROG=	gdbtui
 SRCS=	tui-main.c
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 561e22bc4f36c..7aaf904deff1e 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.1 2004/07/25 05:29:15 marcel Exp $
 
 PROG=	kgdb
 SRCS=	kthr.c main.c trgt.c trgt_${MACHINE_ARCH}.c
diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.1 b/gnu/usr.bin/gdb/kgdb/kgdb.1
index 09d259e11dedb..3823c3f0b610e 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.2 2004/08/15 02:39:20 marcel Exp $
 .Dd August 1, 2004
 .Os
 .Dt KGDB 1
diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.h b/gnu/usr.bin/gdb/kgdb/kgdb.h
index eb380326b6ae7..dccdd12497b68 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.1 2004/07/25 05:29:15 marcel Exp $
  */
 
 #ifndef _KGDB_H_
diff --git a/gnu/usr.bin/gdb/kgdb/kthr.c b/gnu/usr.bin/gdb/kgdb/kthr.c
index 25f8d49193362..7f6a37e77bb86 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.1 2004/07/25 05:29:15 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 3209fc9040642..f192d24e78a7d 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.2 2004/08/15 02:39:20 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 5c889eb3f34dd..28c314219c6a2 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.1 2004/07/25 05:29:15 marcel Exp $");
 
 #include <sys/types.h>
 #include <kvm.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_alpha.c b/gnu/usr.bin/gdb/kgdb/trgt_alpha.c
index 891b0eb63e627..cf8b6d6285192 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.1 2004/07/25 05:29:15 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 e193969ca5ca6..452694b144cb2 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.1 2004/07/25 05:29:15 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 36c1ed0675460..22967b0f2ae41 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.1 2004/07/25 05:29:15 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 15609afe340e8..1019807517863 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.1 2004/07/25 05:29:15 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/md_var.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c b/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c
index 81f9a86940fee..7e97a68e44382 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.1 2004/07/25 05:29:15 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 8857f76f56112..030569abb7927 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.2.2.1 2004/09/04 09:54:42 davidxu Exp $
 
 LIB=	gdb
 INTERNALLIB= yes
diff --git a/gnu/usr.bin/gdb/libgdb/fbsd-threads.c b/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
index 93e019b96776a..e8d319495e8d9 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.4.2.1 2004/09/04 09:56:03 davidxu Exp $ */
 /* FreeBSD libthread_db assisted debugging support.
    Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 
diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 57fd0612bf770..364d20802311d 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 464005e3fa589..508fd570e117c 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 1c0ec790e597f..69321baa49fac 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/Makefile b/gnu/usr.bin/grep/Makefile
index b0c3988552b4f..c91038df276a2 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 6f7794e485f15..216d597e13a4d 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 e57aee3430864..d1b4face9aa85 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.19 2004/07/04 16:25:41 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 014f1b3637c4b..e31067ecd55ac 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.8 2004/07/04 16:16:59 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 82620f984eb7d..fcb1f2e372fe0 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 7b3e3763c45fe..4105120691617 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 425b3932fe548..f33ccf203f4fc 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.25 2004/07/04 10:02:03 tjr 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 e1f4e4133ae83..86f11d79e8311 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.27 2004/07/04 16:16:59 tjr 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 8a10330afc2e0..02f22e16bb82f 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.7 2004/07/04 16:16:59 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 9c5da2b3ea8be..a6d027338d7b6 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 79025396d1b9d..c1ccfbcf13ff6 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 1724f68de11b2..5e107c8bde41e 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/mbcache.h b/gnu/usr.bin/grep/mbcache.h
index 3b76e25e0d716..4b19062028cc1 100644
--- a/gnu/usr.bin/grep/mbcache.h
+++ b/gnu/usr.bin/grep/mbcache.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/mbcache.h,v 1.1 2004/07/04 16:16:59 tjr Exp $ */
 #ifndef MB_CACHE_DEFINED
 #define MB_CACHE_DEFINED
 struct mb_cache
diff --git a/gnu/usr.bin/grep/search.c b/gnu/usr.bin/grep/search.c
index 1ea421741a454..9f0d78273e310 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.17 2004/07/04 16:16:59 tjr Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 7c61f71be9458..3bfe9b6275275 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 d1977518308ab..f6ef7e9f284bc 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.9 2003/08/04 21:31:52 ache Exp $
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
diff --git a/gnu/usr.bin/groff/contrib/Makefile b/gnu/usr.bin/groff/contrib/Makefile
index 6718107cafddf..ec60e6b049729 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 d5552c54c4f8c..3c30d5c661ad7 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 2b07a88cb8b61..f50ac0289ca2e 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 763386ba780ec..428e18d2f0d74 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 6381812cab455..c4ccea7208f2c 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 d78fc81e4b9e5..9be9ef22cb776 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 c4a74c62fc751..a62a4091ff7f6 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 22a1a42e40c77..c917736c93796 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 d515835614b00..b73da83dc865b 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 9a136b819499f..682c3320f116c 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.1 2001/04/17 12:36:45 ru Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX100/Makefile b/gnu/usr.bin/groff/font/devX100/Makefile
index 9a136b819499f..36c44099efe65 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.1 2001/04/17 12:36:44 ru Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile b/gnu/usr.bin/groff/font/devX75-12/Makefile
index 9a136b819499f..66013e55b13d2 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.1 2001/04/17 12:36:46 ru Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75/Makefile b/gnu/usr.bin/groff/font/devX75/Makefile
index 9a136b819499f..947474f806123 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.1 2001/04/17 12:36:45 ru Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devascii/Makefile b/gnu/usr.bin/groff/font/devascii/Makefile
index 544ec16e475d5..462f2d03aed1d 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 d0a887a685c44..a3eaa06396d26 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 9497e2d45b4ab..8d276e55e74e6 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 e210eed1fab93..8659c9982ad96 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 399d2b6d0879f..24605ddc537f8 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 8c16013d46698..73511e47b1d95 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 238320216c1e8..f33a41b19195a 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 1372c8fd87689..07d6a1e052212 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 504677cec4c3f..3691034f5c6fb 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 d45d4426a06e4..f69a1629e7bb6 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 bf5965e19d3e0..a6699b8cf5f1b 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 b22c4c4b19046..4e4c1e42db66e 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 7d2ca90a2252d..e18d64543f82b 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 8af4ff85b996d..6e83166bebb4d 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 4619cbe9ad15d..b0e19d9db159c 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 37454406520a4..01beb68df0782 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 db7099e7f0f70..08f39f38132f6 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.5 2003/05/01 13:22:18 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 85a41c169b953..1eed35e97634b 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 270910a5316da..5ead05928b741 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 4511f69b152e4..0626ed4a2f739 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 d15ee8bf62319..539538415a0ea 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 e95f574715e81..2de2cb74a9949 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 76bd1178d45f4..4fe5a37a440b8 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 1461cda28bac7..9b1e706be76aa 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 627553fa6e85f..3f786b71de5ec 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 c66b8a94c8d7a..b3ec04022389f 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.3 2003/05/01 13:22:19 ru Exp $
 
 LIB=		bib
 INTERNALLIB=	YES
diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
index deb3e3b66156b..c310dea910878 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.3 2003/05/01 13:22:19 ru Exp $
 
 LIB=		driver
 INTERNALLIB=	YES
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index f44789f634255..04f6dca92968b 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.7 2004/04/15 19:13:27 ru Exp $
 
 LIB=		groff
 INTERNALLIB=	YES
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile b/gnu/usr.bin/groff/src/preproc/Makefile
index 70af839313d67..411115b49cb95 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 16c104a1aae62..20129800b27db 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 80871fee3c891..b7049443fb4bc 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 58309d2a5eb80..3bec3ddbb0c0b 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 65839d20d807a..5950e4cda1de8 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.5 2003/05/01 13:22:20 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 3b5939c3bff16..d100f7490bf06 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 8a18f6f7987c1..5e76656ebfc18 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 2c68b8005f0ab..04999bc75a2a3 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 29e7ac238f895..bf25418acb18d 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 543a990c680ff..e0ab68576ebb9 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 f893659c1b992..a910a7134dc69 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 2ae541bbb5024..f963934a934f1 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 718f0cf78acdf..09b3b90dcb390 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 6971890c67e6c..be4631f42da80 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 74bb4ad54980e..508f69c27ed74 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 e2291bab49d3d..57bd86e5ffdef 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 612fbcce39231..a8e8e7fe3fcf1 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 4f62293fce6f2..74a38c7522d9c 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 14953b925312a..816a8025a52ff 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 68945ab39f933..e11ee4704235d 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 26fbb57b9d1ce..20476a396158b 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 00f88ad2b9824..ecc4c7b665d64 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 50e51c96b0bc0..28835bf75a2eb 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 b2c59a2cee814..9cd0fb5a73282 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 f30dc56cbb8f2..3168aca0fc5b6 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 18834a7432d3c..c7d50112fc428 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 4fa71b525af6b..c03a11eaff776 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 ba3bbc54646ff..d9cfdf26746a3 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 43ef6fe779187..36393dfbee01c 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 88dda0d296c60..7b882c7fc6ebd 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 068f7162af6e7..77b342552cbd9 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 42fe42b2905d1..6b9f7beff55ed 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.41.4.1 2004/10/24 09:37:09 scottl Exp $
 .\"
 .\"     %beginstrip%
 .
diff --git a/gnu/usr.bin/groff/tmac/ru.KOI8-R b/gnu/usr.bin/groff/tmac/ru.KOI8-R
index 0d3eb0f7eb7a3..8032126c28272 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 9d30300ab4d0b..58281c40880de 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 efce3910632ee..35d0f39cd6700 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 cdbd812368cc1..b1a77b99dd930 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 cbc48843ce1d3..0643c4ae368b9 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 8cce647a8afc3..b13e0adcba132 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 795e47fe059d8..3b851f2ac4685 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 06b0a32077f29..aa3bb9fb525b3 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.11 2004/05/03 10:29:23 obrien Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/gzip.h b/gnu/usr.bin/gzip/gzip.h
index 79b0efd95980b..bda3f2b91d222 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 82b15704254a2..bc660a551d210 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 934a8d994d419..d4d06747c165e 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 f283f862e2143..99a411609ed9e 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 43b0885e4154a..155e34d0ec7bc 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 abdde17d18fd8..05f73e4c28123 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 fe2405e47f526..a1fd7985667c0 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 971ecc0389a45..200b9e94b4172 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 7e89ca4878226..570f43b051fcf 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 a0ef28699e4cd..97f151458e22d 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 b103a7f496574..8b50bc5bbba59 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 684cc5dd4a543..52fa56f6dca05 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 310a201e1a342..34aa3aaed2669 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 146db92c86d18..251003d3f9460 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 fe5efb9917fd8..cc3ca95f190f8 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 e6811b7e969e3..e5a6fe9b83038 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 3001efae61e09..cd6baaef58a8a 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 c5b985e71dc02..9f77c5f9ec008 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 f5c2d5fe6014e..3bc01e5b2c55e 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 b8157e519f5e6..5a76c1d4bf7bb 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 52b0ae963c2f8..1eb988b09305f 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 8a730e198ad7a..8d34315d52e86 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 5793e15384b84..7ba2f0e7889f9 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.21 2002/10/18 09:14:13 ru 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 2f5244b6d6a89..6a98354ccc031 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 8d9fd50bcd21b..030d317c986f0 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.12 2004/07/02 19:07:29 ru 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 093d633c72b7a..4e8437ba06c3c 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 243d141eaf1f5..51d3937374a7e 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.12 2002/05/13 11:09:03 ru Exp $
 
 LIB=	man
 INTERNALLIB= true
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 905d4dbedf521..521bc90f8d8e3 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 1dff84ae75d3e..53396fe360812 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 18005dfc036d7..9324958d3df81 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 0153f1ff33805..11ecadef580d7 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.23 2004/07/02 21:53:39 ru 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 b4d04faf0aaf8..345f1174ba3fc 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 c1a25dea2f539..92b0473ae0be6 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 5134e46ff017f..66fc7548c619d 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 8d5a8ab75b6b3..339ce8136a159 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.9 2001/10/01 16:58:30 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 374c94faa178a..2a55648dc8717 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 c04e722248a5d..c59f8e90cd7b1 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 373efbb83f772..1be477faff76c 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 94a615de5f7c5..6d8b786e35e0d 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 7600714ae3642..78a7cb73ad8c2 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 ed97132183f6b..44f473d23ccd8 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 d77ef65ff841f..9b35e4debbc9d 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 f1f0386e02b38..b585d7947cf58 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 3cc7957b63047..e17bab84b481b 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 8e06c33beaf5e..e3a069bff4662 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 7dee1a64ed0e3..89c9d327d92c8 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 d815fe8d14e8b..8aebf32db9673 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 b6e6652646b40..436e30f28bc34 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 f31f2e2d5444c..42469ece14bbb 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 753dbfbcd6291..b32a14e60c10c 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 faddf7c65ecdb..d08fd580c26ca 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 589e8b6850919..9b3e93cdbabde 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/NEWS b/gnu/usr.bin/rcs/NEWS
index 99208064bd329..b23236a3b8acd 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 89fc823525ee9..0e008885d3e3a 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 1378af222cb8f..d55b45d75cdf0 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 749a4cf6dbe93..dec62f8d7f2cd 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 2aea3ad1b40da..9aa12ff8b8c9a 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 51cb2b277927e..82564325c10ec 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 f6b0db300330e..4abeed7e98059 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 253a2ce72724a..5b1240dd65fcb 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 9b8bf57365ec7..1057abbb55273 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 ce0865143bd00..3798f756e1188 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.8 2002/05/13 11:09:03 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 96ec07d6c8754..805870d35ca58 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 0f83bf5690d69..878aa28e9cd75 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 8f1d610d5f564..9f261b65e827e 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 05b010854950f..ca796444aa82e 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 9f2f68cc8b6bb..c44af38156e4f 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 dc9dd307de6ae..5c8212d46766d 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 ef0529001b872..7a9a68f01b7cf 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 00caec5adf6f4..4ba009d9d989b 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 35d8702a34f84..03469ec010df7 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 4a90f851e6156..059e815abf648 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 378f57dd0f775..34e2c39af1f2b 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 7a11f79b46c86..e8c00e3486c00 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 89fb08daf3646..fa4bd8ab5b769 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 12c6c43006ac5..3d623d5b40a76 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 07f155bfb8ea8..72e84ec1efa52 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 cfd466096ff7e..6083c1e4bd0d5 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 e10afff6c20d2..dfa516a6d4915 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 a4fd35b7986aa..d59d9c2539a3d 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 aa127bf1c8ec8..57e540e70b2b3 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 aa7cc5fb315d2..7e97a2ec7f4d1 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 37fb59fea0684..0b0dba116b650 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 dfb622a6f8082..d97ad3717cd12 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 0d8aac874d45c..6d2f7404e1a44 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 edcd9ee9389d1..f02c0e7ea9271 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 3111915455a68..5f8245060ec65 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 32c8e7dfbc63f..6759d8263f251 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 74117c270e6c3..deeedd9ec94f9 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 7d3c0a37f66a6..8c8a119055aaf 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 6b5c348a50085..258deeae0fae3 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.8 2002/07/29 09:40:09 ru Exp $
 
 MAN=	rcsfreeze.1
 
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1 b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
index 3f513c4d65add..084830aeb51d9 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 be79406fe0c14..9ef61e1184096 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 aff6f666dabb6..e9c4187f7313a 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 e09dc2469867f..72ef0cf09ad7a 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 75165f1bbd59e..777ff906678cf 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 26bf08a2bcb09..891b4a23dfe94 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 f8872febb971d..755828cca3de6 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 f4f4c2812886d..b5c338b833d8d 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 b5faa3e0b69bd..d4040dcb607e9 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 f17db49acca5b..60b9d0b03318c 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 12a1101063ab8..97a780b4e4a1b 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.16 2004/04/05 23:06:16 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 fe84918c917fb..e7d9a48c5d723 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 0cce6424dc4bd..bc6eb8ba24e48 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 5c9006b200af7..6e4a19d10c226 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 1abb296d86458..d08be352936f4 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 f38405c8f292d..c264169a65f8a 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 bffedc2a60d91..405d774a44165 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 8195ecbd0dd43..c8e3ff720fede 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 47d0a5b6ec943..969047f2c98e8 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.16 2003/06/20 10:48:26 des 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 ea6e98ac9e8a4..f73026a8a6f2a 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.35 2003/11/12 23:08:23 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 2b116183792fa..5f76bd7921f15 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 59a1309f3cdc9..839bdd15e2f98 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 44f944c04b0c2..127dee1234a20 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 f119a5fbad3aa..7da16bcbc4f08 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 3c7a4765eedac..8270f1ad88908 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 875709d40b654..d2888edf4a767 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.24 2004/07/17 06:03:47 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 a0aecf4f26d65..68a0f70e01a5a 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 2d2657de8671b..17d540879a295 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 da23dbe43a4f6..16630323e6f45 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 b317af377192c..cca62305d8006 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.45 2004/07/02 21:53:39 ru Exp $
 .\"
 .Dd December 23, 2000
 .Os
diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index dc0d9e420a2cd..4c5a6d0a389cc 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 f13fa38c69437..3edd75bad9637 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.11 2000/01/17 10:59:13 ru Exp $
 
 TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
 
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile
index 2a0b1a3616a71..0dd18306c7e1c 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 07dedeaec5a4e..d5af7f19a1597 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 4f06ef23b3f1a..616044d669e47 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.1 2002/03/25 13:20:03 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 325c9095b35f8..81496c3edfb83 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 70986567cded0..947a23457410d 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.9 2004/02/17 02:08:03 ache Exp $
 
 LIB=	txi
 INTERNALLIB= true
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index 2533f41036150..655241679a4d7 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.16 2003/05/02 00:51:24 ru Exp $
 
 PROG=	makeinfo
 SRCS=	cmds.c defun.c files.c footnote.c html.c \
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile
index 91c2dfc14e308..00a36664f2cdf 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 16d9c7d28fe62..df451c12468b4 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.222.2.2 2004/09/30 23:36:08 dougb Exp $
 #
 # Doing a "make install" builds /usr/include.
 
diff --git a/include/_ctype.h b/include/_ctype.h
index a1fc0a2e973eb..5aa11c2ffe4ba 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.29 2004/08/12 12:19:10 tjr Exp $
  */
 
 #ifndef __CTYPE_H_
diff --git a/include/a.out.h b/include/a.out.h
index b0bbe49548196..4053ce08d8c95 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 2e6086bc49888..6bc1ff86f04d0 100644
--- a/include/arpa/Makefile
+++ b/include/arpa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/include/arpa/Makefile,v 1.1 2002/05/12 16:00:48 ru Exp $
 
 NOOBJ=	noobj
 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 41cbc11f2cf1b..d50e4668b053d 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 99b51c2e72540..8735b8bd36f20 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 e4f8ab844de69..5f3e8338a7dcc 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 c937f03eacded..dd941c7e700ab 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 84d7dc167c8f2..1de4dd48a9604 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 f267a4a2a2ab5..5ad013563851d 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 cef9d0248d847..3dfb955cb4a61 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 502a178dff334..51d9a7f722518 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 e1d27ce5d2d98..d287af631ca16 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 0825ff652c282..4368a9bfb064e 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 c192a88733da8..a3975f0eda53d 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 d686dafc8e9f6..1d0e1e0be5664 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 2575861ed8c4e..581ffcf1b2deb 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 e009074a98e7d..d572a4f14a437 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 c094a1c788377..b67318709d8a8 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 675c708f98cbb..a3c04cf19f463 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 32f0970fb94ec..256cf335e696d 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 f905ff6e3c267..d1cc03ac650d2 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 cae9172aed8c9..22d807cb6bd1d 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 09c4600a1072a..f44d4c1823937 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.10 2004/05/12 21:38:39 peadar Exp $
  */
 
 #ifndef	_FTS_H_
diff --git a/include/ftw.h b/include/ftw.h
index f01fda20d9250..c5e3e58ed8e89 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.1.2.1 2004/08/29 06:10:53 tjr Exp $
  */
 
 #ifndef	_FTW_H
diff --git a/include/getopt.h b/include/getopt.h
index dca3c3d661944..ddacd89406e9e 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 694ac40589af1..8a8d2aad645ac 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 70b4a8a245137..55a57a7152237 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 4b5d42f7d3023..c7dbeee332e70 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 e2d71903ae44b..a7373efcff756 100644
--- a/include/histedit.h
+++ b/include/histedit.h
@@ -35,7 +35,7 @@
  *
  *	@(#)histedit.h	8.2 (Berkeley) 1/3/94
  *	$NetBSD: histedit.h,v 1.15 2000/02/28 17:41:05 chopps Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/histedit.h,v 1.9 2003/07/14 16:31:20 imp Exp $
  */
 
 /*
diff --git a/include/ieeefp.h b/include/ieeefp.h
index e4f943d389162..981deea0a2cd0 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 f0911a48f3ef9..4de13c5a61388 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 05171a6c9d426..ae537a5771983 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 d38bf4be6a2e4..392b19f0b53f1 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 87f36f33c94af..e41bb59806306 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 59b50f9ce34c0..4a1375ce77250 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 3639c712b9fa2..df21c663bf7f3 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 3f770cc3408e3..587f01f767bc5 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 f95bbe8872a40..bb1c737dd552a 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 ba702140a4ec4..b5a48eaaee27b 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 5d7d7e8396d3f..0688aaae7aaf2 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 ade6a88b511fc..4d4c69d5a5d61 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 b5be330a0cc52..8342ca1cb698f 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 e144ba816a465..1637cd903d525 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 80dc0da2738f0..cead3210902c1 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 ba3ed32f39a96..d2911f5f8d378 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.32 2004/02/25 21:03:44 green Exp $
  */
 
 #ifndef _NETDB_H_
diff --git a/include/nl_types.h b/include/nl_types.h
index ccd771d4b8ee5..f064b12257b49 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -28,7 +28,7 @@
  *				Cambridge, MA 02139  USA
  *				nazgul@alfalfa.com
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nl_types.h,v 1.10 2002/09/24 17:28:12 mike Exp $
  */
 
 #ifndef _NL_TYPES_H_
diff --git a/include/nlist.h b/include/nlist.h
index 3dccf9e7b8eb9..ec5507423103e 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 1f4d078b1c3b3..792b16bb5a4ff 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 22e482c3a853b..9936ad1decc45 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 ec3443a5b1b9f..e89432333af9c 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 55fc21e26392a..952a3ae224b14 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 cc2111c5fcd2d..131325cc8e3ad 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.2 2004/07/17 17:05:12 marcel Exp $
  */
 
 #ifndef _PROC_SERVICE_H_
diff --git a/include/protocols/Makefile b/include/protocols/Makefile
index 3c79142557a6c..3d23dffefce8e 100644
--- a/include/protocols/Makefile
+++ b/include/protocols/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/include/protocols/Makefile,v 1.1 2002/05/12 16:00:48 ru Exp $
 
 NOOBJ=	noobj
 INCS=	dumprestore.h routed.h rwhod.h talkd.h timed.h
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 6abf922eb1927..8062ee6b833b4 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 b55b622507881..5ed6aafb1cefb 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 faa44e4e49fd1..cc23ac845c6db 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 36a5eff331f39..dac74e581eb52 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.32 2003/11/04 20:10:15 deischen Exp $
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
diff --git a/include/pthread_np.h b/include/pthread_np.h
index a11511cb5bee5..3c2a82c84c1f5 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 e045f18351e4c..f01d70da07c6d 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.15 2003/04/18 14:11:17 nectar Exp $
  */
 
 #ifndef _PWD_H_
diff --git a/include/readpassphrase.h b/include/readpassphrase.h
index 031f51796c913..ce28f2a5df880 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 3c3c87fde57b0..5c072f46bf9a7 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 96c2c94db9518..53330155665d3 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 800f73c51da22..cceddc1bce498 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.25 2004/03/15 17:08:28 des Exp $
  */
 
 #ifndef _RESOLV_H_
diff --git a/include/rpc/Makefile b/include/rpc/Makefile
index a7a40a2251c01..b6f1d67955004 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 5cb9abd0368b3..b1d5757aa014a 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 fff4ebfe300c4..24ef5d3442ef4 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 98ad595350e89..bf5f09ea0a1f4 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 48373b2c24c71..721a5c942ad80 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 1c85a4a736881..ef0cb764f3f97 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 1e7a0dea59e41..338d28fbd51c3 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 6148b4eb94a52..397bdbc596ed1 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 f920e22d24a3f..385afde075d3b 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 a5df606e9e0b0..eb166eded1f5b 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 5e26268a68dab..b18dc49fe6341 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 89f1614ab9c9a..e6333c7c7e7bd 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 366832a7d3f8c..d83049943c257 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 5c0806681e9e2..3e069e785c3b6 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 0fea4ad087a28..d418bf41ebba5 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 725b542a8dde3..72a717c053955 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 122fe7e4baca4..56bc68aea8292 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 354b341476771..ab2cde81a535f 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 fa64a853f90dd..3b9966b3b08b9 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 c5748413cdfd5..39f1627765930 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 4388d8b9ff88c..dbc8b0e5f9329 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 7ecae0c68e8f0..393d104ce44cb 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 67df9765e62b2..366f752d9093e 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 3514745d2efd4..67d25643b2cec 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 6c528dbc95c6e..ceb4392c74dac 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 58d22a8a5416a..4323f6dece5a9 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 db29cc3cf5fa1..3138a21b11542 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 d7d093fe5eb70..31613697fe1a5 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 78b0a15754875..af4f3cd964df6 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 3b296c0ddf1d5..23772ab066fb2 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 7800a0781ec67..555d1d203fcec 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 f820bdc1fc80d..6a3f8614d22da 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 95966610cf149..d9dc426ec41fb 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 8a09ac3a4d1fc..722ea38742545 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 7ebb19dff81be..8cf9b1cea5d2d 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 6edaea92c38b0..01a0af926a5f8 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 3146ec30673dc..7fd6b53236a7e 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 9dcc78376b1aa..b0b59fbbd2ce8 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 754affe9a4307..9b2e7f2508f58 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 87bf6c8443594..d9f44dba27742 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 19a4d8c5a2fda..ceb0b6aea38b9 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 eabc4d5928ee2..507f79afbf67c 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 c554827a079e1..5ddb22dcf3eec 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 0f3ecfc54d2e0..fb73b2796b6be 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 3f524ee4c81b6..b3d19a67ca5a6 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 c66287d73231a..dd50d4127b21a 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 0e7c44e92e7b0..2e14fea55a617 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 212050fd7eb64..ae4454f6584bc 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 42431a1ca45b4..3a1d14bca717c 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 abde97c3efeb9..e51a65225d5c2 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 da0399d82db27..c42b3855f1bb9 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 90648a023e6ea..04bef54ae10cd 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 6a767682360a8..96b980b0e2bfa 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/rune.h b/include/rune.h
index 0bb6f437d06cb..ceda8e76b0283 100644
--- a/include/rune.h
+++ b/include/rune.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rune.h	8.1 (Berkeley) 6/27/93
- * $FreeBSD$
+ * $FreeBSD: src/include/rune.h,v 1.5 2004/06/23 07:01:43 tjr Exp $
  */
 
 #ifndef	_RUNE_H_
diff --git a/include/runetype.h b/include/runetype.h
index 1625ef8f4e830..f3054fa51bb93 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 4e4606f12720c..e401e01528c9c 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 95644113e7103..eb8e63081bc51 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 e869e1dd05214..9c8dc7598af13 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 c0ce8bbeb8dc2..be545ce1a1ad5 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.6 2002/08/16 07:33:14 alfred Exp $
  */
 
 #ifndef _STDBOOL_H_
diff --git a/include/stddef.h b/include/stddef.h
index dd7362129323f..a331305f57bbf 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 8ff084dbd4a81..1c35d112ad411 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 f94e7ab82c585..111d4a45f8ec5 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.56 2004/02/23 03:16:58 ache Exp $
  */
 
 #ifndef _STDLIB_H_
diff --git a/include/string.h b/include/string.h
index 3844d41738ec6..1b793cd90e2e3 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.20 2004/07/23 02:20:05 tjr Exp $
  */
 
 #ifndef _STRING_H_
diff --git a/include/stringlist.h b/include/stringlist.h
index bae2a2ca3871a..52a121c24bdb5 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 4b19d0ecc665b..a7f289ff8ecac 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 246a7ba595eba..a52fb022dac40 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.1.2.1 2004/09/06 16:58:25 stefanf Exp $
  */
 
 #ifndef _TGMATH_H_
diff --git a/include/time.h b/include/time.h
index 7a107905b59f0..2b05e1b4c5bee 100644
--- a/include/time.h
+++ b/include/time.h
@@ -39,7 +39,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/include/time.h,v 1.31 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _TIME_H_
diff --git a/include/timeconv.h b/include/timeconv.h
index cce937cf7e546..a9345c6986e2d 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 73180f9c75e11..9a6eacda8ad33 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 12902d097fcf1..e870d705da54c 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 ffc40671ea0f3..c6a451c75f9c1 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 0331308bea83b..4a1eb67452bcc 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.73 2004/02/23 04:51:07 ache Exp $
  */
 
 #ifndef _UNISTD_H_
diff --git a/include/utime.h b/include/utime.h
index 8f803657bc487..ded805af27c6d 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 bdf137be93e81..fdd9accc6a605 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 dcb85c849018d..c2800eb95939f 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.2 2002/11/05 10:55:16 jmallett Exp $
  */
 
 #ifndef _UUID_H_
diff --git a/include/varargs.h b/include/varargs.h
index 51a9b595c54b7..cd5444f907bfe 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 28f9765e78bd2..f06cfbac98106 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 931a4088ef783..87bc16edb69e2 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 098045fa11a50..2372176de4da3 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 b86e6f9e34b78..1a41e3512620d 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/installworld_newk b/installworld_newk
deleted file mode 100755
index 50c1f89f2eec2..0000000000000
--- a/installworld_newk
+++ /dev/null
@@ -1,348 +0,0 @@
-#!/bin/sh
-# -------+---------+---------+---------+---------+---------+---------+---------+
-# Copyright (c) 2004  - Garance Alistair Drosehn <gad@FreeBSD.org>.
-#
-# All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-#  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-#  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-#  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-#  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-#  HOWEVER CAUSED AND ON ANY 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$
-# -------+---------+---------+---------+---------+---------+---------+---------+
-#
-#   This script does a 'make installworld' using the *new* versions of all
-# commands to do the work.  This is important when a major incompatible
-# change is made, a change such that the old-binaries won't work when
-# running on the new-kernel.  This script was written for the change to
-# 64-bit time_t on FreeBSD/Sparc64, but it is not specific to that.
-#
-#   IMPORTANT: This script does require that you ARE RUNNING ON the
-# new kernel that matches the 'world' that you want to install.
-#
-# -------+---------+---------+---------+---------+---------+---------+---------+
-
-#   This script expects that it will be run from /usr/src, or an
-#   equivalent (perhaps NFS-mounted) directory.
-if [ -f MAINTAINERS -a -f UPDATING -a -f Makefile -a -f Makefile.inc1 ] ; then
-    SOURCE_BWDIR="`make -V .OBJDIR`"
-else
-    echo "This script must be run from /usr/src!  (or equivalent)"
-    exit 1
-fi
-
-DOMAKE=
-DOMINI=
-SETMINPATH=
-SYMLINKS=
-VERBOSE=
-BADOPT=
-while test $# != 0
-do
-    case "$1" in
-    -M)   SETMINPATH=yes ;;
-    -S)   SYMLINKS=yes ;;
-    -y)   DOMAKE=yes ;;
-    -n)   DOMAKE=no ;;
-    -v)   VERBOSE=yes ;;
-    *)    echo "Invalid option: $1" ; BADOPT=yes ;;
-    esac
-    shift 1
-done
-if [ -n "$BADOPT" ] ; then
-    exit 1
-fi
-
-echo "* + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - *"
-echo "*  This script expects that a 'make installkernel' has already"
-echo "*  been done, and that you HAVE rebooted, and you ARE running"
-echo "*  on that new kernel."
-echo "* + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - *"
-echo ""
-
-#   Start out with no PATH at all.
-PATH=
-
-#   Where all the binaries should be coming from.
-BW_BIN="${SOURCE_BWDIR}/bin"
-BW_SBIN="${SOURCE_BWDIR}/sbin"
-BW_UBIN="${SOURCE_BWDIR}/usr.bin"
-BW_USBIN="${SOURCE_BWDIR}/usr.sbin"
-BW_GUBIN="${SOURCE_BWDIR}/gnu/usr.bin"
-
-MKTEMPCMD=/usr/bin/mktemp
-chkfile="${BW_UBIN}/mktemp/mktemp"
-if [ -f "${chkfile}" -a -x "${chkfile}" ] ; then
-    MKTEMPCMD="${chkfile}"
-else
-    echo "** Cannot find ${chkfile}?"
-    echo "** Will use ${MKTEMPCMD}"
-fi
-
-#   I intentionally prefer to have a shorter name here...  We just need a
-#   unique name, we're not likely to be under attack during installworld!
-TMPHOLD=`"${MKTEMPCMD}" -q -d ${TMPDIR:-/tmp}/install-newk.XXX`
-if [ $? -ne 0 ] ; then
-    echo "** Unable to create temp program-holding directory"
-    exit 1
-fi
-
-#   Set the most-restrictive value for PATH that the user is willing to
-#   shoot for.  The more restrictive we are here, the more likely we
-#   will catch all references to "old version" executables.
-PATH=${TMPHOLD}:/sbin:/bin:/usr/sbin:/usr/bin
-if [ -n "$SETMINPATH" ] ; then
-    PATH=${TMPHOLD}
-fi
-
-#   Find the most-appropriate version of key commands for this script.
-#   XXX - It would be nice if we could reliably find the exact kernel that
-#	we booted up with, and check for the optional mini-/bin in it.
-COPYCMD=/missing/cp
-for chkexec in "${BW_BIN}/cp/cp" /bin/cp ; do
-    if [ -f "${chkexec}" ] ; then
-        COPYCMD="${chkexec} -p"
-        break
-    fi
-done
-LINKCMD=/missing/ln
-for chkexec in "${BW_BIN}/ln/ln" /bin/ln ; do
-    if [ -f "${chkexec}" ] ; then
-        LINKCMD="${chkexec}"
-        break
-    fi
-done
-COPYINFO="Copying"
-
-copy_exec () {
-    srcdir="$1"
-    cmdname="$2"
-    alsoln="$3"
-    srcfile="${srcdir}/${cmdname}"
-
-    if [ -f "${srcfile}" -a -x "${srcfile}" ] ; then
-        if [ -n "$VERBOSE" ] ; then
-	    echo ".. ${COPYINFO} ${srcfile}"
-	fi
-	${COPYCMD} "${srcfile}" "${TMPHOLD}"
-	if [ $? -ne 0 ] ; then
-	    echo "** Error ${COPYINFO} '${srcfile}'"
-	    exit 1
-	fi
-    else
-        echo "** Cannot find ${cmdname} in ${srcdir}?"
-        exit 1
-    fi
-
-    if [ -n "${alsoln}" ] ; then
-	if [ -n "$VERBOSE" ] ; then
-	    echo ".. Linking '${cmdname}' as '${alsoln}' "
-	fi
-	${LINKCMD} "${TMPHOLD}/${cmdname}" "${TMPHOLD}/${alsoln}"
-	if [ $? -ne 0 ] ; then
-	    echo "** Error Linking '${cmdname}'"
-	    exit 1
-	fi
-    fi
-}
-
-# The programs listed in the following `do' loop are all the same programs
-# that the standard 'installworld' target wants to make copies of, except
-# that this has special-cases for `awk', `[', and `egrep'.  This script
-# also adds the commands `cp', `install', `id' and `which', because those
-# are also *used* by the standard `make installworld' target, although
-# that target doesn't bother to make copies of those programs.  The `sleep'
-# command is also added, but only because it is used in this script.  And
-# `script' is included just because it can be useful when testing this script.
-#
-# Note that this means there will be two copies made of these files
-# (because the 'make installworld' target is still going to copy them a
-# second time).
-# XXX - also remember that these are dynamically-linked, so this is not
-#       necessarily a perfect solution for the 'general case', but it
-#       does seem to work correctly for the switch to 64-bit time_t.
-
-#   Do the `cp' command first, because this script does so much with it.
-chkfile="${BW_BIN}/cp/cp"
-if [ -f "${chkfile}" -a -x "${chkfile}" ] ; then
-    if [ -n "$VERBOSE" ] ; then
-        echo ".. Copying ${chkfile}"
-    fi
-    ${COPYCMD} "${chkfile}" ${TMPHOLD}
-else
-    echo "** Cannot find ${chkfile}?"
-    exit 1
-fi
-
-#   Do the `ln' command as the second one, for similar reasons.
-copy_exec "${BW_BIN}/ln" ln
-
-#   Awk is also called 'nawk'
-copy_exec "${BW_UBIN}/awk" nawk awk
-
-#   The `install' comand is also is a special case, because
-#   the program is actually built under the name 'xinstall'.
-copy_exec "${BW_UBIN}/xinstall" xinstall install
-
-#   Mergemaster is another special case, because it's a script which is
-#   pulled from the /usr/src directory (not from /usr/obj/usr/src/...).
-#   Strictly speaking we shouldn't need to pull this in, but I do in
-#   case someone says 'no' to the automatic-installworld at the end
-#   if this script.  If they also specified -M, then they end up with
-#   a PATH which will have only our TMPHOLD directory when they get
-#   to the mergemaster step.
-copy_exec "`pwd`/usr.sbin/mergemaster" mergemaster.sh mergemaster
-
-#   Worried about the extra disk space that this script uses up in /tmp?  Well,
-#   just specify the -S option, and this script will create symlinks instead of
-#   copying the files.  Note that the original files might be NFS-mounted, and
-#   /tmp might be a memory-based file system, so the `installworld' might go
-#   much faster when copies are done here instead of symlinks.
-if [ -n "$SYMLINKS" ] ; then
-    COPYINFO="Linking to"
-    COPYCMD="ln -s"
-    LINKCMD="ln -s"
-fi
-
-for prog in cap_mkdb cat chflags chmod chown date \
-            echo       find grep    make mkdir mtree mv \
-            pwd_mkdb rm sed sh sysctl test true uname wc zic \
-            hostname id ls sleep script umount which xargs
-do
-    gotmatch=
-    for chkdir in "${BW_BIN}" "${BW_SBIN}" "${BW_UBIN}" "${BW_GUBIN}" \
-                   "${BW_USBIN}" "${BW_USBIN}/${prog}"
-    do
-        #  (the above extra-${prog} case is only needed for 'zic')
-        chkdir="${chkdir}/${prog}"
-        if [ -f "${chkdir}/${prog}" -a -x "${chkdir}/${prog}" ] ; then
-            gotmatch=yes
-            copy_exec "${chkdir}" "${prog}"
-            if [ $? -ne 0 ] ; then
-                exit 1
-            fi
-            break
-        fi
-    done
-    if [ -z "$gotmatch" ] ; then
-        echo "** Did not find '${prog}' ?"
-    fi
-done
-
-#   Special case to handle '[', which we know is the same as 'test'
-if [ -x ${TMPHOLD}/test ] ; then
-    if [ -n "$VERBOSE" ] ; then
-        echo ".. Linking 'test' as '[' "
-    fi
-    ${LINKCMD} ${TMPHOLD}/test ${TMPHOLD}/[
-fi
-#   Special case for 'egrep', which is the same as 'grep'
-if [ -x ${TMPHOLD}/grep ] ; then
-    if [ -n "$VERBOSE" ] ; then
-        echo ".. Linking 'grep' as 'egrep' "
-    fi
-    ${LINKCMD} ${TMPHOLD}/grep ${TMPHOLD}/egrep
-fi
-
-#   Have to duplicate the standard makefile, to make a few changes.
-
-#   First find the setting of PATH.  Insert a line in front of that
-#   which uses the (undocumented) .SHELL feature to get 'make' to
-#   use the newer version of /bin/sh that we just made a copy of.
-#   Then alter the PATH setting so that all make targets check our
-#   directory of copied files first.  If '-M' was given, then have
-#   a PATH setting that looks ONLY at our copied files.
-#    
-#   XXX - the .SHELL feature did NOT seem to work the way that I
-#	wanted it to, but that is not a problem for now.  It can
-#	be looked into at some later date...
-nawk '/^PATH=/ { \
-	    print "#   Try to get the make cmd to use an alternate /bin/sh." ; \
-	    print ".SHELL : name=sh path=" TDIR "/sh"  ; \
-	    print "" ; \
-	    if (WANTMIN == "yes") \
-	        sub(/^PATH *=[ \t]*.*/, "PATH=\t" TDIR ); \
-	    else \
-	        sub(/^PATH *=[ \t]*/, "PATH=\t" TDIR ":"); \
-	    } \
-      /-f Makefile.inc1/ { \
-	    sub(/Makefile.inc1/, TDIR "/Makefile.inc1" ); \
-	    } \
-      { print $0 }' \
-    "TDIR=${TMPHOLD}" "WANTMIN=${SETMINPATH}" Makefile > ${TMPHOLD}/Makefile
-
-#   In the case of this script, we also change Makefile.inc1, just to
-#   set the .SHELL target, and to make it (Makefile.inc1) reference
-#   the modified version in 'make -f' references.  Someone recently
-#   committed a total restructuring of Makefile.inc1, so the following
-#   has to be setup such that it works with both formats.
-nawk '/^# Put initial settings/ { \
-	    print "#   Try to get the make cmd to use an alternate /bin/sh." ; \
-	    print ".SHELL : name=sh path=" TDIR "/sh"  ; \
-	    print "" ; \
-	    } \
-      /^SUBDIR=[\t ]*share\/info .*bin/ { \
-	    print "#   Try to get the make cmd to use an alternate /bin/sh." ; \
-	    print ".SHELL : name=sh path=" TDIR "/sh"  ; \
-	    print "" ; \
-	    } \
-      /-f Makefile.inc1/ { \
-	    sub(/Makefile.inc1/, TDIR "/Makefile.inc1" ); \
-	    } \
-     { print $0 }' \
-    "TDIR=${TMPHOLD}" Makefile.inc1 > "${TMPHOLD}/Makefile.inc1"
-
-echo ""
-echo "The key programs needed by 'make installworld' have been copied."
-if [ -n "$VERBOSE" ] ; then
-    ls -C ${TMPHOLD}
-    echo ""
-fi
-
-#   The sparc64_installcheck will want this in the environment.
-NEWSPARC_TIMETYPE=__int64_t
-export NEWSPARC_TIMETYPE
-
-# See if the user wants us to go ahead with 'installworld',
-#     or just tell them what steps they need to do.
-if [ -z "${DOMAKE}" ] ; then
-    echo "Do you want to proceed with 'installworld'? "
-    read -p "(y/n) ? "  DOMAKE remline
-    echo " "
-fi
-if [ -n "`echo /y/yes/okay/ok/ | grep -i \"/${DOMAKE}/\"`" ] ; then
-    echo "Okay then, this script has set:"
-    echo "    NEWSPARC_TIMETYPE=__int64_t"
-    echo "    PATH=${PATH}"
-    echo "and will now execute the command:"
-    echo "    make -f ${TMPHOLD}/Makefile installworld"
-    sleep 4
-    make -f ${TMPHOLD}/Makefile installworld
-else
-    echo "When you are ready to continue, enter the commands:"
-    echo "    PATH=${PATH}"
-    echo "or:"
-    echo "    PATH=${TMPHOLD}:\${PATH}"
-    echo "and:"
-    echo "    NEWSPARC_TIMETYPE=__int64_t"
-    echo "    export NEWSPARC_TIMETYPE"
-    echo "    make -f ${TMPHOLD}/Makefile installworld"
-fi
diff --git a/installworld_oldk b/installworld_oldk
deleted file mode 100755
index 4eb4c479da46a..0000000000000
--- a/installworld_oldk
+++ /dev/null
@@ -1,454 +0,0 @@
-#!/bin/sh
-# -------+---------+---------+---------+---------+---------+---------+---------+
-# Copyright (c) 2004  - Garance Alistair Drosehn <gad@FreeBSD.org>.
-#
-# All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-#  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-#  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-#  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-#  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-#  HOWEVER CAUSED AND ON ANY 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$
-# -------+---------+---------+---------+---------+---------+---------+---------+
-#
-#   This script does a 'make installworld' using the *old* versions of all
-# commands to do the work.  It expects that the new kernel has been installed,
-# but that the system has not been rebooted (and is thus still running on the
-# previous kernel).  This is useful when a major incompatible change is made,
-# and you want to do an installworld that uses NFS-mounted directories for
-# /usr/src and /usr/obj.  This script was written for the change to
-# 64-bit time_t on FreeBSD/Sparc64, but it is not specific to that.
-#
-#   IMPORTANT: This script does require that you are NOT YET running on
-# the new kernel that matches the 'world' that you want to install.
-#
-# -------+---------+---------+---------+---------+---------+---------+---------+
-
-#   This script expects that it will be run from /usr/src, or an
-#   equivalent (perhaps NFS-mounted) directory.
-if [ -f MAINTAINERS -a -f UPDATING -a -f Makefile -a -f Makefile.inc1 ] ; then
-    SOURCE_BWDIR="`make -V .OBJDIR`"
-else
-    echo "This script must be run from /usr/src!  (or equivalent)"
-    exit 1
-fi
-
-DOMAKE=
-DOMINI=
-SETMINPATH=
-SYMLINKS=
-VERBOSE=
-BADOPT=
-while test $# != 0
-do
-    case "$1" in
-    -M)   SETMINPATH=yes ;;
-    -N)   DOMINI=no ;;
-    -S)   echo "-S (symlinks) is ignored in installworld_oldk." ;;
-    -Y)   DOMINI=yes ;;
-    -y)   DOMAKE=yes ;;
-    -n)   DOMAKE=no ;;
-    -v)   VERBOSE=yes ;;
-    *)    echo "Invalid option: $1" ; BADOPT=yes ;;
-    esac
-    shift 1
-done
-if [ -n "$BADOPT" ] ; then
-    exit 1
-fi
-
-echo "* + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - *"
-echo "*  This script expects that a 'make installkernel' has already"
-echo "*  been done, but that the system is still running the previous"
-echo "*  kernel.  Ie, that you have not rebooted."
-echo "*"
-echo "*  Also note that this only does a PARTIAL installworld.  You"
-echo "*  will still have to do a full installworld after rebooting."
-echo "* + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - *"
-echo ""
-
-#   See if the user wants us to create a mini-/bin inside of the
-#   newly-installed kernel.  These executables would only be used
-#   *after* booting into the new kernel, so we want the new-world
-#   versions of all files.
-#   XXX - This is a idea which could be useful in many situations, but
-#	it really should be implemented as an official make-target.
-#	It would be particularly nice to make this a statically-linked
-#	(and crunchgen-ed) collection of programs...
-if [ -z "${DOMINI}" -a -z "${DOMAKE}" ] ; then
-    echo "Do you want a mini-/bin in that newly-installed /boot/kernel? "
-    read -p "(y/n) ? "  DOMINI remline
-    echo " "
-elif [ -z "${DOMINI}" ] ; then
-    DOMINI="${DOMAKE}"
-fi
-if [ -n "`echo /y/yes/okay/ok/ | grep -i \"/${DOMINI}/\"`" ] ; then
-    KERNBINDIR=/boot/kernel/bin
-    if [ -e ${KERNBINDIR} ] ; then
-        rm -Rf ${KERNBINDIR}
-    fi
-    mkdir -p ${KERNBINDIR}
-    #   Much of this is done in a subshell, so values of DESTDIR, etc,
-    #   will only be in effect for this section of the script.
-    (
-    DESTDIR=${KERNBINDIR}
-    BINDIR=""
-    NOINFO=YES
-    NOMAN=YES
-    export BINDIR DESTDIR NOINFO NOMAN
-    MFLAG=
-    for wantdir in bin/chflags bin/chmod bin/cp bin/ls bin/mkdir bin/mv bin/sh \
-                   sbin/ifconfig sbin/mount sbin/mount_nfs sbin/reboot \
-                   usr.bin/find usr.bin/xargs ; do
-	if [ -n "$VERBOSE" ] ; then
-	    echo ".. Installing ${wantdir} to mini-/bin"
-	fi
-        (cd ${wantdir} && make ${MFLAG} install >/dev/null )
-	if [ $? -ne 0 ] ; then
-	    echo "** Error while in ${wantdir} doing 'make install'"
-	    echo "**       for DESTDIR=${KERNBINDIR}" 
-	    exit 1
-	fi
-    done
-    echo "Done building ${KERNBINDIR}"
-    echo
-    ) || exit 1
-fi
-
-#   Start out with no PATH at all.
-PATH=
-
-#   Where all the binaries should be coming from.
-OW_BIN="/bin"
-OW_SBIN="/sbin"
-OW_UBIN="/usr/bin"
-OW_USBIN="/usr/sbin"
-OW_GUBIN="/usr/bin"
-
-MKTEMPCMD=/usr/bin/mktemp
-
-#   I intentionally prefer to have a shorter name here...  We just need a
-#   unique name, we're not likely to be under attack during installworld!
-TMPHOLD=`"${MKTEMPCMD}" -q -d ${TMPDIR:-/tmp}/install-oldk.XXX`
-if [ $? -ne 0 ] ; then
-    echo "** Unable to create temp program-holding directory"
-    exit 1
-fi
-
-#   Set the most-restrictive value for PATH that the user is willing to
-#   shoot for.  The more restrictive we are here, the more likely we
-#   will catch all references to "unexpected" executables.
-PATH=${TMPHOLD}:/sbin:/bin:/usr/sbin:/usr/bin
-if [ -n "$SETMINPATH" ] ; then
-    PATH=${TMPHOLD}
-fi
-
-#   Find the most-appropriate version of key commands for this script.
-#   XXX - It would be nice if we could reliably find the exact kernel that
-#	we booted up with, and check for the optional mini-/bin in it.
-COPYCMD=/missing/cp
-for chkexec in "/rescue/cp" /bin/cp ; do
-    if [ -f "${chkexec}" ] ; then
-        COPYCMD="${chkexec} -p"
-        break
-    fi
-done
-LINKCMD=/missing/ln
-for chkexec in "/rescue/ln" /bin/ln ; do
-    if [ -f "${chkexec}" ] ; then
-        LINKCMD="${chkexec}"
-        break
-    fi
-done
-COPYINFO="Copying"
-
-copy_exec () {
-    srcdir="$1"
-    cmdname="$2"
-    alsoln="$3"
-    srcfile="${srcdir}/${cmdname}"
-    resfile="/rescue/${cmdname}"
-
-    if [ -f "${resfile}" -a -x "${resfile}" ] ; then
-        if [ -n "$VERBOSE" ] ; then
-	    echo ".. Linking ${TMPHOLD}/RESCUE to ${cmdname}"
-	fi
-	${LINKCMD} "${TMPHOLD}/RESCUE" "${TMPHOLD}/${cmdname}"
-	if [ $? -ne 0 ] ; then
-	    echo "** Error Linking '${cmdname}'"
-	    exit 1
-	fi
-    elif [ -f "${srcfile}" -a -x "${srcfile}" ] ; then
-        if [ -n "$VERBOSE" ] ; then
-	    echo ".. ${COPYINFO} ${srcfile}"
-	fi
-	${COPYCMD} "${srcfile}" "${TMPHOLD}"
-	if [ $? -ne 0 ] ; then
-	    echo "** Error ${COPYINFO} '${srcfile}'"
-	    exit 1
-	fi
-    else
-        echo "** Cannot find ${cmdname} in /rescue or ${srcdir}?"
-        exit 1
-    fi
-
-    if [ -n "${alsoln}" ] ; then
-	if [ -n "$VERBOSE" ] ; then
-	    echo ".. Linking '${cmdname}' as '${alsoln}' "
-	fi
-	${LINKCMD} "${TMPHOLD}/${cmdname}" "${TMPHOLD}/${alsoln}"
-	if [ $? -ne 0 ] ; then
-	    echo "** Error Linking '${cmdname}'"
-	    exit 1
-	fi
-    fi
-}
-
-# The programs listed in the following `do' loop are all the same programs
-# that the standard 'installworld' target wants to make copies of, except
-# that this has special-cases for `awk', `[', and `egrep'.  This script
-# also adds the commands `cp', `install', `id' and `which', because those
-# are also *used* by the standard `make installworld' target, although
-# that target doesn't bother to make copies of those programs.  The `sleep'
-# command is also added, but only because it is used in this script.  And
-# `script' is included just because it can be useful when testing this script.
-#
-# Note that this means there will be two copies made of these files
-# (because the 'make installworld' target is still going to copy them a
-# second time).
-
-#   Do the `cp' command first, because this script does so much with it.
-#   This is done as a special case, because it's the initial program
-#   from /rescue (if /rescue exists).
-chkfile="/rescue/cp"
-if [ -f "${chkfile}" -a -x "${chkfile}" ] ; then
-    if [ -n "$VERBOSE" ] ; then
-        echo ".. Copying ${chkfile} to 'RESCUE'"
-    fi
-    ${COPYCMD} "${chkfile}" "${TMPHOLD}/RESCUE"
-fi
-copy_exec "${OW_BIN}" cp
-
-#   Do the `ln' command as the second one, for similar reasons.
-copy_exec "${OW_BIN}" ln
-
-#   Awk is also called 'nawk'
-copy_exec "${OW_UBIN}" nawk awk
-
-#   The `install' comand is not a special case in this script,
-#   but it is in the installworld_newk script.
-copy_exec "${OW_UBIN}" install
-
-#   Worried about the extra disk space that this script uses up in /tmp?  Well,
-#   just specify the -S option, and this script will create symlinks instead of
-#   copying the files.  Note that the original files might be NFS-mounted, and
-#   /tmp might be a memory-based file system, so the `installworld' might go
-#   much faster when copies are done here instead of symlinks.
-if [ -n "$SYMLINKS" ] ; then
-    echo "The -S (symlinks) option is ignored in installworld_oldk"
-    # COPYINFO="Linking to"
-    # COPYCMD="ln -s"
-    # LINKCMD="ln -s"
-fi
-
-for prog in cap_mkdb cat chflags chmod chown date \
-            echo       find grep    make mkdir mtree mv \
-            pwd_mkdb rm sed sh sysctl test true uname wc zic \
-            hostname id ls sleep script umount which xargs
-do
-    gotmatch=
-    for chkdir in "${OW_BIN}" "${OW_SBIN}" "${OW_UBIN}" "${OW_USBIN}"
-    do
-        if [ -f "${chkdir}/${prog}" -a -x "${chkdir}/${prog}" ] ; then
-            gotmatch=yes
-            copy_exec "${chkdir}" "${prog}"
-            if [ $? -ne 0 ] ; then
-                exit 1
-            fi
-            break
-        fi
-    done
-    if [ -z "$gotmatch" ] ; then
-        echo "** Did not find '${prog}' ?"
-    fi
-done
-
-#   Special case to handle '[', which we know is the same as 'test'
-if [ -x ${TMPHOLD}/test ] ; then
-    if [ -n "$VERBOSE" ] ; then
-        echo ".. Linking 'test' as '[' "
-    fi
-    ${LINKCMD} ${TMPHOLD}/test ${TMPHOLD}/[
-fi
-#   Special case for 'egrep', which is the same as 'grep'
-if [ -x ${TMPHOLD}/grep ] ; then
-    if [ -n "$VERBOSE" ] ; then
-        echo ".. Linking 'grep' as 'egrep' "
-    fi
-    ${LINKCMD} ${TMPHOLD}/grep ${TMPHOLD}/egrep
-fi
-
-#   Have to duplicate the standard makefile, to make a few changes.
-
-#   First find the setting of PATH.  Insert a line in front of that
-#   which uses the (undocumented) .SHELL feature to get 'make' to
-#   use the newer version of /bin/sh that we just made a copy of.
-#   Then alter the PATH setting so that all make targets check our
-#   directory of copied files first.  If '-M' was given, then have
-#   a PATH setting that looks ONLY at our copied files.
-#    
-#   XXX - the .SHELL feature did NOT seem to work the way that I
-#	wanted it to, but that is not a problem for now.  It can
-#	be looked into at some later date...
-nawk '/^PATH=/ { \
-	    print "#   Try to get the make cmd to use an alternate /bin/sh." ; \
-	    print ".SHELL : name=sh path=" TDIR "/sh"  ; \
-	    print "" ; \
-	    if (WANTMIN == "yes") \
-	        sub(/^PATH *=[ \t]*.*/, "PATH=\t" TDIR ); \
-	    else \
-	        sub(/^PATH *=[ \t]*/, "PATH=\t" TDIR ":"); \
-	    } \
-      /-f Makefile.inc1/ { \
-	    sub(/Makefile.inc1/, TDIR "/Makefile.inc1" ); \
-	    } \
-      { print $0 }' \
-    "TDIR=${TMPHOLD}" "WANTMIN=${SETMINPATH}" Makefile > ${TMPHOLD}/Makefile
-
-#   In the case of this script, we want the new libraries to be the
-#   *last* things that are installed (since we will be running some
-#   programs which expect the present libraries).  However, we do
-#   still have the problem that 'make' explicitly uses /bin/sh, so
-#   the install of 'bin' must be delayed to after those libraries.
-#   [Someone recently committed a total restructuring of Makefile.inc1,
-#   so the following  has to be setup such that it works with either
-#   formats.  That's why it seems to be doing everything twice.]
-nawk 'BEGIN { GOTSBIN = 0; } \
-      /^# Put initial settings/ { \
-	    print "#   Try to get the make cmd to use an alternate /bin/sh." ; \
-	    print ".SHELL : name=sh path=" TDIR "/sh"  ; \
-	    print "" ; \
-	    } \
-      /^SUBDIR=[\t ]*share\/info .*bin/ { \
-	    print "#   Try to get the make cmd to use an alternate /bin/sh." ; \
-	    print ".SHELL : name=sh path=" TDIR "/sh"  ; \
-	    print "" ; \
-	    } \
-      /exists\(.*\/sbin\)/ { \
-	    if (GOTSBIN == 0) { \
-		GOTSBIN = 1;
-		print "" ; \
-		print "#   For installworld_oldk processing, forget" ; \
-		print "#   all the subdirectories before sbin..."; \
-		print "SUBDIR=" ; \
-	        } \
-	    } \
-      /^SUBDIR\+=sbin/ { \
-	    if (GOTSBIN == 0) { \
-		GOTSBIN = 1;
-		print "" ; \
-		print "#   For installworld_oldk processing, forget" ; \
-		print "#   all the subdirectories before sbin..."; \
-		print "SUBDIR=" ; \
-	        } \
-	    } \
-      /^# These are last, since it is/ { \
-	    print "#   These dirs are done last for installworld_oldk." ; \
-	    print ".if exists(${.CURDIR}/lib)" ; \
-	    print "SUBDIR+= lib" ; \
-	    print ".endif" ; \
-	    print ".if exists(${.CURDIR}/libexec)" ; \
-	    print "SUBDIR+= libexec"; \
-	    print ".endif"; \
-	    print ".if exists(${.CURDIR}/bin)" ; \
-	    print "SUBDIR+= bin"; \
-	    print ".endif"; \
-	    } \
-      /-f Makefile.inc1/ { \
-	    sub(/Makefile.inc1/, TDIR "/Makefile.inc1" ); \
-	    } \
-     { print $0 } \
-     END    { \
-	    if (GOTSBIN == 0) { \
-	        print "ERROR: No \"sbin\" match in Makefile.inc1" > "/dev/stderr"; \
-	        } \
-	    }' \
-    "TDIR=${TMPHOLD}" Makefile.inc1 > "${TMPHOLD}/Makefile.inc1"
-
-echo ""
-echo "The key programs needed by 'make installworld' have been copied."
-if [ -n "$VERBOSE" ] ; then
-    ls -C ${TMPHOLD}
-    echo ""
-fi
-
-# XXX - Add some "do-nothing" settings so that we won't clobber any
-#	more than we need to.  I wish we could avoid having to set
-#	them as environment variables, particularly for the case
-#	where the user chooses to type in all the commands.  The
-#	more a user has to type, the more chances for a typo...
-NO_FORTRAN=yes
-NO_RESCUE=yes
-NOGAMES=yes
-NOINFO=yes
-NOMAN=yes
-NOSHARE=yes
-export NO_FORTRAN NO_RESCUE NOGAMES NOINFO NOMAN NOSHARE
-
-#   The sparc64_installcheck will want this in the environment.
-NEWSPARC_TIMETYPE=__int64_t
-export NEWSPARC_TIMETYPE
-
-# See if the user wants us to go ahead with 'installworld',
-#     or just tell them what steps they need to do.
-if [ -z "${DOMAKE}" ] ; then
-    echo "Do you want to proceed with the abridged 'installworld'? "
-    read -p "(y/n) ? "  DOMAKE remline
-    echo " "
-fi
-if [ -n "`echo /y/yes/okay/ok/ | grep -i \"/${DOMAKE}/\"`" ] ; then
-    echo "Okay then, this script has set:"
-    echo "    NO_FORTRAN NO_RESCUE NOGAMES NOINFO NOMAN NOSHARE"
-    echo "and:"
-    echo "    NEWSPARC_TIMETYPE=__int64_t"
-    echo "    PATH=${PATH}"
-    echo "and will now execute the command:"
-    echo "    make -f ${TMPHOLD}/Makefile installworld"
-    sleep 4
-    make -f ${TMPHOLD}/Makefile installworld
-else
-    echo "When you are ready to continue, enter the commands:"
-    echo "    NO_FORTRAN=yes"
-    echo "    NO_RESCUE=yes"
-    echo "    NOGAMES=yes"
-    echo "    NOINFO=yes"
-    echo "    NOMAN=yes"
-    echo "    NOSHARE=yes"
-    echo "    export NO_FORTRAN NO_RESCUE NOGAMES NOINFO NOMAN NOSHARE"
-    echo "    NEWSPARC_TIMETYPE=__int64_t"
-    echo "    export NEWSPARC_TIMETYPE"
-    echo "and:"
-    echo "    PATH=${PATH}"
-    echo "or:"
-    echo "    PATH=${TMPHOLD}:\${PATH}"
-    echo "and:"
-    echo "    make -f ${TMPHOLD}/Makefile installworld"
-fi
diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index b434526d202f6..ba2f03e84e527 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 6f6a41c3ed5a7..48a256b8aa1b5 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/Makefile.inc,v 1.23 2004/08/06 07:27:03 cperciva Exp $
 
 NOLINT=
 
diff --git a/kerberos5/doc/Makefile b/kerberos5/doc/Makefile
index 1f71ed85cf5e1..83b11f9460479 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 1bbb7057704e9..e95bbe1b82e96 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.14 2004/04/13 16:40:59 nectar Exp $ */
 
 #include <osreldate.h>
 
diff --git a/kerberos5/include/crypto-headers.h b/kerberos5/include/crypto-headers.h
index b224364140f0a..904e0c81e5d15 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 d43bb74db6790..b88f94b97e8eb 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 2b6d486088caa..9c66030a2e71e 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/version.h,v 1.13 2004/04/13 16:40:59 nectar Exp $ */
 const char *heimdal_long_version = "@(#)$Version: Heimdal 0.6.1 (FreeBSD) $";
 const char *heimdal_version = "Heimdal 0.6.1";
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index 1d07e0b47cfd8..333ed56ed2422 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 ab7791b703696..eb4223a63d1d5 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 2003/10/09 19:48:45 nectar Exp $
 
 SHLIB_MAJOR?=	7
 
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index e36df2c39d70c..bdc01dcaed186 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.22 2004/02/05 18:51:48 ru Exp $
 
 LIB=	asn1
 INCS=	asn1_err.h krb5_asn1.h
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index 68424a66dfc57..c4cd3eb571845 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 eef619f4a9e03..f8a153acd9845 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 32cc80b3b0042..23d0e70476763 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 086cb8f631789..c142bc0bad0aa 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 337c642be9dda..5ce85714c6bc6 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 40cddc361d796..64bca5663c55b 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 a0b60f1f63a81..6948c97d385ba 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 71a38a5729d17..46fb0bca8da63 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 1b91ac172e26a..2cc95e2adff8a 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 89baf6daad57a..559f609faa5f9 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 535597e7d2a59..9bc86b2794053 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 84523cfac15d1..7694414858696 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 4db38fb4bb1b6..c98df00ff9713 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 73fcb8bd20b7a..3c1d37c0b866a 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.16 2004/02/05 18:51:50 ru Exp $
 
 PROG=	ipropd-master
 NOMAN=
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index e2dd6866520c6..4bf797d1abfb2 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.16 2004/02/05 18:51:50 ru Exp $
 
 PROG=	ipropd-slave
 NOMAN=
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index d0514a01342cc..87a4e09225360 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 73a1efcbf853e..3d1d27e2d2b12 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 c0e6a1ea1aa12..c7b3f7075eff4 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 ed8d30a030196..0bd508de1de84 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 c0703a968ec6c..7ceb8c8c3f232 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 c46825281949d..8bd4aad97bda7 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.4 2004/02/05 18:51:51 ru Exp $
 
 PROG=	asn1_compile
 NOMAN=
diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile
index 144c4dc726451..c3185a2c07232 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.1 2004/01/31 08:15:56 ru Exp $
 
 PROG=	make-print-version
 NOMAN=
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
index 473b83ecb2f33..218d324bda677 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.1 2004/01/31 08:15:56 ru Exp $
 
 PROG=	make-roken
 NOMAN=
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 737f13e871ef0..e61b52e0e24f8 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 abd146b6720e0..390acb095d612 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 b646c986eb945..7af1fee532311 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 60bc792780d1a..72fe0c59da10f 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 172ad985a84af..22d0d72f98ff7 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 c97d65fc2ef6f..5c078fcfa19af 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 686c299ccdcaa..708c929c9b50a 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 381685976a9d3..8d410fcb6fb7c 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.14 2004/04/13 16:41:00 nectar Exp $
 
 SCRIPTS=krb5-config
 MAN=	krb5-config.1
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 93f9e21c09645..d1bf47cc99caf 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.13 2004/02/05 18:51:52 ru Exp $
 
 PROG=	ksu
 .if defined(ENABLE_SUID_K5SU)
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
index 7acce0eb7cad2..d93e3a8ca3464 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 2e722ee64ddf4..859d51ca02228 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 dab729d159e4e..ae5a70c4a3dbc 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 d9c6d8d9461d6..44369dbebf5e1 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 e134cce942eb7..a77d29bd0d6e1 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 e2380492a930d..e35d2d6decbd6 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.189.2.2 2004/10/09 15:07:19 mtm 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 a7e1d21b7f2f7..79f44cbc65c0e 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/Makefile.inc,v 1.2 2002/09/28 00:25:28 peter Exp $
 # Default version for system libs (override in <lib>/Makefile if necessary)
 SHLIB_MAJOR?= 2
diff --git a/lib/bind/Makefile b/lib/bind/Makefile
index 5eccf49cf248b..2f09df59d3589 100644
--- a/lib/bind/Makefile
+++ b/lib/bind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/Makefile,v 1.1.2.1 2004/09/26 03:10:10 des Exp $
 
 SUBDIR=		bind bind9 dns isc isccc isccfg lwres
 
diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index 72b00835bcbef..12b34a295a9d8 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.2.1 2004/09/26 03:10:11 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/bind/config.h b/lib/bind/bind/config.h
index 1d5285f1e88c0..6f4fb462c624c 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.2.1 2004/09/26 03:10:11 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 755779b13ac7e..8c7813ba748c7 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.2.1 2004/09/26 03:10:11 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 02a45bda9c8a3..c47860ecbd235 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.2.1 2004/09/26 03:10:11 des Exp $ */
 
 #ifndef port_before_h
 #define port_before_h
diff --git a/lib/bind/bind9/Makefile b/lib/bind/bind9/Makefile
index d470ed66efa40..fed4aa716ff99 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.2.1 2004/09/26 03:10:11 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/config.h b/lib/bind/config.h
index 1632ed8252ec2..bb0d7a920317a 100644
--- a/lib/bind/config.h
+++ b/lib/bind/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/config.h,v 1.1.2.1 2004/09/26 03:10:10 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 77dbf3605ed4c..e7904b27c5cff 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/config.mk,v 1.9.2.1 2004/09/26 03:10:10 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 731f1612801d7..259a54c35fed8 100644
--- a/lib/bind/dns/Makefile
+++ b/lib/bind/dns/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/dns/Makefile,v 1.4.2.1 2004/09/26 03:10:11 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/dns/code.h b/lib/bind/dns/code.h
index e18f26cfaca2a..4ecc0570ae38a 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.1.2.1 2004/09/26 03:10:11 des Exp $ */
 
 /*
  * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/enumclass.h b/lib/bind/dns/dns/enumclass.h
index f82b1f930c1fe..2a0dc78504dc5 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.1.2.1 2004/09/26 03:10:11 des Exp $ */
 
 /*
  * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/enumtype.h b/lib/bind/dns/dns/enumtype.h
index a28c11b332317..e0eaab4a81d66 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.1.2.1 2004/09/26 03:10:11 des Exp $ */
 
 /*
  * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/rdatastruct.h b/lib/bind/dns/dns/rdatastruct.h
index 42fbbe322d990..9d394554c9ecf 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.1.2.1 2004/09/26 03:10:11 des Exp $ */
 
 /*
  * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index 6114bd0cdf68c..57fa04010f447 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.2.1 2004/09/26 03:10:12 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 be0e8ebf3e3de..9659fe72370d6 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.2.1 2004/09/26 03:10:12 des Exp $ */
 
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/isccc/Makefile b/lib/bind/isccc/Makefile
index 18e9c1465552f..d2bbc78ca6e7b 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.2.1 2004/09/26 03:10:12 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/isccfg/Makefile b/lib/bind/isccfg/Makefile
index 609da2c98c163..64f0bceae2329 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.2.1 2004/09/26 03:10:12 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index 81375c78a7ff4..e8618bddffd88 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.5.2.2 2004/09/30 23:36:08 dougb 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 0746e1465a2f1..2a3e2e6df0ee3 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.2.1 2004/09/26 03:10:13 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 99b78004d3a04..e45e33ba738d7 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.2.1 2004/09/26 03:10:13 des Exp $ */
 
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/compat/Makefile b/lib/compat/Makefile
index 3339bccebb8d5..8c1a9c9e942b5 100644
--- a/lib/compat/Makefile
+++ b/lib/compat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/Makefile,v 1.10 2001/02/14 20:49:54 obrien Exp $
 
 SUBDIR=
 
diff --git a/lib/compat/Makefile.inc b/lib/compat/Makefile.inc
index e26661f1c675c..51094e7960c1e 100644
--- a/lib/compat/Makefile.inc
+++ b/lib/compat/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/Makefile.inc,v 1.9 2002/04/18 06:46:34 ru Exp $
 
 # Suck in ${SHLIBDIR} definition.
 .include <bsd.own.mk>
diff --git a/lib/compat/compat1x/Makefile b/lib/compat/compat1x/Makefile
index 4d68d74a97b2a..127880ae989d2 100644
--- a/lib/compat/compat1x/Makefile
+++ b/lib/compat/compat1x/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat1x/Makefile,v 1.14 2002/07/29 09:40:09 ru Exp $
 
 DISTRIBUTION=	compat1x
 
diff --git a/lib/compat/compat20/Makefile b/lib/compat/compat20/Makefile
index 8d7dc6bf0e2cd..6f8deb6cf2195 100644
--- a/lib/compat/compat20/Makefile
+++ b/lib/compat/compat20/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat20/Makefile,v 1.14 2002/07/29 09:40:09 ru Exp $
 
 DISTRIBUTION=	compat20
 
diff --git a/lib/compat/compat21/Makefile b/lib/compat/compat21/Makefile
index 08c41cb801bcd..98b3286aa80b0 100644
--- a/lib/compat/compat21/Makefile
+++ b/lib/compat/compat21/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat21/Makefile,v 1.16 2002/07/29 09:40:10 ru Exp $
 
 DISTRIBUTION=	compat21
 
diff --git a/lib/compat/compat21/libg++.so.3.0.gz.uu b/lib/compat/compat21/libg++.so.3.0.gz.uu
index 246acb57c60d9..4e232adffc7d6 100644
--- a/lib/compat/compat21/libg++.so.3.0.gz.uu
+++ b/lib/compat/compat21/libg++.so.3.0.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat21/libg++.so.3.0.gz.uu,v 1.2 2002/05/31 13:19:58 ru Exp $
 
 begin 444 libg++.so.3.0.gz
 M'XL(".%'0S,"`VQI8F<K*RYS;RXS+C``S#H-<!ME=KO22EX[FY.<Z,"`N3AW
diff --git a/lib/compat/compat22/Makefile b/lib/compat/compat22/Makefile
index 33bc15a79e217..665529ac17481 100644
--- a/lib/compat/compat22/Makefile
+++ b/lib/compat/compat22/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat22/Makefile,v 1.9 2002/08/04 05:51:05 obrien Exp $
 
 DISTRIBUTION=	compat22
 
diff --git a/lib/compat/compat22/libc.so.3.1.bz2.uu b/lib/compat/compat22/libc.so.3.1.bz2.uu
index bbca527396fe7..d70ef4d0178f2 100644
--- a/lib/compat/compat22/libc.so.3.1.bz2.uu
+++ b/lib/compat/compat22/libc.so.3.1.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat22/libc.so.3.1.bz2.uu,v 1.1 2002/08/04 05:51:05 obrien Exp $
 
 begin-base64 640 libc.so.3.1.bz2
 QlpoOTFBWSZTWeNfaiMCvMf/////////////////////////////////////////////4t1iUAdE
diff --git a/lib/compat/compat22/libc_r.so.3.0.bz2.uu b/lib/compat/compat22/libc_r.so.3.0.bz2.uu
index 47692464048b5..269b2ea58d082 100644
--- a/lib/compat/compat22/libc_r.so.3.0.bz2.uu
+++ b/lib/compat/compat22/libc_r.so.3.0.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat22/libc_r.so.3.0.bz2.uu,v 1.1 2002/08/04 05:51:05 obrien Exp $
 
 begin-base64 640 libc_r.so.3.0.bz2
 QlpoOTFBWSZTWUbRsG0DF+J/////////////////////////////////////////////4y6KgAPk
diff --git a/lib/compat/compat22/libxpg4.so.2.0.gz.uu b/lib/compat/compat22/libxpg4.so.2.0.gz.uu
index f682ca3c86c5b..a1b5e5e81db76 100644
--- a/lib/compat/compat22/libxpg4.so.2.0.gz.uu
+++ b/lib/compat/compat22/libxpg4.so.2.0.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat22/libxpg4.so.2.0.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libxpg4.so.2.0.gz
 M'XL(""_'U#<"`VQI8GAP9S0N<V\N,BXP`.U:>W!35WH_$K(0()``V=A@L``1
diff --git a/lib/compat/compat3x.i386/Makefile b/lib/compat/compat3x.i386/Makefile
index c709d78c88b2d..9218b662e4e84 100644
--- a/lib/compat/compat3x.i386/Makefile
+++ b/lib/compat/compat3x.i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat3x.i386/Makefile,v 1.18 2002/07/29 09:40:10 ru Exp $
 
 DISTRIBUTION=	compat3x
 
diff --git a/lib/compat/compat3x.i386/libalias.so.3.gz.uu b/lib/compat/compat3x.i386/libalias.so.3.gz.uu
index 171a973f5e569..421f62ab1aaee 100644
--- a/lib/compat/compat3x.i386/libalias.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libalias.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libalias.so.3.gz.uu,v 1.2 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libalias.so.3.gz
 M'XL("`9@=CD"`VQI8F%L:6%S+G-O+C,`U7U]8!35M?CL1S9+6-D%0H@:(6K0
diff --git a/lib/compat/compat3x.i386/libc.so.3.gz.uu b/lib/compat/compat3x.i386/libc.so.3.gz.uu
index b01a4297edaf7..c1cf6c6e0a89f 100644
--- a/lib/compat/compat3x.i386/libc.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libc.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libc.so.3.gz.uu,v 1.4 2002/09/25 19:47:53 knu Exp $
 
 begin 444 libc.so.3.gz
 M'XL(")D61CT"`VQI8F,N<V\N,P"TO0U<5&4:/GQFF$$L"BPJ*BHJ*BLK+"IP
diff --git a/lib/compat/compat3x.i386/libc_r.so.3.gz.uu b/lib/compat/compat3x.i386/libc_r.so.3.gz.uu
index 310599fa72987..eedf969441e59 100644
--- a/lib/compat/compat3x.i386/libc_r.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libc_r.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libc_r.so.3.gz.uu,v 1.2 2002/09/25 19:47:54 knu Exp $
 
 begin 444 libc_r.so.3.gz
 M'XL("+7*D3T"`VQI8F-?<BYS;RXS`)2="WS68__X[WOW88MAT6&8SM&12E(9
diff --git a/lib/compat/compat3x.i386/libc_r.so.4.gz.uu b/lib/compat/compat3x.i386/libc_r.so.4.gz.uu
index cbb504b93d6e7..5b4b66efb30ce 100644
--- a/lib/compat/compat3x.i386/libc_r.so.4.gz.uu
+++ b/lib/compat/compat3x.i386/libc_r.so.4.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libc_r.so.4.gz.uu,v 1.3 2002/09/25 19:47:54 knu Exp $
 
 begin 444 libc_r.so.4.gz
 M'XL("*<61CT"`VQI8F-?<BYS;RXT`)2=#7R74__XO_L^;:7H4:$R).F!'HG"
diff --git a/lib/compat/compat3x.i386/libcurses.so.2.gz.uu b/lib/compat/compat3x.i386/libcurses.so.2.gz.uu
index bb264f18476bc..5cef9a9eeab68 100644
--- a/lib/compat/compat3x.i386/libcurses.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libcurses.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libcurses.so.2.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libcurses.so.2.gz
 M'XL("!5@=CD"`VQI8F-U<G-E<RYS;RXR`.U]>WQ4U;7_GF2`(0[.B%%'335:
diff --git a/lib/compat/compat3x.i386/libdialog.so.3.gz.uu b/lib/compat/compat3x.i386/libdialog.so.3.gz.uu
index 58b6efde3b12b..e301f5ff0e4a7 100644
--- a/lib/compat/compat3x.i386/libdialog.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libdialog.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libdialog.so.3.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libdialog.so.3.gz
 M'XL("#Y@=CD"`VQI8F1I86QO9RYS;RXS`.V]?4"45?8X_@R,,!`RHTY&23D5
diff --git a/lib/compat/compat3x.i386/libedit.so.2.gz.uu b/lib/compat/compat3x.i386/libedit.so.2.gz.uu
index 266d4cfdbc6a4..16bf23555bca5 100644
--- a/lib/compat/compat3x.i386/libedit.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libedit.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libedit.so.2.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libedit.so.2.gz
 M'XL("!=@=CD"`VQI8F5D:70N<V\N,@",F@]47/65QQ]D@$F<R$0QP4@5%948
diff --git a/lib/compat/compat3x.i386/libf2c.so.2.gz.uu b/lib/compat/compat3x.i386/libf2c.so.2.gz.uu
index 58ef2169f45eb..275d335a4d59a 100644
--- a/lib/compat/compat3x.i386/libf2c.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libf2c.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libf2c.so.2.gz.uu,v 1.4 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libf2c.so.2.gz
 M'XL("!=@=CD"`VQI8F8R8RYS;RXR`,Q]"WP4U?7P3+(D2US9!2(&1(D:%00Q
diff --git a/lib/compat/compat3x.i386/libfetch.so.1.gz.uu b/lib/compat/compat3x.i386/libfetch.so.1.gz.uu
index 8acffe9104265..f0bd6ea8c45b6 100644
--- a/lib/compat/compat3x.i386/libfetch.so.1.gz.uu
+++ b/lib/compat/compat3x.i386/libfetch.so.1.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libfetch.so.1.gz.uu,v 1.2 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libfetch.so.1.gz
 M'XL("!A@=CD"`VQI8F9E=&-H+G-O+C$`S7Q[8%35M?>9!R%@(`$BHE(='R@H
diff --git a/lib/compat/compat3x.i386/libftpio.so.4.gz.uu b/lib/compat/compat3x.i386/libftpio.so.4.gz.uu
index 92410a30a4008..5f583db95cd07 100644
--- a/lib/compat/compat3x.i386/libftpio.so.4.gz.uu
+++ b/lib/compat/compat3x.i386/libftpio.so.4.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libftpio.so.4.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libftpio.so.4.gz
 M'XL("!A@=CD"`VQI8F9T<&EO+G-O+C0`Y5M_?%35E;^33)))#,P`0:/&.EA^
diff --git a/lib/compat/compat3x.i386/libg++.so.4.gz.uu b/lib/compat/compat3x.i386/libg++.so.4.gz.uu
index f04ac0a8dd5e7..477abea443d26 100644
--- a/lib/compat/compat3x.i386/libg++.so.4.gz.uu
+++ b/lib/compat/compat3x.i386/libg++.so.4.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libg++.so.4.gz.uu,v 1.4 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libg++.so.4.gz
 M'XL("$!@=CD"`VQI8F<K*RYS;RXT`,2="WS6TQ_X]SS/8FG58NFVM&IJU=+2
diff --git a/lib/compat/compat3x.i386/libhistory.so.3.gz.uu b/lib/compat/compat3x.i386/libhistory.so.3.gz.uu
index 0ed4cf0ae91c8..3346d6b7820c6 100644
--- a/lib/compat/compat3x.i386/libhistory.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libhistory.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libhistory.so.3.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libhistory.so.3.gz
 M'XL("$5@=CD"`VQI8FAI<W1O<GDN<V\N,P#E?']X%%66:%5WD71")]T)X:>.
diff --git a/lib/compat/compat3x.i386/libmytinfo.so.2.gz.uu b/lib/compat/compat3x.i386/libmytinfo.so.2.gz.uu
index b1d7e3dc20176..9a9124da149e8 100644
--- a/lib/compat/compat3x.i386/libmytinfo.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libmytinfo.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libmytinfo.so.2.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libmytinfo.so.2.gz
 M'XL("/U?=CD"`VQI8FUY=&EN9F\N<V\N,@"4VG]L:N=]Q_&'Q$U(RE:2T(8D
diff --git a/lib/compat/compat3x.i386/libncurses.so.3.gz.uu b/lib/compat/compat3x.i386/libncurses.so.3.gz.uu
index f428bc30766c6..af07a819dc11b 100644
--- a/lib/compat/compat3x.i386/libncurses.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libncurses.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libncurses.so.3.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libncurses.so.3.gz
 M'XL("/Y?=CD"`VQI8FYC=7)S97,N<V\N,P",F@]876=]QT\:VJ8QW6@;5]2H
diff --git a/lib/compat/compat3x.i386/libperl.so.3.gz.uu b/lib/compat/compat3x.i386/libperl.so.3.gz.uu
index 93ede93c7ffd9..b515798bfa876 100644
--- a/lib/compat/compat3x.i386/libperl.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libperl.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libperl.so.3.gz.uu,v 1.2 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libperl.so.3.gz
 M'XL("(5@=CD"`VQI8G!E<FPN<V\N,P"TG0^<5//ZQ^?/F9FM5I86Z<^M*"V%
diff --git a/lib/compat/compat3x.i386/libreadline.so.3.gz.uu b/lib/compat/compat3x.i386/libreadline.so.3.gz.uu
index 6b1652bba652b..6cc0a5d3b44c3 100644
--- a/lib/compat/compat3x.i386/libreadline.so.3.gz.uu
+++ b/lib/compat/compat3x.i386/libreadline.so.3.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libreadline.so.3.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libreadline.so.3.gz
 M'XL("$5@=CD"`VQI8G)E861L:6YE+G-O+C,`I)H+7%35]L?/030T?)18E)JF
diff --git a/lib/compat/compat3x.i386/libss.so.2.gz.uu b/lib/compat/compat3x.i386/libss.so.2.gz.uu
index 8e69ef411b49b..dcb6c3e27591e 100644
--- a/lib/compat/compat3x.i386/libss.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libss.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libss.so.2.gz.uu,v 1.2 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libss.so.2.gz
 M'XL("!Y@=CD"`VQI8G-S+G-O+C(`[5M_?%35E;\S&6$(D0P0%`7UE8)&P4F"
diff --git a/lib/compat/compat3x.i386/libstdc++.so.2.gz.uu b/lib/compat/compat3x.i386/libstdc++.so.2.gz.uu
index c9bc4adf2650b..cf37d9a29f559 100644
--- a/lib/compat/compat3x.i386/libstdc++.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libstdc++.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libstdc++.so.2.gz.uu,v 1.4 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libstdc++.so.2.gz
 M'XL("$A@=CD"`VQI8G-T9&,K*RYS;RXR`*R=#WR7T_[`]WVV6(R&,!3+C3M,
diff --git a/lib/compat/compat3x.i386/libtermcap.so.2.gz.uu b/lib/compat/compat3x.i386/libtermcap.so.2.gz.uu
index 84dfe0a06bd3d..84847558fdcd6 100644
--- a/lib/compat/compat3x.i386/libtermcap.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libtermcap.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libtermcap.so.2.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libtermcap.so.2.gz
 M'XL("`)@=CD"`VQI8G1E<FUC87`N<V\N,@#%.WU\5,6U<S=+LH&%72`"*M4H
diff --git a/lib/compat/compat3x.i386/libutil.so.2.gz.uu b/lib/compat/compat3x.i386/libutil.so.2.gz.uu
index 57a705134ca17..ac33d249b0448 100644
--- a/lib/compat/compat3x.i386/libutil.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libutil.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libutil.so.2.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libutil.so.2.gz
 M'XL(""!@=CD"`VQI8G5T:6PN<V\N,@#M?7MX5-75]YEDR`4C$R`@-W4J%T$P
diff --git a/lib/compat/compat3x.i386/libvgl.so.1.gz.uu b/lib/compat/compat3x.i386/libvgl.so.1.gz.uu
index bc07a3b528d6b..189bec68a29b6 100644
--- a/lib/compat/compat3x.i386/libvgl.so.1.gz.uu
+++ b/lib/compat/compat3x.i386/libvgl.so.1.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libvgl.so.1.gz.uu,v 1.2 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libvgl.so.1.gz
 M'XL(""!@=CD"`VQI8G9G;"YS;RXQ`,U\#7A4U;7HGA^2$09FJ%,=E4*PT9*&
diff --git a/lib/compat/compat3x.i386/libwrap.so.2.gz.uu b/lib/compat/compat3x.i386/libwrap.so.2.gz.uu
index 97c475ee6428e..c083a09fcf55c 100644
--- a/lib/compat/compat3x.i386/libwrap.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libwrap.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libwrap.so.2.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libwrap.so.2.gz
 M'XL(""%@=CD"`VQI8G=R87`N<V\N,@#M?']\5-6U[YED"`$""1`$%7%`(C^$
diff --git a/lib/compat/compat3x.i386/libxpg4.so.2.gz.uu b/lib/compat/compat3x.i386/libxpg4.so.2.gz.uu
index 19dbeccfc02f9..334d1bcaa527e 100644
--- a/lib/compat/compat3x.i386/libxpg4.so.2.gz.uu
+++ b/lib/compat/compat3x.i386/libxpg4.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat3x.i386/libxpg4.so.2.gz.uu,v 1.3 2002/05/31 13:19:59 ru Exp $
 
 begin 444 libxpg4.so.2.gz
 M'XL(""%@=CD"`VQI8GAP9S0N<V\N,@#=6GUT4\>5GR?)0C8RDL%\-0YVRT?Y
diff --git a/lib/compat/compat4x.alpha/Makefile b/lib/compat/compat4x.alpha/Makefile
index b02d08d42526a..299e1e0fdf8bc 100644
--- a/lib/compat/compat4x.alpha/Makefile
+++ b/lib/compat/compat4x.alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.16.4.1 2004/10/02 02:01:51 scottl Exp $
 
 DISTRIBUTION=	compat4x
 
diff --git a/lib/compat/compat4x.alpha/libc.so.4.bz2.uu b/lib/compat/compat4x.alpha/libc.so.4.bz2.uu
index e083183b2dd2d..cd20852c9038e 100644
--- a/lib/compat/compat4x.alpha/libc.so.4.bz2.uu
+++ b/lib/compat/compat4x.alpha/libc.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libc.so.4.bz2.uu,v 1.3 2004/10/02 01:46:19 scottl Exp $
 
 begin-base64 440 libc.so.4.bz2
 QlpoOTFBWSZTWcWQtd4FBJB/////////////////////////////////////////////5ETH3vVF
diff --git a/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu b/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu
index 2944b46e9f839..5dbf49aaa4974 100644
--- a/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu
+++ b/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu,v 1.3 2004/10/02 01:46:19 scottl Exp $
 
 begin-base64 440 libc_r.so.4.bz2
 QlpoOTFBWSZTWXXULFQFLOH/////////////////////////////////////////////5Jj+869U
diff --git a/lib/compat/compat4x.alpha/libcrypto.so.1.gz.uu b/lib/compat/compat4x.alpha/libcrypto.so.1.gz.uu
index 7fba65f4c53d2..6fcee8cb7fd86 100644
--- a/lib/compat/compat4x.alpha/libcrypto.so.1.gz.uu
+++ b/lib/compat/compat4x.alpha/libcrypto.so.1.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libcrypto.so.1.gz.uu,v 1.1 2001/03/21 08:49:01 ps Exp $
 
 begin 444 libcrypto.so.1.gz
 M'XL("+7W?SD``VQI8F-R>7!T;RYS;RXQ`.S]>7R4U?G_C]^L!@2-BAKW`;3&
diff --git a/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu b/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu
index 8568aeb377bff..4639d01faed5a 100644
--- a/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu
+++ b/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu,v 1.1 2003/02/15 16:26:09 nectar Exp $
 
 begin 644 libcrypto.so.2.gz
 M'XL(".R)I#T``VQI8F-R>7!T;RYS;RXR`.S]=WP;Q?KVCRN$8FI,-X<FNNE.
diff --git a/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu b/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu
index 92f96662ff72a..9a89faed9df0e 100644
--- a/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu
+++ b/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu,v 1.1 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libdevstat.so.2.bz2
 QlpoOTFBWSZTWeFVWtsAFur/////////////////f///////f/////9v3//f7ef////f4BZ4zu0+
diff --git a/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu b/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu
index a10b0299b4766..df2e2101df2be 100644
--- a/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu
+++ b/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libedit.so.3.bz2
 QlpoOTFBWSZTWTjNYhAApTP/////////////////////////////////////////////4JBeeAGd
diff --git a/lib/compat/compat4x.alpha/libfetch.so.2.gz.uu b/lib/compat/compat4x.alpha/libfetch.so.2.gz.uu
index 2a40e016d2a08..7990a10e6854d 100644
--- a/lib/compat/compat4x.alpha/libfetch.so.2.gz.uu
+++ b/lib/compat/compat4x.alpha/libfetch.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libfetch.so.2.gz.uu,v 1.2 2002/05/31 13:20:00 ru Exp $
 
 begin 444 libfetch.so.2.gz
 M'XL(")M74#P"`VQI8F9E=&-H+G-O+C(`[)M]=%M%=L!'TG,BVTF0\P%B^;!L
diff --git a/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu b/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu
index 0f73c37004ead..d44671a53e2b3 100644
--- a/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu
+++ b/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libgmp.so.3.bz2
 QlpoOTFBWSZTWeBnh4kA2N//////////////////////////////////////////////4LQ8A7AA
diff --git a/lib/compat/compat4x.alpha/libhistory.so.4.bz2.uu b/lib/compat/compat4x.alpha/libhistory.so.4.bz2.uu
index 063127d2b4993..c24f6d1915316 100644
--- a/lib/compat/compat4x.alpha/libhistory.so.4.bz2.uu
+++ b/lib/compat/compat4x.alpha/libhistory.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libhistory.so.4.bz2.uu,v 1.1 2004/10/02 01:46:20 scottl Exp $
 
 begin-base64 440 libhistory.so.4.bz2
 QlpoOTFBWSZTWRxztDYAK/f//////////////////////////////////////+////f/4CgRAH33
diff --git a/lib/compat/compat4x.alpha/libm.so.2.bz2.uu b/lib/compat/compat4x.alpha/libm.so.2.bz2.uu
index bcde83a31678f..59b7a6618dc7d 100644
--- a/lib/compat/compat4x.alpha/libm.so.2.bz2.uu
+++ b/lib/compat/compat4x.alpha/libm.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libm.so.2.bz2.uu,v 1.1 2004/10/02 01:46:20 scottl Exp $
 
 begin-base64 440 libm.so.2.bz2
 QlpoOTFBWSZTWbf1ll4BBrN/////////////////////////////////////////////4MpfeAAA
diff --git a/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu b/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu
index 902539fb3d696..067fd6e71fff8 100644
--- a/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu
+++ b/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu,v 1.1 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libmp.so.3.bz2
 QlpoOTFBWSZTWck5sdMAXKH/////////////////////////////////////////////4F0d3Xb7
diff --git a/lib/compat/compat4x.alpha/libopie.so.2.bz2.uu b/lib/compat/compat4x.alpha/libopie.so.2.bz2.uu
index fe3c72aca04eb..bd194d0df0f0b 100644
--- a/lib/compat/compat4x.alpha/libopie.so.2.bz2.uu
+++ b/lib/compat/compat4x.alpha/libopie.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libopie.so.2.bz2.uu,v 1.1 2004/10/02 01:46:20 scottl Exp $
 
 begin-base64 440 libopie.so.2.bz2
 QlpoOTFBWSZTWaluydAAR2V/////////////////////////////////////////////4EM/b3SD
diff --git a/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu b/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu
index bdb7e6a667794..f25913087c1fb 100644
--- a/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu
+++ b/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libpam.so.1.bz2
 QlpoOTFBWSZTWYQNthkAUs7/////////////////////////////////////////////4EQesAIx
diff --git a/lib/compat/compat4x.alpha/libpcap.so.2.bz2.uu b/lib/compat/compat4x.alpha/libpcap.so.2.bz2.uu
index 3435200dc0a63..be33c806f0c31 100644
--- a/lib/compat/compat4x.alpha/libpcap.so.2.bz2.uu
+++ b/lib/compat/compat4x.alpha/libpcap.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libpcap.so.2.bz2.uu,v 1.1 2004/10/02 01:46:20 scottl Exp $
 
 begin-base64 440 libpcap.so.2.bz2
 QlpoOTFBWSZTWWGlAicA0cl/////////////////////////////////////////////4M07gABg
diff --git a/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu b/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu
index 3cd47c10b4b78..aa8cdefd26e45 100644
--- a/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu
+++ b/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu,v 1.3 2004/10/02 01:46:19 scottl Exp $
 
 begin-base64 440 libperl.so.3.bz2
 QlpoOTFBWSZTWUh7iEkFGHR/////////////////////////////////////////////5CRXA6oA
diff --git a/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu b/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu
index 0261da505c20e..5b092a47297d6 100644
--- a/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu
+++ b/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu,v 1.1 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libposix1e.so.2.bz2
 QlpoOTFBWSZTWSggIT8AFzp////////////////////v///9/////+X//23/zW3////f4BO4nQ+s
diff --git a/lib/compat/compat4x.alpha/libreadline.so.4.bz2.uu b/lib/compat/compat4x.alpha/libreadline.so.4.bz2.uu
index a6fbd78417771..1a8bdca618b48 100644
--- a/lib/compat/compat4x.alpha/libreadline.so.4.bz2.uu
+++ b/lib/compat/compat4x.alpha/libreadline.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libreadline.so.4.bz2.uu,v 1.1 2004/10/02 01:46:20 scottl Exp $
 
 begin-base64 440 libreadline.so.4.bz2
 QlpoOTFBWSZTWUKLEpgBSwT/////////////////////////////////////////////4P68AAAA
diff --git a/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu b/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu
index d4c4cde0150db..1c4235f14dfc9 100644
--- a/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu
+++ b/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu,v 1.1 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libskey.so.2.bz2
 QlpoOTFBWSZTWcWsekcAMuN/////////////////////////7//f////////////////4DNOewB9
diff --git a/lib/compat/compat4x.alpha/libssl.so.1.gz.uu b/lib/compat/compat4x.alpha/libssl.so.1.gz.uu
index 7d1d4467ada66..46d27bc1b69d8 100644
--- a/lib/compat/compat4x.alpha/libssl.so.1.gz.uu
+++ b/lib/compat/compat4x.alpha/libssl.so.1.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libssl.so.1.gz.uu,v 1.1 2001/03/21 08:49:01 ps Exp $
 
 begin 444 libssl.so.1.gz
 M'XL("+?W?SD``VQI8G-S;"YS;RXQ`.Q<>7A4Q;(_)`$"!,(2(.S#*NXD44$6
diff --git a/lib/compat/compat4x.alpha/libssl.so.2.gz.uu b/lib/compat/compat4x.alpha/libssl.so.2.gz.uu
index 9442c40790784..681a34140a9cb 100644
--- a/lib/compat/compat4x.alpha/libssl.so.2.gz.uu
+++ b/lib/compat/compat4x.alpha/libssl.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libssl.so.2.gz.uu,v 1.1 2003/02/15 16:26:10 nectar Exp $
 
 begin 644 libssl.so.2.gz
 M'XL(".^)I#T``VQI8G-S;"YS;RXR`.1<"714Q=*^)"$D$+:P[P.(@KBQJ;B]
diff --git a/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu b/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu
index ed9928f793e0b..7f9fe4ed3f78f 100644
--- a/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu
+++ b/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libstdc++.so.3.bz2
 QlpoOTFBWSZTWRLiR8cCXX1/////////////////////////////////////////////4aJfeAAA
diff --git a/lib/compat/compat4x.alpha/libusb.so.0.bz2.uu b/lib/compat/compat4x.alpha/libusb.so.0.bz2.uu
index 30886698e2fb1..b236ae61aadd6 100644
--- a/lib/compat/compat4x.alpha/libusb.so.0.bz2.uu
+++ b/lib/compat/compat4x.alpha/libusb.so.0.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libusb.so.0.bz2.uu,v 1.1 2002/05/30 18:51:03 obrien Exp $
 
 begin-base64 600 libusb.so.0.bz2
 QlpoOTFBWSZTWbY+ndYAEcf////////////////f7////////////8/+33/2/+//////4BI5s6+a
diff --git a/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu b/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu
index e8fa105443916..c24efbcf83ece 100644
--- a/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu
+++ b/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu,v 1.1 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 libusbhid.so.0.bz2
 QlpoOTFBWSZTWc/ArdEAFHV////////////////f/////////////+H+/3/Wb3//////4BQZto+v
diff --git a/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu b/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu
index d84ee603e309d..55189dab3776f 100644
--- a/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_cleartext_pass_ok.so.bz2
 QlpoOTFBWSZTWZYf6iEABqH/////////7f97/+/ef//v327/RMJIx8AG3k4kQAVscOTZ0AX7PddD
diff --git a/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu b/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu
index d3ee49574ef21..fc7e7997a0042 100644
--- a/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_deny.so.bz2
 QlpoOTFBWSZTWRsVF0kABi3/////////7f93f+/eP////2b8UEBCT8VG2kxAYEFcYObZ0AVxGeO7
diff --git a/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu b/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu
index 7cba3293bbcf5..e1a757c78f310 100644
--- a/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_opie.so.bz2
 QlpoOTFBWSZTWRKenegACkx///////////97/+/e7//v3+/v60Rf59RG/21TTWf3f+bb4AkWRur6
diff --git a/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu b/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu
index 19f4efc54ed2f..653f823c75d14 100644
--- a/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu,v 1.1 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_opieaccess.so.bz2
 QlpoOTFBWSZTWQK0vhAACBz//////////f/7/+/+f//v3+rvyMZCx8RG2kwESEVXaeTf4Ac5jdQW
diff --git a/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu b/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu
index 6ac7a50c0afa5..7765df8cfdddb 100644
--- a/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_permit.so.bz2
 QlpoOTFBWSZTWbBgI1kABvp/////////7f97///ef//v327/QsJGx8VG2lxQQMFEeOTd0AYbW14E
diff --git a/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu b/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu
index 8794c694ff97d..9e3fa2f1e57f6 100644
--- a/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_radius.so.bz2
 QlpoOTFBWSZTWXhOD3wAEC5////////////////ff////+/1//7j983332/2zXf/f///4A42lh9e
diff --git a/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu b/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu
index e1a60c178b4f3..a265b4f9f8e56 100644
--- a/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_skey.so.bz2
 QlpoOTFBWSZTWdL6XukACLP///////////97/+/e///v3+vvwMZAx8zG3mxMRWX3febd4Ae5jdQR
diff --git a/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu b/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu
index 6e7c072dd49f5..ceee2865b3a7b 100644
--- a/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_ssh.so.bz2
 QlpoOTFBWSZTWbaSakwAFAd////////////////f///v3/////////b333///233/+794BGYnXT5
diff --git a/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu b/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu
index 6ef6b4f198c74..e05e0edbfa6f3 100644
--- a/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_tacplus.so.bz2
 QlpoOTFBWSZTWWlXD8IAENN//////////////+/f///v/+/1//7H//X+3332fXfXf//d4A327Vx9
diff --git a/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu b/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu
index 3db74f5d3f02f..9fd0e64d36c13 100644
--- a/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu
+++ b/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu,v 1.2 2003/12/07 02:11:19 obrien Exp $
 
 begin-base64 440 pam_unix.so.bz2
 QlpoOTFBWSZTWVeYj0wAChL///////////9//+/e///v/+/n/cZJ98hm3m/WXef2ffbd4Aj2u7Pt
diff --git a/lib/compat/compat4x.i386/Makefile b/lib/compat/compat4x.i386/Makefile
index 9fa76a7e9de12..2c9161bf0a334 100644
--- a/lib/compat/compat4x.i386/Makefile
+++ b/lib/compat/compat4x.i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.23.4.1 2004/10/01 23:16:59 scottl Exp $
 
 DISTRIBUTION=	compat4x
 
diff --git a/lib/compat/compat4x.i386/libc.so.4.bz2.uu b/lib/compat/compat4x.i386/libc.so.4.bz2.uu
index 6d8073a0e3449..0638aa05ca5ad 100644
--- a/lib/compat/compat4x.i386/libc.so.4.bz2.uu
+++ b/lib/compat/compat4x.i386/libc.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libc.so.4.bz2.uu,v 1.4 2004/10/01 20:33:25 kensmith Exp $
 
 begin-base64 640 libc.so.4.bz2
 QlpoOTFBWSZTWfzqKd4Cnin/////////////////////////////////////////////45mlWgAO
diff --git a/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu b/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu
index 4100feb277d4b..0d0a97512344b 100644
--- a/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu
+++ b/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu,v 1.4 2004/10/01 20:33:26 kensmith Exp $
 
 begin-base64 640 libc_r.so.4.bz2
 QlpoOTFBWSZTWZOYgJsDFnX/////////////////////////////////////////////5CWEAA0F
diff --git a/lib/compat/compat4x.i386/libcrypto.so.1.gz.uu b/lib/compat/compat4x.i386/libcrypto.so.1.gz.uu
index 029b113332ce6..5e76194ad59b6 100644
--- a/lib/compat/compat4x.i386/libcrypto.so.1.gz.uu
+++ b/lib/compat/compat4x.i386/libcrypto.so.1.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libcrypto.so.1.gz.uu,v 1.2 2001/08/21 07:48:58 peter Exp $
 
 begin 444 libcrypto.so.1.gz
 M'XL("&H0@CL"`VQI8F-R>7!T;RYS;RXQ`.R=>YS/Q??XU[[W?5OW:W)+6D44
diff --git a/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu b/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu
index 6ec35a3489f55..b7e9aa2e2c100 100644
--- a/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu
+++ b/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu,v 1.1 2003/02/15 16:26:10 nectar Exp $
 
 begin 644 libcrypto.so.2.gz
 M'XL(".XDI#T``VQI8F-R>7!T;RYS;RXR`.3]?WS68__'CY]MYZ\1AA#",(2P
diff --git a/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu b/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu
index dd9cfd2477bdf..29ce058b08b91 100644
--- a/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu
+++ b/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu,v 1.1 2003/11/29 03:29:17 obrien Exp $
 
 begin-base64 640 libdevstat.so.2.bz2
 QlpoOTFBWSZTWQ3OdmkADwp/////////////////////////f/9nf3/f///1/f//////4BTbY3br
diff --git a/lib/compat/compat4x.i386/libedit.so.3.bz2.uu b/lib/compat/compat4x.i386/libedit.so.3.bz2.uu
index 96c40fc9c0f61..a908a19fb327e 100644
--- a/lib/compat/compat4x.i386/libedit.so.3.bz2.uu
+++ b/lib/compat/compat4x.i386/libedit.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libedit.so.3.bz2.uu,v 1.2 2003/11/29 03:29:17 obrien Exp $
 
 begin-base64 640 libedit.so.3.bz2
 QlpoOTFBWSZTWcbjTj4AWLd/////////////////////////////////////////////4HSezVXX
diff --git a/lib/compat/compat4x.i386/libfetch.so.2.gz.uu b/lib/compat/compat4x.i386/libfetch.so.2.gz.uu
index a95d506f4e687..214519a3aacbb 100644
--- a/lib/compat/compat4x.i386/libfetch.so.2.gz.uu
+++ b/lib/compat/compat4x.i386/libfetch.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libfetch.so.2.gz.uu,v 1.2 2002/05/31 13:20:01 ru Exp $
 
 begin 444 libfetch.so.2.gz
 M'XL("-HO%3P"`VQI8F9E=&-H+G-O+C(`['U[?%-5UNA)FI:"E:18L2A*9$!!
diff --git a/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu b/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu
index 6e3c572646024..f88156160c876 100644
--- a/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu
+++ b/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu,v 1.2 2003/11/29 03:29:17 obrien Exp $
 
 begin-base64 640 libgmp.so.3.bz2
 QlpoOTFBWSZTWYZRtBsAcip/////////////////////////////////////////////4JHPtLH3
diff --git a/lib/compat/compat4x.i386/libhistory.so.4.bz2.uu b/lib/compat/compat4x.i386/libhistory.so.4.bz2.uu
index 0347d49ad18b0..0064f41e027e2 100644
--- a/lib/compat/compat4x.i386/libhistory.so.4.bz2.uu
+++ b/lib/compat/compat4x.i386/libhistory.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libhistory.so.4.bz2.uu,v 1.1 2004/10/01 20:33:26 kensmith Exp $
 
 begin-base64 640 libhistory.so.4.bz2
 QlpoOTFBWSZTWYyTuDsAFzP///////////////////////////9/////////9///////4CDqPvY+
diff --git a/lib/compat/compat4x.i386/libm.so.2.bz2.uu b/lib/compat/compat4x.i386/libm.so.2.bz2.uu
index 4e49ef49ddd1a..c22b526f970fe 100644
--- a/lib/compat/compat4x.i386/libm.so.2.bz2.uu
+++ b/lib/compat/compat4x.i386/libm.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libm.so.2.bz2.uu,v 1.1 2004/10/01 20:33:26 kensmith Exp $
 
 begin-base64 640 libm.so.2.bz2
 QlpoOTFBWSZTWc+YwREAgHR/////////////////////////////////////////////4J+6zGa+
diff --git a/lib/compat/compat4x.i386/libmp.so.3.bz2.uu b/lib/compat/compat4x.i386/libmp.so.3.bz2.uu
index 536623c855edb..28e17afb49e73 100644
--- a/lib/compat/compat4x.i386/libmp.so.3.bz2.uu
+++ b/lib/compat/compat4x.i386/libmp.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libmp.so.3.bz2.uu,v 1.1 2003/11/29 03:29:17 obrien Exp $
 
 begin-base64 640 libmp.so.3.bz2
 QlpoOTFBWSZTWTC4DcMALx3/////////////////////////////////////////////4EUe7up9
diff --git a/lib/compat/compat4x.i386/libopie.so.2.bz2.uu b/lib/compat/compat4x.i386/libopie.so.2.bz2.uu
index 4519158ffd91b..21345cd962f3a 100644
--- a/lib/compat/compat4x.i386/libopie.so.2.bz2.uu
+++ b/lib/compat/compat4x.i386/libopie.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libopie.so.2.bz2.uu,v 1.1 2004/10/01 20:33:26 kensmith Exp $
 
 begin-base64 640 libopie.so.2.bz2
 QlpoOTFBWSZTWaLMsAAALdx/////////////////////////////////////////////4Dtjp8g+
diff --git a/lib/compat/compat4x.i386/libpam.so.1.bz2.uu b/lib/compat/compat4x.i386/libpam.so.1.bz2.uu
index e1d5830b06104..30ed7c3c99f04 100644
--- a/lib/compat/compat4x.i386/libpam.so.1.bz2.uu
+++ b/lib/compat/compat4x.i386/libpam.so.1.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libpam.so.1.bz2.uu,v 1.3 2003/11/29 03:29:17 obrien Exp $
 
 begin-base64 640 libpam.so.1.bz2
 QlpoOTFBWSZTWeZPwrkAL6p/////////////////////////////////////////////4DoNsG8+
diff --git a/lib/compat/compat4x.i386/libpcap.so.2.bz2.uu b/lib/compat/compat4x.i386/libpcap.so.2.bz2.uu
index 7b446f0c4e439..32ee9ef35eb5c 100644
--- a/lib/compat/compat4x.i386/libpcap.so.2.bz2.uu
+++ b/lib/compat/compat4x.i386/libpcap.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libpcap.so.2.bz2.uu,v 1.1 2004/10/01 20:33:26 kensmith Exp $
 
 begin-base64 640 libpcap.so.2.bz2
 QlpoOTFBWSZTWSGh/cEAiL7/////////////////////////////////////////////4LBtvpzp
diff --git a/lib/compat/compat4x.i386/libperl.so.3.bz2.uu b/lib/compat/compat4x.i386/libperl.so.3.bz2.uu
index 5e5a108f9083d..ffbd6aa55c116 100644
--- a/lib/compat/compat4x.i386/libperl.so.3.bz2.uu
+++ b/lib/compat/compat4x.i386/libperl.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libperl.so.3.bz2.uu,v 1.3 2004/10/01 20:33:26 kensmith Exp $
 
 begin-base64 640 libperl.so.3.bz2
 QlpoOTFBWSZTWaIJRWcCuWF/////////////////////////////////////////////469IAPpi
diff --git a/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu b/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu
index afb25ee28b796..affb0218cfdad 100644
--- a/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu
+++ b/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu,v 1.2 2003/11/29 03:29:17 obrien Exp $
 
 begin-base64 640 libposix1e.so.2.bz2
 QlpoOTFBWSZTWQ/GtNYADfb//////////////////////////9/f39fo//3+dd7f////4BByfbFe
diff --git a/lib/compat/compat4x.i386/libreadline.so.4.bz2.uu b/lib/compat/compat4x.i386/libreadline.so.4.bz2.uu
index 6ece16f9d418f..8e366b3be706c 100644
--- a/lib/compat/compat4x.i386/libreadline.so.4.bz2.uu
+++ b/lib/compat/compat4x.i386/libreadline.so.4.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libreadline.so.4.bz2.uu,v 1.1 2004/10/01 20:33:26 kensmith Exp $
 
 begin-base64 640 libreadline.so.4.bz2
 QlpoOTFBWSZTWXeT2LUApMj/////////////////////////////////////////////4Nb+7rz7
diff --git a/lib/compat/compat4x.i386/libskey.so.2.bz2.uu b/lib/compat/compat4x.i386/libskey.so.2.bz2.uu
index 8dde28343e569..b92d55c12e488 100644
--- a/lib/compat/compat4x.i386/libskey.so.2.bz2.uu
+++ b/lib/compat/compat4x.i386/libskey.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libskey.so.2.bz2.uu,v 1.1 2003/11/29 03:29:17 obrien Exp $
 
 begin-base64 640 libskey.so.2.bz2
 QlpoOTFBWSZTWeEnxGYAIt3///////////////////////////////3/////////////4C4gfQfT
diff --git a/lib/compat/compat4x.i386/libssl.so.1.gz.uu b/lib/compat/compat4x.i386/libssl.so.1.gz.uu
index d9db11b3f1d9a..7423c500139bb 100644
--- a/lib/compat/compat4x.i386/libssl.so.1.gz.uu
+++ b/lib/compat/compat4x.i386/libssl.so.1.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libssl.so.1.gz.uu,v 1.2 2001/08/21 07:48:58 peter Exp $
 
 begin 444 libssl.so.1.gz
 M'XL("!`1@CL"`VQI8G-S;"YS;RXQ`,Q;"UA51=?>>WM7S+NB4J*B8MX022DU
diff --git a/lib/compat/compat4x.i386/libssl.so.2.gz.uu b/lib/compat/compat4x.i386/libssl.so.2.gz.uu
index 4a9bc86c6b1fa..8bc8cabe4cb64 100644
--- a/lib/compat/compat4x.i386/libssl.so.2.gz.uu
+++ b/lib/compat/compat4x.i386/libssl.so.2.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libssl.so.2.gz.uu,v 1.1 2003/02/15 16:26:10 nectar Exp $
 
 begin 644 libssl.so.2.gz
 M'XL(".\DI#T``VQI8G-S;"YS;RXR`+Q;"UQ55=8_YX!O5%14Q!<IF>]4++%,
diff --git a/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu b/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu
index 0050aaf72165c..ea4661440cbf3 100644
--- a/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu
+++ b/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu,v 1.3 2003/11/29 03:29:18 obrien Exp $
 
 begin-base64 640 libstdc++.so.3.bz2
 QlpoOTFBWSZTWQmXMeEBVYv/////////////////////////////////////////////4Wn+19sZ
diff --git a/lib/compat/compat4x.i386/libusb.so.0.bz2.uu b/lib/compat/compat4x.i386/libusb.so.0.bz2.uu
index 2c00f42e7ca62..1b4d2f2d7b6a3 100644
--- a/lib/compat/compat4x.i386/libusb.so.0.bz2.uu
+++ b/lib/compat/compat4x.i386/libusb.so.0.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libusb.so.0.bz2.uu,v 1.2 2002/05/31 13:20:01 ru Exp $
 
 begin-base64 444 libusb.so.0.bz2
 QlpoOTFBWSZTWUogPX8ACyd/////////////f/f///////////5v/m//f//9//V/
diff --git a/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu b/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu
index cdb7bdaa56567..daa31705a9892 100644
--- a/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu
+++ b/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu,v 1.1 2003/11/29 03:29:18 obrien Exp $
 
 begin-base64 640 libusbhid.so.0.bz2
 QlpoOTFBWSZTWQg1pA4ADJX///////////////f/7//3////7//P7/zP///3//7/////4BCqUO0O
diff --git a/lib/compat/compat4x.i386/libutil.so.3.bz2.uu b/lib/compat/compat4x.i386/libutil.so.3.bz2.uu
index 77581f3ac3147..b44c444fc285f 100644
--- a/lib/compat/compat4x.i386/libutil.so.3.bz2.uu
+++ b/lib/compat/compat4x.i386/libutil.so.3.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libutil.so.3.bz2.uu,v 1.1 2003/11/29 03:29:18 obrien Exp $
 
 begin-base64 640 libutil.so.3.bz2
 QlpoOTFBWSZTWWJUwJcAJst////////////////////////////////v////////////4DUb7ffL
diff --git a/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu b/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu
index 0fe9a235a8d92..7687cd4770969 100644
--- a/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu
+++ b/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu,v 1.1 2003/11/29 03:29:18 obrien Exp $
 
 begin-base64 640 libvgl.so.2.bz2
 QlpoOTFBWSZTWSW5vrMAG7r////////////////////////////9////////////////4CmfbUZH
diff --git a/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu b/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu
index f65f347221a48..f47094f44a3f8 100644
--- a/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_cleartext_pass_ok.so.bz2
 QlpoOTFBWSZTWXDURlcABHX////////3bf53f7fPu///3mvua0RUXMTNHF3wVFBKfmVV0ATU9kBo
diff --git a/lib/compat/compat4x.i386/pam_deny.so.bz2.uu b/lib/compat/compat4x.i386/pam_deny.so.bz2.uu
index 505623ea02829..1f008a9125206 100644
--- a/lib/compat/compat4x.i386/pam_deny.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_deny.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_deny.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_deny.so.bz2
 QlpoOTFBWSZTWYPECoEABGf/////////bf53f6ffP//v3mmsakQMTERIzA3g0ExabGVF0AR16bAC
diff --git a/lib/compat/compat4x.i386/pam_opie.so.bz2.uu b/lib/compat/compat4x.i386/pam_opie.so.bz2.uu
index b7599f5f103e9..b99bb7b189d1f 100644
--- a/lib/compat/compat4x.i386/pam_opie.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_opie.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_opie.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_opie.so.bz2
 QlpoOTFBWSZTWTh8PZoABtr///////////53/+f///////fv72SFyoFOT1+lwh9Kb21v4Af2xj7w
diff --git a/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu b/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu
index 895ed147c30cf..8e1048ddeaef3 100644
--- a/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu,v 1.1 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_opieaccess.so.bz2
 QlpoOTFBWSZTWfWKBqIABav//////////f//f+f///////bvblRk7lZOb03kxADbbWXH4AYyJwDf
diff --git a/lib/compat/compat4x.i386/pam_permit.so.bz2.uu b/lib/compat/compat4x.i386/pam_permit.so.bz2.uu
index 21367a708a527..dc83458ea3d59 100644
--- a/lib/compat/compat4x.i386/pam_permit.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_permit.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_permit.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_permit.so.bz2
 QlpoOTFBWSZTWWZmRx4ABNZ/////////b/53f+fP/////m7vfkQQLFFIHk3gaARa7OdV0ATy9bAA
diff --git a/lib/compat/compat4x.i386/pam_radius.so.bz2.uu b/lib/compat/compat4x.i386/pam_radius.so.bz2.uu
index c8797beb0707b..c5a2864dadaed 100644
--- a/lib/compat/compat4x.i386/pam_radius.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_radius.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_radius.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_radius.so.bz2
 QlpoOTFBWSZTWfmCKG8ACbl/////////////f/ff///3//f///5t3mf+7l/5Xvrab///4Aw0fWre
diff --git a/lib/compat/compat4x.i386/pam_skey.so.bz2.uu b/lib/compat/compat4x.i386/pam_skey.so.bz2.uu
index a78e62a8d1854..525d360710a89 100644
--- a/lib/compat/compat4x.i386/pam_skey.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_skey.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_skey.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_skey.so.bz2
 QlpoOTFBWSZTWUIs+T8ABcb//////////f93f+/P/////+vrfuVBT/RvXk3kXUxvbe1/4AaT7MvH
diff --git a/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu b/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu
index eb9d57d4f683d..b40e25b0d1cea 100644
--- a/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_ssh.so.bz2
 QlpoOTFBWSZTWW/v6kEAC8l//////////////////////+//f+f9f+3v/3//f3977///4BAT21Q8
diff --git a/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu b/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu
index b1969640131d8..ad83230f27c6a 100644
--- a/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_tacplus.so.bz2
 QlpoOTFBWSZTWbZ4fJ0ACo////////////////f///////f//17u+/F///3+3/7e/3//4AzSfR3c
diff --git a/lib/compat/compat4x.i386/pam_unix.so.bz2.uu b/lib/compat/compat4x.i386/pam_unix.so.bz2.uu
index 73ef931d755e9..71b6d1bd51562 100644
--- a/lib/compat/compat4x.i386/pam_unix.so.bz2.uu
+++ b/lib/compat/compat4x.i386/pam_unix.so.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat4x.i386/pam_unix.so.bz2.uu,v 1.3 2003/12/07 03:02:27 obrien Exp $
 
 begin-base64 444 pam_unix.so.bz2
 QlpoOTFBWSZTWfMhHx8ABsH///////////9/f//v/////+7v/mXHT9Rfan3kZYhPbfVP4AeyE4KN
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index 8b81815146c30..8f3e04ff1976f 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 b8ad3ea10063b..a04e719474b42 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.16.2.1 2004/08/21 16:36:21 kensmith Exp $\"");
diff --git a/lib/csu/alpha/crti.S b/lib/csu/alpha/crti.S
index 5ecd99c300281..cc47041e46959 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 6928d37c1a292..e3031e771e57b 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 4b51e6b68a70d..283dddc086bf4 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 f1f0f7b0b0c26..5e0eb0876247a 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 c46f001019162..a1a209e919263 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 d6d09dabeb218..4f9325cc50b55 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/common/crtbegin.c b/lib/csu/common/crtbegin.c
index ec50ecdee121f..d03b53079b04e 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 dde60b38bb489..7e9014477b764 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 4b33f0c7bb4fc..5d83c01e380c9 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 8598ce8552f5f..7f5c3bef679bb 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 9e8acaa49596f..90780fea37c01 100644
--- a/lib/csu/i386-elf/crt1.c
+++ b/lib/csu/i386-elf/crt1.c
@@ -112,4 +112,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.13 2004/08/15 16:18:51 dfr Exp $\"");
diff --git a/lib/csu/i386-elf/crti.S b/lib/csu/i386-elf/crti.S
index b2e99e4088d83..8efda756f9a6e 100644
--- a/lib/csu/i386-elf/crti.S
+++ b/lib/csu/i386-elf/crti.S
@@ -36,4 +36,4 @@ _init:
 _fini:
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/i386-elf/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $\0"
diff --git a/lib/csu/i386-elf/crtn.S b/lib/csu/i386-elf/crtn.S
index b2322daa5ee6c..405340b12ff74 100644
--- a/lib/csu/i386-elf/crtn.S
+++ b/lib/csu/i386-elf/crtn.S
@@ -30,4 +30,4 @@
 	ret
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/i386-elf/crtn.S,v 1.5 2002/05/15 04:19:49 obrien Exp $\0"
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 219f3c696dcca..39c3f3396ad78 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/i386/Makefile,v 1.42 2002/07/29 09:40:10 ru Exp $
 
 CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer \
 		-I${.CURDIR}/../../libc/include
diff --git a/lib/csu/i386/c++rt0.c b/lib/csu/i386/c++rt0.c
index 39752d5b1c488..4328a98695218 100644
--- a/lib/csu/i386/c++rt0.c
+++ b/lib/csu/i386/c++rt0.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/lib/csu/i386/c++rt0.c,v 1.9 1999/08/27 23:57:55 peter Exp $
  */
 
 /*
diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c
index 49431d906fb6a..4e520d720f578 100644
--- a/lib/csu/i386/crt0.c
+++ b/lib/csu/i386/crt0.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/lib/csu/i386/crt0.c,v 1.37 2002/03/29 22:43:41 markm Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile
index c906c094267be..c17035908d81b 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 10e1a63d17b4d..1d9bba25468b2 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.3.2.1 2004/08/19 05:52:09 marcel Exp $"
 
 		.text
 
diff --git a/lib/csu/ia64/crti.S b/lib/csu/ia64/crti.S
index 1314cb3a5b2cb..5bb540ecf8174 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 42ec1feffabe2..68b496fc9fb4b 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/sparc64/Makefile b/lib/csu/sparc64/Makefile
index 2e1d03f9cb6da..1eb2230e517d8 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 19c0fadb738dd..9abdc10adf762 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 e3e81af18cc9e..466645c4af41e 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 7c0d1605393db..c35fecad30c11 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/HISTORY b/lib/libalias/HISTORY
index c5bca59cac1f1..225d2591add40 100644
--- a/lib/libalias/HISTORY
+++ b/lib/libalias/HISTORY
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libalias/HISTORY,v 1.9 2000/07/26 23:15:46 archie Exp $
 
 Version 1.0: August 11, 1996 (cjm)
 
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index f59f1f7112dd6..944c24bd735c0 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/Makefile,v 1.28 2004/07/06 12:15:24 des Exp $
 
 LIB=	alias
 SHLIBDIR?= /lib
diff --git a/lib/libalias/alias.c b/lib/libalias/alias.c
index 3f52e57d6b2dd..52ff8e50710cb 100644
--- a/lib/libalias/alias.c
+++ b/lib/libalias/alias.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.49 2004/08/14 14:21:09 phk Exp $");
 
 /*
     Alias.c provides supervisory control for the functions of the
diff --git a/lib/libalias/alias.h b/lib/libalias/alias.h
index 1deec9f083157..41aa5ac2509c2 100644
--- a/lib/libalias/alias.h
+++ b/lib/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/lib/libalias/alias.h,v 1.29 2004/07/05 11:10:57 des Exp $
  */
 
 /*-
diff --git a/lib/libalias/alias_cuseeme.c b/lib/libalias/alias_cuseeme.c
index cbacc55cad8d2..3c11b2e0a07a0 100644
--- a/lib/libalias/alias_cuseeme.c
+++ b/lib/libalias/alias_cuseeme.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_cuseeme.c,v 1.10 2004/07/06 12:13:28 des Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/libalias/alias_db.c b/lib/libalias/alias_db.c
index f9c953b27b1f4..4df143f225b2d 100644
--- a/lib/libalias/alias_db.c
+++ b/lib/libalias/alias_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_db.c,v 1.61 2004/07/06 12:13:28 des Exp $");
 
 /*
     Alias_db.c encapsulates all data structures used for storing
diff --git a/lib/libalias/alias_ftp.c b/lib/libalias/alias_ftp.c
index b628528a0c1d3..71915d9f403b8 100644
--- a/lib/libalias/alias_ftp.c
+++ b/lib/libalias/alias_ftp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_ftp.c,v 1.23 2004/07/06 12:13:28 des Exp $");
 
 /*
     Alias_ftp.c performs special processing for FTP sessions under
diff --git a/lib/libalias/alias_irc.c b/lib/libalias/alias_irc.c
index 66106fa351126..0849f9bba3534 100644
--- a/lib/libalias/alias_irc.c
+++ b/lib/libalias/alias_irc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_irc.c,v 1.18 2004/07/06 12:13:28 des 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/lib/libalias/alias_local.h b/lib/libalias/alias_local.h
index 67947da818531..60fa4e043cb21 100644
--- a/lib/libalias/alias_local.h
+++ b/lib/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/lib/libalias/alias_local.h,v 1.29 2004/07/06 12:13:28 des Exp $
  */
 
 /*
diff --git a/lib/libalias/alias_nbt.c b/lib/libalias/alias_nbt.c
index b51abd1c5da56..809d411c473d8 100644
--- a/lib/libalias/alias_nbt.c
+++ b/lib/libalias/alias_nbt.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_nbt.c,v 1.15 2004/07/06 12:13:28 des Exp $");
 
 /*
     alias_nbt.c performs special processing for NetBios over TCP/IP
diff --git a/lib/libalias/alias_old.c b/lib/libalias/alias_old.c
index 120c1428882de..c94222fb2ade3 100644
--- a/lib/libalias/alias_old.c
+++ b/lib/libalias/alias_old.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_old.c,v 1.5 2004/07/05 11:10:57 des Exp $");
 
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/lib/libalias/alias_pptp.c b/lib/libalias/alias_pptp.c
index 05722b10813d7..2cf8410bcb2a8 100644
--- a/lib/libalias/alias_pptp.c
+++ b/lib/libalias/alias_pptp.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_pptp.c,v 1.12 2004/08/04 15:17:08 marcus Exp $");
 
 /*
    Alias_pptp.c performs special processing for PPTP sessions under TCP.
diff --git a/lib/libalias/alias_proxy.c b/lib/libalias/alias_proxy.c
index e0e1c059ed68f..eabf30490964d 100644
--- a/lib/libalias/alias_proxy.c
+++ b/lib/libalias/alias_proxy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_proxy.c,v 1.18 2004/07/06 12:13:28 des Exp $");
 
 /* file: alias_proxy.c
 
diff --git a/lib/libalias/alias_skinny.c b/lib/libalias/alias_skinny.c
index 74c283c73cf16..dfa880add1ec1 100644
--- a/lib/libalias/alias_skinny.c
+++ b/lib/libalias/alias_skinny.c
@@ -27,7 +27,7 @@
  *
  * Author: Joe Marcus Clarke <marcus@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libalias/alias_skinny.c,v 1.7 2004/08/04 15:17:08 marcus Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libalias/alias_smedia.c b/lib/libalias/alias_smedia.c
index 888937c9f2411..56f16c4b0ca71 100644
--- a/lib/libalias/alias_smedia.c
+++ b/lib/libalias/alias_smedia.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_smedia.c,v 1.11 2004/07/06 12:13:28 des Exp $");
 
 /*
    Alias_smedia.c is meant to contain the aliasing code for streaming media
diff --git a/lib/libalias/alias_util.c b/lib/libalias/alias_util.c
index 687168e830b72..ac019c842e760 100644
--- a/lib/libalias/alias_util.c
+++ b/lib/libalias/alias_util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_util.c,v 1.15 2004/07/06 12:13:28 des Exp $");
 
 
 /*
diff --git a/lib/libalias/libalias.3 b/lib/libalias/libalias.3
index bb77e30384d36..a6af7ed7daf5d 100644
--- a/lib/libalias/libalias.3
+++ b/lib/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/lib/libalias/libalias.3,v 1.52 2004/07/02 23:52:09 ru Exp $
 .\"
 .Dd January 17, 2004
 .Dt LIBALIAS 3
diff --git a/lib/libarchive/COPYING b/lib/libarchive/COPYING
index 0d9c216bef70d..645e5fceee90b 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 7da94c1d42bf2..8275ed2e16e25 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 55d2aaf4f3ed3..923f997ace458 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.20.2.1 2004/09/09 05:42:22 kientzle Exp $
 
 #
 # Use "make distfile" to build a conventional tar.gz archive
diff --git a/lib/libarchive/Makefile.am b/lib/libarchive/Makefile.am
index b7d5dd524b503..bc7299894ac13 100644
--- a/lib/libarchive/Makefile.am
+++ b/lib/libarchive/Makefile.am
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/Makefile.am,v 1.2 2004/08/08 00:48:39 kientzle Exp $
 
 lib_LIBRARIES=	libarchive.a
 
diff --git a/lib/libarchive/README b/lib/libarchive/README
index 105cef597a985..2e2d23f92a2b8 100644
--- a/lib/libarchive/README
+++ b/lib/libarchive/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/README,v 1.3 2004/08/04 06:19:31 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 52603437eb6a5..eb8d08ddeb693 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.17 2004/08/07 19:22:50 kientzle Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
diff --git a/lib/libarchive/archive_check_magic.c b/lib/libarchive/archive_check_magic.c
index d674a056b6b0c..386e33df7bb4b 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.3 2004/04/12 01:16:16 kientzle Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libarchive/archive_entry.3 b/lib/libarchive/archive_entry.3
index 2f82f89d033ae..f2bb69f57fa31 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 2004/08/08 07:39:19 kientzle Exp $
 .\"
 .Dd December 15, 2003
 .Dt archive_entry 3
diff --git a/lib/libarchive/archive_entry.c b/lib/libarchive/archive_entry.c
index db92789bacdab..8d7d09f646481 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.23 2004/08/08 07:39:19 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 e5bdaf645a3c8..b8e5084c523d7 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.12 2004/08/08 07:39:19 kientzle Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_H_INCLUDED
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h
index 490bcba38ef4d..ecbacc7d35ffc 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.12 2004/08/07 03:09:28 kientzle Exp $
  */
 
 /*
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index d9d4713e0f3d2..9d733785dc675 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.15 2004/08/14 03:45:45 kientzle Exp $
  */
 
 #ifndef ARCHIVE_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_read.3 b/lib/libarchive/archive_read.3
index f42838c987175..7dd9e69e33f31 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.11 2004/08/07 19:22:50 kientzle Exp $
 .\"
 .Dd October 1, 2003
 .Dt archive_read 3
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index 39ff7a8ce128c..bbf0a3e74cdf6 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.12 2004/08/14 03:45:45 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 0b526174209de..48d12ff101d4a 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 b2143cae8107d..7cc0613ea0250 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.7 2004/06/27 01:15:31 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 b41f95bf84057..60bf75f79bfc4 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.33.2.2 2004/09/02 04:00:12 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 e3b2527a59781..6f8caded0e243 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 54e1239b5b576..139eb8678fbd9 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.6 2004/06/27 23:36:39 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 bd3a9b9f37aff..b9c458483aff8 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 8b82696c5f631..3f40503d57957 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.6 2004/08/14 03:45:45 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_read_support_compression_compress.c b/lib/libarchive/archive_read_support_compression_compress.c
index 93683eb898514..786054788a970 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.2 2004/08/14 03:45:45 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 50da5ba9158b6..053012e643049 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.7 2004/08/14 03:45:45 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 48e3ea47883f5..ead251f7a24f6 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.5 2004/04/28 04:41:27 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 8f0dcfadf282d..c7e0342163478 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.4 2004/05/27 21:27:42 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 b795337221d99..2447cd1e11601 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.11 2004/08/14 03:45:45 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 e8a769cf98820..9f7fe61c34116 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.26.2.1 2004/09/10 04:30:24 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_string.c b/lib/libarchive/archive_string.c
index 0e92836233c68..72cac6e56f0bc 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.5 2004/08/14 03:45:45 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 1c6e8b17f9552..90c3876b034e1 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.3 2004/05/03 01:40:34 kientzle Exp $
  *
  */
 
diff --git a/lib/libarchive/archive_string_sprintf.c b/lib/libarchive/archive_string_sprintf.c
index b191b4b253550..c211a8af49040 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.4.2.1 2004/08/31 05:10:36 kientzle Exp $");
 
 /*
  * This uses 'printf' family functions, which can cause issues
diff --git a/lib/libarchive/archive_util.3 b/lib/libarchive/archive_util.3
index 4b3788962bb8c..c00c77ac4b9ab 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.2 2004/07/04 21:15:37 ru Exp $
 .\"
 .Dd October 1, 2003
 .Dt archive_util 3
diff --git a/lib/libarchive/archive_util.c b/lib/libarchive/archive_util.c
index 77b74ff583d7f..2778fe7cb00cb 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.8 2004/08/14 03:45:45 kientzle Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_write.3 b/lib/libarchive/archive_write.3
index b7af9d56ca758..3a2ac9e0833f2 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.7 2004/08/07 19:22:50 kientzle Exp $
 .\"
 .Dd October 1, 2003
 .Dt archive_write 3
diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c
index 40f660d05c53e..23d83e0592846 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.12 2004/08/14 03:43:35 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 ae8c2e228ee0a..54d56c77d7f9f 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.3 2004/06/27 18:38:13 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 cfce0a593da45..05d154b37333d 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.7 2004/06/27 18:38:13 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 c7cee5e6d580f..a4274dd214c27 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.5 2004/07/30 04:14:47 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_write_set_compression_gzip.c b/lib/libarchive/archive_write_set_compression_gzip.c
index 003cf2b558951..7456f10e068e4 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.7 2004/08/07 19:21:18 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 7a598c6882721..de4d72a2a970c 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.5 2004/08/07 19:21:18 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 5f6df0ef8451a..559b74b9f5cf5 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 2402e1c38b25c..239e89f70c50b 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 91f8283b362da..3a0044324551f 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.4 2004/04/13 23:45:37 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 7987e08982d96..cfcf4d3a778e9 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.17.2.1 2004/09/21 03:38:06 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 2e3f348369cda..18606fa61b859 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.10 2004/06/27 18:38:13 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 3961e7de12eae..64acfcdf60494 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.11 2004/08/07 02:24:20 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/configure.ac.in b/lib/libarchive/configure.ac.in
index 2bb657c180ab4..42b6c7aab53f5 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.2 2004/08/14 03:43:35 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 866d90c9ade01..8b9adcf2c453a 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.2 2004/07/04 21:15:37 ru Exp $
 .\"
 .Dd April 27, 2004
 .Dt libarchive-formats 3
diff --git a/lib/libarchive/libarchive.3 b/lib/libarchive/libarchive.3
index ce99eaeb3bcca..043831279004e 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.4 2004/07/04 21:15:37 ru Exp $
 .\"
 .Dd October 1, 2003
 .Dt LIBARCHIVE 3
diff --git a/lib/libarchive/tar.5 b/lib/libarchive/tar.5
index e8aaa37c9d86d..4aa0a8f38857e 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.9 2004/08/07 17:24:50 kientzle Exp $
 .\"
 .Dd May 20, 2004
 .Dt TAR 5
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index c7b335eec4dd1..18d5a0aff266a 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.11 2004/05/14 13:31:20 cognet Exp $
 
 LIB=	atm
 SHLIBDIR?= /lib
diff --git a/lib/libatm/atm_addr.c b/lib/libatm/atm_addr.c
index f4c65f2b25f4e..771e0dec4d0cd 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 8e212e6e6362c..2fd3850a6e4b1 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 f7b15f1178bcc..5610c3c9eba01 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 d3a52765011b8..2b76476237a9a 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 2881c24a16b00..8171c445c8159 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 1c2088fa0784c..bbd7b5db84a10 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 1870e55c017bf..3b69bd9289671 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/libbegemot/Makefile b/lib/libbegemot/Makefile
index d3994ee954d83..a26922ca0a666 100644
--- a/lib/libbegemot/Makefile
+++ b/lib/libbegemot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbegemot/Makefile,v 1.1.2.1 2004/09/26 03:10:13 des Exp $
 
 LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
 
diff --git a/lib/libbluetooth/Makefile b/lib/libbluetooth/Makefile
index becd41b8dafc6..12124534aa819 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 2003/10/12 22:04:18 emax Exp $
 
 LIB=		bluetooth
 MAN=		bluetooth.3
diff --git a/lib/libbluetooth/bluetooth.3 b/lib/libbluetooth/bluetooth.3
index 8e64d3ce8bf03..84e3e0b8141e1 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.3 2004/07/05 16:32:30 ru Exp $
 .\"
 .Dd May 7, 2003
 .Dt BLUETOOTH 3
diff --git a/lib/libbluetooth/bluetooth.c b/lib/libbluetooth/bluetooth.c
index f206aeeee4d8e..04b4c6f5c17a8 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 516f691623c55..106a9ee936b46 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.1 2003/10/12 22:04:18 emax Exp $
  */
 
 #ifndef _BLUETOOTH_H_
diff --git a/lib/libbsnmp/Makefile b/lib/libbsnmp/Makefile
index fc430f87c164e..3ff1a229c131e 100644
--- a/lib/libbsnmp/Makefile
+++ b/lib/libbsnmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/Makefile,v 1.2 2004/01/19 19:26:01 ru Exp $
 
 SUBDIR=	libbsnmp modules
 
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index 09d6f14dc9345..fd5f71b60bfde 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.4 2004/04/14 16:29:46 harti Exp $
 
 SHLIB_MAJOR=	2
 WARNS?=		6
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index a261847361e6f..bd262c193bb8a 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/libbsnmp/modules/Makefile b/lib/libbsnmp/modules/Makefile
index 6f5bd6a2a36aa..9b16423cc2483 100644
--- a/lib/libbsnmp/modules/Makefile
+++ b/lib/libbsnmp/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/modules/Makefile,v 1.6 2004/08/11 16:47:12 harti Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd
 
diff --git a/lib/libbsnmp/modules/Makefile.inc b/lib/libbsnmp/modules/Makefile.inc
index 88f522d16c513..8409e94fb1602 100644
--- a/lib/libbsnmp/modules/Makefile.inc
+++ b/lib/libbsnmp/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/modules/Makefile.inc,v 1.7 2004/08/09 16:37:25 harti Exp $
 
 SHLIB_NAME=	snmp_${MOD}.so.${SHLIB_MAJOR}
 SRCS+=		${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h
diff --git a/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt b/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
index 83c4e5c26bbcb..0c5693a6f1c47 100644
--- a/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
+++ b/lib/libbsnmp/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/lib/libbsnmp/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/lib/libbsnmp/modules/snmp_atm/Makefile b/lib/libbsnmp/modules/snmp_atm/Makefile
index b3725ee81d52a..ffd76d816907a 100644
--- a/lib/libbsnmp/modules/snmp_atm/Makefile
+++ b/lib/libbsnmp/modules/snmp_atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/modules/snmp_atm/Makefile,v 1.1 2004/08/09 16:36:04 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def b/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def
index 6cc61d0121844..ce6225658ef50 100644
--- a/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def
+++ b/lib/libbsnmp/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/lib/libbsnmp/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/lib/libbsnmp/modules/snmp_atm/atm_sys.c b/lib/libbsnmp/modules/snmp_atm/atm_sys.c
index 525e80548a5f0..d428c6b24227a 100644
--- a/lib/libbsnmp/modules/snmp_atm/atm_sys.c
+++ b/lib/libbsnmp/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/lib/libbsnmp/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/lib/libbsnmp/modules/snmp_mibII/Makefile b/lib/libbsnmp/modules/snmp_mibII/Makefile
index c677c533ef356..8c1e73dae44a2 100644
--- a/lib/libbsnmp/modules/snmp_mibII/Makefile
+++ b/lib/libbsnmp/modules/snmp_mibII/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/modules/snmp_mibII/Makefile,v 1.5 2004/01/23 16:22:49 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt b/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
index 1896fe696ed8c..d8fc98ec9f710 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
+++ b/lib/libbsnmp/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/lib/libbsnmp/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/lib/libbsnmp/modules/snmp_netgraph/Makefile b/lib/libbsnmp/modules/snmp_netgraph/Makefile
index d0323154be598..8d39c478fbd41 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/Makefile
+++ b/lib/libbsnmp/modules/snmp_netgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/Makefile,v 1.6 2004/01/24 20:12:30 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def b/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def
index eff59ff15c7c7..5c13faf655d64 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def
+++ b/lib/libbsnmp/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/lib/libbsnmp/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/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3 b/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3
index 11e8b48cedf2c..0131996c6a861 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3
+++ b/lib/libbsnmp/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/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3,v 1.5 2004/07/04 20:55:48 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt snmp_netgraph 3
diff --git a/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c b/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c
index 5aad23b16a022..5bab60660c302 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c
+++ b/lib/libbsnmp/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/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c,v 1.4 2004/04/14 16:09:20 harti Exp $
  *
  * Netgraph interface for SNMPd.
  */
diff --git a/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h b/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h
index 21e553c30916a..63652ce64a910 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h
+++ b/lib/libbsnmp/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/lib/libbsnmp/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/lib/libbz2/Makefile b/lib/libbz2/Makefile
index b76b11c9779cc..ef675c979ace0 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbz2/Makefile,v 1.5 2003/06/14 19:32:51 obrien Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 24072d0d6fe38..4edb63aec6ba7 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.52 2004/05/14 12:04:29 cognet 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 5a4d48e4a5d05..7c3029e772566 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.5 1999/08/27 23:58:07 peter Exp $
 #
 # Machine dependent definitions for the alpha architecture.
 #
diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 5365e670bf8a3..51a8d25f7bc2d 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 1f3e525e2d986..79feb05b4ae3d 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.4 2004/01/18 07:57:01 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/alpha/arith.h b/lib/libc/alpha/arith.h
index c8af6de23075b..e5a1df2d8fe27 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 96a92ce226e62..06edd87f20a72 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.15 2004/08/15 16:18:02 dfr 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 229a6c19bd163..fcf1832f1a797 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 7aff9f76b09cf..a5f98fedefff4 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 85ed8c7e0831f..b8236c35bc793 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 10406a6b683f1..33c5835164fb0 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.3 2000/05/10 19:04:57 obrien 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 5a742fec5e7b0..dfb1157db03b3 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 c3219d91bd333..7ce455ec548d7 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 036a150f75532..bfcda2bb633c4 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 1fd96b2ec53e3..af9e514a992f5 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 7586eb40722fd..942d984c51713 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 65da3c5114212..1b1b55de934cd 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 8e994c74d72ab..a6bf2c4ae57c4 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/fpsetsticky.c b/lib/libc/alpha/gen/fpsetsticky.c
index 698109f1b02e0..3d16268b2aa72 100644
--- a/lib/libc/alpha/gen/fpsetsticky.c
+++ b/lib/libc/alpha/gen/fpsetsticky.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fpsetsticky.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/infinity.c b/lib/libc/alpha/gen/infinity.c
index b10f6d38a6e53..00a3be22f1efe 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/ldexp.c b/lib/libc/alpha/gen/ldexp.c
index 78decbb3b87cd..6b33077042d60 100644
--- a/lib/libc/alpha/gen/ldexp.c
+++ b/lib/libc/alpha/gen/ldexp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/ldexp.c,v 1.4 2002/03/21 18:36:48 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/alpha/gen/makecontext.c b/lib/libc/alpha/gen/makecontext.c
index bc8ea037731aa..8a0c6b3e33eb7 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 37786dc1e19b8..7d9d1919bb3d0 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 68b0233549bab..5db7be7a42c4e 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 779684d328f32..a158e3eb654cc 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 a3f6397195947..1ab61ff04eb2b 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 0f7e4008f9a90..a36a987bbc1c8 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 b7178133b9724..6fa6644654b4d 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 d7933c4aebb2d..c41cffbe89f50 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 04acc85d3aed2..101eee35b82df 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 05c906c1bbbf7..0944988a1a347 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 4bd3a8b61b60b..69d171fcb494c 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 a08a1627e28e9..83c1f18644d86 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 79e6e0c73d09d..e4031b15ffc3c 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 dda8c76018d82..789699de9aec7 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/stdlib/gdtoa.mk b/lib/libc/alpha/stdlib/gdtoa.mk
index c631f64404222..bae34f7d00021 100644
--- a/lib/libc/alpha/stdlib/gdtoa.mk
+++ b/lib/libc/alpha/stdlib/gdtoa.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:58 das Exp $
 
 # On Alpha, long double is just double precision.
 MDSRCS+=machdep_ldisd.c
diff --git a/lib/libc/alpha/string/Makefile.inc b/lib/libc/alpha/string/Makefile.inc
index 7bbcc8de10e91..97bf568e03b7c 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 dc230637fd160..8ccdd055e4b43 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 dd94200f5c028..9558040f38847 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 11147d6071358..7d943e681a621 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 ef50ab162905a..28903b15bc341 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 ad80b1cda1d3a..8cbbeada58e69 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 d0b21ed8d2d92..1a46ef5f4dde1 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 99663f1e5cb48..55558e0591161 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 9f3385b7bc27b..049d5c9623a3c 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 5744129807bf1..bbae3f94c584b 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 8ad065f695145..27d33b41b06f2 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 5f408966f2eeb..f1ee930f33b68 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 e94398e9656c0..01d9e80d91325 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 8e4c371f7f0c6..3ae711e317d0c 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 4d79906502292..1f84fca053ec9 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 00b1d3c8e1527..78d12362ae5fd 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 9b13d5f1a1368..1538803eac3e3 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 fb0879503a71b..a894d10c2f59c 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.1 2003/07/22 06:34:57 peter Exp $
 #
 # Machine dependent definitions for the amd64 architecture.
 #
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index 844fe6a6ae36b..6fd0a9c3b1da2 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 e3645186aff2d..26c695a78f273 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.4 2004/01/18 07:57:01 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/amd64/arith.h b/lib/libc/amd64/arith.h
index ecb1a33fccb0e..8d3b5f6268929 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 3d28e66dd06be..3cf345ac941bb 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.28 2004/08/15 16:18:02 dfr 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 02e5e14603025..3cfffab2c4f9a 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 eed057bea5842..c2584a04c9464 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 59cd910414bad..0fb3c43bb53d7 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 c0ce81f6dfa9b..c4eb847298066 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 03bb2741ef6ab..979c4b1171faf 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 22d21480566a1..051c32f93f2f3 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 9c066b149ca22..31271a2d9996b 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 c3acb91d63e5c..09cb5554a372f 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 996e167ac1d96..3e9ebbe5eef4c 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 5898de7e0e82a..0e256911ff397 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 6f13367510d6d..f17f2e9d3b290 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/fpsetsticky.c b/lib/libc/amd64/gen/fpsetsticky.c
index 95b165589e386..0d24ea7f31d43 100644
--- a/lib/libc/amd64/gen/fpsetsticky.c
+++ b/lib/libc/amd64/gen/fpsetsticky.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpsetsticky.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 464b4029b35ae..7b42ae8777a11 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 b01b9378c7586..7efb58e17be59 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 15f10b50ded46..0999a18059c40 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 d448de168012f..e7ff171095331 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 aa7001c5d5873..cb3cf644d32ee 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 14696f6776970..2819d3fad6ffb 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 1a2621aa7229c..b7efc18708968 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 3b138017205df..74a5fabeb0d0f 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 96e559bf8027d..643f74813b1cd 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 8d802d62df2a0..3d10614c2d125 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 6940ef06b0e18..aee48545f3a40 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 e5e2150c45259..c4aa9c2061d6a 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 02e44418e4eb9..9be127d1dd208 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/stdlib/gdtoa.mk b/lib/libc/amd64/stdlib/gdtoa.mk
index 50f2f0d0b3b1b..eb59c4693a1bf 100644
--- a/lib/libc/amd64/stdlib/gdtoa.mk
+++ b/lib/libc/amd64/stdlib/gdtoa.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:59 das Exp $
 
 # Long double is 80 bits
 GDTOASRCS+=strtopx.c
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index 4f8bef70f24cf..ef7c1d9f252a4 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 ff5eb8f305ae5..d9201eae2b07a 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 ddbf977f5dd18..566644bf27a22 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 e0914859a1ae6..c3c9af6b76bcd 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 f8963288ac073..b8829bfcc5b7b 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 ee04cac894064..8d241008e5a0b 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.12.8.1 2004/10/30 00:08:46 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libc/amd64/sys/cerror.S
index f9f4da0f46a02..6ddfd7ec0f829 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.13 2003/04/30 18:16:33 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/exect.S b/lib/libc/amd64/sys/exect.S
index d71a94b374dfe..708ec7a02ff64 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 9fa95fa09b18b..06b78c68294ce 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 4baf20c9d0ded..7b1f976676b02 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 f0b86f4aea642..d85614fdb478a 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 0ed4329ebca2f..af2a52759fa2c 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 dde1bcdabbc35..0d89dc7b4a1b5 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 439e417443633..28de338e6f0e1 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 2556ab94e5053..c1040c100e3fa 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 e49bca9b1ba8a..716a592cd4c2f 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/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index 2eca9535d96e2..e4abb4d637d49 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 6f8fc6f901d15..b62365a3700f4 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 0030e5097a28b..7af5b25d043f2 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 8d58004f73324..fcd7d712ce671 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.12 2004/07/02 23:52:09 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 cc1b905028e9d..0f08fad14bf36 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 668dae07ada7b..b15d2e2c0449a 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.3 2002/03/22 21:51:56 obrien 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 fe78a9670fdbd..dc48c2278cd6a 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 3eafc76259a5d..a6220f7084409 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 55ad65854953f..a23ec8ef47946 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 381c018f80094..0c07ce8e91aba 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 1617ab13b9bf1..360e562e63f8d 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 472e7fb089718..ae6900b3fa09f 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.10 2001/10/01 16:08:50 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 a0a6e813da7bb..5fb6d60b97c8c 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 67a741268ad30..37ba978d012ff 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 2711d18bde539..aad50f90885d0 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 8e8d78f0a41f9..438d308cb528b 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 a3f95e241f587..80870d69e57c1 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.24 2004/07/02 23:52:09 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt SIGVEC 2
diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index 72fbb4f4a8c60..4b21fdb89e25a 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 76c2238300279..97d3336c18e35 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 3bdb50597fdf5..c211d5be48bf9 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 18f377472403d..7496a3c376045 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 11ed3d8ce2a80..606ecff81c275 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.2 2002/03/22 21:52:01 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index 13e43df515746..6204464c6d2a3 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 1911731070ee5..0d91ae44882d3 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 40b00a581cda1..c8a103a5fb9ed 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 7f479f50ece01..5e0f1ae94d604 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 105ffa538e1bc..339270931b312 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 42b6f7e4de21e..0dca165693d96 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 4fc39e94acce2..cee177da50b55 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 8b0dae2f91e82..662e195357367 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 1dd466692ac23..272869cf89bfb 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.5.6.1 2004/09/18 03:57:38 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 0f8ef3424cdb6..e9acfb718655e 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 1ac6fe106efcf..d5adeb7ea2d09 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 a151acca066fb..478f6afc3e62c 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 2bbac4e702506..db5340ecc2005 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 830f581de1839..9c65e5520f8f4 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 3a0cf444b1acc..fe87f1d7f6834 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 b7e441a5755ee..10a28cd30817b 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 2ecb81763f248..0ebdde956026f 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 9ae583265fa21..2259ac07e5f6a 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 d29d7d0f832b2..f3ef3ea52a55f 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.11 2002/03/21 22:46:26 obrien 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 2c0a542ed4e49..33fefa7d298e1 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 c70b375f4782c..487df5b36d028 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 1ec6b11e7e695..2a81cb6ceff5a 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 194c87233c67f..d46d62086c9f8 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 c9634dcfc4fd8..827dbef9e7459 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 f0739fb655e90..8c4b0b52efa01 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 b1d825da9d465..8561c8c254cc0 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 6ad92484661d9..2cf7460e0c30f 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 349b029482191..2a0364adc9ac2 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 5712d18aaedad..7f04c3ade5798 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 f2b7f465eae47..9585e6313ca60 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 e2475635d72b4..f3aee097e11ef 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.10 2004/07/02 23:52:10 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 6c2e93041da75..d60c809dead21 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 78feab9b6698c..3cbc3075876b8 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.12.6.1 2004/08/31 07:04:41 roam 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 726f74f8b3cc8..b5e6f58466719 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 9fef71262b6db..0361f3f160ff7 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 e3af051ccfab4..79b7d0bc4653a 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.11 2004/01/20 00:40:35 das 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 bcd827dce29db..0d823684aa234 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 6e08e3f303bdc..5492f0bffacf9 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 ffa7243fde23f..8c59f47e14d33 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 326a943ea931e..fea96ae5413da 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 9996c2d3c36be..12055940487f9 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 e7ae1237406b0..d9da658e17440 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 537057711fe7d..a431f6f1da7c5 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 10210d5226fda..14cc8117112b1 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 8e82917f9762e..3353bfb380205 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 b75d44e9dd5d1..6ed3384bd0e5c 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 1ace3ba18b31e..81fa1d657a782 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 031857112915b..b0c0af76867da 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 712ad62583764..0b97a58e17c33 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 6308dcb885c11..adb5d15dbe340 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 4d81aee74aada..6552708dd69ed 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 8b1c644d43e71..3c9c26823714d 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 eff661af271ca..a5712cf48fb69 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 0a5eabb32df13..5607899e01b77 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 90b37839c377e..27e84cc394154 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 75f9fbb3fbe40..89b7d6595db51 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 4e5dc84a36c8d..d2a29c6bfeeba 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 18505f534e90b..a80dc287788fa 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 219063657af8a..6eb3671019bb3 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.6 2004/01/18 10:32:49 das Exp $
 
 # netlib gdtoa sources
 .PATH: ${.CURDIR}/gdtoa
diff --git a/lib/libc/gdtoa/_hdtoa.c b/lib/libc/gdtoa/_hdtoa.c
index deb65821952c3..1a8598630f84e 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.2 2004/01/21 04:51:50 grehan Exp $");
 
 #include <float.h>
 #include <inttypes.h>
diff --git a/lib/libc/gdtoa/_ldtoa.c b/lib/libc/gdtoa/_ldtoa.c
index 750a25226c122..ededc68d217c2 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 39e491a7a277e..5178f593728f4 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 e5cf6e63ad9d5..fca9c291e898e 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 e2dbb609c3595..2e20e1754c640 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 0b61de653f7c0..0ceea1b29de95 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 2499dd1c4d8e4..181a440326064 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.116.2.1 2004/08/29 06:10:53 tjr 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 4d1be8c04f109..359f8eae7ffbb 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 dd93752ac7f9a..71c1a542bccf8 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 279bbc3623943..4dbf0d7681f85 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 85faf285cbe35..78512b3f68b08 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 acaf65cf518c1..afcd8563c3204 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 b85b879d40a13..e9be94f4538e8 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 d3920cceae106..58cce208e24d1 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 27c6fd16c9870..3e2aaa38c862b 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 e2448d56cbe9d..7d882b8154cc0 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 117f0d8b10e20..f14e39c48774e 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 6f03b4ae57dbe..d8dfd75fa8039 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 9552ab3486660..c5da4636d5022 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 53e5aa83d3625..0768d6df81b32 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.2 2002/12/04 15:47:41 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 0ccdec115a871..716f5b2679d24 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 2418762d26ee3..cff60dc80937c 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 91d20db4a8286..ddfccbe80aba6 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 11838d1b8bf84..31dedc0345910 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 63440591bdf5e..65a005c1d5d95 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 966c3fe2ae19a..7c4699c505190 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 5fee5373accab..f846343132c9b 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 c8f3c100e31f4..c36d55f2da420 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 4c2ffe3c67bf4..6b2c6828b4cae 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 5b4a5e03e9765..04e0a51900256 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 01589768a37a4..1b9b706e31746 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 42cc407e07fc0..84627e94a9e58 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.17 2003/09/12 21:54:10 ru Exp $
 .\"
 .Dd July 18, 1999
 .Dt DEVNAME 3
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index ca0d6a9b617f3..bf5af30dbdeed 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 2edf5dc228aa2..506f6634223e6 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 eac042d173bb3..b2d0f6fd879e0 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 56b75f63716ea..8a4e1c948b40f 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 2ff306139b643..82ef8006268b0 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 414fa49a3e90a..0bb62759a6243 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 be58e28c5cdd8..971b2dcab56e6 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 72a683a055d1e..933ea19c62bd0 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 ef77e7c0039ea..a7998750288ff 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.8 2004/06/21 19:30:45 mpp Exp $
 .\"
 .Dd February 14, 2003
 .Os
diff --git a/lib/libc/gen/dllockinit.3 b/lib/libc/gen/dllockinit.3
index 98d10749485ed..99811ab2724ae 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 118e165ba4333..3a3c87874f47a 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 672b5eef6b198..92aeb80f9ca22 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 cdb3ec85052b4..4b0c1dfe989bd 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 753ef15fc910e..75e5f2b82af2c 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.19 2002/08/05 06:49:58 mike Exp $
 .\"
 .Dd March 6, 1999
 .Dt ERR 3
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 9365d7dac6962..aa0d30681f07e 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 b871a1e161172..5207748b0c191 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.7 2002/10/09 08:04:24 peter Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
index 02e0351badc23..7d98857d63637 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 b3c219169caad..b741da2c77e56 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.23 2003/09/10 19:24:32 ru Exp $
 .\"
 .Dd January 24, 1994
 .Dt EXEC 3
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index a832bdc7c0cf7..211eb78f2efd7 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 366355849fdbb..1a5bb54682997 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 661cb8a020bb3..e90799556df82 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.7 2004/05/02 10:55:05 das Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/gen/fmtmsg.3 b/lib/libc/gen/fmtmsg.3
index 7995d7bd31c50..3320bd045e7bd 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 6caabbbb884d1..4db35dc9c102f 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 db27033c339e6..3d268ccdadb72 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 3c3377f570a9e..b97db73bf9be8 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.16 2004/07/29 03:13:10 tjr 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 9379e382202c3..8ca38b2dd4870 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.5 2004/07/09 06:37:44 das Exp $
 .\"
 .Dd July 8, 2004
 .Dt FPCLASSIFY 3
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
index 26cb910cc1419..e7eae15e1510f 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.1 2003/02/08 20:37:50 mike Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/gen/frexp.3 b/lib/libc/gen/frexp.3
index 9e9c01c30d458..4414b3d5a44aa 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.10 2002/12/18 13:33:02 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FREXP 3
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index 53483da885688..24e10697e5cc3 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 beeb700f62fd2..33fc30942b8f1 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 a1c7dde545892..436b77e8375fd 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 4269e370c9f43..6c7157ae70b95 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 3ef0220e74d25..3bee7f1921df0 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.20 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd September 15, 2002
 .Dt FTS 3
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 48f9e0bd49f4d..28bf1774caa94 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 447272abb9d59..7c408f6e20101 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 0177712143ee1..6378507a83778 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.3.2.1 2004/08/29 06:10:53 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 03e4c122834a1..f8471901866ae 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.12 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd September 23, 1994
 .Dt GETBOOTFILE 3
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index 2bb30bf63b521..6acbb959d9394 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.7 2003/04/11 13:54:28 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
index cbf48630f94b1..cf3bc8ae32ef2 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 1a3a70d07ebb3..b922f1c77f179 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 090ec5ac2972e..d0ce237f2e61b 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.25 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd May 13, 1994
 .Dt GETCAP 3
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index af051135e2392..3cf07fabc93fd 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 789b232b0b540..3f98e86c77e8c 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.2 2002/12/04 15:47:41 ru Exp $
 .\"
 .Dd September 10, 2002
 .Dt GETCONTEXT 3
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index ba59c154e2a35..e7591d932bd23 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 6606af7463a75..3b6a81376a756 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 2003/10/29 10:45:01 tjr Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getdiskbyname.3 b/lib/libc/gen/getdiskbyname.3
index 0dffef96eb0cb..2a4eee87825cb 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 ed1f0ff741297..0d2ee8a84600c 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.19 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd May 6, 1994
 .Dt GETDOMAINNAME 3
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index fa9679a6b446d..05441d7fbd4fd 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 e08f798cd6419..af43be234e17a 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 b8628b2835c67..e731711847aea 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.25 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd April 16, 2003
 .Dt GETGRENT 3
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index c9b7474e78d71..bf86ecca5ccc9 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 da949c7ebb2f2..5a923e339b14f 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 40d55fc5bce06..e01cad86685e0 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.13 2003/02/16 17:29:09 nectar Exp $");
 
 /*
  * get credential
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 9a0afedca804a..3a25abda45616 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 acc338680633a..9071be2e84ac8 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 37a8d678d2557..24e7cdfe52b52 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 5022d0de00605..c3450f1f58a87 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 92af0d18555a2..6e3208cadf515 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 7a3cc0261c30f..307d49471d55c 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 636039a12aa35..383df1e72848d 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 91d0dd3f07cac..eb2b252173223 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.11 2002/12/18 10:13:54 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETNETGRENT 3
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 2431fd7629cb4..7b1dfc02c2720 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.31 2004/07/28 11:56:03 des Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getobjformat.3 b/lib/libc/gen/getobjformat.3
index 8705f0166622c..69280bcf96aaa 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 7428f36b884bc..d1ac7df1a0042 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 78dc7e5f0b462..d7b132151e47b 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 b0421a3007951..97cd9bfe7cb87 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 80f2f19cf783c..a8e57e1416212 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 6963cfdf0af06..3c8881ec88aa3 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 7a85fc3356ca1..f3317bdce73db 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 12999e501b092..6b5aed038870a 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 5ecb243b53c5d..5608c48932306 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 53d39a60526b8..5ea703ef8ed34 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 fd51d1322517d..4be82e32152ad 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 5ed800c90f615..cc28791f1b874 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.27 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd April 16, 2003
 .Dt GETPWENT 3
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index a0867ddf8e1ca..cba41daab69c3 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 9c2be8f899aed..08eb9ac51f572 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 e4eadc46af1e4..64506fa0939ae 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 2002/02/01 01:32:19 obrien Exp $");
 
 #include <ttyent.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
index e9eca6f020004..4d8805e529112 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: getusershell.3,v 1.6 1999/03/22 19:44:42 garbled Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/gen/getusershell.3,v 1.10 2001/10/01 16:08:51 ru Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index 62061c1d4eee6..b8fd9b44f64c7 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 a7cfa2e9c47f7..0df69eaadd75c 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 20f389dd35f0d..be93b004a11a4 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 34e82943aa156..1eacf6001fb88 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.27 2004/07/29 03:41:24 tjr Exp $
 .\"
 .Dd July 18, 2004
 .Dt GLOB 3
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index f68623bc63bc2..2ce86d8af4570 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 2004/07/29 03:48:52 tjr 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 3df1ffd49e93c..beba09ee92a78 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 82bbb3af1fa60..50c910a7740d5 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 c70cb1a539d60..d16a9634ed1c3 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 b1cec72d7a6b5..93972dc95de5b 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.2 2003/06/01 19:19:59 ru Exp $
 .\"
 .Dd February 12, 2003
 .Dt ISGREATER 3
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
index 4a4152a5a032d..932675dc33dd9 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 ec81362f4f99c..f5522eb1d1241 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.1.2.1 2004/10/01 06:33:00 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c
index 17076205559a2..f47bf2aa0a3fa 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 ab0d1f762d80f..8b11e08c57c46 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 6ebe68d6de9cd..88c0d2fef73ed 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.8 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt LDEXP 3
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index cb3b8ef39d464..bf6b7b1ca6230 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 c448f18040729..375b2ce4d50e0 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 44a7f5d0e924c..948b923a529d8 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 ad55e7abcb476..36e3ce811b2e6 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 4afd4e6b47c7c..891ae61a10798 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 ef20fb87bf507..f65ed779088ab 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 f049a1cf551a4..8391de27bc11a 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 e257c607d1ee8..d87574734d740 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 8c280ae293a08..ddea36fa5b2ac 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.19 2004/07/02 23:52:10 ru Exp $
 .\"
 .\"/
 .Dd November 24, 1997
diff --git a/lib/libc/gen/msgsnd.3 b/lib/libc/gen/msgsnd.3
index 257802b0935da..111cdfd5b9c64 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.19 2003/01/26 20:09:34 alfred Exp $
 .\"
 .Dd November 24, 1997
 .Dt MSGSND 3
diff --git a/lib/libc/gen/nftw.c b/lib/libc/gen/nftw.c
index 43110c1a3b4a8..591796746dcca 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.2.1 2004/08/29 06:10:53 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 bfb01ae4620bd..6a98d9eb67531 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 8ec41d1b50aed..453caa762c355 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 d72dad603753e..9a6309c229381 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 b52d7c2a82e37..ff20b50a0bc3c 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 16c8ca111b5e5..3a21c3f2a546f 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/ntp_gettime.c b/lib/libc/gen/ntp_gettime.c
index b0b6e1415e2fe..583e7ac5d9eb6 100644
--- a/lib/libc/gen/ntp_gettime.c
+++ b/lib/libc/gen/ntp_gettime.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ntp_gettime.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/opendir.c b/lib/libc/gen/opendir.c
index c076abb63b6ca..9148240d7f3fc 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 1822283ee0156..b8c257ec8f8d7 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 f1b5c25e3abcb..4f56289c3d6ce 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 60cef637bf166..744c6e560e47c 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 50132a2ea1a35..12974b78bd31c 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.16 2003/06/08 10:01:51 charnier Exp $
 .\"
 .Dd May 3, 1995
 .Dt POPEN 3
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 5cb57fb457406..0ed56578cc938 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 05fc1c9bf4035..0baa7006950a0 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 a56a0a80a884a..4b12fb7374cb1 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 28066a204aa4c..13b25538e22ee 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 771de7d8cb0e0..02013a453eea2 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 c0f63cdbdd918..832e04b902c2a 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 04cc388c8210a..a5057f90ef077 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 f83df2cdec688..28669f797e085 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 dc8c77c653ac3..ea2263ff2d781 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 cb2aa42123dec..2d4b27291bd8a 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 8dac8f5e87c08..1a8fcd7e9ad67 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 2e50fd4fad62b..4a94cb905076b 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 1bd315e951a5c..c009a2d65a3d2 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.16 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd October 8, 1993
 .Dt RAND48 3
diff --git a/lib/libc/gen/rand48.h b/lib/libc/gen/rand48.h
index b6602dc5a9f70..0a3d83d3c0c73 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 68d0ddd663853..fa0438cdadeec 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 48859a929664e..ea143ec76d1dd 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.6 2002/12/27 12:15:28 schweikh Exp $
 .\"
 .Dd December 7, 2001
 .Dt READPASSPHRASE 3
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c
index 983e01d893068..d100be4085238 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 294301e7e26ef..dae75cc31739d 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 e985e1c99e7f0..bd03d93d2e6cc 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 045e4ececa093..b76eff8c209d0 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 6c7259fa79b75..cf79bcedea95b 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 5339b8c0c4e9b..94167a7b11978 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 e6fbf10457f8e..53858193003b2 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 64ba05b70b8b7..4054e3ad8a1d1 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 f488b4efe08d2..c10dbf3291d19 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 a8dd177ea381f..ff5ab2711e081 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 d18f5e23547e4..d8e7c3a1bdb04 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 2004/07/02 16:45:56 ru 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 f5ba249f126a9..e9b0365e9adde 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 6dd18a1ef880f..b0c308a0adac9 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 2004/07/02 16:45:56 ru 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 b6c3b7c798ce4..b54ebdbfcba90 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 2004/07/02 16:45:56 ru Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_WAIT 3
diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c
index 4b5283f897c89..4c0b249f6d801 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 90d5be86a3dfb..571a73f125359 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 769401af6ed29..3a15727a7732c 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 98202984e413b..09f12507ca037 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 917a21c9b743a..d5d8d065e0cc2 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 bca8e684826a1..ac41f4c4c0088 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 fd67ec6a5b9a1..3e4a6ee8972c6 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.9 2003/02/23 00:24:03 mikeh Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index fe9f19acde6ef..8792110b1c304 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 cd705fb609466..433bba233e2e3 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 29a6cd025ec89..654bef4161b8e 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 7b62e9a722713..59590e7c7f800 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.11 2004/07/05 17:12:52 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 9680a1523d426..34e1a9c47ebb0 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 8269499d25990..8c719f8a61c4a 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 d723e3eeae565..f2690262cbf7e 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 1fdad3386480f..4fa65c960fc47 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.38 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd June 7, 2004
 .Dt SIGNAL 3
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index d954cd4813a57..a958347cc9a82 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 5ca92e5c6fc66..40caa53da0ea7 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.8 2003/06/24 15:27:31 yar Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGSETOPS 3
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index 38014da34e738..e345f2648de23 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 4c204dc98d1eb..b77a2c5f6f75a 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 71318ce01ae65..bd48358ccd0f7 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 f9c7430f6e99b..82e4d0f83723d 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 fe9462bd307be..303950bbfab8f 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 d75407c34fac8..f28dd5ac98692 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.10 2003/02/23 01:47:47 ru Exp $
 .\"
 .Dd November 28, 1999
 .Os
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
index 79e605df43041..1d977e4e41ec3 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 4b2d5c587412f..355e81aea1373 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 be54f6a7570cd..20a5c9fc9a2fe 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 c34cb235cffb2..1725068a3e180 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 86fb16f4a88e3..815e2a7a766cf 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.20 2003/12/23 18:42:55 trhodes Exp $
 .\"
 .Dd June 18, 2001
 .Dt SYSCONF 3
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index 27729a6fa9d4d..309e163299651 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 24d078aa30653..4b12bf4adc236 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.63 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd January 23, 2001
 .Dt SYSCTL 3
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index 525175a19a158..b6c89a093e0e6 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 4510fe050c9e9..e949a5cde122e 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 1515784a5becc..1a932ec465047 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 a82d36a01a58a..9e87ae5b1223e 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.23 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SYSLOG 3
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 2c16d73d46939..0d6693958c499 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.30 2004/05/10 17:12:52 dds Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/tcgetpgrp.3 b/lib/libc/gen/tcgetpgrp.3
index d6aaa76565522..b155763412f16 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 e85d104c15d90..c1be0bef357a5 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 82df2a6f49952..56c9e0e623d29 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 8ddb4690a82b7..b50e6a8715e97 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 170e547443121..f3219107042f6 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 4fb4cb6ca8aa9..82cf9c1b792b8 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 cc57cf8b72460..65f814157fc0b 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 9494ec7c350d7..a3ba1d9b26348 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.13 2004/07/02 19:07:30 ru Exp $
 .\"
 .Dd July 18, 2003
 .Dt TIME 3
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index 4468b0154015c..5bf0ce00a1d35 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 4ef554cf48aec..6aa58c3d45d1a 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 c7de17ee72a75..5bdc6078eb23b 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.2 2002/02/01 01:08:48 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/timezone.3 b/lib/libc/gen/timezone.3
index 2a90c11793f94..27caaa20bfa1c 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 c9d595702ae94..8d8139a56216a 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 69489125eae16..b32de90bec49e 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.2.2.2 2004/08/27 16:57:28 dfr Exp $
  */
 
 /*
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index 324ebb1bf6ef9..c1d1b4fd173a5 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.10 2002/12/18 13:33:02 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt TTYNAME 3
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index e4a0ed4dec089..b4e52f7505c65 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.16 2004/01/06 18:26:14 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index 2710e7074d2ef..0d7359c461182 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 80c525da81e37..2297e3a0be9d7 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 7783a30b6b5cc..65cc711904aec 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 f56a70d9c4fcc..a9200ae847441 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 05743224a82b5..86210de24bf09 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 e4c2d769323ca..3dc745f52643d 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 e1bc020662092..d25ff4799ea60 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 d88ba33cfd2da..cfca201a46691 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 b5d5af3da3237..699e7b2fe79ef 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 f371f9a0c4813..8d160d83267e0 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 c5bf6bb46ee0c..35443d11545ca 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 ffdc9223b71d9..72fb09815a624 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 95c36a8558bc4..81eb948f0ff70 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 2002/12/29 00:59:09 mike Exp $");
 
 #include "namespace.h"
 #include <time.h>
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index f18ce66cdad65..7dc3611965bf3 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.11 2002/08/24 00:39:43 mike Exp $
 .\"
 .Dd June 4, 1993
 .Dt UTIME 3
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index 7e544adc767de..cefa0205d4adc 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 fceec478ced0e..e40f19fbbc5fb 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 456f31d21cfd0..206a7e86a575d 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 03676ff5479ae..01b926f91fbf2 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.26 2004/07/17 12:27:25 tjr Exp $
 .\"
 .Dd March 21, 2004
 .Dt VIS 3
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index 1d7e860636b0e..8b82877758111 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 f1711cdfa5de7..8cb80a41ef128 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 edfd227fa74ef..a4b91a771782e 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 ecb0e4d1a2adc..273d1f3b8e3dd 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 c3fb5e0aa6068..495d8446c4f53 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 a437543bca403..b09d397624ef2 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 535e7dee2557f..7a9a68384567c 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 da0c1795997a3..13939c4733234 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.18 2003/06/02 02:32:22 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index c72299da8a197..b3efd02262375 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.19 2004/01/06 18:49:54 nectar Exp $");
 
 #include <sys/param.h>
 #include <sys/gmon.h>
diff --git a/lib/libc/gmon/moncontrol.3 b/lib/libc/gmon/moncontrol.3
index 1af4974a1d0cd..1f027623b0fe1 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/SYS.h b/lib/libc/i386/SYS.h
index 1483f9d8e7636..209f0b232e05f 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 e5347946fd71e..daebe95e54550 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.3 2004/01/18 07:57:01 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/i386/arith.h b/lib/libc/i386/arith.h
index 2d65061e82a7c..c55a4df3ab29c 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 709cf5d915169..70e7ed80517f5 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 91a06b8636578..6bef78e747181 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 d975b797f7656..a90d4f7181afe 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.1 2004/08/15 16:18:03 dfr Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index d2b7b6e1f67ee..c2fa562ef2449 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 657c11424bd94..dbf6fb85769ec 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 52784cf7b275d..4350f188268c1 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 16417ffd46e20..2856636eb010a 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 464b4029b35ae..dd54481e16f87 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 b01b9378c7586..596c8dc4b3461 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 1154459470d27..f6b34b8f169fe 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.4 2004/07/02 14:19:44 davidxu 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 426037bde9332..de7c96a1b66cc 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 c0fc624f0ae36..04ad5495033af 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 f64c77fa9835c..89c2b568dbeca 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 877b6556a3f2e..6beb809944b45 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 09b512d2be3d5..f6ab301700b70 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 96e559bf8027d..68786442eac2f 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 da74ed67a902b..ab45c864b56a3 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.9 2002/03/23 02:06:08 obrien Exp $");
 
 /* netorder = htonl(hostorder) */
 
diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S
index d5d63fc0c1075..37b92a609a27c 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 15e2d6e35232f..6622d77736e8d 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.9 2002/03/23 02:06:08 obrien Exp $");
 
 /* hostorder = ntohl(netorder) */
 
diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S
index eb0668c4e1e53..676b3eaf46bdd 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 0a6a6a89237c3..1bb5c21e49e12 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 55a929606bc63..31d7531bc09d5 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 bafaf6a85e924..383b31f887bf0 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/gdtoa.mk b/lib/libc/i386/stdlib/gdtoa.mk
index 50f2f0d0b3b1b..3468989e3af71 100644
--- a/lib/libc/i386/stdlib/gdtoa.mk
+++ b/lib/libc/i386/stdlib/gdtoa.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:59 das Exp $
 
 # Long double is 80 bits
 GDTOASRCS+=strtopx.c
diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S
index 9dd474d8521c6..3268520839fec 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 578eff0fe0fde..91e132a419342 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 cd908a6225979..753cc9829d8f0 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 60ece4f70b730..b8fe6042ba041 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.8 2002/03/23 02:44:19 obrien 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 1050ed2de7a4e..be2f9f468e5d3 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 f66bd780a8beb..fb842011f0326 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 450f586c9eba9..b64411d406c5d 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 db0a162b2dab5..4bdde0815e5eb 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 639077d2696ce..5f4951a39a6a4 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 8aa2f4ea0413f..27c479c904c64 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 f85a1a5b80213..5102bc7148e72 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 02330c44414bd..42b526384db24 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 52f0485e6368c..27eca36127201 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 f0d99f1569db1..c76cf8f499c3c 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 3a667cac2bd81..a175d5b8eac79 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 19ff5d4ad3eec..87d4fda79f480 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 07a87b67a50e4..6e98893f8d907 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 a474ec1b722bf..237175a97839b 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 22d683ef9f468..3f4ee5b953d34 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 e5953c520482f..b6c1648528a40 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 8b63ddf73cf10..9547d258076d6 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 80b2f3c5507cd..40a48a6792411 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 c020d74177868..588a68b81a967 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 aa441404b805e..c609544733aba 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 2bebc1e39ed33..bb9c38002fb13 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 a4ef081911567..9e0b41af95c4a 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 5adee6515c024..30895470bfdd9 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.27 2003/09/04 00:20:40 peter Exp $
 
 SRCS+=	i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \
 	i386_set_ldt.c i386_set_watch.c i386_vm86.c
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index 20ece5e470ec4..a3ce2c931d76d 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 61f6cbebdd425..1bc535913b4aa 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 1d625be58af39..5d7248b621055 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 5848e611797c5..a7a6888148b7b 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 b66ad30a754b4..97f6a01db0f7d 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 721c1b8cc46c3..1b0e935ec3140 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_ioperm.2 b/lib/libc/i386/sys/i386_get_ioperm.2
index 4d3bbf18262b4..49023e7047ed3 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 7bc27f8126543..fb3f48b607851 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 135d8b8d4c531..3f40fe4bed442 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 73d76670bb8bf..51ac9ef585ec6 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_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index 258e2af417b0b..cb3f7763ce80f 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 0bb109aee9706..df65f9fd73521 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 15b8497acc955..ddb673bf0f3ed 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 cc1b8ed03b7cc..325aff7b2fdd6 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 03c1873c89845..56e4f458584d6 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 c007608e62209..02b3446f78af1 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 99a7ff001143a..c6042cadebcde 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 71ce5c7a16331..fb35a49155735 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 80e3d36d4632b..11bb985683395 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 97c47690d069d..917e1873d6705 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 013dc7eb37430..9dfd39e52c9cc 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 2556ab94e5053..ff705c9dd4264 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 c6e9083245655..3035e55f9fe07 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 58afd5d7e7391..2a1a53a5755ca 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.2 2001/03/05 10:00:57 obrien Exp $
 #
 # Machine dependent definitions for the alpha architecture.
 #
diff --git a/lib/libc/ia64/SYS.h b/lib/libc/ia64/SYS.h
index 64d50d2a18a66..b05a8cba04980 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 311574a973daa..717d7711ac7a2 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.4 2004/01/18 07:57:01 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/ia64/arith.h b/lib/libc/ia64/arith.h
index 67265284dbf0a..2863185bfddd9 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 1eb72640dda00..547382130066a 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.12 2004/08/15 16:18:03 dfr Exp $
 
 SRCS+=	__divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
 	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \
diff --git a/lib/libc/ia64/gen/__divdf3.S b/lib/libc/ia64/gen/__divdf3.S
index 58425d92dbaa3..e81c31d8aaf2e 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 92e29116f6e29..3711e597cbb00 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 fe7bcb4d68eed..8defe7459b690 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 4c82e32ddcf13..44485917453e7 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 e15f964c6ff94..6c62375a13e97 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 1939493eff38c..9d5311e1e6de4 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 1233e8aa4105e..faaeb2c4e6425 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 25959b88a9228..a238ad63ee527 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 509c62bb687ea..9697a3a4bd92c 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 697db2e5d8c97..80590f50ccfce 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/_set_tp.c b/lib/libc/ia64/gen/_set_tp.c
index 2419e10209ecb..6ac54b09d3c87 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 3966e836475f7..02b2e99970c3a 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 036d49201321e..3ef9ad9db7af6 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 d65096545abc3..759346a4ed4af 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 ac166e249388c..dcc49365c4696 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 6f5e8cc86c4cf..bbf30d06cc105 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 d959dc6281aba..46890ea1e2d7f 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 db2eef1e49c23..974b02f174b12 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 1ae92a804d555..8c46c93cbb09a 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/ldexp.c b/lib/libc/ia64/gen/ldexp.c
index c431417a563bb..0e9341ec20863 100644
--- a/lib/libc/ia64/gen/ldexp.c
+++ b/lib/libc/ia64/gen/ldexp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/ldexp.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/makecontext.c b/lib/libc/ia64/gen/makecontext.c
index bee47f11ce579..b3a401db742d2 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 def3aadbad261..2b914baee258c 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 a2b56d6af9f01..785bf948f7116 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 b47daf37d9ea6..9b7b495505772 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 9f02a26a5a7ab..ba9a20f3d13be 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 7afd0eff496ea..2eb3627680767 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 b7178133b9724..a4272433c247c 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 34498b7bc2008..72a4790f21582 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 c5daa81d02134..1bd2deca4d9e6 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 05c906c1bbbf7..57da283394754 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 4bd3a8b61b60b..2e4b135a68538 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 a08a1627e28e9..6de18646e3ce1 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 79e6e0c73d09d..b9b5c80074c42 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 dda8c76018d82..bf2bd66872e16 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/stdlib/gdtoa.mk b/lib/libc/ia64/stdlib/gdtoa.mk
index 50f2f0d0b3b1b..a159d9f9a69d4 100644
--- a/lib/libc/ia64/stdlib/gdtoa.mk
+++ b/lib/libc/ia64/stdlib/gdtoa.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:59 das Exp $
 
 # Long double is 80 bits
 GDTOASRCS+=strtopx.c
diff --git a/lib/libc/ia64/string/Makefile.inc b/lib/libc/ia64/string/Makefile.inc
index 7bbcc8de10e91..47b5fc3f5b10b 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 34aac1984cf4c..ec9851d46f02a 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 0963c36aac80d..86c8cc25f98cb 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 d99d765813417..2f667eb265232 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 d7557c1f039f2..b69b678d3e053 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.2.6.1 2004/09/04 00:17:50 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 19fa8affc3998..12b3e1aa94fe6 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.2.6.1 2004/09/04 00:33:05 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 dacd2f904562e..94f9521dd27be 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 6eb69583f7e91..cdcd776d7c606 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 fee1728bc0dae..fa7f3d0f2d57d 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 ca0b0c735b1b2..d7a31670a6911 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 817d3b1b38481..fe43441d87cab 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 5b09f77118205..601b023e9eca2 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 0ec6f92e4f85a..d2ee8d0af1a75 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 a6413dfd464bd..2ac4d239179eb 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 b6d3abdedda9d..0a6be54ccb71a 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 98b5ce92c21f7..a554f54a5dc2e 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 1d29a40664a31..1de787caf5dd3 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 2c7a710a14619..da4a329f14b99 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 210189f6ff4ff..e96751c9d45e5 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 6d36251461a19..f52a6bdd1b8ec 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.2 2004/01/18 08:05:21 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index 0f170dbb9b6de..e64b53c0bdda9 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 e626200e1e29e..1e59c6c708cda 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 2003/05/01 19:03:13 nectar Exp $
  */
 
 #ifndef _NAMESPACE_H_
diff --git a/lib/libc/include/nss_tls.h b/lib/libc/include/nss_tls.h
index 13ab367d06b5f..7420f9225f9b6 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 8ab328bc62797..07af90ab85d0e 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 eee1969cffd74..8e9adb16042f7 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 eaa947111c4de..067e22d224c24 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 2003/05/01 19:03:13 nectar Exp $
  */
 
 #ifndef _UN_NAMESPACE_H_
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index cf02a3fa5cbf2..24c797ecaf1eb 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.57 2004/07/21 10:54:57 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 13d0c7b64e535..8319d9f56d5c2 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 dab181d000cca..26000a8b224f0 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/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.16 2004/05/17 11:16:14 tjr Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/btowc.3 b/lib/libc/locale/btowc.3
index 85ee7515f948e..da9d1e5103b52 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 2c4d493b89a1f..44b501e28479e 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 a4eec6b33c178..abc5f24bcd30d 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.32 2002/10/29 09:03:57 tjr Exp $");
 
 #include "namespace.h"
 #include <arpa/inet.h>
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index ce03e748742e8..4d55f9ce56059 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.14 2002/08/30 20:26:02 ache Exp $
  */
 
 #ifndef _COLLATE_H_
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index 480be8293f91d..8cbd213f2f4b8 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.17 2003/08/03 19:28:23 ache Exp $");
 
 #include <string.h>
 #include "collate.h"
diff --git a/lib/libc/locale/ctype.3 b/lib/libc/locale/ctype.3
index 44aeac7f3bdb7..ab993754c130d 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 672e2460ab4ff..9f49a46feec30 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 d4e128b416736..3a4a689f13016 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 9b0b7e553a79d..3811156c9b19e 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.20 2004/06/23 07:01:43 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
index 2e5bc047d592b..ab08f3f2cbd5c 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/frune.c b/lib/libc/locale/frune.c
index 996bf120f1b55..34d4a56d0cb32 100644
--- a/lib/libc/locale/frune.c
+++ b/lib/libc/locale/frune.c
@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)frune.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/frune.c,v 1.5 2003/10/31 10:55:19 tjr Exp $");
 
 #include <limits.h>
 #include <rune.h>
diff --git a/lib/libc/locale/gb18030.5 b/lib/libc/locale/gb18030.5
index 3a296c017844d..5e708652d3811 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 5542f6cb1ae43..192b0f635b580 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.6 2004/05/12 14:09:04 tjr Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/gb2312.5 b/lib/libc/locale/gb2312.5
index 5f1f712097d54..1524462b72ed9 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 e30755bd3f39c..4cf94b7c35382 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.8 2004/05/12 14:09:04 tjr Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/gbk.5 b/lib/libc/locale/gbk.5
index cec22c6395408..c1f2539839a51 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 6f377ef201d5e..6adcc41316759 100644
--- a/lib/libc/locale/gbk.c
+++ b/lib/libc/locale/gbk.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.11 2004/05/17 11:16:14 tjr Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/isalnum.3 b/lib/libc/locale/isalnum.3
index 643a97916d00d..4f2d92d39d7d0 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.18 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISALNUM 3
diff --git a/lib/libc/locale/isalpha.3 b/lib/libc/locale/isalpha.3
index 2e1ead270f43a..3fbb8ec895d82 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.17 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISALPHA 3
diff --git a/lib/libc/locale/isascii.3 b/lib/libc/locale/isascii.3
index a031d8b3f2e5e..b93040190e72f 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 d8bfb8ebaa2c3..1fdbdc66a7b93 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.18 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISBLANK 3
diff --git a/lib/libc/locale/iscntrl.3 b/lib/libc/locale/iscntrl.3
index d3ea5aa5354d2..fcf5d77850257 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.16 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISCNTRL 3
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index d25772bec279e..d718b773af2bb 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 1d5eadd615687..e40d663441c32 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.18 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISDIGIT 3
diff --git a/lib/libc/locale/isgraph.3 b/lib/libc/locale/isgraph.3
index 39da046111b70..c0e6ccd5550e2 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.18 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISGRAPH 3
diff --git a/lib/libc/locale/isideogram.3 b/lib/libc/locale/isideogram.3
index cbaa625e91dff..e4fe16ba0cd68 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 5a818d71ebaab..47fddcb5b5905 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.16 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISLOWER 3
diff --git a/lib/libc/locale/isphonogram.3 b/lib/libc/locale/isphonogram.3
index b0d82c428cba3..66bd0062c3994 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 ace183a56c09e..97030fdd842d1 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.19 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISPRINT 3
diff --git a/lib/libc/locale/ispunct.3 b/lib/libc/locale/ispunct.3
index 96b2c4fec58a2..f7611910096a3 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.17 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISPUNCT 3
diff --git a/lib/libc/locale/isrune.3 b/lib/libc/locale/isrune.3
index 424c367d20144..2b1f64f6cb352 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 a808371de224b..7882aff67f7d0 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.16 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISSPACE 3
diff --git a/lib/libc/locale/isspecial.3 b/lib/libc/locale/isspecial.3
index de361d28f96ba..57eefc8221c35 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 c3c187a98c65d..5e3d8f2c79c35 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.17 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISUPPER 3
diff --git a/lib/libc/locale/iswalnum.3 b/lib/libc/locale/iswalnum.3
index 8a2053286a289..4aafb25feec59 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 05d13299fcaed..37e2656d9ebd0 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 4019d69b9ee41..9d08a62c81c3f 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.19 2004/07/29 23:32:41 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt ISXDIGIT 3
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
index ea7b3886ada83..932165ff67e42 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 45f7339fe8fb8..02e0c9502b09a 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 3498be2a6e8e9..488b5728c332f 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 41dcfa98ca6b3..ee690ae7c1cc8 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 8d55ab2c6e5de..e3e709585c323 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 45ec3235b5780..e278ea5135118 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 d4ed04f659453..ff9c94871e6a5 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 cc6965b62cc74..9678c1f02c1a0 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 d3a5783a8dfdc..c73d59e1fc537 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 97c22dd1d1340..1420aa88f578c 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 26f2c52beb6a9..fbe01a9dc6527 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 4a2cc5cbcde8b..2891e90e99bd9 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 3727b72c0742c..9b89a4461b10a 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.3 2004/07/21 10:54:57 tjr Exp $
  */
 
 #ifndef _MBLOCAL_H_
diff --git a/lib/libc/locale/mbrlen.3 b/lib/libc/locale/mbrlen.3
index 524d2c7b4016f..ce33175353b5a 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 b4c3a04694d41..33f7ea02c0b37 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 10160d1916fd5..ab7138eb54173 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 42d5f7a178d61..9b19d1046b51c 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/mbrune.3 b/lib/libc/locale/mbrune.3
index 8dbd846503ab7..33d948329c8af 100644
--- a/lib/libc/locale/mbrune.3
+++ b/lib/libc/locale/mbrune.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mbrune.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbrune.3,v 1.16 2003/11/15 02:26:04 tjr Exp $
 .\"
 .Dd April 19, 1994
 .Dt MBRUNE 3
diff --git a/lib/libc/locale/mbrune.c b/lib/libc/locale/mbrune.c
index 8fcf8c17ea06a..caff65e01b371 100644
--- a/lib/libc/locale/mbrune.c
+++ b/lib/libc/locale/mbrune.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)mbrune.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbrune.c,v 1.4 2003/06/13 07:13:54 tjr Exp $");
 
 #include <limits.h>
 #include <rune.h>
diff --git a/lib/libc/locale/mbsinit.3 b/lib/libc/locale/mbsinit.3
index afc2500c3a771..e2a9e46143b0e 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 24408c7f573e7..cddb56726acdd 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 5284087fb4c1c..3e65b154b58b5 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 f54e419139e24..05f2e1aae9e72 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.5 2004/07/21 10:54:57 tjr Exp $
 .Dd July 21, 2004
 .Dt MBSRTOWCS 3
 .Os
diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
index 1239c82c337ff..12feaab5ead0d 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 2e344f8a4b2bb..634d972314a15 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 ad259d84dab37..ab2e849eeb7d1 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 1d5783a929867..c4bea65b66893 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 ad5b735256351..5e3a3683e62bb 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 8ebaccdd7af2b..29802d5a70151 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 5c9a303dbfaa6..c84661aac94ee 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/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.16 2004/05/14 15:40:47 tjr Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index 6047113856154..07f1c6570fc91 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.26 2004/06/30 20:09:08 ru Exp $
 .\"
 .Dd April 8, 2004
 .Dt MULTIBYTE 3
diff --git a/lib/libc/locale/nextwctype.3 b/lib/libc/locale/nextwctype.3
index 2d9acd1f90185..2af82895cfe59 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.1 2004/07/08 06:43:37 tjr Exp $
 .\"
 .Dd July 8, 2004
 .Dt NEXTWCTYPE 3
diff --git a/lib/libc/locale/nextwctype.c b/lib/libc/locale/nextwctype.c
index 9363b0a700ccc..89c63df81889f 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 57071c456c5c7..3fc47e0ece4b9 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.5 2003/09/08 19:57:14 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 9bd508214e4b7..22d27a3e450f8 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 ba49a1fe0b378..eea37d01674a0 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 d964233e45e0f..0514bc4632ca7 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.12 2004/07/21 10:54:57 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index debb26e42b8c3..3ba94f7f18ab3 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rune.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/rune.3,v 1.25 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd October 6, 2002
 .Dt RUNE 3
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index d179da101acc7..e5ecfe8b3323c 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.12 2004/07/29 06:16:19 tjr Exp $");
 
 #include "namespace.h"
 #include <arpa/inet.h>
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index be40d05e518b1..2536c557bd53e 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.11 2004/07/29 06:16:19 tjr Exp $");
 
 #include <stdio.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/setinvalidrune.c b/lib/libc/locale/setinvalidrune.c
index 90fb5f13aacfd..97f0fc245bdb2 100644
--- a/lib/libc/locale/setinvalidrune.c
+++ b/lib/libc/locale/setinvalidrune.c
@@ -38,7 +38,7 @@
 #define	OBSOLETE_IN_6
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/setinvalidrune.c,v 1.4 2003/06/13 07:13:54 tjr Exp $");
 
 #include <rune.h>
 
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index 278e18d50d1e9..948158b93c8bb 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.31 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd November 21, 2003
 .Dt SETLOCALE 3
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 92c5dd3aa1f33..e42f53a6a20a2 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 33b4b6e9aeeab..82462ee8de6fc 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 4c19ff76a178c..66861ab9c0047 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -38,7 +38,7 @@
 #define	OBSOLETE_IN_6
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.40 2004/07/21 10:54:57 tjr Exp $");
 
 #include <rune.h>
 #include <errno.h>
diff --git a/lib/libc/locale/srune.c b/lib/libc/locale/srune.c
index bb9326f25f11a..75ec833a8c6f2 100644
--- a/lib/libc/locale/srune.c
+++ b/lib/libc/locale/srune.c
@@ -28,7 +28,7 @@
 #define	OBSOLETE_IN_6
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/srune.c,v 1.4 2004/05/12 14:09:04 tjr Exp $");
 
 #include <limits.h>
 #include <rune.h>
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index dfac185442f15..b6731840b39a8 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.25 2004/07/29 06:16:19 tjr Exp $");
 
 #include <ctype.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/toascii.3 b/lib/libc/locale/toascii.3
index 975b320ab1508..b1a2425e73243 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 394895eaccefe..bb2c801e2c2d4 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.15 2002/10/03 11:14:00 tjr Exp $
 .\"
 .Dd October 3, 2002
 .Dt TOLOWER 3
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index faace3e73b985..24694e766031e 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 9d6d3ba3bd37a..f0fddf9368c24 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.15 2002/10/03 11:14:00 tjr Exp $
 .\"
 .Dd October 3, 2002
 .Dt TOUPPER 3
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index aca1ca1657dc0..bb7f36a9e6b3d 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 63d643165f1b7..6bdd3c85f3d78 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 0fdefa9547c50..c771998dc1c4c 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/utf2.5 b/lib/libc/locale/utf2.5
index 1b10ff240796a..de0721a883345 100644
--- a/lib/libc/locale/utf2.5
+++ b/lib/libc/locale/utf2.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)utf2.4	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/utf2.5,v 1.14 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd October 11, 2002
 .Dt UTF2 5
diff --git a/lib/libc/locale/utf2.c b/lib/libc/locale/utf2.c
index cf0e3c89c1885..14c2b018c74a5 100644
--- a/lib/libc/locale/utf2.c
+++ b/lib/libc/locale/utf2.c
@@ -37,7 +37,7 @@
 #define	OBSOLETE_IN_6
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/utf2.c,v 1.13 2004/05/12 14:09:04 tjr Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/utf8.5 b/lib/libc/locale/utf8.5
index f142b63509bd7..1b8d45af0448c 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.5 2004/04/12 12:58:41 tjr Exp $
 .\"
 .Dd April 7, 2004
 .Dt UTF8 5
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index 8ef7b9af2782b..26f89f79f2bf0 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.11 2004/07/27 06:29:48 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcrtomb.3 b/lib/libc/locale/wcrtomb.3
index c89614e2d34b0..432eddf34f81a 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 ef75b78f37603..4d7b115067222 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 92aee9313f592..5f29f39c7130e 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 7a54fc053c5a7..2598043e64413 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 68d6b5ceae02e..6de6ff946e02f 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.2 2004/07/22 02:57:29 tjr Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/wcsrtombs.3 b/lib/libc/locale/wcsrtombs.3
index ff607c2dad11e..b38f3a4527b70 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 f3b38b71c4d82..61e5432de749b 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 f8c5135ee86b5..e63a2c8e68804 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 68df1eddfeddb..da90f16c28f47 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 ba238d459031e..a68b382d989c2 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 0dadd5a13e290..09e7817f46e8c 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 e69a72672d545..306f223022262 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 fcf220ef391af..ae51c2e44b2f4 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 cf9d87464c5df..c50ffbdf6bca3 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 feddbdfad4bd1..a48056cddc8d1 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 0cb712a49a237..ee995bb9d01b2 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 acd0051463b3e..b798c9e1a5e53 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 4be83a3ff724a..f3b8b492a3eaa 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 e57a37a13195b..fd9558beb286d 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 9793ba3098d77..01e25d528d598 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 cb39adc451417..a8f00560b0d3d 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 a669f0e4d5155..b7de6e5428a23 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 77b9043d61e10..701b3ca4cc61f 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 ce3e68c9eb340..0f2bc650b9c7f 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 6813e3304629f..a86e5c782987e 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 6dec7bbef3d63..30409f3a8db36 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 f9aa8dd2fe48c..a0e21bc87a781 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 0c7c74fed155c..026813f201385 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 f7dababfd7961..288a60db6dbad 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 9b94ed34bae5a..c066496924549 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.51 2004/05/26 22:58:05 brooks 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 b24c44e4887e9..95aa886e8122d 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.15 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd June 13, 1996
 .Dt ADDR2ASCII 3
diff --git a/lib/libc/net/addr2ascii.c b/lib/libc/net/addr2ascii.c
index 4fad6a8a49a17..708b0f594f189 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 5167a51366989..bf2263b03c1cd 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 43350303898ec..0facc934e34e6 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 e10613d4b4930..52faf91c032ac 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.11 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd May 11, 2002
 .Dt BYTEORDER 3
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index e8bc8ba39ddf9..08d6ca3c39003 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 4f774e52ad149..5c5cf5c6f6ac0 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.22 2003/09/08 19:57:14 ru Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 3
diff --git a/lib/libc/net/eui64.3 b/lib/libc/net/eui64.3
index 7a500dd09a386..a162c5a1263a8 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.3 2004/07/07 20:15:31 ru Exp $
 .\"
 .Dd March 4, 2004
 .Dt EUI64 3
diff --git a/lib/libc/net/eui64.c b/lib/libc/net/eui64.c
index 50851674de69a..e842903ee5429 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/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index e44a947112773..b2d29213b3290 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.26 2004/08/06 15:29:54 roam Exp $
 .\"
 .Dd August 6, 2004
 .Dt GETADDRINFO 3
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 6508024d6cb01..f8c6f9a804572 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.52 2004/06/16 16:41:23 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index 7dc405d6bfa2d..54f2a9b4734fb 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.46 2004/07/21 17:26:40 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 e4320fd8a2cca..76d7a6b0f89e8 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.16 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 8fb1e96e270ec..debefa0f0afbb 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.32 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd May 25, 1995
 .Dt GETHOSTBYNAME 3
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 88bd310b8dca7..9ff607d3edc26 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.17 2004/02/25 21:03:45 green Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index f5c3382ffc8ff..d43083bff8087 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.22 2003/06/19 07:57:11 kris Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index 83877239aa394..99c456539d93b 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/net/getifaddrs.3,v 1.8 2004/07/02 23:52:11 ru Exp $
 .\"	$KAME: getifaddrs.3,v 1.4 2000/05/17 14:13:14 itojun Exp $
 .\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
 .\"
diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c
index 41ef3f464ab6f..81f365e8a90af 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 613a187eabed2..39a28f379054c 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.2 2004/07/05 07:21:55 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt GETIFMADDRS 3
diff --git a/lib/libc/net/getifmaddrs.c b/lib/libc/net/getifmaddrs.c
index 40475ae19fed4..45382b197ff66 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.1 2003/11/14 18:53:22 bms Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/getipnodebyname.3 b/lib/libc/net/getipnodebyname.3
index 241b6fac22f7d..666d439df227e 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.15 2004/08/06 15:29:54 roam Exp $
 .\"
 .Dd August 6, 2004
 .Dt GETIPNODEBYNAME 3
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 796531831a92f..834bf85b706ab 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.18 2004/08/06 15:29:54 roam Exp $
 .\"	$KAME: getnameinfo.3,v 1.17 2000/08/09 21:16:17 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index cee07f6e0fe73..9808bbcf45641 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.14 2003/05/01 19:03:14 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index 60c79a783c4f5..887d9bf5f8259 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.28 2004/02/07 11:13:47 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index 6eaebc52a0a68..b63036d0782b2 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.10 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index abeb09349953e..11c5b9710b95c 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.15 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetent.3 b/lib/libc/net/getnetent.3
index b6cd94424afd2..f2fe486792702 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.19 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETNETENT 3
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 002765af9e891..22eeff6cb9d5b 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.17 2003/04/24 18:05:48 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
index b22bc518d478e..71907ff7ef5d6 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.3 2002/03/21 18:49:23 obrien Exp $");
 
 #include <netdb.h>
 
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
index 7811c788c6a55..731a981d208d5 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.9 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPROTOENT 3
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
index c8f1ad483e822..0580556133efd 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.2 2002/03/21 18:49:23 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
index 7039b0adf8196..5632357cb33a8 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.3 2002/03/21 18:49:23 obrien Exp $");
 
 #include <netdb.h>
 #include <string.h>
diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c
index 79769f6ab32c0..47e96d11e1a8e 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.4 2002/03/21 18:49:23 obrien Exp $");
 
 #include <netdb.h>
 #include <string.h>
diff --git a/lib/libc/net/getservbyport.c b/lib/libc/net/getservbyport.c
index 2efb60f881c74..ce4a57c6713ba 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.4 2002/03/21 18:49:23 obrien Exp $");
 
 #include <netdb.h>
 #include <string.h>
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index 26399b5cf208c..cba03d0cd4dba 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.13 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd July 9, 1995
 .Dt GETSERVENT 3
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index a89bc51739663..9e117efe2cdca 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.12 2003/02/27 13:40:00 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/herror.c b/lib/libc/net/herror.c
index b84c06c1069fc..5f46bfc5b4fbd 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 d91db9ed805b4..860755b7db990 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.4 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd November 30, 1996
 .Dt HESIOD 3
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index c22bdbad836b7..3afa0ab9c3a67 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 b1d1688081e5e..6862a6c6ae1a8 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 4dadce351ad96..33888cdb3c680 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 7a12d34b58e7c..f190f23f8b828 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 d0ca5212755df..e94463468ee51 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 21d0d71da9c8d..e1b0c1a8db9a8 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.29 2004/07/02 23:52:11 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 88dd4837c7042..d8a8598aa10fe 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.4 2004/07/05 07:21:55 ru Exp $
 .\"
 .Dd February 5, 2000
 .Dt INET6_OPT_INIT 3
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index c050aec9207d8..284ec6b993047 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: inet6_option_space.3,v 1.4 2000/02/05 10:32:24 jinmei Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.12 2003/09/10 19:24:32 ru Exp $
 .\"
 .Dd December 10, 1999
 .Dt INET6_OPTION_SPACE 3
diff --git a/lib/libc/net/inet6_rth_space.3 b/lib/libc/net/inet6_rth_space.3
index 34e3f26a86267..0e75912ac2b35 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.4 2004/07/05 07:21:55 ru Exp $
 .\"
 .Dd February 5, 2000
 .Dt INET6_RTH_SPACE 3
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index 9c3e5be85fd56..c0d55b8b33e72 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: inet6_rthdr_space.3,v 1.5 2000/02/05 13:19:07 jinmei Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_rthdr_space.3,v 1.11 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd December 10, 1999
 .Dt INET6_RTHDR_SPACE 3
diff --git a/lib/libc/net/inet_addr.c b/lib/libc/net/inet_addr.c
index eb97f84513e56..d53c9ea14dc46 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 e45ea6e224f69..d107b27d6db38 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 4e975138c8f01..27544e7fd5ec5 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 9ca00a6e86a74..220075f8693db 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 8f3b1d78a2207..b97428acaa8d5 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 3a71454176635..6958f17290008 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 c918962779094..43b4af15c7f00 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 336eccdc3875d..1f829a4fbfe66 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 631cb6a1e3cae..92ff831da0ea5 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 00f5492cdaaf6..326a76a65ba57 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 d73a33cf2ceeb..7c4652dd8de77 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 65f28cfd02bf3..487e246f26362 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 2002/09/06 11:23:49 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index 73f7e3af57aba..542a39742c63e 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 2003/11/14 18:07:50 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
index 1f1c21f6b4507..5008a8526c33e 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 c23559a16b0b4..0161558ca9752 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 c8aaa3a04b807..83ce54ae16fd6 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.8 2002/06/26 08:18:05 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 8d7152ef5c617..c333a4093ff97 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -94,7 +94,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.39 2004/07/21 17:26:40 ume Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/ns_name.c b/lib/libc/net/ns_name.c
index 5422875cc0c6b..6c0aad48d29e1 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 845a07e94677e..3b4b1a5f93371 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 7b32fa4ce98a6..3dce2a4aa3885 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 52e5b03c22edd..a4433eb1bcbc1 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 79083b2e618c8..86392dd1cdd46 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 61b315fd270b8..8fc9d2624a808 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 09566dc6ffa53..92b1e06479cd1 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.11 2003/05/22 13:02:27 ru Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index c9be76396567d..8aa7040ea14a2 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 34c79d9259646..f87d66b44bb57 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 4806dea84628a..a013a72b66b41 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 9bea37b1c24b0..e39a25a19fd46 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 09a2d4f8f5cc6..135bad40a3e2d 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 3673c81cac68e..4b4953938ebd1 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.23 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 3, 2000
 .Dt RCMD 3
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index fcdd639dfa809..2490f73d7f106 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.38 2003/02/18 13:39:52 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/rcmdsh.3 b/lib/libc/net/rcmdsh.3
index 91b81b98e7fe0..8a11cc4811cfc 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.5 2002/12/19 09:40:22 ru Exp $
 .\"
 .Dd September 1, 1996
 .Dt RCMDSH 3
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
index bc4e87af9faff..8d93bcbeefd22 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 267e171cae532..ee3509e7ae7cd 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 ef99c22335221..761a4b5fccd71 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.17 2002/03/22 21:52:29 obrien 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 b17fd2de594d1..b7deb38f96321 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 70a7d9e2ad746..675f0251f0ddd 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 3481419b5ab15..0b648d3a30f5e 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 1d48f606d1561..fbc2c88c7eca4 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.32 2004/02/25 21:03:45 green 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 7ef1ace2f3f0b..3ca9e0da8fa0a 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 67513389de301..3537b30909e2b 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.5 2003/02/18 13:39:52 nectar 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 68ac05cb4a634..e45cf6840956e 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.29 2004/04/21 09:50:52 ru 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 6885ffd0dc027..8f913439e55c2 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.48 2004/03/15 17:08:28 des 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 df96dda276088..22c53b2b1a0fb 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 fda6f776d276f..6f805d2c524b7 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 49257bf7b7a97..929c8c17f5b2c 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.28 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RESOLVER 3
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index d7b0077f606e1..96234ca8a6278 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 2003/10/24 18:26:28 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
index f10d21be2cf62..8874f46e8facf 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 61a1a9f529895..0bb8745679494 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 e416de80a9ca8..497ce7f3ab834 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 42ee2054d4e7d..8181b8193324c 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/Makefile.inc b/lib/libc/nls/Makefile.inc
index 9adab3d647fad..4cfb27c83963d 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.8 2002/11/18 09:50:55 ru Exp $
 
 .PATH: ${.CURDIR}/nls
 
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
index 733face81fc66..7ac7172bf9d79 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.14 2001/10/01 16:08:56 ru Exp $
 .Dd May 29, 1994
 .Dt CATCLOSE 3
 .Os
diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3
index 592f57cca28a7..905e2cb713671 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.11 2001/10/01 16:08:56 ru Exp $
 .Dd May 29, 1994
 .Dt CATGETS 3
 .Os
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
index 9fd8b826f9f4c..ad75519fa78ee 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.16 2001/10/01 16:08:56 ru Exp $
 .Dd May 29, 1994
 .Dt CATOPEN 3
 .Os
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 86fba82692cfe..9b61cc9965b5b 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.48 2003/10/29 10:45:01 tjr Exp $");
 
 /*
  * We need a better way of handling errors than printing text.  I need
diff --git a/lib/libc/nls/msgcat.h b/lib/libc/nls/msgcat.h
index f13d88823110e..df2bf5a8780d3 100644
--- a/lib/libc/nls/msgcat.h
+++ b/lib/libc/nls/msgcat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/nls/msgcat.h,v 1.8 2000/09/03 21:05:10 ache Exp $ */
 
 #ifndef _MSGCAT_H_
 #define _MSGCAT_H_
diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc
index 872b6ae488199..ac09937531803 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.16 2004/06/17 16:08:36 rwatson Exp $
 
 MAINTAINER=	rwatson@FreeBSD.org
 
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index 1c824d047e705..eed1b9968d149 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 43d04f11fb0a8..13a7047067fc5 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 48d2678c2f5dc..6a540e5fc3f86 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 7e2f955803180..86c198e12dcd1 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 db026a3abcf4f..ba24470b5dfbd 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 6d1e0a86736b9..137394484707d 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 fead89ffe431e..1656a4a4d9d10 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 fb856ad77bcbc..8fdfeccb9515e 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 fb2958b73e498..347a885a4112f 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 a93cd7b2ec9dc..106242e456876 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 a931db03f04ae..46ace13695ee9 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 3195fac65a30e..2a0c5f92c6bb1 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 0740d61333759..f7919ce6ce803 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 ae4ff4f7b4745..be42e4e5c9daf 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 f5bdbede9c5cf..437acfd17f51d 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 d64c72a7c7e27..654e57a016829 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 6de41da8abfbb..316c77cabd895 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 8b10784e502b3..0be44862f9156 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 59d9142a52838..6a427b579faea 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 fa915df3ec48e..114d761d834d0 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 1f97baaecabc9..a5d8da158c3ca 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 0627ecbd6b04d..8a433248ef479 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 2004/07/02 23:52:11 ru 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 7fe6c9c5b7bad..d576ef9c19cc1 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 403b10a059042..e75437cc08e66 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 867809e52da69..3b2a1835ac3b0 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 ff225114a3949..47b81cf73c86e 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 dba89231c44a2..44db86ec374ce 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 6ce40de479694..c766ecda0ff6a 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 c3375e000c213..06f0697215754 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 a2d50b840dde7..e5280908a9cf9 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 34d5a336e093f..65a1d07b57255 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 152e226d5b977..222cb408a6aab 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 3442a823f9ec2..ed4091e4f19ab 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 3830be7c1d7ff..04b4aa29636dc 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 e8bd0a423fbfa..a7a4e3ccc304d 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 61e4cf9ee8d97..b1e6452e1d57d 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 6cccf0b434f9f..6960ad5da9a5f 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 833a6d2a575d8..0da6278a3ea67 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 f2905c3a05c52..0368280644003 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 e525db6e59a89..6ef2be00e58ce 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.15 2004/07/02 23:52:11 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 9b1f9b96c4d2c..2c35a0a730979 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 5e606861c6227..f37f7dfb121af 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 e9d28a3e48265..8e7046cecf9f5 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 7a255423695db..4fcb920cd8940 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.13 2003/05/22 13:02:27 ru Exp $
 .\"
 .Dd April 19, 2003
 .Dt MAC 3
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index ded9059cdc6cc..2d17148f83d29 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 4fa58ae60f3f0..0edb84793c7c7 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.4 2003/05/24 19:50:43 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 fb3f994114db4..b7325aca8fd11 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 33ef9ec785a8a..c9673fde4f5a2 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 cd498d0e4e7d5..832bea5b90e59 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 bbfe7ede3878c..ffdcf63257ede 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.4 2003/11/16 20:18:24 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 6466488d7752d..a8ee0ead60a28 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 597ce028230cd..22496efae8593 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.5 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd August 22, 2003
 .Os
diff --git a/lib/libc/posix1e/mac_set.3 b/lib/libc/posix1e/mac_set.3
index 175a25a11556e..2337651c2d4b6 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 4353ee64f1d8b..4b1c7d9364ee7 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 068533a215a66..20a5039c488c5 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 84f892826f407..0f9c338702d16 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/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index c2e2255619345..94396d6e81267 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 d0cd68a15f00f..57397eebadc1f 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 8992c7cfd5fc9..5e27a92f0d3c7 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 9fdf16c4a3adc..d97059e27da3a 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 37a3e7750b86c..7d58cf17c23c2 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 85dcb908ac053..6e9d493ae6867 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 62bb90695dcc6..0d57b20edd273 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 7e4d5f73be2f5..495a8eece3a24 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 5390e07a33393..a8290d8237f35 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 fa947efdf784a..10c2d51c86ac1 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 953c6b6b54ad5..647a4a1ce0a4a 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 632b1967e98d9..694cd6229669b 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 928e251ecea87..1263feea33dd6 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 59ceb150a6dc1..ba0b6a79a1abe 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 ef53b6b7a8caf..bac96c288c85f 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 f149dc3ce479d..66bf63bf1d022 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 d41a53ec837b6..be16676f56156 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 aab64f8342b82..261f4b0a8a0a1 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 a31f3e1323b2a..9f35ed6311ec4 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 410e6d66d12b0..7a51dd34faace 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 38cc42ea83a15..cc0c887af1fa7 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 657319fa536ea..f1de706077fab 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 80d082ca68320..354abe56d03b1 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 9176b8e5cf420..b57077afd4733 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 fd1f5cc8824df..60a2ffb400e56 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 1c5690a085cf8..64adfdadfcabf 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 83f919546b44c..d5958baab2a93 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 54a539cefafb0..f7ce83afce6d3 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 ecc5bdc7d973e..12703c76fe09e 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 b10aee92910ac..73594de90564b 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 221400dbaea2d..e89b466aa34d3 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/cclass.h b/lib/libc/regex/cclass.h
index 32a25fa360172..956a655fa3363 100644
--- a/lib/libc/regex/cclass.h
+++ b/lib/libc/regex/cclass.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cclass.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/cclass.h,v 1.4 2002/03/22 23:41:56 obrien Exp $
  */
 
 
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
index b03085e485cc5..4f0d583d291e5 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 e6484ef6b8ba0..6ab6732ce036f 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.14 2004/07/12 07:35:59 tjr 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 3e4172432f1c9..be00e5d00ed14 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 caa2ca39612d3..74bca46573311 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 6b2bf386eed4f..b43c0eb4f595d 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 1deba7983d5ce..72bf2215d05c3 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 70e0ec5fca904..fbc8b012b9994 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 07e9dfb8539d3..7b7922b640781 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 d4555a02d0a68..4527043f2a7d6 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 ace6d0a46f67f..d2081c0323072 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.32.2.1 2004/09/08 04:42:46 tjr Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index 7942ef706940f..4e43f3dd5045b 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 f10b8412fc538..33fed75094ee1 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.17 2004/07/12 11:03:42 tjr Exp $
 .\"
 .Dd July 12, 2004
 .Dt REGEX 3
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 6beea48e3050a..c971c9c3b968e 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 c596bdd1628cd..c570369623e95 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 b1e6a359a1d7f..110879e637abe 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 9d6eba3cf8cb9..5439b6cd45e99 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 9a3a99161ae8c..738db7df82982 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 5f1205c7052d1..6914461a79048 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 96b004b1d5200..9153ad42fd7bf 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 13d761908a8ee..75c25a6723ad2 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 8b791309747e3..1fbde7d3fd5b1 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 9a948bd445dc4..a7652c0b8d195 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 e663e7fd4f941..de4f1ac05ee97 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 78b0a2c815d34..d715d3a4afe14 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 260c7f37eb050..55f26c604c973 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 480a339bce570..aa09e2d433d01 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 c915fad283c6e..45bbd529627c0 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 a8f3b27686654..5cfa76e3b3c44 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -57,7 +57,7 @@
 /* from: 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.8 2002/03/22 23:18:35 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 e766343125c24..f673f7df1131f 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.12 2002/03/22 23:18:35 obrien Exp $");
 
 /*
  * auth_none.c
diff --git a/lib/libc/rpc/auth_time.c b/lib/libc/rpc/auth_time.c
index 0bebea6127924..01e5aed8f3f7d 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.10 2004/01/06 18:45:58 nectar Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 4885ece05636e..6e80a2d2a142f 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.15 2002/03/22 23:18:35 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 19969b01819af..b9069c5a30673 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 45077e70da47f..6431780d4453b 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.8 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * authunix_prot.c
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
index 28e86e5f2a6fa..92ebf56b551cf 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 537ab51216d25..5edbe414f01ea 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -35,7 +35,7 @@
 /*from: OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.15 2002/03/22 23:18:36 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 d827820bf6085..783de60377cca 100644
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -38,7 +38,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.7 2003/01/27 22:43:23 mbr Exp $");
 
 
 /*
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index 8b98c47a17b17..270ba33112514 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -38,7 +38,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.16 2003/10/29 09:25:07 mbr Exp $");
 
 /*
  * Implements a connectionless client side RPC.
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index d249df677cf8d..81b438335d236 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -53,7 +53,7 @@
 /*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.14 2002/07/11 16:23:04 alfred 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 21fd7cb83e172..9853cf4c8cce8 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -35,7 +35,7 @@ static char *sccsid = "@(#)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.16 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * clnt_perror.c
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index a8e11c516df22..3898991be85fe 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.18 2002/07/14 23:14:02 alfred Exp $");
 
 /*
  * clnt_raw.c
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index cacecaf895f3a..84fc5bc30c439 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -37,7 +37,7 @@ static char *sccsid = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micr
 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.18 2003/10/29 09:18:44 mbr Exp $");
 
 /*
  * clnt_simple.c
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index f1a8e2010da98..2178413122bfa 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 sccsid[] = "@(#)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.16 2004/08/13 23:22:38 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 255b266f0567b..cdb5a0dc991ae 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 b40a62c4ae298..51ebe40d83b64 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 13fd812770aff..fc5e55dbc0ab8 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.7 2002/03/22 23:18:36 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 0f31360ecc7ee..1c6774e0b43a9 100644
--- a/lib/libc/rpc/des_soft.c
+++ b/lib/libc/rpc/des_soft.c
@@ -2,7 +2,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.2 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/getnetconfig.3 b/lib/libc/rpc/getnetconfig.3
index e67b9bbb75c9b..d6c2e5c38608c 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 ea140d437bf97..bf55bef7a4e33 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -35,7 +35,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.10 2004/03/05 08:10:17 markm Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getnetpath.3 b/lib/libc/rpc/getnetpath.3
index 5dfe68ad6ec90..c5717063402f9 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 474d3e0fbec9d..a828e4f8ae867 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -35,7 +35,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.4 2003/01/27 22:36:53 mbr Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
index 301b8e5c34d7b..124eae4cdbb29 100644
--- a/lib/libc/rpc/getpublickey.c
+++ b/lib/libc/rpc/getpublickey.c
@@ -31,7 +31,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.6 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * publickey.c
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
index 4d209b593c12e..5bd1e5cc4fea7 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.17 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd December 14, 1987
 .Dt GETRPCENT 3
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index b20d80d3498e8..927dc3f891a5f 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 6e1f199e7b3c0..e28ed3f5fb9fa 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 57634197246b4..024c85d551372 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -35,7 +35,7 @@ static char *sccsid = "@(#)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.12 2002/03/22 23:18:36 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 8263e3aeb7087..6f46e8c359531 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -33,7 +33,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.14 2002/07/14 23:20:08 alfred 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 937083aae808a..e0ce9f1cc40b5 100644
--- a/lib/libc/rpc/key_prot_xdr.c
+++ b/lib/libc/rpc/key_prot_xdr.c
@@ -38,7 +38,7 @@
 /* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.4 2002/03/22 23:18:36 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 023ec6a4c4626..4d1efe17b8525 100644
--- a/lib/libc/rpc/mt_misc.c
+++ b/lib/libc/rpc/mt_misc.c
@@ -3,7 +3,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.5 2003/02/16 17:29:10 nectar Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc/rpc/netconfig.5 b/lib/libc/rpc/netconfig.5
index 25738bcc2efe6..5cbc810a469fd 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 1834689988214..e41cb21459f9f 100644
--- a/lib/libc/rpc/netname.c
+++ b/lib/libc/rpc/netname.c
@@ -31,7 +31,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.7 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * netname utility routines
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 4983b7c4bbc25..5cfef0cb157fc 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -31,7 +31,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.9 2002/03/22 23:18:36 obrien Exp $");
 /*
  * netname utility routines convert from unix names to network names and
  * vice-versa This module is operating system dependent! What we define here
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index d720b1792962f..8cc07fd1c99fd 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.14 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * pmap_clnt.c
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index edc26bfa30fb1..578f78d3918f3 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.15 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * pmap_getmap.c
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index e54d0d5b0158d..5565dbf57f8b7 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -34,7 +34,7 @@ static char *sccsid = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micr
 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.14 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * pmap_getport.c
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index 8daf8441ac1f5..41f204dc31af6 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.8 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * pmap_prot.c
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index 9f3c5c7a162b7..e630344b85340 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.9 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * pmap_prot2.c
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index be62c12f886e2..5078c622b667b 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -35,7 +35,7 @@ static char *sccsid = "@(#)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.19 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * pmap_rmt.c
diff --git a/lib/libc/rpc/publickey.3 b/lib/libc/rpc/publickey.3
index 369ae8be0833d..2bbe9c751b6b0 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 71f4ef6aca404..674ad29b46252 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 81a24ca631636..17a3a5c1cebf7 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 a45cc2da9f4ad..c4059f20161fe 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.10 2001/03/20 08:51:20 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 3a85681db1790..1e3a200d95f8b 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.11 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * rpc_callmsg.c
diff --git a/lib/libc/rpc/rpc_clnt_auth.3 b/lib/libc/rpc/rpc_clnt_auth.3
index 1412c61e481bd..ee8fd1d3f636c 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.5 2002/12/19 09:40:23 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 0626d90869a5c..38b29d5574d17 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.7 2002/12/19 09:40:23 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 2c6047259d3d1..acdbab4529e39 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.12 2003/09/14 13:41:56 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 a7cfd9730d04a..0c6a0688bdbe9 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 679233a9521ef..8f7e897a9c186 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 91c3bb197715e..a4c2cba33f06e 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.14 2002/03/22 23:18:37 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 4baa633154945..e6d78eadb9852 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 0581762ce43a8..ed66095d7e313 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.11 2002/03/22 23:18:37 obrien Exp $");
 
 /*
  * rpc_prot.c
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index 07c6314c9402f..ca131cb71c72a 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 ebc666b7bcec5..59058c06c6b5f 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 9a58fc59246a4..7b0b10ee1fdcf 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.13 2003/05/01 19:03:14 nectar Exp $");
 
 #ifdef PORTMAP
 /*
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
index c3265d8182483..582b45d131532 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.8 2003/09/08 19:57:15 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 4016a6c36b03e..d47be2b2927bc 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 6e26b1ab4bbd9..49139cb0844df 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.4 2002/12/19 09:40:23 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 95756db178c08..56dd530eee43b 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.5 2002/12/19 09:40:23 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 0ae7d73a12c0a..feb708bcede63 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.3 2001/10/03 16:47:56 bde 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 1701ac30f5c04..74394379807e8 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.13 2003/10/29 09:22:49 mbr Exp $");
 
 /*
  * rpcb_clnt.c
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
index 068ea716c4a87..3b478e17d79ce 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.4 2004/02/10 20:40:17 cperciva Exp $");
 
 /*
  * rpcb_prot.c
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
index 7ca2ba94ff749..92f391217df5b 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 b90d461f72a7f..99b03cf552a5e 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.5 2002/12/19 09:40:23 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 2bd1829b747aa..9766efa37ea5c 100644
--- a/lib/libc/rpc/rpcdname.c
+++ b/lib/libc/rpc/rpcdname.c
@@ -31,7 +31,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.4 2002/03/22 23:18:37 obrien Exp $");
 
 /*
  * rpcdname.c
diff --git a/lib/libc/rpc/rtime.3 b/lib/libc/rpc/rtime.3
index 028d2beade14f..6e61350c32bc8 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 62538404c0eed..109bad9a37631 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.8 2002/03/22 23:18:37 obrien Exp $");
 
 extern int _rpc_dtablesize( void );
 
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 9d7435e45ffae..972bb5a7e3ab6 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.22 2003/01/16 07:13:51 mbr 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 f2b4cf9c79d58..2409b1b728813 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -38,7 +38,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.11 2002/03/22 23:18:37 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 84f1e19a17596..7529c2962ae99 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 b53ccdc8086bf..936a48450193c 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -32,7 +32,7 @@ static char *sccsid = "@(#)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.10 2002/03/22 23:18:37 obrien Exp $");
 
 /*
  * svc_auth_unix.c
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index 56955f6d8ac2d..97f12e56ab04c 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -35,7 +35,7 @@
 
 /* #ident	"@(#)svc_dg.c	1.17	94/04/24 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.6 2003/01/27 22:46:50 mbr 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 1ffb9327ee29c..673bfa06c6f82 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -39,7 +39,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.5 2003/05/18 15:07:25 mbr 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 930c863a13f00..743015827e1dc 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.13 2002/04/28 15:18:46 des 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 8b65475e15e34..97f2cacc1a134 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -34,7 +34,7 @@ static char *sccsid = "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.18 2003/02/27 13:40:01 nectar 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 2acae4b3a5ff2..008af575e926d 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 283b250d6ea2d..27fa0c42e1b1d 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.23 2004/08/13 23:22:38 stefanf Exp $");
 
 /*
  * svc_vc.c, Server side for Connection Oriented based RPC. 
diff --git a/lib/libc/sparc64/Makefile.inc b/lib/libc/sparc64/Makefile.inc
index ebac893acc80f..0b4c48a5048f0 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.2 2002/03/05 00:00:40 tmm Exp $
 #
 # Machine dependent definitions for the ultra sparc architecture.
 #
diff --git a/lib/libc/sparc64/SYS.h b/lib/libc/sparc64/SYS.h
index 6fe4ccdb29d96..46d11e2b7fb19 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 ba8c403af0838..d0e867cff3955 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.3 2004/01/18 07:57:02 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/sparc64/arith.h b/lib/libc/sparc64/arith.h
index 3c35b80f35c33..a32a3420fcacb 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 1974d8a0b3193..eb9d3a5369618 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 63a3c0d2ec2cf..db11b1773ccfb 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 405b9b83bed56..0ccffceec21da 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 9cb7488454df3..e0b30a10e6795 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 428e8d39990ff..58caddffc27f9 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 a7b4782961b90..9bc6396493d07 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 51996b16e3c22..53e4e2f3718aa 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 7c1f3eb5a716f..b2b8f57fd51c7 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.5 2002/05/11 21:20:04 jake 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 f22c46300a55e..abc0fe3287cdf 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 2c3475ee52b77..0a41bb37decfa 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 0bdb6ff52c343..23d2e9e41af92 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 9e3bedc0f4436..9d18b9da53721 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.5 2004/03/16 20:42:02 des 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 781b4fec8f9cb..0c3093b2679e3 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 b8b72291b71fd..5a91dc2751ddf 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 c35e2bc7a72e8..30e36d100af0a 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 7e6308ff129eb..3fc7534b48b9d 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 c228fc0330370..2cd62a1fcff43 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.11 2004/08/15 16:18:03 dfr Exp $
 
 SRCS+=	_ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \
 	fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \
diff --git a/lib/libc/sparc64/gen/_ctx_start.S b/lib/libc/sparc64/gen/_ctx_start.S
index 4ba3fd80624b3..c35c0e55853a0 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 6255fd33ce1d4..a6ea1d0da5eae 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 c48876e89d1eb..cf182adbde9fc 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 7b205db2b6903..f3477bb3d6540 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 bbc744af8a8b6..c711689a97379 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 75fceb6b48f65..f110e600c3129 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 b0b7ddec11ce1..aaea084d309b6 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.1 2001/10/26 05:40:07 jake 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 05b151af0d104..1dbdfd012666c 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 dbc90d728bd19..949e9ae487ee6 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 274566acd48a3..842cf5ddc14b6 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 9aefb137837a4..dd95579bf0e40 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 1e27f596c16c0..1bca4d0066d44 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/fpsetsticky.c b/lib/libc/sparc64/gen/fpsetsticky.c
index 61d3d1bf3472c..4e83e75bb461f 100644
--- a/lib/libc/sparc64/gen/fpsetsticky.c
+++ b/lib/libc/sparc64/gen/fpsetsticky.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpsetsticky.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 6d0d9344b1904..fabc24517abc6 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/ldexp.c b/lib/libc/sparc64/gen/ldexp.c
index 3a85612d47dd0..100224978612e 100644
--- a/lib/libc/sparc64/gen/ldexp.c
+++ b/lib/libc/sparc64/gen/ldexp.c
@@ -40,7 +40,7 @@
 __RCSID("$NetBSD: ldexp.c,v 1.8 1999/08/30 18:28:26 mycroft Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/ldexp.c,v 1.3 2002/03/22 21:52:59 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/sparc64/gen/makecontext.c b/lib/libc/sparc64/gen/makecontext.c
index 95795de992cf9..2fc4580ace116 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 f578c459ce691..36678d8f69523 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 5ad65a5a5f362..6f191fda24ee9 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 622f36f5bd75b..44933a7607253 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 4e4456648c665..c141c3ebe59ae 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 b7178133b9724..a99bf8083f02f 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 2ba02c4394733..2f5a7dbf01e4a 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 16035e05e305a..20513e9ab0f24 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 4333f231dc1a1..68e51c78a7700 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 03a09b57a1ede..b878b3f17de3f 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 e8c0da7a1d7eb..52a362a6255f8 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/stdlib/gdtoa.mk b/lib/libc/sparc64/stdlib/gdtoa.mk
index f951a8dcad6b8..991dd30fcced1 100644
--- a/lib/libc/sparc64/stdlib/gdtoa.mk
+++ b/lib/libc/sparc64/stdlib/gdtoa.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:59 das Exp $
 
 # Long double is quad precision
 GDTOASRCS+=strtopQ.c
diff --git a/lib/libc/sparc64/string/Makefile.inc b/lib/libc/sparc64/string/Makefile.inc
index e8c0da7a1d7eb..c032c7f7f398f 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 f677df19d1baa..576da64ab3b98 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 4475c6d4632ad..6b6b2ac6f75f8 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 e556f830570fc..fa7ea575623f7 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 9b59826263cd9..6d494dd3ce778 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 6c6dd1b9b97ad..2381a019c272f 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 502f81a22510f..159d62925eef3 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 6f6f0e3d2c57b..ca50d26608ef7 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 7b1a5e7a0226b..604fb3bf7cacc 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 8b9ae9eefc961..c909e8945c4fc 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 f4a624bfe4c76..14993bb542a42 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 2e799f6566b80..e58fff03dabab 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 018c87732d2d9..8f6d312dcdd67 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 c75f27cd2f924..6641ee398d31c 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 f8e38833e6081..d6ea9e5de2def 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 1168134b1937e..c9853d4a4cb49 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 b1d1ff2c8e2a6..ff78a74e43fd6 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 2ade2738d7144..2ba2cdee541b2 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 480e9ecd6a49d..f5d362242b1e3 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 7d32f975af20f..3105ec15e963d 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 be3cb451a8b3e..21bcb66c3c74a 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 f8a90f8209806..68376bcb6fde9 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 8abc8e3b63842..3a73ee1a68257 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 f14265179589d..02362b0c23f0c 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 13538d522abfb..bfac2c10b30fe 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 9d482285c9896..8adc65ac6face 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 3524f60948561..ad4dae7a531cd 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 961c0d964d2f6..15e7e8f731b18 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 0bb12bead9912..7c091871dc7c4 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 3fe283987466d..6e7d1ba115021 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 5d4c187dd1dff..0f960f7385d17 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 6fa6d23ea4a59..cc3e7e85ab41e 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 3090dc96d532c..59da908229eae 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 455c2ac771f0d..5cd8c7ed98d1c 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 59156ef810dd0..e96dcf73508a8 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 d2efe0993b77a..a1b303e726885 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 295b20a8379ea..581c5c834a103 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 fee8c92530892..1b43d4c1ff2ab 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 bb4ea4c70223b..36ae4fd665be3 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 719556ad9e1f1..f4a273a6542a9 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 282b03a96e06d..8701a37d2a612 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 2004/07/16 06:06:09 tjr Exp $
 .\"
 .Dd July 16, 2004
 .Dt FGETWLN 3
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
index 1a1ad2ddeaa04..49b52af314421 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 dc04275e9587f..ac51398a420d5 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 9b7075d3c2527..d3fb4218bfd41 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.5 2004/07/21 12:12:48 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 51c0464ecb6cc..60bac45c87f8c 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 26d4dcf7797de..2621966109448 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 8a1c7d0430c74..cd90f837ab04e 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 2463a85b998ec..83beec755f2b0 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 a895a0aae0451..a8c9c26ecb686 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 1508e5953e229..a328c5b0c502b 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.18 2003/01/26 10:01:59 tjr Exp $
 .\"
 .Dd January 26, 2003
 .Dt FOPEN 3
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
index b7c84a72006c7..5a043ca72c51b 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 27b82223e0395..35093b03390d2 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 b653bc5808d67..f191843c151e1 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 97de1c0b7fb19..a10af2b20714b 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 3ce20b25b58ab..a0c034105f3ef 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 812c37da50dfa..58278abff2680 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 0848b74998d1d..dfe876f85fc81 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 52bae9610c3ae..2642a74f78a4a 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 025e1c00d198f..fea591490dbb7 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 925ef61fc9495..b0bf094304423 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 73c7c1922eb0d..ad5d81bf3e84b 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 476f3efc856eb..ddd978e720d0e 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 bb5ee4c060648..aaad50056c2ed 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 96abc0ac83cc3..2f3518663eae8 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 b346b5d6e9491..e6a5bd6c0880a 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 6eeffda9bbebc..6d75acdbac856 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 94e962c68db5b..477e3a157033a 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 80ce999041f1a..e40a5dd5e8c18 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 459cd5c7c353e..040c80650ac8f 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 9cc4c5573a687..fd12da1232118 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 df59bf0b706b6..5414ec8cc572f 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 811fb54f11844..a8a49fccb4315 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 6ff8d92649954..1c1961fbcc739 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 70309f56daa1f..1386c48d4b4b2 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 a22edaeb55f05..dcd6c3841fd31 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 0a74d81194857..27b660e8ca22b 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 f779c538518ad..47e8550215d99 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 6b73e492c9ab0..fd015af33f639 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 61b2c54287e56..0aa9dca03ef43 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 baf587691d763..2ea530feedbb2 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 e24727150de0a..5ef23ab8552e4 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 e74823574bb3d..c7ba04f676e56 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 6e4069c59bc31..c4705542886ea 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 ba5ab6011bfd7..34a7de32584f0 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 79dd7bc4b33bd..1297cbb86f7f6 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 79e1cd4044662..44223ffa2973e 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.2 2002/03/22 23:42:01 obrien Exp $
  */
 
 /*
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 16a9e78db6ff2..7cef096f643c2 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 bc8a468f25802..a4c5c36a02103 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 432d0ded23c3a..acbecc45dab8e 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.20 2004/02/20 04:08:28 green Exp $
 .\"
 .Dd February 11, 1998
 .Dt MKTEMP 3
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 3bfad9dbc5379..8207c17ca9bbc 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 29016f742444f..658b880cdb5ac 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 4196cccf893a4..753462202691c 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.57 2004/06/30 20:09:09 ru Exp $
 .\"
 .Dd January 18, 2004
 .Dt PRINTF 3
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index cfd10d04bf472..86452e23b9d90 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 e14963048d83e..7c766b095d75d 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 864df9f073895..e78bb42c556df 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 ead55652815c4..d23161d0b9e0d 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 3e7c4952b24d2..9ac915ef14137 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 717b14847b0cb..ee0c23b7e9dd2 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 4e46834fd07fb..aaaec12f4bc0d 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 8fe065bdfe328..0feec5b621c57 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 55030713c7522..b983995d3e82d 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 b76bb701aca04..edd8bb60bbf56 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 cf088c7e71879..8c9d65fe8cc0a 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 b17124c000858..2553f64269950 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 a9b91dbe30d9c..76f2ed370c60d 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 9a0bd975cc598..9b7f5866c86ab 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 4b74826ce847a..3f5913ac6fa8c 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 37236cd9a5dc0..b4fb1a3c2e6ea 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 0342149d2d16d..37055a73196f7 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.14 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETBUF 3
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
index 348104c0dacef..5eb6fb13e1274 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 ec779179ba27f..6ec437651ef76 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 7ab91e5014545..166d5b129c31e 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 ee5219e9a5651..b381852818c37 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 cf1587fdf7332..6b9ed994fb887 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 4db0d2963aff4..b4850cd50d25e 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 ab5d1fd16184e..3a349dac486a0 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.26 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd January 10, 2003
 .Dt STDIO 3
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index daae1a2cc98aa..233427cc1d58d 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 d66531820d30a..190326a7b6e9c 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 728a3d6957c52..81ac9f1256a2b 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 8ac39edea5cdc..d4dbaa3faaf1b 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 22d0eb1c5f0c8..cf5b70a12cc91 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 7937a0ab6d0aa..78a78d3bb32cc 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.16 2004/06/21 19:38:25 mpp Exp $
 .\"
 .Dd November 17, 1993
 .Dt TMPFILE 3
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index 7c75b54952394..38fcdd65cffde 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 3ffab32fc0640..0c0bf83e1f4b0 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 01131619d63ac..2217259679996 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 40907afc22d6a..0ffe7e83ac0c3 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 bae2c3ebcea40..b90671acfce3b 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 083d26f24ffd9..6b1c0ef44fc59 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 01ac06889c3ef..197c42714bab6 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 ff688e7c86a87..5a624a6167618 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.67.2.1 2004/08/31 05:20:43 des Exp $");
 
 /*
  * Actual printf innards.
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 118323fd6ff27..61087e8fe4f34 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.37 2004/05/02 10:55:05 das Exp $");
 
 #include "namespace.h"
 #include <ctype.h>
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index d93e507a53b2e..f02960daf9822 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.22.2.1 2004/08/31 05:20:43 des Exp $");
 
 /*
  * Actual wprintf innards.
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index 6a9c9faa767e3..8bc96364596e2 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 15c32412f1888..329bbf094787c 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 cd273e38c2cd6..694573663f9af 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 16d46eeaae026..3a439393ab985 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 b3150e51c2e5d..698f7527c5505 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 40d494737b7d7..e7bbe2543c95c 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 77e289d25d7ca..50c98760096f6 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.5 2004/04/07 09:55:05 tjr Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
index 7b17e2f39779b..03675d4699571 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 91212a8bf3d0d..4390c0696fda3 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 4a21af2d8356f..6e103d5485d2e 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 4a123052c789a..3697be82280e4 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 7a3f952b01b5a..def25bd613fe2 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 92426f6c207be..4b5596e1da2ce 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 bc8729febb786..b7eac3c8244d9 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 5e27b401fa84d..86290272cd5ce 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 4c18dd48bb118..7b120fff7dbc0 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 bebbc63792fa2..0e8b4481a979e 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 e7f0f5104f93a..3a2e94e78c9fd 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 51b6f1bc716e0..07ca798283cee 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 36cd15ba62bb0..18d0c73eac546 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 d9296ef6c571e..f2556e87faaf6 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 0cca02b8c91f7..26f87eb587d2f 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 e87cd9fb098cf..c5be9fff6614a 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 b3dec68bc0b43..72a9977257559 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 43a0e7495fac6..bd94bcd7230d9 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 704c2e1689391..cd30b3f3fbe69 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 d338e3d9766af..785f9d1de5679 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 2ce0012253bd3..ca69ab64bc08f 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 34a1b2d5216a5..6f71dc1a07000 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 7190da723eaa4..3da2fda9be05f 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 10b8cf7081ec4..bbd7ddbc25c28 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 f4d8d1f20abf2..c66c04e9b0a2a 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 463677dd85365..b7c38b8f68a85 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 b8a18d37fc6fa..25c608db2a5b4 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 10888963fc6c3..771758232c725 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 9e7850c84ca72..0bdbb2369ad11 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 05567fbd39498..49f2b4fe21fe2 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 0c3c48498a64d..54278d6d85901 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 8a5231bc49f62..aa07fda9e4561 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 83abdbd5d5064..e71b3db4ff8fb 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 c5ed228238f98..fc1963287a5ed 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.16 2004/07/07 19:57:13 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt GETENV 3
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 1643db0eb4882..aa15989265240 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 88fb51f38fecd..b24a75cf6c811 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 af0c5cab2139c..efcfa0a68744f 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 f615ea75ea933..dde7980d5dc67 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.11 2004/03/06 14:47:49 ache 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 47eab1ffbc753..ef306bc2ab135 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 1688426da08bb..651f357a17ca6 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 6d76f78dd1c77..488706a365de5 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 b4ad8c4edf410..795f4af7ae11f 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 3b7a0e9cdd92a..9902c5487acd2 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.2 2003/01/04 08:10:55 tjr Exp $");
 #endif /* not lint */
 
 #include "namespace.h"
diff --git a/lib/libc/stdlib/hcreate.3 b/lib/libc/stdlib/hcreate.3
index 88943c1176078..e6a5e44f0b796 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.4 2003/09/08 19:57:15 ru Exp $
 .\"
 .Dd May 8, 2001
 .Os
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index 58780850be6d1..6ab33e5be8011 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 d37d199e43270..e846be2a8380e 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 430f873280f56..ac520b299d14d 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 35e3dee79d363..531de24fb81ae 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 0ee0971a81bef..2a6bad57fecf7 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 7dae4675e2b1e..ff3087b6315e8 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 a54434c6d3161..06f93bf20fc34 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 388e4d592617e..92984b07d7846 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 2c8db6e89109b..d496b30552a63 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 36ae55d4a1f7a..42e63d11b37d3 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 eddf9db07ae37..c75b8be732237 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 37e95fa7bdfe1..560d5c2841e01 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 8c031a940d6f1..a8238dacea5a4 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 2bfbada80d93c..4721fcee54e83 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 976a997b9cc80..96ecf1aeec70f 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 b34b65e8632d1..c9a4853329ce2 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 e3a324cd52f8b..fd79b9ae80213 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.4 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd October 11, 2002
 .Dt LSEARCH 3
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
index e4d1dd59c54d7..791bc4934d51e 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 d1f081b908dea..fb90765c42f1d 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.60 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd August 27, 1996
 .Dt MALLOC 3
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 46cf573980bb6..2f8b156614920 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.89.2.1 2004/09/07 15:38:34 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 a339043410421..25222d40c3858 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 f03bb3d34cd1b..711b9cd9192c8 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.6 2002/03/21 22:48:42 obrien 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 1aa9998855cd6..c8f3b6049c824 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 07777db8efc37..5a901ce7bb088 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.15 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd September 30, 2003
 .Dt QSORT 3
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 47e563ad703ed..f1add73c5a4c2 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 d86873604f591..f7c0e54f74330 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 da4ed165cfeab..a1421c6494830 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 933474470a27d..5f9eaebc6ec47 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 c0500ba7970cf..59e0ee2122ae2 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.14 2003/09/08 19:57:15 ru Exp $
 .\"
 .Dd May 25, 1999
 .Dt RAND 3
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index c412133d93635..359e12a93b61f 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 a1dbf8a92348e..9af134b839527 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.20 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RANDOM 3
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 768d125f7bbce..f42436ab72f4b 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 5320926ce4bc6..d502006229da1 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 3593df76377dd..5fe8c16ae0492 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 3082f5f4b95a9..31e097787b8fb 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 0a2f28f77c7c3..068a75fc0e163 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 5c6d906482f74..d7c0394075122 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 11b8e211bf66e..739a79877299a 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 37200ad5f1abc..db569d512405d 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 0fd70031a8950..f40d89633947d 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.19 2003/05/22 13:02:28 ru Exp $
 .\"
 .Dd March 2, 2003
 .Dt STRTOD 3
diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
index 0cb387b64ad94..c57d0448eb5bb 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.9 2003/01/01 18:48:43 schweikh Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index 63d1156aa5a3c..9f540543b9009 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.19 2002/10/10 04:31:57 tjr Exp $
 .\"
 .Dd November 28, 2001
 .Dt STRTOL 3
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index 658628e370c60..2b3fcf4f49cf3 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.17 2002/09/06 11:23:59 tjr Exp $");
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index 2eb3a509a58c8..cff57d98a2186 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.19 2002/09/06 11:23:59 tjr Exp $");
 
 #include <limits.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
index a3e37afab85f5..6e8bcb8e18ec4 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 d031630977d51..48bf05caf163a 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.20 2002/10/10 04:31:57 tjr Exp $
 .\"
 .Dd November 28, 2001
 .Dt STRTOUL 3
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index 2146a98b8ac05..40eeba364e538 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.16 2002/09/06 11:23:59 tjr Exp $");
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 1720a8f6571c5..43f31385c1060 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.18 2002/09/06 11:23:59 tjr Exp $");
 
 #include <limits.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c
index ddaee5935a4bc..eb714d7fcba62 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.8 2002/09/06 11:23:59 tjr Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
index 1a14f3676ae76..c0e0bef4d321e 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 60707b400cfc1..f0557c867cb7c 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 ac14ae99f096e..fd2cc2a16ec1a 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 c83afb8cf3f1a..7fb6893466a06 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 c5d66cf41612c..b58ed88735798 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 ea0a9dabc316c..073ec809788c4 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.13 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd June 15, 1997
 .Dt TSEARCH 3
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 149c2bb00f164..edeccde809d5e 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 55f220f387500..516ef44e006c3 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 003b62b453e97..ae3cd6ddb8a58 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 0f4212f81c149..c28abae9826f2 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 7b9830452b0a3..e20b954e39f85 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.22 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd January 2, 1999
 .Dt CTIME 3
diff --git a/lib/libc/stdtime/difftime.c b/lib/libc/stdtime/difftime.c
index 596ea82f67ca6..df557534ff5c4 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 9efff47a8af3b..18647efddcb1e 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.39 2004/06/14 10:31:52 stefanf 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 a3c777834e3d5..9878a1a4428f2 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 e6c3807ae9b9a..c3f803dc7113e 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.34 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd January 4, 2003
 .Dt STRFTIME 3
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index d55bb793b24e7..fecc82159def7 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.40 2004/06/14 10:31:52 stefanf Exp $");
 
 #include "tzfile.h"
 #include <fcntl.h>
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index 5f93b3452abc6..c265dd894b42b 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.23 2004/07/02 23:52:12 ru Exp $
 .\" "
 .Dd January 4, 2003
 .Dt STRPTIME 3
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index ddf6b57e38fcc..901a742570455 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 c11a402a3fff4..01a8e515d60d4 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.13 2001/10/01 16:08:59 ru Exp $
 .\"
 .Dd May 1, 1996
 .Dt TIME2POSIX 3
diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c
index e852a4f279e4b..5085dd7d9bf17 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 6917e6b6ccee6..2aba03c58ae92 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 5d26bf938d97f..0b0a59a483d4c 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 cc7e659660606..04ecce86136d8 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 89c569453c21f..378d7ae606c6c 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 a2d172264a908..67696e8fc99d0 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 2004/01/13 16:05:47 des Exp $
 
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
 
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index cc75ac17964f7..a3709e53d1f63 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 6c757671d0c00..f5227dfbb987c 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 c7e9706f0d7bb..6513af4041cf4 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 0c2ec94fc43a4..983b2fbb160f6 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 40526551110e8..3629a3eb3daa2 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 a8c4a2752955e..8a10597e7b90b 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 201bd64f808d7..85bc5e834e98c 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 7199bf5c9c267..93e7148704deb 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 f8da99629c616..ef4d0f0a6885e 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 3ef9afaf900b7..1c25a0a94580a 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 e27f3ff2f1764..8550cf8a64a78 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 127e311071cb6..f9612b51e9784 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 124597002a998..c47e96473fc07 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 5d79f4f7741c8..be2c0520342b2 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 84f385d3be6b2..44a457fc14c41 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 62c47a1d79838..0bc6a11160dc3 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 87215534b8287..b3631853f2edd 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 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCHR 3
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index a217a80f5c277..e3c66791386b1 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 d38154a4d2559..980af28433f83 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 6b28c31d09f65..045e4d9a0f06b 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 c970d7ce7a0bf..ba9cae999a546 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 ed03856e54b4e..dfc03aed80e32 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/memmove.3 b/lib/libc/string/memmove.3
index 39543c3b486c6..8f4f2cc45dfb9 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 05cf75a2ce6a5..8f44e82cc3668 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 71ab4d58c55f2..3f1ba5e650951 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 17683aeda183b..1cb8644e3eab4 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 641c00f7ee89f..697b69a5c2021 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 0bee746290570..2742bf7a93ada 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 346b9e3414d6f..4da0d235821a5 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 cb031ceec3cfe..6f400d7d679e3 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 d950766cf5a8f..dafcb79e2138e 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 ac4f7b0da9684..73678954d66ca 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 d30389dbacf7a..5d28c865d7cc7 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 2936be77fd5ad..f6780e0826d74 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 2003/09/04 20:36:54 simon Exp $
 .\"
 .Dd April 19, 1994
 .Dt STRCHR 3
diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c
index 1d82abe86fd56..2fb91140984cc 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 08adad0cac0ba..101d71bd54c7b 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 a6bb0d5079358..1befcbce16e22 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 a62010818c56f..d2e1ae47c681e 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 a0daf8dc182fd..b93ce48614231 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 f40e792058941..138bace16a1f7 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 630ae23e799ce..5cd2f45c1707d 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 2dfda10c45cc9..c105c12064a25 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 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRCSPN 3
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 2ec9326d9b540..48354a65bd453 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)strcspn.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/strcspn.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index ec91f3568608c..3bb2516b1f0ea 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 788a185e54d18..a9881a193bdc5 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 c8c9a20ff3537..1462c657dea67 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.22 2002/12/19 10:24:52 tjr Exp $
 .\"
 .Dd December 19, 2002
 .Dt STRERROR 3
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index 02fba0cfcd39a..b1c491312d0aa 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.13 2003/05/01 19:03:14 nectar Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 2be58b8063c20..0a59cec23ce03 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 2c2fa568e2233..19924e5c55b1a 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.9 2003/05/01 19:03:14 nectar Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index f674fe2ac49bf..c33c0dd90896e 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 a8a6cb7da86b7..eedb6a9e5562b 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.7 2003/05/01 19:03:14 nectar Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
index 69b89453321cd..b490cede4916d 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 841c7c24792a8..c67667df056b2 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 8c315cde04f44..f306a5be80df1 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 fe2cf9ee99582..2409b4e4f5788 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 4218ae292971c..e05e030b8fd79 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 60d09c15a7409..6b0cfc88b9edb 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 7759e61a05d0c..2fcc9579f179d 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 6983507b55dbc..9f3b038f46e14 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.2 2001/11/07 19:55:16 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3
index 92a3388ab1a92..715bb7193e248 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 42e8c626bbb1f..fb0e1d4ca3e5a 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 11cbd31e38472..b8c05007c938b 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 7a2b0f88d3206..ca235200a4bf6 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 dd5ec0bc2ed1f..d0bccce94c693 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 f839e44034e40..0cbb4cda3e926 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.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
index 17ab817cd2dde..b55b12c762019 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 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRSPN 3
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index 5612ba045457f..ae28642636dc3 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strspn.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/strspn.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3
index 16c6db20fa75e..83d7bed971b7b 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 2001/11/20 14:11:07 ru Exp $
 .\"
 .Dd October 11, 2001
 .Dt STRSTR 3
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index 3f6d81c3ac353..f51d17024e03f 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 ba47f7257ec11..b1d41b9b72c25 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.24 2002/12/18 12:45:11 ru Exp $
 .\"
 .Dd November 27, 1998
 .Dt STRTOK 3
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index 1a29cc53a66b9..6aec194f87bca 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 6f4acf4fd6b77..14b6bbcdae891 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 81e05af6ab7bb..3ab7b720a4dee 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 4d27e17d5b3fa..c449add4c0e69 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.7 2002/08/30 21:18:39 robert Exp $
 .\"
 .Dd June 4, 1993
 .Dt SWAB 3
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index aa6f2682c01b4..de5770345b55d 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.5 2002/08/30 20:33:05 robert Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 1c965335e4d2a..cf7812ffd1397 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 1df1fe6cd5201..0fae132247706 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 7b9f7029542ee..20152b2e17d57 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 3270952c862d8..18a9ef7a440ea 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 dbfbcfa919a75..5095158efaf49 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 180bbd1b192d0..b4c236a780f33 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 57a804c0c639f..c16f27083afce 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 6466f0690fd7b..f3b9a63608a2c 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 1b9459a0c19e8..273c8fd937c82 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 1636d98cd2762..5e462a183daf0 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 ba49a9eab98aa..5abb442f80671 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 7544cc71a7cf2..7043e066fcb59 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 e9c9110fb63da..fb9cef0453506 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 7315c4445dda2..550244081b882 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 37c81ec8cdb70..093dd082aacab 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 584a9d352850c..d4101c7f25100 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 e391e9f57d7b5..0533e59bbecec 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 0de24d8366c87..4ddfb040e09de 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 0dbdfe0e28365..5781adbda28b6 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 76d32ad8e4b94..973bfe067bedc 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 553e6d2f813d2..98a095d18c0de 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 9e626479c3d15..e85ebb0b3cd01 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 5e47ad946ee6b..7aea3d13bf1f0 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 a448064418a29..de091a617bb7b 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 2d96708fd6c4d..0b09f9421079b 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 c9a9095b8eb23..30140416b716f 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 38d563d8053cb..4391309ea5dff 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 6b3ee94e3a903..dd2036c953e4b 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 b923f14637f10..df9153765e83d 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 64836b9b13868..440fefab0024b 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.112 2004/04/05 10:17:56 dfr 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 8dcf8942701bf..4219db2389c03 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 17f4d09191ac1..969c53af1e7c8 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.16 2002/12/18 13:33:04 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt EXIT 2
diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
index 5b844c6534442..847ca6afa5ef5 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.30 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt ACCEPT 2
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 94e78317252e0..ad564bed0288d 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 aa071d9dcfe9e..9c46b9c2c59bb 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.19 2004/04/16 22:53:51 brueffer Exp $
 .\"
 .Dd April 17, 2004
 .Dt ACCT 2
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
index 373c46e21257e..f043ad9fee652 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.13 2002/12/18 09:22:30 ru 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 08102cf9d861d..a5f1392c64f5a 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 91bb0974d01c7..20b5a07f7507d 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 07c28cfd2810e..ac66d6b54be68 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 4d7282f8623bf..8c2b5ceb78b9e 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 06d278a999620..bbee7935e85b2 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.20 2004/07/02 23:52:13 ru 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 5145f78118ab9..d0547fb74d689 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 5e9cda2a0a0f9..e63f1f0fbff81 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 9cad89740b91f..36bb0f6511f07 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 e1053f3c0edc5..e2e5f4bdc9c1f 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.24 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd July 12, 1999
 .Dt BRK 2
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
index 8e8214e447f54..89df1269e315c 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 0160878807ba4..658525b2ccc66 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 7da7092710a6e..44efae81d3f1b 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.31 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt CHMOD 2
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 555ee38441e18..ea7195db06048 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 7142e0d4ea90f..9481e1115ee8a 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 a608870114603..2229c1145ea21 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 04dbe3df1ab22..0826ea2806575 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 5b74fbef80a0f..c989b656fd71b 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 ef903f946a48b..eaa0a1801292e 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 45d4baea76fc0..b27d2d5a0c6f6 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 b22f50fd03c1e..5ab549544f110 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.14 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd March 28, 2001
 .Dt EXTATTR 2
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 804b4abda4548..b4e4c5e6d02f9 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 7f078df09faa1..899f90a89c99b 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.15 2002/12/27 12:15:29 schweikh Exp $
 .\"
 .Dd June 29, 1999
 .Dt FHOPEN 2
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
index acb9741e20927..0753186d08566 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.23 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt FLOCK 2
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
index 5dd641360dd0e..53440fbbfa3a5 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 644f337086078..c62433142c1b9 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 28acc5879c16b..ac6f58ed24edd 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 d739549eb4bac..5e2e0ebbac73b 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 b53571e91ab88..e3df18c4f95e0 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 389671630bee4..a2c26ace86e0f 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 3100d93586f17..dfeaf9767ae2c 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 00c64ea2dcef1..599678ad30e09 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 54b6959f18ab4..ac0a1aabb37d2 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 babcd3bc1db27..24a566cef5229 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.20 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd May 16, 1995
 .Dt GETITIMER 2
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index 9a254f3cef5b9..7b09bae4eaa58 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.27 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETLOGIN 2
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index a5d9bfe7f092c..6bf6b74330a27 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 e96ba84edfd96..2d8120736b903 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.19 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPGRP 2
diff --git a/lib/libc/sys/getpid.2 b/lib/libc/sys/getpid.2
index 20e33192ac63f..7810f94da245d 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 6e7ab2ad38692..bd4a88c26313f 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 1e670836dcf3f..c47819d0de95b 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 b27e3a61d2687..6e15adeadfc50 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.20 2004/08/06 14:49:11 roam Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETRUSAGE 2
diff --git a/lib/libc/sys/getsid.2 b/lib/libc/sys/getsid.2
index 8d31074396010..a0119824fc49f 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 0c285ad6a1d5d..3cd67fdc6d654 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.24 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETSOCKNAME 2
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index ccc71e3ae1e38..1dace9d7e9146 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.31 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd May 2, 1995
 .Dt GETSOCKOPT 2
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index f10425340dce2..6b47b17d946fc 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 3e32fb0a8e2ad..4bb017bac2f1d 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 1bb900b01edb4..45f8356cbce60 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.42 2004/07/08 20:27:38 wollman Exp $
 .\"
 .Dd February 27, 1995
 .Dt INTRO 2
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index e5a902f3831dd..773383d03f1fc 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 a9b234bef2dba..6b202e55aaeee 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 de649b5857447..68b399da1bb0a 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.27 2004/06/21 18:57:32 mpp Exp $
 .\"
 .Dd April 8, 2003
 .Dt JAIL 2
diff --git a/lib/libc/sys/kenv.2 b/lib/libc/sys/kenv.2
index 1a24a273429a4..80c9b6b1c6eb3 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.4 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd April 17, 2002
 .Dt KENV 2
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index 51640664aa7d5..22f1aa5f40849 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 a8892ed00650f..27268dc03b03f 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 d9967ccd779c8..1830a3190fcde 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 d31cc086e2f9e..04518a7f17779 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 9588647cc24e4..6eaefcfcd3ca4 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.15 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDNEXT 2
diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2
index 946417a1b46d3..0c65a0169d5e6 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 acd6fcd77b147..37fc63454108b 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 aa042d2d6a545..ae2b6d4fcf78a 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.17 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDUNLOAD 2
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index 5e84e8a0d1be4..35d3ab05e783c 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.40 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd April 14, 2000
 .Dt KQUEUE 2
diff --git a/lib/libc/sys/kse.2 b/lib/libc/sys/kse.2
index a1151dcc59359..9be12455481c0 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.13 2003/12/10 02:38:51 marcel Exp $
 .\"
 .Dd September 10, 2002
 .Dt KSE 2
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index de0a3f2b9798b..62e7f65805827 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 f39768a5d35db..a56680348c624 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 011433ad6da95..5101f3e1d09c4 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 bcee68fd91005..21063020b74a0 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 2003/01/17 19:25:27 tmm Exp $
 .\"
 .Dd May 8, 2002
 .Dt LISTEN 2
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index 13bcf2177dba6..a1ba3b959566b 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.21 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt LSEEK 2
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
index 3544fbf059ad2..161abfe771103 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 ea7e8efe75040..0d7a18ae396a8 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 25ad07628fdf7..dcd9755689391 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 b19e36dc4cc23..4112d7eefcf3a 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.19 2002/12/18 09:22:31 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 e91c9ba9ec3a6..2769cf46785f9 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 329c26b29dcd5..a73a33119bad4 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 1c9fca389f375..71b5115705703 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 d8c5ab4ea1492..185c0ff6b2286 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.18 2004/08/10 16:38:19 green Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLOCK 2
diff --git a/lib/libc/sys/mlockall.2 b/lib/libc/sys/mlockall.2
index db4c4a933e4ca..9f4fb35fc5b01 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 798396e50671b..3c262c5d587ee 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 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd November 17, 2001
 .Dt MMAP 2
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
index 309d2bcb59786..00d5e2a7aff38 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 3f485798a6c9a..8444d65e7164e 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 3a6f69b709473..107bd1fc54a6e 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.8 2004/07/02 23:52: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 935623243c8c9..fcfc0b703b860 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 844c1fec0e326..a8c1fd140dae3 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.40 2004/08/13 14:33:03 roam Exp $
 .\"
 .Dd August 13, 2004
 .Dt MOUNT 2
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index 909b2404834b9..95b62f80541b1 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 28aa1a7a38f0a..546888b071578 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.27 2004/06/30 20:09:10 ru Exp $
 .\"
 .Dd June 21, 1994
 .Dt MSYNC 2
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index e748873dcdce1..2ceeb2ae2e427 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 f086305d2e5b3..9f7cc65b8ddf2 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 2b33c72ac8d0c..d1341df80550c 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 6ed71cef00d1a..bba808d300468 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 f556d74f27951..6c5c75d5645c7 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 14d8722a109de..1c95e9c423389 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 b3d61ad83eb2b..e82c5c17c39d9 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.17 2004/07/08 20:27:38 wollman Exp $
 .\"
 .Dd November 4, 2002
 .Dt PATHCONF 2
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index 247b9990a52ba..9ae51214aadde 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 28c426e6495cc..78e4a1498ee9d 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.15 2004/07/02 23:52:13 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 c1a913636ca8c..db1060194de19 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 5dea7ab3786e8..3864a59b51f73 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 a8910d7466a6b..c7bcddd7704ef 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.36 2004/07/12 04:43:58 marcel 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 e6969cdaf7b45..dc1b060273ebd 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 12f724d243a9f..9d7a382969280 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.23 2003/09/10 19:24:33 ru Exp $
 .\"
 .Dd March 5, 1999
 .Dt QUOTACTL 2
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
index 1e98f3a3bb6f5..83f3e99a5d45a 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.25 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd February 26, 1994
 .Dt READ 2
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index 28ecc4b2c208d..ee66ce3092afd 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 54c04da0fd696..933522d229290 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.18 2003/09/08 19:57:16 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt REBOOT 2
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 1131824ecff65..dc40c90e70b44 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.21 2004/07/16 17:15:37 harti Exp $
 .\"
 .Dd February 21, 1994
 .Dt RECV 2
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 0080f409f6dd9..6df763d776301 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 64de5569043b5..96db97f97766b 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 d6c69dcf45630..4109d4c3d2214 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.32 2004/07/02 23:52: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 c2014fc1a998d..0efb2224d23a5 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 ce519fc88fc63..009b3908b5fbc 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.25 2002/12/19 09:40:25 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 88d1d6d1460de..512ce35622c37 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 315fd826cc7d4..f9b944d652265 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 21b34e0381900..2d6fce6d84b83 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 9db8942249e23..0e6c98dcd3894 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 bacd76ee958e7..950940de97762 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.29 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd November 17, 2002
 .Dt SELECT 2
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 0971949ff0a4b..58c11326df9a5 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.19 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMCTL 2
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index 18c083b56b147..bb3ce1fcc08d0 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.15 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMGET 2
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 70c712b82f6a4..94896e75025d9 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.18 2003/01/25 21:27:37 alfred Exp $
 .\"
 .Dd September 22, 1995
 .Dt SEMOP 2
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index f5fae6f4fa38b..9854b1e40c324 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.27 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd February 15, 1995
 .Dt SEND 2
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index 3f2b3d3cbb174..0854a13d8fd22 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.23 2004/06/30 20:09:10 ru Exp $
 .\"
 .Dd November 5, 1998
 .Dt SENDFILE 2
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index cbc3a36b61f48..5a382b1ba3492 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 c771e0377aae1..e63fadc468ccb 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.14 2004/02/08 12:38:30 das Exp $
 .\"
 .Dd February 8, 2004
 .Dt SETPGID 2
diff --git a/lib/libc/sys/setregid.2 b/lib/libc/sys/setregid.2
index fd27e71191e54..8648840ff77a7 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 08d07f3b67768..8f4eeef93e315 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 cd8b7187a58ee..4b30572c90f36 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 56506a6116a76..ddc716fcedee8 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 57ccadb824b7c..2ccc2fbc4a5df 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 8fe340c9ae4ab..de798c8262587 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 d73c516e2bde5..41b787a55968b 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.17 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd July 17, 1995
 .Dt SHMCTL 2
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index e7fd6d1672171..c198085a52884 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 3d258cbabd68e..0c2df14a06fcd 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 9f15f8be98fff..32ed3f3f1b670 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.55 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd June 7, 2004
 .Dt SIGACTION 2
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index fe8fda534c898..37e6bc8400826 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 39565fdced809..41db236db87a8 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 8f3a58631cb4d..c341715b0a3fe 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 aed6a9126cbd3..2c976eb6bfd8d 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 95c0db294b66d..be72c409aaf61 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 bf946d36a78dc..d5f2988fabca2 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 2d635cbb2cd26..01dfefe4ebf5b 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 dadd6837360e8..ffe635c46a8e7 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 2dbc202e71089..a978c7194f214 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.15 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SOCKETPAIR 2
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 842492a123c77..c86e307efc6ca 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.36 2003/12/10 15:08:41 dds Exp $
 .\"
 .Dd February 15, 2002
 .Dt STAT 2
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index 0a98ba7889082..be60491e44cff 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.25 2004/07/20 19:30:57 csjp Exp $
 .\"
 .Dd November 16, 2003
 .Dt STATFS 2
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 29e9da5a136d8..1d4f0e78b1566 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 19fa7fa047122..3e0cb9e1b11ee 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 89c2583dc4448..07f9944db38df 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.14 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SYNC 2
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
index 9d8f0509c635a..7bd7723b9605e 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 675cf8eca3aa0..2fc1e6a8cf3ba 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.11 2003/09/10 19:24:33 ru Exp $
 .\"
 .Dd June 16, 1993
 .Dt SYSCALL 2
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index 5966f5f836c07..d24700c9f1492 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.16 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt TRUNCATE 2
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
index cedfd5b88e937..fe8ad8a2d4b66 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 00ff4e7284030..39566cbad3f68 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 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt UMASK 2
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
index 5faf50aec6de2..d3f60fc121b6a 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 3326134486045..2507334dab277 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.17 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt UNLINK 2
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 79dd2d068731e..1a9ad81a05b2f 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 a83c18551ad01..aa7a96df8567e 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 8f29e8ebc812e..73d85cfaf7e44 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 2003/06/27 13:41:29 yar Exp $
 .\"
 .Dd May 26, 2002
 .Dt UUIDGEN 2
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index a1f74cb29d524..b497d5b16aa43 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.24 2004/07/04 20:55:48 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt VFORK 2
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index ab734fc192b7a..2cc980eed776c 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.19 2004/07/04 20:55:48 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt WAIT 2
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index 4687e3bab6a91..93c915d64e6cb 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.26 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd April 2, 1994
 .Dt WRITE 2
diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc
index 022d55666414b..2f9ee04886bf0 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 188fa9b8e2a1a..044ecc3cab450 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.4 2003/08/08 19:12:28 marcel 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 9d1c3c606a5f5..a48f579b0bfc2 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.3 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c
index da3f1d39f78d8..407e37156b982 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 6e85ae7fb768c..0dc6d5d3ba18c 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 1f6328cd149e3..16e1b1e6dd35e 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.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c
index b09a04df875d8..a2c7193279b34 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 4753a12756daf..40e8f9801bae1 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.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
index d397f7a0a3cd0..520c41d261a10 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.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c
index 16bda3ac0ecf1..d5d007114ac10 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.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index 60bd69864d246..02cf5f0a7ba3b 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 25944ccd279bc..029eb4f1df18c 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 16a8a1a94c5a8..2e42b98f3b699 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.13 2002/04/28 15:18:47 des Exp $");
 
 /*
  * xdr.c, Generic XDR routines implementation.
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index 72005e42b4c6f..cd8e0de0a50a8 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.14 2002/08/01 12:23:04 nectar 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 b1b8dc7c93273..8c7e13a6982a3 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.13 2004/05/14 11:51:22 cognet 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 c1d7594a73601..6ba23c89fa8de 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.12 2003/03/07 13:19:40 nectar 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 cb5a3023563e7..cd5af93ae72cb 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -35,7 +35,7 @@ static char *sccsid = "@(#)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.20 2003/05/28 09:13:09 mbr 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 0a0b19d4a53b4..e65f40edb52a9 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -33,10 +33,10 @@
 #if defined(LIBC_SCCS) && !defined(lint) 
 static char *sccsid = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 static char *sccsid = "@(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.11 2002/03/22 21:53:26 obrien Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.11 2002/03/22 21:53:26 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 20f1c3a20eb37..71322c810ef3b 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 103d2400412c9..70bdfb939b3e4 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -34,7 +34,7 @@ static char *sccsid = "@(#)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.12 2004/01/24 01:23:30 mbr 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 0ce6dae064038..70810188c8292 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 7aed6ad3af840..4a1c80fd71f14 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 6087f2b2b28f6..fe8c2958c8b7c 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.45 2003/05/01 19:03:14 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index b6072004b09d7..dd7b035f82d41 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/Makefile,v 1.39 2004/01/31 17:00:04 deischen 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 1ddceb0865b97..ef42698d8c48b 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 aaab0814d8c3b..f9ffba7945c76 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 af49aff68f038..7e32633e070f2 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 b4b84da9f652b..4f6e0f1cb9031 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 ce931df630fdc..882486ed171d0 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 e608afa69909c..96d320e296444 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 8c52967427b17..45d5310970075 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 0eb530c3ef148..b97f39803cd98 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 507ea4e19f74f..0a70ff4ee9ad2 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 35aa4067cc48f..9e1740d30d752 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 7802ff3c38d6f..45ea5a48d3c7b 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 2eefa7f48bfe5..a078faaa73493 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 6d77526f16c77..3dbc0a9331b92 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 942bf2dae0aea..0bfccd6705260 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 9a351400e3169..db1a45290bd7c 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 2f0c868aad859..7d0fe6dfc20dc 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 9cd5fb054ae14..11c2317ea3485 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 b834591852d96..2238b44888eee 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 d2420ed844563..349fb149aa3ee 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 f3ccd6b98491d..749cc2c341abf 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 2863e5c3fa0c1..4502148262540 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 06c5a70b1c28d..29a0588d7c94f 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.37 2003/07/25 17:02:33 mp 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 f83e2f4b26175..0deb32d6ce786 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.82 2004/01/22 19:15:08 deischen Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H
diff --git a/lib/libc_r/uthread/uthread_accept.c b/lib/libc_r/uthread/uthread_accept.c
index f045fc15a7cb4..968f8bf2588f0 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 19e9aaa6096d9..35cbb33a9c52d 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 2368c5f38bde1..850bd76c1846f 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 f0fa8b18804b2..525a549e6aa4c 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 c68751a0d8a00..c38fe9e663453 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 23d34f9aa52b5..a922e1f64091d 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_attr_destroy.c b/lib/libc_r/uthread/uthread_attr_destroy.c
index 420bd5a33969d..9d57cd5f98033 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 ba6fd19655fc9..9d2adac5db3a0 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 515248d84a6dd..d590c88634a18 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 849bf27a50250..66f94ef5ddcf0 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 6d6d3244e651e..b2106c49ecf20 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 cac86fa92882a..e2c69b3a14d57 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 f2b74fccc8fdd..6386984065ea0 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 8abf418cfdca7..3747c1484fa5e 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 e63cd8f6ccd11..8222d0f8e7caa 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 0cef0f3fbe980..41bc45da77a56 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 091a0c78cd8e2..44c982deef65d 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 10423cec99f5d..715265b1a0b3f 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 be6f8d76e3245..7edbf174d3b0d 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 e0e23c20e95ae..66c5c80958537 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 ad3e8bb9292f9..404d1677d3e3d 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 3538131ca07a6..03729d38fbe69 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 c42973e9c0bcf..2ab5964fa6067 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 d9c83e64b3f7b..642263f49c27d 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 3614615a3c017..6d739c4d5977e 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 e03f6deefe165..c51f943072980 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 60469324e22d5..c06d34da67c5a 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 622ba7f93b0b4..71cc726ed0f7f 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 03ee58d6f5a5b..a8ba932985385 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 bb076b0991cac..881645124a49b 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 d9324abf01aa3..68487da48f397 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 6330cb9782d0c..dc5f8fe38ebee 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 ba291a3c884df..a7aa24ebe1017 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 ddb82c19ea33e..8662bb5fc8935 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 c3ca7410bed17..dee5cab263ff8 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 3a05487309c8a..2cb83f398be4f 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 92ce709f82dfe..2fb0bf5bb9372 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 dfdcb2109821f..d65a50142debb 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 92da971799019..087d7a586aee6 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 356bc07f02643..b333d7b031f4b 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 298fdb41b0dbd..7d586b9cb704d 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 aaae6914679d3..130a29b3f578d 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 739a7ad897dbe..01fab8c299515 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 0dfb63d980a7f..45ed67b31c608 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 c0aa31c559ccf..d91cb0de70785 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 d9b497c804bf7..b9d1aff5b54fa 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.28 2002/11/13 18:13:26 deischen 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 cd076e2d21a94..4fdd502f37600 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 05dea245b6dae..a5fe333d10322 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 5b27bcb7809ab..a599a832ed78c 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 a5b64054f6ef3..6e400232fb28e 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 7b8bb717ab67b..bc41528326be7 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 cbedbc7b2a811..61e99fde1129d 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 e6e9294f2111e..3eb207b4d2cec 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 03312ff4b946b..22965ce5067d0 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 dd6d3ffead7ad..5d3231b1f05f4 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.27 2002/03/19 22:58:56 deischen 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 97e1d65e3e98c..5e78e952e0340 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 0aa49d129d848..2801ab073491a 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 80a8fd5e47485..be51e978864e1 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 b8b9f3c6b910c..884b23231bf1e 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 cdc5fa7515cd2..3f8705adde728 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 b633c08c8de6d..1455ad08000fc 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 8ff8b43b02f97..141694958da13 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 a10c88973439f..53ee11d0ed784 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 0d1ffe924ccdf..595b5e1cca61b 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 745ba239499a7..af76ef0832aee 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 ad2d10eedb07e..34d3c45638ed7 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 71a9747e7f001..a38dbb17939d5 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 d3a2b45617d44..fe64ae9b58664 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.46 2003/12/03 06:54:40 peter 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 7199372b6e18b..408af95e3c54a 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 df9759fb81dc4..5e1ed1b445d14 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.9 2001/10/10 17:48:43 bde Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_join.c b/lib/libc_r/uthread/uthread_join.c
index a410a01e1ac10..f26f0b59cdcd9 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 35953a5fbb649..b0de5a15769e6 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 17aeaea4583e8..c383003c68654 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 29e181425c313..9f692b6455b39 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 15aceb0b13899..fee328bc77427 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 0b73ab2ea0f59..573fc8cdd4e9a 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 1c9c30b8a7519..ab53524274daa 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 5e4af710ecbe2..b02a2b735bec4 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.8 2002/11/13 18:13:26 deischen 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 04db2a0ffbb55..def3eaa7c869e 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.7 2001/04/10 04:19:20 deischen 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 24cbaa6053bb5..1b3098c7d05f0 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 bd42365621a6a..7cabc70180879 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 dc94d45eda175..ac4defb2dcce0 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 eccc9e46f3821..a62bc160223c3 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 4d020d6c5360b..79d0e03c90134 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 bdc85a5261300..a3b8c1f336ac7 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 e5569e71e150d..bfe30965b93b3 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 1815f2a344997..e626e1096e864 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 380761b9881e2..56e26b94c41a5 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 57b508f266f61..6807f9c6f11bd 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 f47e7d61b64aa..638c48ebe66d4 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 62b261394dbbd..b22f0397d38a9 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 b700d97f79557..2481357b6ec19 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 9848863325b21..a48f2cce757bd 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 067befa0c1764..35a98670918cf 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 e2b79d73696cc..ba392218caaa0 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 e18d449908868..e862b0bbb74c8 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 3ecae3f04f7db..e63c04de4a950 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 ed20b6a8d2f5e..a4da7a2d4b067 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 fdda04cd46ed2..fc87c298ab8c2 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 bc1b9eec03071..c304e6e18ed68 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 2776cb2c80fcf..46f9fc4cf4442 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 1c09e3d206b8a..1e6b7746a1581 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 f85bb91ea0e53..6216855d5a304 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 ddaddeb3ff1e8..64fdf8e13b820 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 5bb825c247b40..041f148c566b7 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 17c2907619c86..9174b3af80283 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 0d9474fc26a54..1308341c36a4e 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 9099a6e73815b..cab53495ecce6 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 7696762cc5f80..1c6d8471f975c 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 081518c833f14..d99675ed854ef 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 a148d85b6785e..41f3999dc86df 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 3617b36f73357..11ae1f5920977 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 a4765427a5833..77786046d4f60 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 040e7aad2dba3..719c908518dbc 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 5eaf6ff38e51f..d9ed24dbb1a99 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 cc0b8da8db8a3..b741b5bcf786b 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 42f174b262f5c..3ac4d9340eaab 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 c245e5da6ebbd..29c90ac3b2d24 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 1ee5e7918bd97..7a85bc275852b 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 9e09db775a0af..4583a9dac2de3 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 28b5a72f8cc9e..51cf0dd1aa2be 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 6cd9cb6835671..ebcffb2f021a2 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 e71f75fb02cbd..c3cd5d2dca16b 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 0c8eae33ecae7..23bc330866a32 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 63fa4cdba10cf..79c0b0f104c69 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.5 2002/11/13 18:13:26 deischen 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 952baa350ec5a..f9dcb05a6b65c 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 f24d99f74a4a3..2e5dde2d09f15 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 d63969b085054..733c366c15616 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 272bdf6e2747a..4ccccc6539ad2 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 dbefc65218024..87f2aa13a2bbf 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 e61138b21451c..7464a0fbe5882 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 05ed065dd925b..3f00ba8cffe8d 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 fcbbc9fa44ff5..72ccdc31272f2 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 0b1e4a047cc3c..908a2abcd4886 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 31d2b8cc1080d..fec0f29842239 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 ec89255fb92c2..8b3417744f5ec 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 8bba20b726ba5..ea85d18ea41d1 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 469f1c9e70c5c..71c176e0324ef 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 fca63eebd9ec6..02e32f8817a40 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 2c42d6c2214ee..378382a040b9a 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 8bb3e1c46a97b..d11ee576a9ff6 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 92be69db120fe..9e41141c740f4 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 76b716b54db86..ec149d20739cd 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.13 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd October 10, 1998
 .Os
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index 7d7d4deca796d..c8ca2140bd011 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.20 2004/07/02 23:52:14 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 03754bb9a6209..9ab4d49b0ad40 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 2004/07/29 15:35:45 scottl Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index e505c77c43afb..a0d1817c30852 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 3d977e10ad833..24faab2d9975b 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 65a3ffd212ad0..cdd9477791a60 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 4c3c0bb0c7447..39b4f9513a226 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 6c71da8122e8b..466a6583f088b 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 b3c15e43f3268..ac917b3a9451c 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 5f7dd348507ce..d79f2e77d099f 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.15 2003/03/24 16:02:05 charnier Exp $
 .\"
 .Dd June 15, 1993
 .Os
diff --git a/lib/libcompat/4.1/cftime.c b/lib/libcompat/4.1/cftime.c
index 8033e446eb92b..40dc98b652638 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 87ee1b00f3e18..091e8ee2af75d 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 cc4a7f9ca071a..204f0ec3aa44a 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 3897136b9123d..02bdeddfb0b62 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 d6f4f8b5c2139..12a778d028d62 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 524f1a64753d4..25fdd650d2258 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 71b46147d8003..7b2d9e9f78edf 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 cf0137f7ac197..75a6ac864fba3 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 4d380e4a2898a..86c292e0b8c59 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 902ef3d5e4004..756d6dc51b668 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 5faf8eae5a04c..2c42ca2cbfad4 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 2fc85dad9b847..66d293229e8be 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 72811d5196d6a..3382b9ba240ba 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 e2f0988f06687..1fb66ca38f32f 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 5cac818927c41..5812fdfed229c 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.23 2003/07/01 15:07:01 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 f6dad1050a519..533f747a0edda 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.11 2004/07/02 23:52:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt REGEXP 3
diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c
index 8276ffcf68662..b02b5dbfa414b 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 4ab921cf6f20a..d580e7ece440e 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 a406a9f97a14e..b8666f61d8b8f 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libcrypt/Makefile,v 1.33 2003/08/17 08:28:44 gordon Exp $
 #
 
 SHLIB_MAJOR=	2
diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c
index 33186cd4de951..14a085d4665c9 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 19b84ceb831d2..705a461c183e7 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 1f97dae37b1f1..571b3c0de7acd 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.29 2004/07/02 23:52:15 ru Exp $
 .\"
 .\" Manual page, using -mandoc macros
 .\"
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index a6b91f58ced59..be503ac39237f 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 c6771605dc2f3..62ad53f58fb6b 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 594c5801c4254..8135b8d73b051 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 0615195f9385e..fb5cce0e5ccff 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 49516ccb9adfc..538c449a18be9 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 03186291ddb45..c0c73a644f010 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.4 2002/09/20 02:16:33 imp Exp $");
 
 /*
  * An interface to the FreeBSD kernel's bus/devce information interface.
diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index f31058a2353b2..06339fee989f7 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 2002/09/20 02:16:33 imp Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libdevinfo/devinfo_var.h b/lib/libdevinfo/devinfo_var.h
index b409671e1d4df..3ff9bcdd7fc85 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 11368f898b88b..14b6ba7cf1231 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdevstat/Makefile,v 1.14 2004/02/05 22:44:22 ru Exp $
 
 LIB=	devstat
 SHLIBDIR?= /lib
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index fc6c76955125a..463eef325af07 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.25 2004/07/02 23:52:15 ru Exp $
 .\"
 .Dd July 15, 2001
 .Dt DEVSTAT 3
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index f583755a72bd3..42568be5ca593 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.26 2004/06/25 01:16:02 kan Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index 7ffcf3b4b1a02..5d3ae8eab95c5 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 2003/03/18 17:05:27 phk Exp $
  */
 
 #ifndef _DEVSTAT_H
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index a9786341ff972..a16bf6ab9193a 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdisk/Makefile,v 1.42 2004/03/30 06:16:41 kuriyama Exp $
 
 .if ${MACHINE_ARCH} == "ia64"
 _open_disk=	open_ia64_disk.c
diff --git a/lib/libdisk/blocks.c b/lib/libdisk/blocks.c
index 313c5cca357e0..96d31e2937c0d 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 12812bda47ef7..d0b1eb9b98f9a 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.25 2004/01/27 15:25:33 nyan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index ef63ccc90f3f4..7da3f96a30d94 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.51 2004/04/21 23:21:13 grehan Exp $");
 
 #include <sys/types.h>
 #include <sys/stdint.h>
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index 3d498a6652d3a..641bd2c668886 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.85 2004/04/21 23:21:13 grehan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 5d2d9d5913217..0a160e6f39b78 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.122 2004/05/16 22:08:16 stefanf Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index 1f4cef070e863..42b560bc864f8 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.32 2004/07/02 23:52:15 ru Exp $
 .\" "
 .Dd March 15, 1996
 .Dt LIBDISK 3
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index 36866edc4d442..5c0734f3ea54c 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 8a8229b41d474..8427d4bba4551 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.6.2.1 2004/09/28 18:11:24 pjd Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/open_ia64_disk.c b/lib/libdisk/open_ia64_disk.c
index 8fc9f64817ee6..e396b7ed2fbc3 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 1f12f4c8a384f..842cb26b9c0a2 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 7bb7579599711..41b34ddba2509 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 251282e40596f..765cc3a5384c4 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 98992583fdff5..93b8d2bb5d69a 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 024981beff239..e0d5864b31588 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 15317d384f53a..4f7469f62fe8f 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 0b57fdff5f59c..a040dfb4bfac6 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 8f2a45da91f01..582d0ee09f33a 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 ec955e2d35e49..31c89bb736c64 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 9832b0d32a1bd..5e354eba9792d 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 49d58fdd9850b..f8b6e9503bd52 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libedit/Makefile,v 1.28 2003/08/18 15:25:38 obrien Exp $
 
 LIB=	edit
 SHLIB_MAJOR=	4
diff --git a/lib/libedit/TEST/test.c b/lib/libedit/TEST/test.c
index d7b4df52336f2..9ae845ad8f6f6 100644
--- a/lib/libedit/TEST/test.c
+++ b/lib/libedit/TEST/test.c
@@ -44,7 +44,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.8 1999/09/21 00:07:03 lukem Exp $");
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/TEST/test.c,v 1.4 2001/10/01 08:41:27 obrien Exp $");
 
 /*
  * test.c: A little test program
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index 8efb35d3be477..d7d70f871f6e5 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -40,7 +40,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 2001/10/01 23:00:28 obrien Exp $");
 
 /*
  * chared.c: Character editor utilities
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
index 80606bb83192c..39f693bb5c561 100644
--- a/lib/libedit/chared.h
+++ b/lib/libedit/chared.h
@@ -35,7 +35,7 @@
  *
  *	@(#)chared.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: chared.h,v 1.5 2000/09/04 22:06:29 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/chared.h,v 1.6 2003/01/01 18:48:44 schweikh Exp $
  */
 
 /*
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 145f4b7d6de4f..b79db0de5ef34 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -40,7 +40,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 2003/01/01 18:48:44 schweikh Exp $");
 
 /*
  * common.c: Common Editor functions
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 373e5cd0d65aa..a3553037ae204 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.21 2003/09/08 19:57:17 ru Exp $
 .\"
 .Dd November 12, 1999
 .Os
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 62c1409495ceb..a8362da808014 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.16 2002/12/27 12:15:30 schweikh Exp $
 .\"
 .Dd November 8, 2000
 .Os
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
index 4491b30e45a86..004b49df05621 100644
--- a/lib/libedit/el.c
+++ b/lib/libedit/el.c
@@ -40,7 +40,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 2002/06/16 08:29:35 mdodd Exp $");
 
 /*
  * el.c: EditLine interface functions
diff --git a/lib/libedit/el.h b/lib/libedit/el.h
index dc1d257be8954..c742d21d8fc77 100644
--- a/lib/libedit/el.h
+++ b/lib/libedit/el.h
@@ -35,7 +35,7 @@
  *
  *	@(#)el.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: el.h,v 1.7 2000/11/11 22:18:57 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/el.h,v 1.4 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index eff478dfdbbcd..d43704e362864 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -40,7 +40,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 2003/01/01 18:48:44 schweikh Exp $");
 
 /*
  * emacs.c: Emacs functions
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
index f4bbf5dee2e37..4b3f2b793324f 100644
--- a/lib/libedit/hist.c
+++ b/lib/libedit/hist.c
@@ -40,7 +40,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 2001/10/01 23:00:28 obrien Exp $");
 
 /*
  * hist.c: History access functions
diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h
index 7fbaaa4a5c787..eb9805a4dc189 100644
--- a/lib/libedit/hist.h
+++ b/lib/libedit/hist.h
@@ -35,7 +35,7 @@
  *
  *	@(#)hist.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: hist.h,v 1.5 2000/09/04 22:06:30 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/hist.h,v 1.3 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index f2e6aee6fdce3..04a72904c340f 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -40,7 +40,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 2002/10/14 10:42:38 tjr Exp $");
 
 /*
  * hist.c: History access functions
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index 7643f3d75d5dd..99107f5dafe92 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -40,7 +40,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 2002/12/30 21:18:03 schweikh Exp $");
 
 /*
  * key.c: This module contains the procedures for maintaining
diff --git a/lib/libedit/key.h b/lib/libedit/key.h
index c6d71881e8402..a061c3af698f5 100644
--- a/lib/libedit/key.h
+++ b/lib/libedit/key.h
@@ -35,7 +35,7 @@
  *
  *	@(#)key.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: key.h,v 1.4 2000/09/04 22:06:30 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/key.h,v 1.3 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/makelist b/lib/libedit/makelist
index 3201a1436c20d..e91f8e99aa636 100644
--- a/lib/libedit/makelist
+++ b/lib/libedit/makelist
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #	$NetBSD: makelist,v 1.6 2000/09/04 23:45:18 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libedit/makelist,v 1.8 2003/08/04 21:31:51 ache 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 67c61cf56500c..1328b70cf0c62 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -40,7 +40,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 2001/10/01 23:00:28 obrien Exp $");
 
 /*
  * map.c: Editor function definitions
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
index 5ca7f52b29af1..a25a038b9643e 100644
--- a/lib/libedit/map.h
+++ b/lib/libedit/map.h
@@ -35,7 +35,7 @@
  *
  *	@(#)map.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: map.h,v 1.5 2000/09/04 22:06:31 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/map.h,v 1.3 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
index f83dc94c6e386..4a21245076013 100644
--- a/lib/libedit/parse.c
+++ b/lib/libedit/parse.c
@@ -40,7 +40,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 2001/10/01 23:00:28 obrien Exp $");
 
 /*
  * parse.c: parse an editline extended command
diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h
index 356750d7ad604..c30fb37a455ac 100644
--- a/lib/libedit/parse.h
+++ b/lib/libedit/parse.h
@@ -35,7 +35,7 @@
  *
  *	@(#)parse.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: parse.h,v 1.3 1999/07/02 15:21:26 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/parse.h,v 1.3 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 10ba70b2baca6..c85c1bd5b927b 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -40,7 +40,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 2001/10/01 23:00:28 obrien Exp $");
 
 /*
  * prompt.c: Prompt printing functions
diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h
index 509c9207cf297..9ddb898fb7947 100644
--- a/lib/libedit/prompt.h
+++ b/lib/libedit/prompt.h
@@ -35,7 +35,7 @@
  *
  *	@(#)prompt.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: prompt.h,v 1.4 1999/11/12 01:05:07 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/prompt.h,v 1.2 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
index 6b9d71688aa7e..c8bad4d6aa7a6 100644
--- a/lib/libedit/read.c
+++ b/lib/libedit/read.c
@@ -40,7 +40,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 2001/10/01 08:41:25 obrien Exp $");
 
 /*
  * read.c: Clean this junk up! This is horrible code.
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index 08f1336e203a2..731aef029073a 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -40,7 +40,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 2001/10/01 23:00:28 obrien Exp $");
 
 /*
  * refresh.c: Lower level screen refreshing functions
diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h
index 516f3ad2825c2..8034be7732f9f 100644
--- a/lib/libedit/refresh.h
+++ b/lib/libedit/refresh.h
@@ -35,7 +35,7 @@
  *
  *	@(#)refresh.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: refresh.h,v 1.3 2000/09/04 22:06:32 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/refresh.h,v 1.2 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 96a0206bd2852..d7f07d1eab0c0 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -40,7 +40,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 2001/10/01 23:00:29 obrien Exp $");
 
 /*
  * search.c: History and character search functions
diff --git a/lib/libedit/search.h b/lib/libedit/search.h
index 8f9594a0d0be5..3cef49e0e9d67 100644
--- a/lib/libedit/search.h
+++ b/lib/libedit/search.h
@@ -35,7 +35,7 @@
  *
  *	@(#)search.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: search.h,v 1.4 1999/07/02 15:21:27 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/search.h,v 1.3 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c
index 55bebb03b59c8..85c4058ce3631 100644
--- a/lib/libedit/sig.c
+++ b/lib/libedit/sig.c
@@ -40,7 +40,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 2001/10/01 08:41:25 obrien Exp $");
 
 /*
  * sig.c: Signal handling stuff.
diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h
index 80910658c856f..2ea518ca349ef 100644
--- a/lib/libedit/sig.h
+++ b/lib/libedit/sig.h
@@ -35,7 +35,7 @@
  *
  *	@(#)sig.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: sig.h,v 1.2 1997/01/11 06:48:11 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/sig.h,v 1.2 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
index 894f59e8ec669..41e4bcc4524d7 100644
--- a/lib/libedit/sys.h
+++ b/lib/libedit/sys.h
@@ -35,7 +35,7 @@
  *
  *	@(#)sys.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: sys.h,v 1.3 1997/01/11 06:48:12 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/sys.h,v 1.4 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 03cd4c4445369..01e9c4021ba12 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -40,7 +40,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 2002/01/24 13:54:19 obrien Exp $");
 
 /*
  * term.c: Editor/termcap-curses interface
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
index 9dff45727344a..b77293e43eea2 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/term.h
@@ -35,7 +35,7 @@
  *
  *	@(#)term.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: term.h,v 1.11 2000/11/11 22:18:58 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/term.h,v 1.5 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 8c7ae8e36ca4c..0c5353573296f 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -40,7 +40,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 2001/10/01 23:00:29 obrien Exp $");
 
 /*
  * tokenize.c: Bourne shell like tokenizer
diff --git a/lib/libedit/tokenizer.h b/lib/libedit/tokenizer.h
index b49c9dbc0f8c8..bc6fe3cc2ee64 100644
--- a/lib/libedit/tokenizer.h
+++ b/lib/libedit/tokenizer.h
@@ -35,7 +35,7 @@
  *
  *	@(#)tokenizer.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: tokenizer.h,v 1.3 1999/07/02 15:21:27 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/tokenizer.h,v 1.3 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index b4c9f4f4e10e4..4c215b99eb562 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -40,7 +40,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 2001/10/01 08:41:25 obrien Exp $");
 
 /*
  * tty.c: tty interface stuff
diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h
index 7e9cd8b038ae5..a0b7d43bc61cc 100644
--- a/lib/libedit/tty.h
+++ b/lib/libedit/tty.h
@@ -35,7 +35,7 @@
  *
  *	@(#)tty.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: tty.h,v 1.7 1999/09/26 14:37:47 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/tty.h,v 1.4 2001/10/01 08:41:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index 72de5c9b0ce72..bac6fcc51f2e1 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -40,7 +40,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 2003/01/01 18:48:44 schweikh Exp $");
 
 /*
  * vi.c: Vi mode commands.
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 496a12bcc446d..81e603fd8fe8f 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libexpat/Makefile,v 1.4 2003/08/17 08:28:44 gordon Exp $
 
 EXPAT=		${.CURDIR}/../../contrib/expat
 
diff --git a/lib/libexpat/expat_config.h b/lib/libexpat/expat_config.h
index 036c4d3a5cd53..065b7b899536e 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 2d5fc3e5e82ef..f18c7eac9bc12 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 3f9ca1c618c17..57b8eddb834e7 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.43 2004/08/06 07:27:03 cperciva Exp $
 
 LIB=		fetch
 CFLAGS+=	-I.
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index 4a169ae66a02a..5d056a2cc6a74 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.48 2003/10/23 13:50:01 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index 6f652593076a2..10b34c07a723b 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.27 2003/03/03 12:35:03 des Exp $
  */
 
 #ifndef _COMMON_H_INCLUDED
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index da965a88bdbfb..bc5f014217a46 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.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/libfetch/fetch.3,v 1.57 2004/07/02 23:52:15 ru Exp $
 .\"
 .Dd July 1, 1998
 .Dt FETCH 3
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index 59ee8a849f5fe..c328806ab12ba 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.37 2003/01/28 08:04:40 des Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libfetch/fetch.h b/lib/libfetch/fetch.h
index 1c627d34f8f44..17472e5783e5e 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.25 2002/07/22 16:11:39 des Exp $
  */
 
 #ifndef _FETCH_H_INCLUDED
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index d73159abb6dd8..bb6670df04baf 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.16 2003/01/28 08:04:40 des Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index 6d7a81c893593..1c5e5be579ffc 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.90 2003/08/29 15:56:52 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 9a4a11ec4b866..9ce0277fbeadb 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 1d723d1f0d165..f1e952b3135c9 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.73 2004/08/07 20:23:50 des Exp $");
 
 /*
  * The following copyright applies to the base64 code:
diff --git a/lib/libfetch/http.errors b/lib/libfetch/http.errors
index 1f38574d463a7..62e5581a2e237 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 6e69075ba698a..3f02f3121eb2d 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 4cce5d8f9b733..8be3a071f69d1 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libftpio/Makefile,v 1.13 2002/09/28 00:25:29 peter Exp $
 
 LIB=		ftpio
 SHLIB_MAJOR=	5
diff --git a/lib/libftpio/ftp.errors b/lib/libftpio/ftp.errors
index c03eeacae3294..632fcdca24f68 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 3d2b57736b0f7..5c63eb490c3d8 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.33 2004/07/02 23:52:15 ru Exp $
 .\"
 .Dd June 17, 1996
 .Dt FTPIO 3
diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c
index 313f42b49a13a..bfafe90876e88 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.42 2002/07/02 11:11:17 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libftpio/ftpio.h b/lib/libftpio/ftpio.h
index 879abea6607c7..5799d6a30e2e2 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 c64ce5072d5bc..a10f06876a897 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 d308849e80a14..7029119079a36 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 fbc9cb876c9be..34ff632a1dfda 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 14f9b222123c8..fc61e3f418481 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 af4d94f75f4bb..4e3e0858bba65 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.4 2004/03/09 21:14:18 jhb Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libgeom/libgeom.3 b/lib/libgeom/libgeom.3
index 0c142ed875d36..835b2b26d91b4 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 2cdb037b1f252..17b410b6c242c 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/libio/Makefile b/lib/libio/Makefile
index 71e1c9e09cc6b..fa8ee2be0d1ea 100644
--- a/lib/libio/Makefile
+++ b/lib/libio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libio/Makefile,v 1.2 1999/08/28 00:04:42 peter Exp $
 
 LIB=		io
 SHLIB_MAJOR=	1
diff --git a/lib/libio/alpha_sethae.c b/lib/libio/alpha_sethae.c
index 206b6ddac4d2e..ce6c920fbf199 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 5b479686f376d..764d44cfc1c55 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 a963349f29e14..91cbdee672dc9 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 1f4c62034ef3a..70b3609325500 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 eab2a0380b63a..b5c7a49da7384 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 d197caa2fdc62..5beb21266d95b 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.15 2003/11/05 09:41:23 ume Exp $
 
 LIB=	ipsec
 SHLIBDIR?= /lib
diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c
index 3ce525b169374..9ed56a1fe7c00 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 911b2ce46428e..cd6d1c42d1af4 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 5c63acffdda4d..faf96af0b2d3e 100644
--- a/lib/libipsec/ipsec_set_policy.3
+++ b/lib/libipsec/ipsec_set_policy.3
@@ -1,5 +1,5 @@
 .\"	$KAME: ipsec_set_policy.3,v 1.15 2001/08/17 07:21:36 itojun Exp $
-.\"     $FreeBSD$
+.\"     $FreeBSD: src/lib/libipsec/ipsec_set_policy.3,v 1.19 2004/07/01 17:13:15 ru Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
 .\" All rights reserved.
diff --git a/lib/libipsec/ipsec_strerror.3 b/lib/libipsec/ipsec_strerror.3
index 2c90a1ed94ef2..8e81c9d003f42 100644
--- a/lib/libipsec/ipsec_strerror.3
+++ b/lib/libipsec/ipsec_strerror.3
@@ -1,5 +1,5 @@
 .\"	$KAME: ipsec_strerror.3,v 1.9 2001/08/17 07:21:36 itojun Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libipsec/ipsec_strerror.3,v 1.12 2003/10/26 12:00:27 ume Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
 .\" All rights reserved.
diff --git a/lib/libipsec/ipsec_strerror.c b/lib/libipsec/ipsec_strerror.c
index 203b6517edb4b..5451d5f4675eb 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 d9a1f0deffe2e..2492f7a14d6bb 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 07ff582ec8275..022961c4c63ab 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 ca75df44a17a1..628d01e9209a4 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 d8d467642a554..0b23ea3fcc9a2 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 ae25958852cc5..95aab84bb89f4 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 f95756954e10c..5c899a62efd0a 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 65c111dd094d9..f08e84dada0b1 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 66f566a4bd04b..2cd9c094afac6 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 e232892869513..0d2e9fd79a198 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.14 2004/07/02 23:52:15 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt IPX 3
diff --git a/lib/libipx/ipx_addr.c b/lib/libipx/ipx_addr.c
index 99da440426994..b3f9ab28e1c8d 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 0864bde8a7c6f..c3227e03ff39d 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 763c5fd6eb1bb..8c1c8dca0350c 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkiconv/Makefile,v 1.2 2003/12/08 08:32:19 fjoe Exp $
 
 LIB=		kiconv
 SHLIBDIR?=	/lib
diff --git a/lib/libkiconv/kiconv.3 b/lib/libkiconv/kiconv.3
index affacf1687cb8..757d1381bd8e3 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 d9a80ee5ec992..287c01eca21e5 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 682d2cd7fc0ce..5a1c20453c91b 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 58d4ec8a0e7b9..7792e3d4ebf31 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 5078c28d16f6d..623355bfa3fb4 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 2003/09/26 20:26:20 fjoe Exp $
  */
 
 /*
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 33081c4226e91..6f46fa8baf42a 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 1d3c5eb610162..33f737a90ffaf 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 44a9e8c96b60e..e0fb549d92f1f 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.26 2004/06/08 13:08:19 stefanf Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index 0886c778cf6d6..35aeff592eef7 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 096996fbcc2f1..90bbe08de3ad6 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.7 2001/10/13 04:38:46 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/user.h>
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index 0e0366d7b5839..44072084b43dc 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.17 2004/05/19 18:24:13 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 25f4442f9ffe4..06a801e04c023 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.1 2004/05/14 12:24:03 cognet Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index 4a2e20cf39944..d57df635b1b89 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 754d82213a06e..b6aa598a788ce 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.7 2001/10/01 16:09:16 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 d803c9795f337..28d218c819e0a 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.14 2004/07/02 23:52:16 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 23310bc7ef166..da754ca970725 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 72d59cd38fb42..2ca68a1ce5e60 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 bacaed62f6cc4..ceb55a895d0ce 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.18 2004/07/02 23:52:16 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 edd2068de4d1d..1d760b227e93d 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 9ba7a5c2cba17..9430c15119441 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 c9550c3866873..8489d291f2d21 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.15 2001/10/10 17:48:43 bde Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_ia64.c b/lib/libkvm/kvm_ia64.c
index 964919097253c..6aa8dbfa932ec 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.4 2003/05/16 21:26:40 marcel 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 c1dd8b7212f35..c71e480eafe49 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 a289a7e5435bc..9e77eb3376543 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.16 2004/07/02 23:52:16 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 204d5e66fb542..00a9fa6998ef3 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.2 2002/05/15 09:56:40 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index 6afe9031c1a85..8e9f1c56e5cf4 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.8 2002/03/22 09:18:38 obrien Exp $
  */
 
 struct __kvm {
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 41aed4b89988a..8711afaf2fffc 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.79.2.1 2004/09/09 10:03:21 julian 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 a2a24850d57af..1e050671232ff 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 c74e5579ed739..ea720c86d721d 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.5 2002/03/21 23:38:09 obrien Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index 167d1f4fd6bb8..22311022e465f 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.6 2002/12/27 01:45:05 jake Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 632ff43276662..d369f05afca18 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmagic/Makefile,v 1.3 2004/08/09 11:05:09 obrien 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 ad2b5d6cfda52..61061c8d242f3 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libmagic/config.h,v 1.1 2004/08/09 08:48:28 obrien Exp $ */
 
 #include <osreldate.h>
 
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index f3759eb031b2c..dcd9ed5ce97ea 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmd/Makefile,v 1.41 2004/02/26 07:44:37 bde Exp $
 
 LIB=	md
 SHLIBDIR?= /lib
diff --git a/lib/libmd/md2.copyright b/lib/libmd/md2.copyright
index acef7bab5be66..545af1c2afd17 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 e449eed2979f7..4b1adeffcfd6a 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 c08fe0b8e337f..743a379d30b60 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 e4502073a1ce9..0c170052918a0 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 f727d7ed02c96..0c2eaed54fa46 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 d3725123019e1..d8b195943508f 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 b718bf8b5ebe9..f5ecc5bd48fd5 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 45a0972b725ce..45933f86e9454 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 2d879bca517c1..944775d32b260 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.26 2003/10/09 23:06:06 hmp Exp $
 .\"
 .Dd February 11, 1999
 .Dt MDX 3
diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c
index fd2589aecd4a6..73ee6051146e6 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 c12c5fb5b9905..d54eef3a4c2c2 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 53b172e92662b..426e085667149 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.13 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd February 26, 1999
 .Dt RIPEMD 3
diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h
index e64f501db014b..ca13e62d8564b 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 2467d71bc2c2d..c7d0bc7d8c67c 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 29084a962b6e8..1d81a87d0a946 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 b8a7f960a45d4..c778101f0b0cc 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.15 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd February 25, 1999
 .Dt SHA 3
diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h
index 7e5f2b67f965b..7b399e5584bf0 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 47ea62b212d96..6826e6278eb4d 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 97a6ceb77389d..7281ebad88a3d 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/shadriver.c b/lib/libmd/shadriver.c
index 4dd9078ddb4c2..684a8aea1b10f 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.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/libmenu/Makefile b/lib/libmenu/Makefile
index fd3ddfe711580..66414e7edbd71 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 3e89e332454c5..eccc4fac198f7 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmilter/Makefile,v 1.4 2004/06/01 01:29:41 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index 26ff2c88f2846..63700692f567d 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmp/Makefile,v 1.9 2004/07/28 05:44:07 kan Exp $
 
 LIB=		mp
 SHLIB_MAJOR=	4
diff --git a/lib/libmp/libmp.3 b/lib/libmp/libmp.3
index 9be21d7b0de43..99352b735ded3 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 4c2c94d05fc84..dbe5023484aa6 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 726e2f179dc6e..ab078464d1fe2 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 43380553e8f90..0ca5463fb9d6d 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 1896dbe3d1421..a976bd1e2ef89 100644
--- a/lib/libncp/Makefile
+++ b/lib/libncp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libncp/Makefile,v 1.4 2002/09/28 00:25:30 peter Exp $
 
 NCPLIB=${.CURDIR}
 
diff --git a/lib/libncp/ipx.c b/lib/libncp/ipx.c
index 9371fddb55905..3757656d5244a 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 2d8d7f039ec65..9f7f577c4722b 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 ab591eb44fc95..651529536e88d 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 8f49cb9a2c889..b266e5ebfdc2d 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.9 2004/07/28 05:44:52 kan Exp $");
 
 /*
  *
diff --git a/lib/libncp/ncpl_crypt.c b/lib/libncp/ncpl_crypt.c
index bc304c0cb2e24..bfd60f092e1f3 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 2ffcc466a6ec9..676e24920efa2 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 16a54c5db15b7..7e38c67e8c2d2 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 5af2d72871857..5bb54bbeabea5 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 c161ce1e87bda..2039f18d5b9f8 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 68fae017bff9b..38a6b00492283 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 1f003a1519931..d75018e5c20b3 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 72395f32b2e29..0314735efbc77 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 f2240e3b1301e..c69e720d1cbc6 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 0dd191faf3980..9f25ab8edc096 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.10 2004/06/02 03:41:10 bp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libncp/sap.c b/lib/libncp/sap.c
index a0c7d0cf205b5..c0180f98d6ad7 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 37aff41cb6d84..c7055e75ea977 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libncurses/Makefile,v 1.73 2003/08/30 13:57:31 ru Exp $
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
diff --git a/lib/libncurses/ncurses_cfg.h b/lib/libncurses/ncurses_cfg.h
index 3fc4c2b1f91c0..2d14122b1b34c 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 5cac36f3651f2..6f25f3291199b 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 24e71d302df55..dc775105046af 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 42c9cd39112b1..dfd41e8d38ed2 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libnetgraph/Makefile,v 1.10 2004/01/28 00:11:42 ru 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 696d7d945bcea..9ccfcb8f61212 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.7 2001/09/30 22:03:54 dillon Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libnetgraph/internal.h b/lib/libnetgraph/internal.h
index 0c947e5eab6d4..82a06db32d7d8 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 90b6278a53153..d9ef1240c759f 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.9 2004/01/27 20:25:14 ru Exp $");
 
 #include <sys/types.h>
 #include <stdarg.h>
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index d2ef8bd8c8fe5..87dc5c4ed2f6a 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 4eb15bd8bd892..21038a488a5cd 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 070abea9852d1..67b5aa00d75be 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.6 2004/01/27 20:25:14 ru Exp $");
 
 #include <sys/types.h>
 #include <stdarg.h>
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
index 36709141187a2..ff018e975d20a 100644
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libngatm/Makefile,v 1.5 2004/07/08 17:09:55 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 8f95c40defa2c..a5de56efb1914 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libopie
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libopie/Makefile,v 1.18.2.1 2004/10/01 16:32:05 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 b6ad39bbbf03a..8eb9c58921931 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 6e2b6b88328c8..1e7c1620bb04f 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 088e8a03b4f58..11d4a84a26958 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 22c076be3527e..e546505559915 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.15 2004/03/15 13:23:20 des Exp $
 
 .ifdef PAM_DEBUG
 DEBUG_FLAGS+=	-DDEBUG
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 2d6498ab9f281..6fd6af75ebd23 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.50 2004/08/06 07:27:04 cperciva 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 c3fe8e3f84673..5523034fe64ba 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 a9ddfba51a263..6ff35563eb4c9 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 ffc6f92c40520..757698914bbec 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 cacf0115da7a8..9247187e9bc29 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 b21a93d52553e..7c87240b66e28 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.15 2003/03/09 20:06:34 obrien Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index 9858c58c45f9e..0fa8dad00423b 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.18 2003/05/31 16:52:57 des Exp $
 
 MODULES		 =
 MODULES		+= pam_chroot
diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile
index 6d0fc0ef7a56b..018d7a7e26acf 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 1bb48008d7812..08cf1c6188992 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 447e5f78dd104..49f53aca03699 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 3bf819692747a..c01782f79f1a7 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 d9544be9b09f6..4ca5c8f58400a 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 2c91e2685a089..8d084f4a1c9ec 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.9 2002/04/12 22:27:19 des Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile
index 6f239460e9b0a..5b123d56133be 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 b162b5b1e4b58..0ba857893c948 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 ff008597b9214..3bebc486d5193 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 0cf4268a27a8b..b197664cc6bd4 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 c07ff26ecd6d2..5b88ab62e315b 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.4 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd February 6, 2003
 .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 b59a9d353db00..a54829598e907 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.3 2003/02/06 12:56:51 des 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 8bca1aab86dd1..2219dad72fa85 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 380e3b026c708..69642cce95ae6 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 421955ab250ec..389b2e0a95ed7 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 73b072a477956..7607450dda307 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 832841b4c6993..1ee17e87fae5a 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 a9d5fc32df1c3..f3168e167f8bd 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 ccc192e5378ae..a174e84e48a9f 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 0bd175524f7ea..29cf852083925 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 110edcec0ed4e..096498a56ec57 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 9bbe345353a96..250a334e82c85 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.13 2004/08/06 07:27:04 cperciva 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 3e0db91e009a2..f7a455aa87272 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 b1b97e52a3d8c..46e93a149dc81 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.20 2004/02/10 10:13:20 des 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 1cb19990c81f0..c000e19b5b310 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 614dc9ef78f87..08322b79eb47f 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 80a395a8abd90..2539c4e48d4d7 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 f0b96c4d7da7f..911be918bda39 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 274de2fbe99c8..cc70abf7d41f4 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.6 2004/07/02 23:52:17 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 519d4520b8123..d892ea3c01901 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 60e94f51f02c7..d28ea0223128f 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 78be90683ad7a..ea2b697e7a965 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 dbc139717dc5a..3ec674433b9e3 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 6995227487d64..1cb0e1d0980b0 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 945d5eb913a79..9caf1612dd343 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 38c304958042a..95f7dc1942488 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 ba5a7d4aa770a..f76b7da2206ff 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 a2c5990a9c237..cd9be29e944a7 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 f148be6fdecbc..9c06cbfecc5d1 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 fbc12788e9ca3..2a0171178d9b9 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 968985a6c9f67..759d6738d21e2 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 737b044e747dd..03e3322b847b5 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 1554a882ba301..4e031138f0341 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 07a66a4e84fde..1cb2ea8434ab5 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 035111553d5ec..bb015fd82db2c 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 905afe1c7eb6d..c3add1f1edc59 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 408f77d2707d3..fa17f291aca1e 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 dbbd5b5d58134..23e194a515d00 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 c7d98ab48e165..40f68c64227d9 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 fe0a4ed2958b0..25a8d693e8ebc 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 88e4357a4b262..1d4165fa58e95 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 2ff55757071f5..df926facc8e06 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.16 2004/07/02 23:52:18 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 f6e1dc73a6147..61e52d9e05389 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.22 2004/06/25 12:32:45 kan 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 866267e63e117..4aa7731cbfebb 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 8adfcc6ed5ae0..fa8b80250b9fc 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 4ba6ade378348..965493f4b1640 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 8582daae97c5a..12860fef6462d 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 4203fbd246b73..ced6cf442ead1 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 16fab1f22cc58..1ad149d5daa0f 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 8eb3e6e7a6d1e..ad0a563337c55 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 5825fb452a7a8..66e92a11a6cbe 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 f58274a2ff47f..67fd4859204ca 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 50718e1798460..1aecd82f18083 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 d021434770c60..8dd9e14a3a9ae 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 63df46c0f984c..1ff1e14e1de26 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 c7e4c332d8b46..45b74e913277c 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.18 2004/08/06 07:27:04 cperciva 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 468e99c452b8f..3a65a0ea11143 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 2004/07/02 23:52:18 ru 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 719178cc3644b..437c8ac0b9bbf 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 2004/02/10 10:13:21 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 053812ac5178d..71573baf09dac 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 03faf0cee7de6..f1944a0685d51 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 7f860c3b370f3..c0cdf544f88d7 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 f8501a78c64c1..9dadcf88c3304 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.18 2003/03/09 20:06:38 obrien 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 21889949cdf2e..53c2c53b0d743 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.10 2004/01/17 09:46:49 schweikh 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 e45a777e23192..5ae789751892f 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.49 2004/02/10 10:13:21 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libpanel/Makefile b/lib/libpanel/Makefile
index e715921652ac3..ae0e11a2c275a 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 57651c324f428..bf253eca1b9ec 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpcap
-# $FreeBSD$
+# $FreeBSD: src/lib/libpcap/Makefile,v 1.33.2.1 2004/10/01 16:32:05 kensmith 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 39a80b4171194..d2fb73582174d 100644
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libpcap/config.h,v 1.3 2004/03/31 09:15:09 bms Exp $ */
 /* This is an edited copy of the config.h generated by configure. */
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index c0f0399f3723d..8e74201beb040 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.52 2004/08/16 03:27:28 davidxu 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 7bb3ad93cbffe..2bd7bbbd01ab0 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 6ef42b629c8b7..d6c9112760fc3 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 4dfddff600a5e..b0e8d85decf7a 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.2 2004/02/10 20:45:28 cperciva 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 c8445b177c546..70745558d96cc 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 7c3e62bbb50ea..f8cfe4fad24e5 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 c7a85f12b31a8..8d5c545a53286 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 c8b0362bca851..54a06d540d558 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 9e6ed74df7106..e75a448b1427e 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 fb0df8725785c..401243de0b2b3 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 67d4943071ebb..02c1c60e07f22 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.3 2004/08/15 16:28:04 dfr 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 980eb8e664caa..d784ac09d1ea2 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 4f903c57fd2b8..d731b1f076a6c 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.9 2004/08/16 03:27:28 davidxu Exp $
  */
 /*
  * Machine-dependent thread prototypes/definitions for the thread kernel.
diff --git a/lib/libpthread/arch/i386/Makefile.inc b/lib/libpthread/arch/i386/Makefile.inc
index 73a9a8acde45f..3107b574e6ee0 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 3d9bd368f1097..cf30de9308c9b 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.3 2004/08/15 16:28:05 dfr 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 bf6df8f5c60bd..247341cf22a8d 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 c3d6a78693afa..92a7c59ed7c4c 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 7bc3d1b71a054..33f759ee798b5 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 d208d2ecb6863..cfe98bbf9d885 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.10 2004/08/16 03:27:29 davidxu 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 c8b0362bca851..3e4f8151d4550 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 9411293ec7b81..0bb7f36566ebf 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 5df4d939272c0..28c6a89b96237 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 00e9a40fe5df7..dd55f01df8398 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 483c9050634d1..1a3e7dc5ae677 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 1df5046287f2d..c3115f505b673 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/sparc64/Makefile.inc b/lib/libpthread/arch/sparc64/Makefile.inc
index 07107b4729af6..0d3d53e0e9b83 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 4f4d8af28c82c..24085da710b34 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 fac62c2bf1c41..49e53014f810a 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 3e22c9f6e1344..3a902ec1fb385 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 d6bf95d00d6dc..a163c2abdf0ab 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 ca6473ab18eae..c76051a4e9530 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 4d9110e719120..f8f13611454b4 100644
--- a/lib/libpthread/pthread.map
+++ b/lib/libpthread/pthread.map
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/pthread.map,v 1.12.2.1 2004/10/11 20:04:58 julian Exp $
 LIBTHREAD_1_0 {
 global:
 	___creat;
diff --git a/lib/libpthread/support/Makefile.inc b/lib/libpthread/support/Makefile.inc
index 0b7e0598fb583..7bfb40c591b9d 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.7 2003/09/05 18:08:19 kan 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 ad40fec879e42..e8acb2807d309 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.3 2003/06/28 09:55:01 davidxu Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc
index fb4a108856953..447e62b1e44b3 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 e65b552ffaa33..729b8420bbb11 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.8 2003/11/04 20:01:38 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libpthread/sys/lock.h b/lib/libpthread/sys/lock.h
index 6102a0b7d60fc..feb6bb417d13c 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 6f19f931fce9a..b08ee94dea863 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.7 2003/04/23 21:46:50 deischen Exp $
  */
 #include <pthread.h>
 #include "libc_private.h"
diff --git a/lib/libpthread/test/Makefile b/lib/libpthread/test/Makefile
index 5b5eb3c79a36a..32225c6390fee 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 8f625a1438e73..fcfe0cf57904f 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 42bf4edd3bbbe..e90a946b41849 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 7802ff3c38d6f..f9b92caa7d9f0 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 2eefa7f48bfe5..a0458df1810e5 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 6d77526f16c77..7fc80057c1fe2 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 942bf2dae0aea..bbcef450a3790 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 6532ca5bfc746..bbd73ca4a13c1 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 801d7791e2dd9..babf5d720cc2b 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 6b8509043d980..5d4d4edcbfab8 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 b834591852d96..85b9c7378c4f9 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 aa80a073e4e1f..1b3aa4657d18b 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 f3ccd6b98491d..5a4a351aabd7b 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 2863e5c3fa0c1..e8a9ee689779b 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 3ba361e884dfc..45a7efcda1694 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.48.2.1 2004/10/11 20:04:59 julian Exp $
 
 # thr sources
 .PATH: ${.CURDIR}/thread
diff --git a/lib/libpthread/thread/thr_accept.c b/lib/libpthread/thread/thr_accept.c
index 0131bc8eb97cb..4a05d39151f6f 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 5b8a6dcaa4214..12c08280d787b 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 0487a366c1af9..f498959166938 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 e239a1dc5c41f..de1b9a8954e37 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 e844acbd7a008..67d26a87fbf08 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 d994548de061d..d0376bb4fb22a 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 b32015ad0a154..172bc1c000c15 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 26ae9e4831134..8210c06745752 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 79911f4ad4ba8..3b6545935ebb3 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 1234b7d06849b..56e4913d0aff8 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 fefe6cf8ee43c..92095f61eca45 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 8c0f87fbe07d8..e9710db3da13a 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 d0822489de32a..27bf56a66eb14 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 ec1a9beeeb7ea..681ac23344bbc 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 9c73463ab9adc..5d34d0bf92761 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.9 2003/07/18 02:46:55 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 d844d6297106a..d1f136c596170 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 4d517f2382258..b925247a4e2f6 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 d56b2541f6d7a..399b7a1cbff27 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 e91b214bff72b..5e08c8a0b5e69 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 bbb4b1ec37d25..929e5793ca7de 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 ddb092157826d..e3cc902ec43ed 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 dcf179e290e4b..fb6a27e4e124f 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 feeb7132fed1f..10f8ad126976b 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 87837f13388d1..ada9b4d8a4225 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 e26ab7df948ec..2bc2d9b692c62 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 95b2a853ca586..c5af0bdcae664 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 612acb1c57d85..5028c88d07624 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 f71c0ddf0551d..f7c6790162eba 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 8cd7acc2f6aff..750a80d7b5a8b 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.31 2003/12/09 02:20:56 davidxu 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 a8cedb43962f1..d5530a6c572cc 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.8 2003/04/18 05:04:15 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 263d4a63aaaa7..2a2f5658d3b50 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 59e8550203b57..d99f43a5e2fe3 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.8 2004/03/14 05:24:27 bde Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c
index fd7b6d927cffa..7a089ef2b5ddd 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.51 2003/12/09 02:20:56 davidxu 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 e0ade00883eee..37417174a1b64 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 7cf4c9eac92be..2b59f155fe336 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 2d5614b5ef51a..74c1712297902 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 d2a91bfcdd2a6..80e3502c71c2b 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 54bcd3b0780e7..98be28b816d0f 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.57 2004/08/12 12:12:12 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 0159e531758cc..76778f2518e4a 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 f8882f5f073b3..e2178c26d3760 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 db5b8587e123a..e3c3f052bf0e1 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.2.1 2004/10/11 20:04:59 julian Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_exit.c b/lib/libpthread/thread/thr_exit.c
index ecea47ad6dc09..e0e11604df70c 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.38 2004/08/12 12:12:12 deischen Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libpthread/thread/thr_fcntl.c b/lib/libpthread/thread/thr_fcntl.c
index 947bc1159d64f..093f23701a25b 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 e8d9fcbd3e4d1..72d82e0588f1e 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.13 2003/07/17 23:02:30 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 401aae9e18832..22570ff8cbeec 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.34 2003/11/05 18:18:45 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 15fe31a51c5a6..9452ebc7023e9 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 fa95ef9540ae3..92bec9a36f6c6 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 ad8486c8fda2c..e0ca7808876d2 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 60813819c50c4..bd61bcbd4c92b 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 baee1bbd89c32..8cb81a3515074 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.65 2004/08/12 12:12:12 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 9f940da0ff747..24481765886d8 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 ac8bf5af2b23f..5491273ca45aa 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.112 2004/08/15 16:28:05 dfr 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 226cb8606c993..e1a7dd189d6b2 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 0dacd4804c623..66d15f3e30f9d 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 d5a7a1898aa7a..57d03d029ba80 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 f3d30ff075b73..22d4a42351f9a 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 c2e34335dc4ac..b178b2d9ff82c 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 bd42365621a6a..32f657104f700 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 1232f33a181df..b7ba22f7969e8 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.45 2004/01/17 03:09:57 davidxu 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 c65270a62abeb..473400355fdb9 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 9f0f262667d8e..cc5f2970740b0 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 b9852b57a63c5..13e279fc79be7 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 e8baa844a1d02..8d9c52b5449f7 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 ad158d13e5995..dd26f9169734a 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.9 2003/09/09 22:38:12 davidxu Exp $
  */
 #include "namespace.h"
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_open.c b/lib/libpthread/thread/thr_open.c
index 8ac625d8a30f0..dc25cd44ca923 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 391b5a0b55bb3..2d975446f42d2 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 1b165989b4f35..f9b9c0353a2de 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 2a4b12bf971ce..d6ef52cd88b2c 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 f750a0178961d..ade4bbf273db2 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 b2d1987ae5479..35a7ff36ddb7d 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.118 2004/08/07 15:15:38 deischen Exp $
  */
 
 #ifndef _THR_PRIVATE_H
diff --git a/lib/libpthread/thread/thr_pselect.c b/lib/libpthread/thread/thr_pselect.c
index ce7a530dc4f4b..5c20d8f3bd0c3 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 b58d7120d4eae..4b43be443ce4f 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 0554fa411745b..c2b04c08ecf89 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 c0391c55411aa..f656ad305b36c 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 eb0e54aa0454e..7fcbc0fe1007d 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 ba9b91169d43f..663263cd9d3b3 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 9528593fbde4e..cd2b1c9a31823 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 ca8a0815d2e02..d4e33846534b0 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 8c0697bd671cf..aac5ac233680f 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 792ff09eb1897..21ca26771812b 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 0c702a66e5d27..4e85a138c0fb3 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 b347a12ead923..b84947fd6ed83 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.15 2004/02/06 15:20:56 deischen Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libpthread/thread/thr_seterrno.c b/lib/libpthread/thread/thr_seterrno.c
index 245d43f190959..536233d269231 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 c5a950600a13b..ab93c5931699b 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 63cd0730a9555..9ae2cccd2f99f 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 0f84db82efde7..21f1cec5be33f 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.79 2004/07/13 22:52:11 davidxu 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 694f37e37f959..0be34ebb6981b 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 3153ebd378dfd..a473501c15fed 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 70463a5a051fc..b350409854e05 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 7a0a76dcb8c33..c2f882872e0db 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 d87df58e60c0a..c944eefd765b4 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 b7802e3685d90..f81848cbb7bb4 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.24 2004/06/12 07:40:01 davidxu Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_sigwait.c b/lib/libpthread/thread/thr_sigwait.c
index 6f60653ea4616..8480f543529d1 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 1ee5e7918bd97..6f6250ac8e8fe 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 7547e60674a14..74c6c19a1b82a 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 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libpthread/thread/thr_spec.c b/lib/libpthread/thread/thr_spec.c
index 6c2b6367c6510..b18eb9db1f87d 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 deaeb9bfc5817..9914d8cb4fcb7 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.21 2003/12/09 02:37:40 davidxu Exp $
  *
  */
 
diff --git a/lib/libpthread/thread/thr_stack.c b/lib/libpthread/thread/thr_stack.c
index 484eb81a4c56f..7b4f5dd807432 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.8.4.1 2004/10/09 10:21:19 davidxu 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 4813de1ad6e50..06c33d395f36c 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 b70ce7008f294..7173182fea280 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 5091a9517c66c..d118c967975ec 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 57c219977714c..e20f1845453ec 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 d0d701b0f360a..e16ec4607a975 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 dbefc65218024..874bf8f2618e1 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 689f6833dce7d..8f1bc4a1edd83 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 12a10670dcfd7..450b2eb1112b4 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 4edef3bfdb818..0379ffda5229e 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 39d221c363d0f..e09667f158d34 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 81499d708f39d..0541cf49d7d61 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 5c24113c27676..f75e72e13e9c3 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 0f2eb88bbd6a5..988f98a3d9bd0 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.10 2004/08/06 07:27:04 cperciva Exp $
 
 LIB=		radius
 SRCS=		radlib.c
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index 095d6e9a58aab..4cd2edd24f337 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 6fa5cd78a587b..b4d326e9bf24b 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 6060885f0ad33..9661e520aa5b0 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 2c42c3a9f40e8..e6cacc250b798 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 d323cbd5fcc97..07269a657ffad 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 8b3a75e79d6a7..c9ab743396fea 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 2927f142d12cd..7c1f9a15fa3e8 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.16 2002/05/14 11:37:10 ru Exp $
 
 .PATH: ${DESTDIR}/usr/include/rpcsvc
 
diff --git a/lib/librpcsvc/rnusers.c b/lib/librpcsvc/rnusers.c
index 49cab076e4764..1e35a3cfb7329 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 1c19c4e841d46..7df89a64c1fe8 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 dd7b590d9506d..84831c3e27448 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 f45544546bb67..db40259796f64 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 aa5d8ae92225b..eb601a03f9946 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.4 2002/03/21 23:53:40 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index e7c59145fa2e0..00a4fac517c81 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 1d2848d4ea615..45374d4b04db6 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 b166befc287e9..2f4b14bbead9f 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 c4ee1957bcd3d..5f078b3d88877 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 2004/01/25 21:33:58 emax Exp $
 
 LIB=		sdp
 MAN=		sdp.3
diff --git a/lib/libsdp/sdp-int.h b/lib/libsdp/sdp-int.h
index d8a064d1e382d..1b7daca31a717 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 9c5f19ba2df7e..516c5188889dd 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.7 2004/07/05 17:38:08 ru Exp $
 .\"
 .Dd September 7, 2003
 .Dt SDP 3
diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h
index 42743f9887977..6b4cb7489fcf8 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.4 2004/01/20 20:48:25 emax Exp $
  */
 
 #ifndef _SDP_H_
diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c
index 20fc7e309a4a4..c0d084f0aeb20 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.6 2004/02/26 20:44:55 emax Exp $
  */
 
 #include <sys/uio.h>
diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c
index 2667966c78228..bd245926b7d99 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 a31f3278dc0fa..6f95366bca04e 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 ae41fb24074d0..ef152b1d28549 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.4 2004/04/09 23:01:38 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index ef0e194939fae..d92e060c2fcd0 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsm/Makefile,v 1.5 2004/08/01 01:16:59 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsm
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index 7f01a60843596..fd55877ca4e9c 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmb/Makefile,v 1.3 2002/09/28 00:25:31 peter Exp $
 
 LIB=		smb
 
diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile
index bbba436e1d50a..2644f722e6e38 100644
--- a/lib/libsmdb/Makefile
+++ b/lib/libsmdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmdb/Makefile,v 1.6 2003/07/07 03:54:03 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmdb
diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile
index ec23f2336d0c2..ad696d7dda345 100644
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmutil/Makefile,v 1.6 2003/07/07 03:54:03 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmutil
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 4a817461be324..61aaa0d6b0564 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libstand/Makefile,v 1.43 2004/07/01 00:01:26 tjr 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 1c7e67703e0d6..a592b4f9ead79 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 15879785a1882..8c8af826ca418 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/arp.c b/lib/libstand/arp.c
index 59f0ce5536d5f..d6c25c4ade2a1 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 b42435824ae8c..76209c50d648b 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 7bd67c91620a6..337e1b3f9dfc0 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 0a6d31034b113..4e84bb2cbf81a 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 ed9101f3ea89a..c11daf1be8818 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 e4d2f1022c925..730f4098e8658 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 a9bd323b7f62c..69ebf897fceee 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 7f89b337ce053..c82d9b016088b 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.6 2004/01/21 20:12:23 jhb Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/bzlib.c.diff b/lib/libstand/bzlib.c.diff
index cbc800d9d5da7..d2e9ed8614ace 100644
--- a/lib/libstand/bzlib.c.diff
+++ b/lib/libstand/bzlib.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libstand/bzlib.c.diff,v 1.2 2002/02/01 16:33:40 sobomax Exp $
 
 A patch to avoid linking into libstand compression routines from the bzip2
 that never being used anyway, while bloat loader(8) by additional 15KB.
diff --git a/lib/libstand/bzlib.h.diff b/lib/libstand/bzlib.h.diff
index ef6c4da16f498..d7ee9ff72bffa 100644
--- a/lib/libstand/bzlib.h.diff
+++ b/lib/libstand/bzlib.h.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libstand/bzlib.h.diff,v 1.1 2002/02/01 16:33:40 sobomax Exp $
 
 --- bzlib.h	2002/02/01 15:20:44	1.1
 +++ bzlib.h	2002/02/01 15:20:49
diff --git a/lib/libstand/bzlib_private.h.diff b/lib/libstand/bzlib_private.h.diff
index 938ecad6abc48..54ec6acfaff6a 100644
--- a/lib/libstand/bzlib_private.h.diff
+++ b/lib/libstand/bzlib_private.h.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libstand/bzlib_private.h.diff,v 1.2 2003/04/25 06:44:56 ru Exp $
 
 --- bzlib_private.h	1 Feb 2002 16:26:19 -0000	1.1.1.2
 +++ bzlib_private.h	25 Apr 2003 03:55:07 -0000
diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c
index 1c43e7564b605..a49c56bd14792 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 8ad628b876084..74d9f7d39b4ab 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 2f7be72e9a949..2989233f5dd6b 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 12d7130cca7b6..b374d559beec4 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 41547c83c7274..f042d836050c7 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.7 2004/01/21 20:12:23 jhb Exp $");
 
 /*
  * Readonly filesystem for Microsoft FAT12/FAT16/FAT32 filesystems,
diff --git a/lib/libstand/environment.c b/lib/libstand/environment.c
index 1a3cfc7e5fef5..b03f80feb412a 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 1fc5ff2ed525f..5e7e04ef7143f 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 153f1639c7896..5a7b879a426c6 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.5 2004/01/21 20:12:23 jhb Exp $");
 
 /*-
  * Copyright (c) 1993
diff --git a/lib/libstand/fstat.c b/lib/libstand/fstat.c
index 7d953604e5d5c..67083519a717a 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 9af05e0966324..388f3c600f203 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 cb0e7557c1608..89f3152c57a9d 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 03108232fff03..6e88b5ef93a86 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 0d7c59b263ac5..b8d6a2f5517b7 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 6fc8ac1c9d678..28503f5661d3c 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 392ef7a3bf3bb..eb58f7260b1ac 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 e253fad319168..41d3ed5638c50 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 3bfe09eb883bd..a03afd98d5bfd 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 debd9e4ef8b37..b985454934301 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 451c0eac89ff2..4d535a17ae23c 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.31 2004/08/06 15:29:54 roam Exp $
 .\"
 .Dd August 6, 2004
 .Dt LIBSTAND 3
diff --git a/lib/libstand/lseek.c b/lib/libstand/lseek.c
index 6880ef9297c52..f6eba7f9958c0 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 89ef12d30aa8d..25f78dd9b4dd9 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.5 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/net.h b/lib/libstand/net.h
index dcd574fb12258..0dc48b353cc1e 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 c260690c503c7..1e04b4bef1eab 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 dac285107a735..3c7fdd7d3811a 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 1c439a899ab7c..b62880c00b740 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 02c3070e222c7..5203a519e4410 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 fea4c7a52c953..47eb423e750e8 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 64721e51d4f1f..fb37778bde4c2 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 a966b0bd79920..fa601d46a209b 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/printf.c b/lib/libstand/printf.c
index e877a537418ce..fbd9103e126d7 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 584a0b1e67b0e..0eb0c716fe9c3 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 86c3772798378..6a1069660220b 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 441c4ae6d6ac2..365bc5bb01e0f 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 eed1ed0594d6e..669d07e9445d1 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 07401c1e83414..bc29cef5fb1e4 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.4 2004/01/21 20:12:23 jhb Exp $");
 
 #include <sys/param.h>
 #include "stand.h"
diff --git a/lib/libstand/readdir.c b/lib/libstand/readdir.c
index e49d93d15ed6c..e2fb1b0b82987 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 bddb49d51781c..7ebc244c36816 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 b6245f96f8fc8..cc5626c06db31 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.4 2001/09/30 22:28:01 dillon Exp $");
 
 /*
  * Minimal sbrk() emulation required for malloc support.
diff --git a/lib/libstand/sparc64/_setjmp.S b/lib/libstand/sparc64/_setjmp.S
index a66188164c1b5..84b0a63f0dd2a 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 35593ad05cfd6..b8a4b70cd5105 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.6 2004/01/21 20:12:23 jhb Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 219b2df46976b..a400752fd10d1 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.39 2004/01/15 18:35:32 jhb 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 8593281c57cd5..b8287c0f96afe 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 9eb8350938c39..622d436a446fc 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 2204d33e052fb..1043c60e50b3b 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 7c7f579cc2f5b..675ebc887c608 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 4844a1a0972ff..ab5a18cbb6091 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 3a6630c87c5e5..71a4753794709 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.11 2003/03/03 00:58:47 marcel Exp $");
 
 /*
  * Simple TFTP implementation for libsa.
diff --git a/lib/libstand/twiddle.c b/lib/libstand/twiddle.c
index 46bd8958e29d2..303750d2ae026 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 49539329b6cae..1a1e0da8006ed 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.4 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/ufs.c b/lib/libstand/ufs.c
index 6a3d758495328..1a1157bd15475 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.14 2004/01/21 20:12:23 jhb Exp $");
 
 /*
  *	Stand-alone file reading package.
diff --git a/lib/libstand/write.c b/lib/libstand/write.c
index 8f0fa9712ad40..30f676acb87b6 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 aa8ccd03c0fac..3fd75a7ea92f9 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 668f785f99cd7..143fb79d54534 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.14 2004/05/14 13:32:13 cognet Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c
index 3161fc37dcba5..cfb8f6c5e63a7 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 c872da17da73e..2dbd1a9786640 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 c90bd5a3cd358..2466f1fea551c 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/libstand/zutil.h.diff b/lib/libstand/zutil.h.diff
index 0d8193f79693b..adb72433805d7 100644
--- a/lib/libstand/zutil.h.diff
+++ b/lib/libstand/zutil.h.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libstand/zutil.h.diff,v 1.1 2002/07/20 04:18:20 peter Exp $
 --- zutil.h	Fri Jun 28 23:58:21 2002
 +++ zutil.h	Fri Jun 28 23:56:24 2002
 @@ -15,11 +15,7 @@
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 58cbcf3b2fcfa..544b3336340ef 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 2004/02/05 22:44:23 ru Exp $
 
 LIB=		tacplus
 SRCS=		taclib.c
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index 94c96943a4605..f2b9b1213523a 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 d99995dfea6da..7e10218799802 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.5 2002/09/25 23:18:51 pst Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libtacplus/taclib.h b/lib/libtacplus/taclib.h
index 2ef36b9efd50d..53d9c10a49023 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 bbc1990c92692..a261941d48e3a 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 e68982d3d627f..aad579d89632c 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 a8753671d62d3..06ca5ed7d0d90 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.20 2004/08/06 07:27:04 cperciva Exp $
 
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/libtelnet
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index aaf94e38c3a37..0d6ffc6953d21 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/Makefile,v 1.7 2004/08/15 21:51:18 dfr 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 9f6f72c745717..270dec729ed26 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.1.1.1 2003/07/19 15:57:52 mtm Exp $
 
 .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/alpha/alpha/_curthread.c b/lib/libthr/arch/alpha/alpha/_curthread.c
index 56166a77c1697..1959902ef6cdb 100644
--- a/lib/libthr/arch/alpha/alpha/_curthread.c
+++ b/lib/libthr/arch/alpha/alpha/_curthread.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthr/arch/alpha/alpha/_curthread.c,v 1.2 2003/07/24 07:51:49 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libthr/arch/amd64/Makefile.inc b/lib/libthr/arch/amd64/Makefile.inc
index c822c8c8217f8..d9a765c6f14bd 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.1.2.1 2004/10/09 15:07:19 mtm Exp $
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/amd64/amd64/_setcurthread.c b/lib/libthr/arch/amd64/amd64/_setcurthread.c
index 51395c1473123..40b3b8c8b7bbd 100644
--- a/lib/libthr/arch/amd64/amd64/_setcurthread.c
+++ b/lib/libthr/arch/amd64/amd64/_setcurthread.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/_setcurthread.c,v 1.1.2.1 2004/10/09 15:07:19 mtm Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/i386/Makefile.inc b/lib/libthr/arch/i386/Makefile.inc
index 0c86284b8046d..5300cd4244a8a 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.1 2003/04/01 07:07:38 jeff Exp $
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/i386/i386/_curthread.S b/lib/libthr/arch/i386/i386/_curthread.S
index eb658dff7a746..ba7d4ca292f0a 100644
--- a/lib/libthr/arch/i386/i386/_curthread.S
+++ b/lib/libthr/arch/i386/i386/_curthread.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libthr/arch/i386/i386/_curthread.S,v 1.3 2004/08/15 16:21:30 dfr Exp $ */
 
 #include <machine/asm.h>
 
diff --git a/lib/libthr/arch/i386/i386/_setcurthread.c b/lib/libthr/arch/i386/i386/_setcurthread.c
index 4e07579f3fe16..b4aa75e359f67 100644
--- a/lib/libthr/arch/i386/i386/_setcurthread.c
+++ b/lib/libthr/arch/i386/i386/_setcurthread.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/i386/i386/_setcurthread.c,v 1.14.2.1 2004/10/09 15:07:20 mtm Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/ia64/Makefile.inc b/lib/libthr/arch/ia64/Makefile.inc
index 6599098d35a3d..dc1e2ee045205 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.1 2003/04/20 03:06:42 marcel Exp $
 
 .PATH:	${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/ia64/ia64/_curthread.c b/lib/libthr/arch/ia64/ia64/_curthread.c
index 6c3de0e9e93c6..70faf864850a8 100644
--- a/lib/libthr/arch/ia64/ia64/_curthread.c
+++ b/lib/libthr/arch/ia64/ia64/_curthread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthr/arch/ia64/ia64/_curthread.c,v 1.3 2003/05/25 22:40:57 mtm Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libthr/arch/sparc64/Makefile.inc b/lib/libthr/arch/sparc64/Makefile.inc
index ee22813984e6d..ff9169f29d677 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.2 2003/04/02 08:15:07 jake Exp $
 
 .PATH:	${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/sparc64/sparc64/_setcurthread.c b/lib/libthr/arch/sparc64/sparc64/_setcurthread.c
index 4c0fb88bcdfc8..c7453a9ffff07 100644
--- a/lib/libthr/arch/sparc64/sparc64/_setcurthread.c
+++ b/lib/libthr/arch/sparc64/sparc64/_setcurthread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthr/arch/sparc64/sparc64/_setcurthread.c,v 1.3 2003/05/25 22:40:57 mtm Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libthr/sys/Makefile.inc b/lib/libthr/sys/Makefile.inc
index 59018f7065ad0..c54c8c94d9859 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.2 2003/04/01 07:07:38 jeff Exp $
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/sys/thr_error.c b/lib/libthr/sys/thr_error.c
index 726c0df0717da..c2316b0b5fc3b 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.1 2003/04/01 03:51:08 jeff Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/Makefile.inc b/lib/libthr/thread/Makefile.inc
index 395cefc3e76f4..2034436f0edaa 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.8 2004/06/27 10:01:35 mtm Exp $
 
 # thr sources
 .PATH: ${.CURDIR}/thread
diff --git a/lib/libthr/thread/thr_atfork.c b/lib/libthr/thread/thr_atfork.c
index 214424ab6bc36..cb0b26f189acb 100644
--- a/lib/libthr/thread/thr_atfork.c
+++ b/lib/libthr/thread/thr_atfork.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthr/thread/thr_atfork.c,v 1.1 2004/06/27 10:01:35 mtm Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c
index 1db7bf375b4b1..cabb0d37bbb82 100644
--- a/lib/libthr/thread/thr_attr.c
+++ b/lib/libthr/thread/thr_attr.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_attr.c,v 1.2 2004/02/18 14:56:20 mtm Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_autoinit.c b/lib/libthr/thread/thr_autoinit.c
index c425569c226e5..2179033c59ab1 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 547a7212f2296..4ac631d745806 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.2 2004/05/20 12:06:16 mtm Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_barrierattr.c b/lib/libthr/thread/thr_barrierattr.c
index 2fe3955236d1b..9572adbf37e05 100644
--- a/lib/libthr/thread/thr_barrierattr.c
+++ b/lib/libthr/thread/thr_barrierattr.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_barrierattr.c,v 1.1 2004/02/19 13:51:52 mtm Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index 5880e1f1e9aa0..77b96effe296b 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.c
@@ -1,6 +1,6 @@
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.10 2004/05/20 12:06:16 mtm Exp $
  */
 #include <sys/errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_clean.c b/lib/libthr/thread/thr_clean.c
index cc6f34fc5cb57..e7f33f5be2fde 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.2 2003/04/02 03:05:39 jeff Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_concurrency.c b/lib/libthr/thread/thr_concurrency.c
index 9f2315b06640b..6e48453e1109e 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.1 2003/04/20 01:53:13 jdp Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c
index b2cbb837892a0..dbb1026c179c4 100644
--- a/lib/libthr/thread/thr_cond.c
+++ b/lib/libthr/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/libthr/thread/thr_cond.c,v 1.15 2004/07/02 00:40:07 marcel Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_condattr_destroy.c b/lib/libthr/thread/thr_condattr_destroy.c
index e0ade00883eee..c4ff8411ed98d 100644
--- a/lib/libthr/thread/thr_condattr_destroy.c
+++ b/lib/libthr/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/libthr/thread/thr_condattr_destroy.c,v 1.1 2003/04/01 03:46:28 jeff Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_condattr_init.c b/lib/libthr/thread/thr_condattr_init.c
index 1af12e1d30cdf..f81cf5d90b342 100644
--- a/lib/libthr/thread/thr_condattr_init.c
+++ b/lib/libthr/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/libthr/thread/thr_condattr_init.c,v 1.1 2003/04/01 03:46:28 jeff Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index 38e483fd97085..d6eaf7e7cda7c 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_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/libthr/thread/thr_create.c,v 1.18 2004/07/04 19:07:07 marcel Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_detach.c b/lib/libthr/thread/thr_detach.c
index 1d7d3342c4ba2..73ead30afe4eb 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.8 2004/05/20 12:06:16 mtm Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_equal.c b/lib/libthr/thread/thr_equal.c
index f8882f5f073b3..df56a214e24f9 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_exit.c b/lib/libthr/thread/thr_exit.c
index 6a4568788f325..c1074be25d5c1 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.13.2.1 2004/10/09 15:12:33 mtm Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libthr/thread/thr_find_thread.c b/lib/libthr/thread/thr_find_thread.c
index a00d19e0d3ef1..bf8001f90f881 100644
--- a/lib/libthr/thread/thr_find_thread.c
+++ b/lib/libthr/thread/thr_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/libthr/thread/thr_find_thread.c,v 1.4 2004/03/26 14:45:35 mtm Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_getprio.c b/lib/libthr/thread/thr_getprio.c
index fa95ef9540ae3..dc4a66660990e 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_info.c b/lib/libthr/thread/thr_info.c
index b0fae8329d625..5d34ee7d98bec 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.3 2003/05/25 08:31:33 mtm Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index 548474d653165..e4ab9510dafc2 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_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/libthr/thread/thr_init.c,v 1.17 2004/06/27 10:01:35 mtm 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 8ff4c1a1c2490..f3630b0e78bde 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.14 2004/05/20 12:06:16 mtm Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_kern.c b/lib/libthr/thread/thr_kern.c
index 0f0305eea87a2..a3cd240a97380 100644
--- a/lib/libthr/thread/thr_kern.c
+++ b/lib/libthr/thread/thr_kern.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_kern.c,v 1.18 2004/03/27 14:39:21 mtm Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libthr/thread/thr_main_np.c b/lib/libthr/thread/thr_main_np.c
index 1d5849d6d1629..e9db9fee58d5e 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.1 2003/04/01 03:46:28 jeff Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_mattr_init.c b/lib/libthr/thread/thr_mattr_init.c
index 3d4195ce52f25..7283f37686490 100644
--- a/lib/libthr/thread/thr_mattr_init.c
+++ b/lib/libthr/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/libthr/thread/thr_mattr_init.c,v 1.1 2003/04/01 03:46:29 jeff Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_mattr_kind_np.c b/lib/libthr/thread/thr_mattr_kind_np.c
index 2b1e8afc8a103..13ae9c8fb6860 100644
--- a/lib/libthr/thread/thr_mattr_kind_np.c
+++ b/lib/libthr/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/libthr/thread/thr_mattr_kind_np.c,v 1.2 2004/03/29 13:57:55 mtm Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_multi_np.c b/lib/libthr/thread/thr_multi_np.c
index bd42365621a6a..7473fa504646d 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 ec2893164677f..2a9b217cb5d84 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.30.2.1 2004/10/09 15:13:50 mtm Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_mutex_prioceiling.c b/lib/libthr/thread/thr_mutex_prioceiling.c
index c7396a4d2d77a..eca3ded31cf18 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.3 2004/02/18 15:22:52 mtm Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_mutex_protocol.c b/lib/libthr/thread/thr_mutex_protocol.c
index 56c8622555a3e..69ebbf11c7592 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.2 2004/02/18 15:22:52 mtm Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_mutexattr_destroy.c b/lib/libthr/thread/thr_mutexattr_destroy.c
index b9852b57a63c5..c1bbcaed815c9 100644
--- a/lib/libthr/thread/thr_mutexattr_destroy.c
+++ b/lib/libthr/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/libthr/thread/thr_mutexattr_destroy.c,v 1.1 2003/04/01 03:46:29 jeff Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c
index cef478d7dc485..81e87a1339162 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.1 2003/04/01 03:46:29 jeff Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libthr/thread/thr_printf.c b/lib/libthr/thread/thr_printf.c
index e6f1a84612f1e..c20cb336d7b23 100644
--- a/lib/libthr/thread/thr_printf.c
+++ b/lib/libthr/thread/thr_printf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.4 2004/02/10 20:42:33 cperciva Exp $");
 
 #include <sys/types.h>
 #include <sys/fcntl.h>
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 02ad3b101e9ee..f02e4d4fb30b2 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.39.2.1 2004/10/09 15:37:42 mtm Exp $
  */
 
 #ifndef _THR_PRIVATE_H
diff --git a/lib/libthr/thread/thr_resume_np.c b/lib/libthr/thread/thr_resume_np.c
index a18d57d4e4e6c..ec95c73eac3c8 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.7 2004/05/20 12:06:16 mtm Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index 73c489e4eb91f..33afa34cb1550 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.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_rwlock.c,v 1.7 2004/07/30 17:13:00 mtm Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_rwlockattr.c b/lib/libthr/thread/thr_rwlockattr.c
index 8c0697bd671cf..031cfaa6806e0 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 0d69538422686..0b9b2b3ea77f2 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.2 2003/04/02 03:05:39 jeff Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c
index c634034a6b740..278da2144be86 100644
--- a/lib/libthr/thread/thr_sem.c
+++ b/lib/libthr/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/libthr/thread/thr_sem.c,v 1.4 2004/02/03 22:30:01 deischen Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_seterrno.c b/lib/libthr/thread/thr_seterrno.c
index ec801d6dbdddf..48fd460fbeb7a 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.1 2003/04/01 03:46:29 jeff Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libthr/thread/thr_setprio.c b/lib/libthr/thread/thr_setprio.c
index c5a950600a13b..b9a28ffc54357 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 fff1abf05370a..86a766b7c8d47 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.8 2004/07/30 17:13:00 mtm Exp $
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index 8a805afb385cf..43fd1d2e4e416 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.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_sig.c,v 1.12 2004/05/20 12:06:16 mtm Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libthr/thread/thr_spec.c b/lib/libthr/thread/thr_spec.c
index eefae51d00851..9d273f37ea767 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.2 2003/04/02 03:05:39 jeff Exp $
  */
 #include <signal.h>
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_spinlock.c b/lib/libthr/thread/thr_spinlock.c
index d590ad5796e44..90d413fcf1a41 100644
--- a/lib/libthr/thread/thr_spinlock.c
+++ b/lib/libthr/thread/thr_spinlock.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_spinlock.c,v 1.10 2004/04/24 09:38:41 mtm Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c
index b4063ad564ffe..83eedfd4499f3 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.3 2003/05/26 00:37:07 mtm Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/lib/libthr/thread/thr_subr.c b/lib/libthr/thread/thr_subr.c
index c777d177ccee4..6183d854c27d8 100644
--- a/lib/libthr/thread/thr_subr.c
+++ b/lib/libthr/thread/thr_subr.c
@@ -25,7 +25,7 @@
  *
  *	Problems/Questions to: Mike Makonnen <mtm@FreeBSD.Org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_subr.c,v 1.1 2003/12/09 11:06:55 mtm Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_suspend_np.c b/lib/libthr/thread/thr_suspend_np.c
index de957356c6e6d..dc8efee689e20 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.2 2004/01/15 16:09:58 ru Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c
index 7e2b0754c3f5e..32e32f9c0a5b9 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.7.2.1 2004/10/09 15:37:42 mtm Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_yield.c b/lib/libthr/thread/thr_yield.c
index 2c9682090423e..d587d4f9f6d95 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 fda5afec1edb2..6dd5838a92603 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 2004/08/16 03:30:16 davidxu 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 227440c860f0b..0b08e2b29a065 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 7553ed117eae4..4daec818cc76a 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 6c53953235bee..a902b4695dbb8 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 8fca1fdf1acc5..7102fe06585bf 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 de27b682a8040..546a2b9aa97ff 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 86bb88d33689b..f0888a81c5033 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.1 2004/07/18 04:17:14 marcel 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 6c53953235bee..530ee55a11e66 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 7553ed117eae4..374f7d54a0a5d 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 6c53953235bee..3c15470bb6d61 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 7553ed117eae4..f683e063f673d 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 c141f0eb46e56..d6917861270d4 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.1 2004/07/18 04:17:13 marcel 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 603f30ed16960..011697e1d03b5 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.6 2004/08/16 05:20:12 davidxu Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libthread_db/libpthread_db.h b/lib/libthread_db/libpthread_db.h
index 7a17b79c0eb44..7b01528ca6a2a 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.2 2004/08/16 03:30:16 davidxu Exp $
  */
 
 #ifndef _LIBPTHREAD_DB_H_
diff --git a/lib/libthread_db/libthr_db.c b/lib/libthread_db/libthr_db.c
index f5f387f964765..67985c274238d 100644
--- a/lib/libthread_db/libthr_db.c
+++ b/lib/libthread_db/libthr_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.2 2004/08/13 06:47:33 davidxu Exp $");
 
 #include <proc_service.h>
 #include <stdlib.h>
diff --git a/lib/libthread_db/thread_db.c b/lib/libthread_db/thread_db.c
index b1b1bccc9f6a4..a769f9af5cf91 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.2 2004/08/08 22:37:53 davidxu 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 8827dd698d778..6551c96ec7fb9 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.3 2004/08/08 22:37:53 davidxu Exp $
  */
 
 #ifndef _THREAD_DB_H_
diff --git a/lib/libthread_db/thread_db_int.h b/lib/libthread_db/thread_db_int.h
index 7dc152cb3441e..dacc3cd62fec2 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.2 2004/08/08 22:37:53 davidxu Exp $
  */
 
 #ifndef _THREAD_DB_INT_H_
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index fc72c0c7db220..9d3fa6205428f 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 c4ff304827074..d1bb852944830 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 80aa921f91e61..4df1361424ebc 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 f98da40714b62..a9881c11ccc28 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 d615b18dd32b6..2118beb5aad58 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 881d9e72be30c..7e90a330ad626 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 d8bef61f89170..9307f30e1b1ca 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 ecdfb275f67a3..22f2358823564 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 57062f9baa459..102477da699da 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 c9125f28ad345..a9186faf3cd81 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 e59365a80b271..497032136f106 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 c88da96baa7cc..da6fea036f793 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 de9152858a3e0..246e8b49685e7 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.5 2004/07/02 18:00:02 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt UFS_DISK_CLOSE 3
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index 761b6352202c3..241b3f4ab10bb 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libugidfw/Makefile,v 1.5 2004/02/25 03:24:39 rwatson Exp $
 
 LIB=		ugidfw
 SHLIB_MAJOR=	1
diff --git a/lib/libugidfw/bsde_get_rule.3 b/lib/libugidfw/bsde_get_rule.3
index a3b6691eaa9aa..fa4fb0e5bc4eb 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 bf441e150d9c3..15b9884593276 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 d510cab26a2e0..3c69ad5dbef2f 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 44144069a5249..567d598ed9dba 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 ea7ce89ebb5bc..d226fbb67dab5 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.6 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd February 25, 2004
 .Os
diff --git a/lib/libugidfw/ugidfw.c b/lib/libugidfw/ugidfw.c
index 6f79b209f3a94..59ebffdd872b9 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.6 2004/03/11 09:56:04 bde Exp $
  */
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libugidfw/ugidfw.h b/lib/libugidfw/ugidfw.h
index 7637ca5a53469..a662056f814af 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 9594649b88d28..151aae896fcc5 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.8 2003/04/09 01:52:48 mdodd Exp $
 
 MAINTAINER=	n_hibma@FreeBSD.ORG
 
diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c
index d278ddb8d8753..4505362284698 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 4afdb61ce19ba..8c7d2ceb7c7ff 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 3abc036644bad..e4ed230b5a4ea 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 280ef69aae8cf..b1030e5572f49 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 201ec17feee56..a1ace415300cd 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.16 2003/12/21 14:30:23 rushani Exp $
 .\"
 .Dd December 29, 2001
 .Dt USBHID 3
diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h
index af3228f17c426..42e0b994861fd 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 7ed04e5edea1f..83c7b8d75466c 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 7157c51994b39..1bb98af8ca30d 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 2004/05/24 22:19:27 pjd Exp $
 
 LIB=	util
 SHLIB_MAJOR= 4
diff --git a/lib/libutil/_secure_path.3 b/lib/libutil/_secure_path.3
index 0a19885a4d426..a3bfb6de54980 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.12 2003/03/24 15:55:03 charnier Exp $
 .\"
 .Dd May 2, 1997
 .Os
diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c
index 0411080c45302..f31cd7ef29461 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.8 2003/10/18 10:04:16 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index 510486e213551..cced1a42486bf 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.9 2002/12/27 12:15:31 schweikh Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index 748c3ad84bd7f..2028a17f66f1e 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 0d1c0b9bfc9da..673fd17430442 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.7 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd October 7, 1998
 .Dt AUTH.CONF 5
diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3
index 1e8f30e7418ed..1be70c9ffc625 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.9 2001/10/01 16:09:18 ru Exp $
 .\"
 .\" Copyright (c) 1997 Christos Zoulas.  All rights reserved.
 .\"
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 0624f0e4ea31b..36e9eb7a433b1 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 09ed619a56536..61f9dc96cc283 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.4.2.1 2004/09/28 18:24:50 pjd 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 21d5e3962c45f..3b7e24c908447 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.1.2.1 2004/09/28 18:24:10 pjd Exp $");
 
 #include <sys/types.h>
 #include <assert.h>
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index 3042d0fddb3ad..78b979bca6608 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 d88f719485d2a..70ff01a251f54 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 c2a0b16635fd6..3a20f45a86659 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 adb2328dd0bdb..102a2590e9231 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.52 2004/08/06 12:56:39 roam Exp $
 .\"
 .Dd August 6, 2004
 .Dt LOGIN.CONF 5
diff --git a/lib/libutil/login_auth.3 b/lib/libutil/login_auth.3
index 3750bd69182ba..d388f254a00bb 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 ce9a2e47c316e..a4bd8ad119ba7 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 075ca2bf900b1..513a1ce1a8d4d 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.33 2004/07/03 22:30:10 ru Exp $
 .\"
 .Dd December 27, 1996
 .Os
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 50ebf260620e1..c94e6e2e51fd0 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.32 2004/05/11 11:05:26 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
index a7cb4c67e8f0a..7860c99317b46 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 c698bdb667245..7a43ecf1a57ca 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 30716056fc89b..d899fcac3b580 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 c65fc9b8328a8..acfb89b278e48 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 8a6f291c97c1f..c072507345a57 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 19c884f2057b9..3b6276dcd03da 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 e1f57cea173cd..4e1b411d7b2c2 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 10e88dd5a5f3b..e3700165c9452 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 6303d685e0348..a35d6dfeb9726 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 985a6ea58cb7c..92a0dc23da3a6 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 426fe087040a2..819acf608815b 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 292f8980dc1c6..93a6decb2b4ec 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 16903fbde79b2..a0d00319ff0b5 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 03ee4cf06dead..a87d56d1964e6 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.19 2003/10/18 10:04:16 markm Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index e5acef3c898f3..7fad889017779 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.17 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index f2c3917e92964..3e46e18b33468 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 35f0b828ce2f1..70c811ec004de 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 b230edb113af3..73c634d66e8c9 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 90c9d72f4f93c..b06d7256af0e3 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 e5cdbf118b04d..d10f45e84ba81 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.9 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd April 6, 1999
 .Os
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 6eff893e3e070..85fe167719f40 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.17 2003/10/18 10:04:16 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index 773c4afa8dc14..bb784af72b2d1 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.10 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd January 11, 2000
 .Os
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index ec78a3503609a..4f9828c3828b6 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 f01e884e7870d..c3708124dd6fe 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 a7ce8c4eaea35..848b56f4de98e 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 d901831de3c69..583d327de4dcd 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.18 2004/07/02 23:52:20 ru Exp $
 .\" "
 .Dd March 30, 1997
 .Os
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 71ea25e1e2155..dfd9be67d1218 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 227ad7ac48f08..cf42712e2a24e 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libvgl/Makefile,v 1.10 2002/09/28 00:25:32 peter Exp $
 LIB=	vgl
 SHLIB_MAJOR= 3
 CFLAGS+=-Wall -I${.CURDIR}
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index ec99d26c7126b..1fe72d1863f94 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 5c437ad453345..7002d80783eb8 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 8506a1bc87293..f3fc92ec46772 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 4f9dc6210530b..c7d8cbe90a78d 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 b7d789a57a7c8..273b3cde2f7a5 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 757702f126551..30fce56b690dd 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 fb155f7e15c0f..5e483acfbd7ac 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.28 2004/07/02 23:52:20 ru Exp $
 .Dd November 7, 1999
 .Dt VGL 3
 .Os
diff --git a/lib/libvgl/vgl.h b/lib/libvgl/vgl.h
index 1b843829d72b2..24a5c387c6c67 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 c559ce9517b24..e0764d4273c1a 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.14 2003/07/24 19:58:55 markm Exp $
 #
 
 LIB=	wrap
diff --git a/lib/libxpg4/Makefile b/lib/libxpg4/Makefile
index 8d05099ee5b8e..b1b7fd8140e42 100644
--- a/lib/libxpg4/Makefile
+++ b/lib/libxpg4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libxpg4/Makefile,v 1.9 2002/09/28 00:25:32 peter Exp $
 
 LIB=    xpg4
 SHLIB_MAJOR=    3
diff --git a/lib/libxpg4/fakelib.c b/lib/libxpg4/fakelib.c
index add637aa6a09b..d81769ff6ab09 100644
--- a/lib/libxpg4/fakelib.c
+++ b/lib/libxpg4/fakelib.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libxpg4/fakelib.c,v 1.2 2003/06/13 07:21:37 tjr Exp $ */
 
 /* libxpg4 is obsolete in FreeBSD 6 -- library has been merged into libc. */
 #define	OBSOLETE_IN_6
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 27266b82b0e94..a9909771181a3 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/liby/Makefile,v 1.10 2002/09/28 00:25:32 peter Exp $
 
 LIB=		y
 SHLIB_MAJOR=	2
diff --git a/lib/liby/main.c b/lib/liby/main.c
index c2955c407369d..7878e855fba4c 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 c2159c8a94445..378ba13b266c1 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 6e5de685fe01e..cece64d10a3f0 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libypclnt/Makefile,v 1.12 2004/02/04 09:53:29 ru Exp $
 
 LIB=	ypclnt
 SHLIB_MAJOR= 1
diff --git a/lib/libypclnt/ypclnt.h b/lib/libypclnt/ypclnt.h
index 476981c15d150..48537e6193644 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 5670fa4425879..f2a3399c41213 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 a7d986f19dd9e..40075b5dcbdd1 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 f5e78a42054e6..975083b8a109a 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 8a709719959ee..e242a13d4ec35 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 650cfdd62f7ef..a6cb21f10e629 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 648379430aba3..d12e97e468fcd 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/Makefile b/lib/libz/Makefile
index 6b7bec7ec45a1..70f73cf2b7db3 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libz/Makefile,v 1.16 2004/06/30 23:58:22 tjr Exp $
 #
 
 MAINTAINER=peter@FreeBSD.org
diff --git a/lib/libz/adler32.c b/lib/libz/adler32.c
index 1bf48cf1d8744..a09279cf4ae52 100644
--- a/lib/libz/adler32.c
+++ b/lib/libz/adler32.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/adler32.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/lib/libz/compress.c b/lib/libz/compress.c
index 7b349f5fb90a9..85f92a67b0c77 100644
--- a/lib/libz/compress.c
+++ b/lib/libz/compress.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/compress.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/lib/libz/crc32.c b/lib/libz/crc32.c
index efb152acea6e6..a6e3b5d8b9273 100644
--- a/lib/libz/crc32.c
+++ b/lib/libz/crc32.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/crc32.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 #ifdef MAKECRCH
 #  include <stdio.h>
diff --git a/lib/libz/deflate.c b/lib/libz/deflate.c
index 155b72a73c515..ba82e59d15d5c 100644
--- a/lib/libz/deflate.c
+++ b/lib/libz/deflate.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/deflate.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 /*
  *  ALGORITHM
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
  *
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/deflate.c,v 1.8 2004/06/30 23:54:46 tjr Exp $ */
 
 #include "deflate.h"
 
diff --git a/lib/libz/deflate.h b/lib/libz/deflate.h
index 8f4ff2dda9012..6a60b96ae53d9 100644
--- a/lib/libz/deflate.h
+++ b/lib/libz/deflate.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/deflate.h,v 1.7 2004/06/30 23:54:46 tjr Exp $ */
 
 #ifndef DEFLATE_H
 #define DEFLATE_H
diff --git a/lib/libz/example.c b/lib/libz/example.c
index c528b62549c14..a46b11041c96a 100644
--- a/lib/libz/example.c
+++ b/lib/libz/example.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/example.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index 88e3f031a6ada..59f34a740b16b 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.10 2004/06/30 23:54:46 tjr Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libz/inffast.c b/lib/libz/inffast.c
index c5c93a5bc226a..fb57effa3fdef 100644
--- a/lib/libz/inffast.c
+++ b/lib/libz/inffast.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/inffast.c,v 1.4 2004/06/30 23:54:46 tjr Exp $");
 
 #include "zutil.h"
 #include "inftrees.h"
diff --git a/lib/libz/inflate.c b/lib/libz/inflate.c
index 913f00296b566..6a20499f58420 100644
--- a/lib/libz/inflate.c
+++ b/lib/libz/inflate.c
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/inflate.c,v 1.4.2.1 2004/09/02 14:34:28 nectar Exp $");
 
 #include "zutil.h"
 #include "inftrees.h"
diff --git a/lib/libz/inftrees.c b/lib/libz/inftrees.c
index 4d0b487b4505f..0cfe327fc9612 100644
--- a/lib/libz/inftrees.c
+++ b/lib/libz/inftrees.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/inftrees.c,v 1.4 2004/06/30 23:54:46 tjr Exp $");
 
 #include "zutil.h"
 #include "inftrees.h"
diff --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c
index 979fd9f24c834..ed95c1c6faf9c 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/trees.c b/lib/libz/trees.c
index 3f8289f108377..e8691fb774042 100644
--- a/lib/libz/trees.c
+++ b/lib/libz/trees.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/trees.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 /* #define GEN_TREES_H */
 
diff --git a/lib/libz/uncompr.c b/lib/libz/uncompr.c
index a428b5a5cb50b..b2c71b4131890 100644
--- a/lib/libz/uncompr.c
+++ b/lib/libz/uncompr.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/uncompr.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h
index f3d8467477100..660a9503ddea2 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.8 2004/06/30 23:54:46 tjr Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/lib/libz/zlib.3 b/lib/libz/zlib.3
index a1e01960bea36..31fb6e4a7f170 100644
--- a/lib/libz/zlib.3
+++ b/lib/libz/zlib.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libz/zlib.3,v 1.7 2004/06/30 23:54:46 tjr Exp $
 .\"
 .TH ZLIB 3 "17 November 2003"
 .SH NAME
diff --git a/lib/libz/zopen.c b/lib/libz/zopen.c
index 025899f0dc057..0e77ddb21efa4 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/libz/zutil.c b/lib/libz/zutil.c
index 8f749cef1a96c..138112ffc17b0 100644
--- a/lib/libz/zutil.c
+++ b/lib/libz/zutil.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/zutil.c,v 1.8 2004/06/30 23:54:46 tjr Exp $");
 
 #include "zutil.h"
 
diff --git a/lib/libz/zutil.h b/lib/libz/zutil.h
index 60e5d2bc392ed..d1d8d56c5c1e9 100644
--- a/lib/libz/zutil.h
+++ b/lib/libz/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/zutil.h,v 1.7 2004/06/30 23:54:46 tjr Exp $ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 496e7408e7e46..56e9bc08e858f 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.51.2.1 2004/10/01 16:32:06 kensmith Exp $
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
diff --git a/lib/msun/alpha/fenv.c b/lib/msun/alpha/fenv.c
index 017cd7a5b3c16..9de99e3100b0f 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.1 2004/06/06 09:58:55 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/alpha/fenv.h b/lib/msun/alpha/fenv.h
index 9ecec5942de4d..3ad0ca6f75d43 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.1 2004/06/06 09:58:55 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/alpha/s_copysign.S b/lib/msun/alpha/s_copysign.S
index 2a724e228c481..12381bb0370ea 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 d8a42a464c4c4..2e5eda1134733 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/fenv.c b/lib/msun/amd64/fenv.c
index dd21dadb168d4..588bb55cfbb6f 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.2 2004/06/11 02:35:19 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/amd64/fenv.h b/lib/msun/amd64/fenv.h
index de8272904936f..54bcc8369c6c1 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.1 2004/06/06 10:03:25 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c
index dff6282d6f038..ed9d0ace17b3f 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.6 2004/05/17 01:04:37 das Exp $");
 
 
 /* EXP(X)
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index 75cd81ea0a651..e953dd6c21bf9 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.6 2003/01/01 18:48:44 schweikh Exp $");
 
 #include <math.h>
 #include <errno.h>
diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c
index 6c405dff35714..046f605089b34 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.5 2002/03/26 11:59:29 bde Exp $");
 
 /*
  * This code by P. McIlroy, Oct 1992;
diff --git a/lib/msun/bsdsrc/mathimpl.h b/lib/msun/bsdsrc/mathimpl.h
index 8c1f96f06773f..83f50aabbbf72 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.4 2004/05/17 01:04:37 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/i387/e_acos.S b/lib/msun/i387/e_acos.S
index bd1499c66d5fd..cd77716673b34 100644
--- a/lib/msun/i387/e_acos.S
+++ b/lib/msun/i387/e_acos.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_acos.S,v 1.7 1999/08/28 00:06:08 peter Exp $")
 
 /*
  * acos(x) = atan2(sqrt(1  - x^2, x).
diff --git a/lib/msun/i387/e_asin.S b/lib/msun/i387/e_asin.S
index 1876cfd7d3430..868cffae2eb06 100644
--- a/lib/msun/i387/e_asin.S
+++ b/lib/msun/i387/e_asin.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_asin.S,v 1.7 1999/08/28 00:06:09 peter Exp $")
 
 /*
  * asin(x) = atan2(x, sqrt(1  - x^2).
diff --git a/lib/msun/i387/e_atan2.S b/lib/msun/i387/e_atan2.S
index 456de5636f60e..18bf4668eae68 100644
--- a/lib/msun/i387/e_atan2.S
+++ b/lib/msun/i387/e_atan2.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_atan2.S,v 1.6 1999/08/28 00:06:09 peter Exp $")
 
 ENTRY(__ieee754_atan2)
 	fldl	 4(%esp)
diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S
index 9277c87dc92a7..fa824492969b8 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.9 2000/06/06 12:12:36 bde Exp $")
 
 /* e^x = 2^(x * log2(e)) */
 ENTRY(__ieee754_exp)
diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S
index d8527b5145f6b..638ead20e42f1 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.7 2000/06/06 12:12:36 bde Exp $")
 
 ENTRY(__ieee754_fmod)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S
index 79a58c1739e32..65104e4e2830d 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.6 1999/08/28 00:06:10 peter Exp $")
 
 ENTRY(__ieee754_log)
 	fldln2
diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S
index c7f9bc437ac89..a08067bb3b119 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.6 1999/08/28 00:06:10 peter Exp $")
 
 ENTRY(__ieee754_log10)
 	fldlg2
diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S
index 67c1de07fdf27..d90035beab896 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.7 2000/06/06 12:12:36 bde Exp $")
 
 ENTRY(__ieee754_remainder)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_scalb.S b/lib/msun/i387/e_scalb.S
index fc8bb779525a7..6633b68145ae0 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.7 1999/08/28 00:06:10 peter Exp $")
 
 ENTRY(__ieee754_scalb)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S
index f0403f0dfd7fe..674bef1de5468 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.6 1999/08/28 00:06:11 peter Exp $")
 
 ENTRY(__ieee754_sqrt)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c
index 54197f558a1a5..623ca6ec3f0f8 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.1 2004/06/06 10:04:17 das Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/msun/i387/fenv.h b/lib/msun/i387/fenv.h
index 6989c0503c00a..23c820f6b089a 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.1 2004/06/06 10:04:17 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/i387/s_atan.S b/lib/msun/i387/s_atan.S
index 1150cce97802d..f51ef53f57349 100644
--- a/lib/msun/i387/s_atan.S
+++ b/lib/msun/i387/s_atan.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_atan.S,v 1.6 1999/08/28 00:06:11 peter Exp $")
 
 ENTRY(atan)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S
index e805d8524bb99..8e73b38fe3ae9 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_copysign.S b/lib/msun/i387/s_copysign.S
index ec28b452bfa76..6ecc7703a927c 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_cos.S b/lib/msun/i387/s_cos.S
index a73ba0621229f..c38cb7b207d36 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 b27b7d1149dfb..4835b0e06e693 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 66c1d9f9d0f59..722f83d6cdb49 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_log1p.S b/lib/msun/i387/s_log1p.S
index 24b28219d3455..6e01ae0f7b0cf 100644
--- a/lib/msun/i387/s_log1p.S
+++ b/lib/msun/i387/s_log1p.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_log1p.S,v 1.7 1999/08/28 00:06:13 peter Exp $")
 
 /*
  * The fyl2xp1 instruction has such a limited range:
diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S
index 9e09f840c40c1..d3f8d9d933ec3 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_rint.S b/lib/msun/i387/s_rint.S
index 79da080d71102..ccda3142ac1b2 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_scalbn.S b/lib/msun/i387/s_scalbn.S
index c00e1fb137e02..4600603aa01d2 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_significand.S b/lib/msun/i387/s_significand.S
index 13f1f3e762824..eddbc8262d27a 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_sin.S b/lib/msun/i387/s_sin.S
index d152352abf2f7..c3d65fd7f0c1e 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 d0cbc0aabd977..925e11a1188ae 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/ia64/fenv.c b/lib/msun/ia64/fenv.c
index 95a580998e57e..182d37e47daac 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 97ce1d756e489..9e194c733da74 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.1 2004/06/06 10:04:43 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3
index 6004f32d4afe9..d3505c24298a0 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.12 2001/10/13 12:29:25 bde Exp $
 .\"
 .Dd May 2, 1991
 .Dt ACOS 3
diff --git a/lib/msun/man/acosh.3 b/lib/msun/man/acosh.3
index 2eb82d13dadc0..94ba2cfb5104c 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.10 2001/10/13 12:23:22 bde Exp $
 .\"
 .Dd May 6, 1991
 .Dt ACOSH 3
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index f3ec7ac71208e..40a459b8efe29 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.14 2004/07/03 22:30:10 ru Exp $
 .\"
 .Dd May 2, 1991
 .Dt ASIN 3
diff --git a/lib/msun/man/asinh.3 b/lib/msun/man/asinh.3
index 636bbe08cc56e..6a0d9a088d767 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 b6417c639be6e..c4cefed7f468b 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 f951812bab0cd..d59108a17375f 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.12 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd May 2, 1991
 .Dt ATAN2 3
diff --git a/lib/msun/man/atanh.3 b/lib/msun/man/atanh.3
index cd9f276ce19f3..d1cac58fbc9d0 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.11 2004/07/03 22:30:10 ru Exp $
 .\"
 .Dd May 6, 1991
 .Dt ATANH 3
diff --git a/lib/msun/man/ceil.3 b/lib/msun/man/ceil.3
index 15b0ff48ec53f..24a26b3b2359c 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.13 2004/06/20 09:27:17 das Exp $
 .\"
 .Dd March 10, 1994
 .Dt CEIL 3
diff --git a/lib/msun/man/cimag.3 b/lib/msun/man/cimag.3
index 8fe3cc4afec8a..89d2662de00e9 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.1 2004/08/07 23:03:36 stefanf Exp $
 .\"
 .Dd Aug 7, 2004
 .Dt CIMAG 3
diff --git a/lib/msun/man/cos.3 b/lib/msun/man/cos.3
index 38d8ccfc36b9a..8e0bd91777fe0 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 d2b28249b8a0d..be953572d3369 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.11 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd May 2, 1991
 .Dt COSH 3
diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index 0ebb6a721ae68..824787f21c481 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 62e9e3e1b3014..98d3041cc28fa 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.18 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd July 31, 1991
 .Dt EXP 3
diff --git a/lib/msun/man/fabs.3 b/lib/msun/man/fabs.3
index 9d93484777199..56b3a2307c05d 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 2de2e320ab4f6..ca4e5ec0799c2 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 67c4341e98f90..82e88c27027f6 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.1 2004/06/06 10:06:26 das Exp $
 .\"
 .Dd May 8, 2004
 .Dt FECLEAREXCEPT 3
diff --git a/lib/msun/man/fegetenv.3 b/lib/msun/man/fegetenv.3
index c99663ed1a4b7..2e386adad4612 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 1461c83cca87c..fd29fc864ee11 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.1 2004/06/06 10:06:26 das Exp $
 .\"
 .Dd May 8, 2004
 .Dt FEGETROUND 3
diff --git a/lib/msun/man/fenv.3 b/lib/msun/man/fenv.3
index 336bbc0a86b2a..68d391edcceab 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.1 2004/06/06 10:06:26 das Exp $
 .\"
 .Dd May 8, 2004
 .Dt FENV 3
diff --git a/lib/msun/man/floor.3 b/lib/msun/man/floor.3
index 61558809105f0..4095efde06746 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.14 2004/06/20 09:27:17 das Exp $
 .\"
 .Dd March 10, 1994
 .Dt FLOOR 3
diff --git a/lib/msun/man/fmax.3 b/lib/msun/man/fmax.3
index a5ed8e60e3fa9..897cf6ae306b4 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.1 2004/06/30 07:04:01 das Exp $
 .\"
 .Dd June 29, 2004
 .Dt FMAX 3
diff --git a/lib/msun/man/fmod.3 b/lib/msun/man/fmod.3
index c585408faee06..c0d4ed8df84df 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 312457878d1f1..dc92514608324 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.12 2004/07/01 18:20:57 ru Exp $
 .\"
 .Dd May 6, 1991
 .Dt HYPOT 3
diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3
index 73a39f689465f..f62649fc5da22 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.17 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd June 20, 2004
 .Dt IEEE 3
diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3
index 986fd08b9ae8a..4bbb3659f1f8b 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/j0.3 b/lib/msun/man/j0.3
index 006119fcbaa78..3777ca6b85429 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.12 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd April 19, 1991
 .Dt J0 3
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index e950908ce6f4a..8e9e1771a0b38 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.20 2003/03/02 21:04:20 ru Exp $
 .\"
 .Dd December 3, 1992
 .Dt LGAMMA 3
diff --git a/lib/msun/man/math.3 b/lib/msun/man/math.3
index 40811e09234f3..06ddfd3b0fc16 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.12 2004/06/20 10:39:09 das Exp $
 .\"
 .Dd June 11, 2004
 .Dt MATH 3
diff --git a/lib/msun/man/rint.3 b/lib/msun/man/rint.3
index 09f7e19280f0b..3232e2e59e086 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.10 2004/07/06 04:46:08 das Exp $
 .\"
 .Dd July 5, 2004
 .Dt RINT 3
diff --git a/lib/msun/man/round.3 b/lib/msun/man/round.3
index 1665806ea78cc..6b4db45a20f6e 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.2 2004/06/20 09:27:17 das Exp $
 .\"
 .Dd November 29, 2003
 .Dt ROUND 3
diff --git a/lib/msun/man/signbit.3 b/lib/msun/man/signbit.3
index dd0a39fcee155..b749671202921 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 f3e2db1205a1c..3a408a784ed83 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 ce3808cbf0012..628519591c1bb 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.11 2004/07/03 22:30:10 ru Exp $
 .Dd April 19, 1991
 .Dt SINH 3
 .Os
diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3
index d4abf01f00a7b..f5e493fbf12f6 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.11 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd May 6, 1991
 .Dt SQRT 3
diff --git a/lib/msun/man/tan.3 b/lib/msun/man/tan.3
index fee9fb286c846..5995a3b5bbf54 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 39315e2c39901..391bc15829ec3 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 f7672d21a249e..ad182df0d3b63 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.1 2004/06/20 09:25:43 das Exp $
 .\"
 .Dd June 20, 2004
 .Dt TRUNC 3
diff --git a/lib/msun/sparc64/fenv.c b/lib/msun/sparc64/fenv.c
index 6e8220f7ec0b1..79a0f64de72ab 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 793adcfebc4a3..8f313bf30c1b0 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.1 2004/06/06 10:05:57 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index ff6269bd31056..cab3f0cc417f9 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acos.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_acos(x)
diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c
index 0688edf1c3b9b..a11f48ee6f669 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 98938f94bac6e..e7828467d8e36 100644
--- a/lib/msun/src/e_acosh.c
+++ b/lib/msun/src/e_acosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosh.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /* __ieee754_acosh(x)
diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c
index 5138d72521767..52579140bc44f 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 f4c4f40ac3185..c0e809ba3b721 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asin.c,v 1.10 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_asin(x)
diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c
index 178289a4d5ece..5f7a8947c141f 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 e9c98589c5bf5..53dd494555115 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_atan2(y,x)
diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c
index af011318d6490..466d5d40b1da7 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 d838c132773d0..b1b01689bf92a 100644
--- a/lib/msun/src/e_atanh.c
+++ b/lib/msun/src/e_atanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanh.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /* __ieee754_atanh(x)
diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c
index c7cf3e00840ca..64ebd3d698da0 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 1a67f9afdd1b3..103921243cfa9 100644
--- a/lib/msun/src/e_cosh.c
+++ b/lib/msun/src/e_cosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_cosh.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /* __ieee754_cosh(x)
diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c
index d2368a65a7272..8f4616e4bd16d 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 7ce259ccbcc6a..ddf6c76332237 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.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_exp(x)
diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c
index 5858d2c50675d..65049be50d752 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.7 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index 06e7c1514ca3d..07b70c3765fe2 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmod.c,v 1.8 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c
index e3865c4d44d5a..8b487ac68cbfe 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 6cfbe1755adad..1caa802db2eea 100644
--- a/lib/msun/src/e_gamma.c
+++ b/lib/msun/src/e_gamma.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /* __ieee754_gamma(x)
diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c
index 79ae4eacc1783..593e60f05b175 100644
--- a/lib/msun/src/e_gamma_r.c
+++ b/lib/msun/src/e_gamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma_r.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /* __ieee754_gamma_r(x, signgamp)
diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c
index da31d9fd8818e..b5c2ec12320a5 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 c14870d239ac4..d4300c3bd9c2b 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 aa50051254443..98c34435aaeb7 100644
--- a/lib/msun/src/e_hypot.c
+++ b/lib/msun/src/e_hypot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.8 2002/05/28 18:15:03 alfred Exp $";
 #endif
 
 /* __ieee754_hypot(x,y)
diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c
index 0624a39606eaf..354075ade84e0 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 ca08293744fa8..e7d7f7bc476a3 100644
--- a/lib/msun/src/e_j0.c
+++ b/lib/msun/src/e_j0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0.c,v 1.7 2002/05/28 18:15:03 alfred 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 6d9858207cf62..b872406bbf371 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 97fdcf84cbad5..d2d433b060ba9 100644
--- a/lib/msun/src/e_j1.c
+++ b/lib/msun/src/e_j1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1.c,v 1.7 2002/05/28 18:15:04 alfred 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 6ccc0697f10a9..539399e4f2dba 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 d0162cdf02919..7ebb111655b74 100644
--- a/lib/msun/src/e_jn.c
+++ b/lib/msun/src/e_jn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jn.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c
index 17a7008616eaa..029dba65b77d7 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 8158cbe89cae9..25ca8798e3d17 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* __ieee754_lgamma(x)
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index ea2d97e83fbef..3f741b9d760c5 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* __ieee754_lgamma_r(x, signgamp)
diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c
index 4fcf943a04ba0..b1f48d579ea25 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 1c12eec427359..f946b6b2af168 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 aa1a70be81f30..988e699192fcc 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_log(x)
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index 7a76defd44061..b1898595a0922 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10.c,v 1.10 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_log10(x)
diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c
index beb2271bbd8b5..347308874ad7c 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 4e7142b18d296..ef80aa2014474 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 04a2da5017f90..032e617f97ed8 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_pow.c,v 1.10 2004/06/01 19:28:38 bde 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 09fb59cdf4199..41f08ddbb682a 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 668c1ea4f55a1..67a9933af9450 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.7 2002/05/28 17:51:46 alfred 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 eef45b070ee6c..11c8d16b126e3 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 ba226b70363aa..a4e974b5262a7 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_remainder(x,p)
diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c
index 7841bdceb682a..4045088d11f88 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 6553d50b2fb95..a8f0ac663dd97 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.11 2004/07/09 10:01:10 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c
index e0e7c02753bc0..508d4eab2f350 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 76c4576c129a9..976f659097880 100644
--- a/lib/msun/src/e_sinh.c
+++ b/lib/msun/src/e_sinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinh.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* __ieee754_sinh(x)
diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c
index 7e022b08356f3..05455961d861c 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 5aeadee765913..f6afcb8bddc15 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrt.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* __ieee754_sqrt(x)
diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c
index 7eba4d07f92ce..edc9ef2c5470a 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 f8fe2fd134dbf..49c1291d11e2c 100644
--- a/lib/msun/src/k_cos.c
+++ b/lib/msun/src/k_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cos.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index fb021ed21a1a5..bd81f73c822fe 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 3613c3851d95a..7966d7e0e1696 100644
--- a/lib/msun/src/k_rem_pio2.c
+++ b/lib/msun/src/k_rem_pio2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_rem_pio2f.c b/lib/msun/src/k_rem_pio2f.c
index 655d2a83c1e68..e594f0bce5d9b 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.6 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c
index 52d3faa2552c7..ea2b23acfb6db 100644
--- a/lib/msun/src/k_sin.c
+++ b/lib/msun/src/k_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sin.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* __kernel_sin( x, y, iy)
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index 10a3290d27411..8dc0c4e3bdab1 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_standard.c b/lib/msun/src/k_standard.c
index 2f36ef1f0a536..e4ac86ffbbcc2 100644
--- a/lib/msun/src/k_standard.c
+++ b/lib/msun/src/k_standard.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_standard.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 b7cdf3570d1b6..9f60b0f7947ee 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tan.c,v 1.9 2004/06/02 04:39:29 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 41c522c8df1e0..6412853d9c53d 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 b85ef96ce7cb0..ff5b2bb0f57ef 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.43 2004/07/19 08:16:10 das Exp $
  */
 
 #ifndef _MATH_H_
diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h
index 3fa63954c7106..b28b113b3c248 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.15 2003/07/23 04:53:46 peter Exp $
  */
 
 #ifndef _MATH_PRIVATE_H_
diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c
index 95a539dc60493..079007f6ae8de 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 6dcfc5b038440..73dc7981477ac 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 5ef6700c58dbb..23d7aa8331048 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 d4a500f53b6df..f90b35dcdc060 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 4d70825786eba..6fbd92763f6ac 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 4ed43511d9acc..03ef35901bb4c 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 210b7ee61ddfa..e5440e2965284 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 96a0f4879f94d..5c465b36c1638 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_cimag.c b/lib/msun/src/s_cimag.c
index 03ddf79cc0f1a..e4be0b30f6190 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 6f943d8b4df20..1e0f53fd7b1fe 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 7f531d0fc29e8..a87677eff8767 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 1d0011bea1309..d47a15d9868fb 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 ea951b9a90122..24e0398f739a5 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 e6cb2efa4f379..13d80c2411022 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 7b0fc386954f8..f37be0d2c5b20 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 df5304f80530b..79c44800c4c9d 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 8d39f841db201..5c5bd3914a866 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 b49b28aa05e3a..17064908bc987 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 18e02990442dc..0d638ac13333b 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 3295ff281b03c..ad14cdf66809f 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 5819b86b790fd..a5c1562938f56 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 e4946f9fd0885..1531d166f81fd 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 8461425ac8c91..f33a2a55d0e84 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 6bb24cfd94d80..24e053c2bd757 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_expm1.c b/lib/msun/src/s_expm1.c
index 1bf4aa62f754b..57aa3f20cf3b0 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 f8191b2d64ba2..a670a72c56c3e 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 15529e58576fa..0dfa9405eb8c7 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 6b7d0a16dd277..2200705c6a99c 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 f150dddb842c0..200a9a5275323 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 2f347fda6fe0c..6ec10dfe66cd6 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 8e7c1752f56e3..704d1d8ccf33a 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 a8ccb92b427c3..b43063968e914 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 16fc7f6200121..acc32146b1981 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 d4bb6c5a0ef05..70a71f3de431b 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_fmax.c b/lib/msun/src/s_fmax.c
index b51b8655eb8f9..6e619febaba74 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 423da54517e83..a97eeb520a35e 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 0ac48a976cc44..5ed4ee034bf8b 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 3500c84a1c84a..76c1c12e7552c 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 76a5c76a997da..bd1d24157503b 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 f9d3ebb058524..63395df297192 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 eeb70d9f2eec2..7f2c77b04df8f 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.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c
index 1952836ffa032..89d464b4d57c2 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_ilogb.c b/lib/msun/src/s_ilogb.c
index ef24efacde4d0..d124080ab7b7c 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.8 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* ilogb(double x)
diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c
index b65a365466803..bcfd06771ec69 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.6 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_isfinite.c b/lib/msun/src/s_isfinite.c
index c9d1bd7a1347d..394505d2a9977 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 5de99ad0ff3b1..4715715aec0bc 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 49f2a74346b37..1345dbafda148 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_ldexp.c b/lib/msun/src/s_ldexp.c
index 9dbffc0569637..642616e33c3e2 100644
--- a/lib/msun/src/s_ldexp.c
+++ b/lib/msun/src/s_ldexp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ldexp.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ldexpf.c b/lib/msun/src/s_ldexpf.c
index 3b57da54f5346..6b9771723adf9 100644
--- a/lib/msun/src/s_ldexpf.c
+++ b/lib/msun/src/s_ldexpf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ldexpf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_lib_version.c b/lib/msun/src/s_lib_version.c
index 29269d3d4fda0..1383076a49b2c 100644
--- a/lib/msun/src/s_lib_version.c
+++ b/lib/msun/src/s_lib_version.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_lib_version.c,v 1.5 1999/08/28 00:06:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c
index 4ce4c3aa86a1f..31b5c4768f1d9 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 c2f01c71e5efd..4da4e43a8a49c 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 5c6ea6cb17882..141f9e876be90 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 e673d965ed603..10325a5aa5682 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_matherr.c b/lib/msun/src/s_matherr.c
index 7b8937b513754..aa0aea1ebaf15 100644
--- a/lib/msun/src/s_matherr.c
+++ b/lib/msun/src/s_matherr.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_matherr.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c
index 8cfe56884a01c..683fbdaa28e7c 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 69b64e901cf9a..6c75ffd063c6a 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 a075d2f48d63e..0fd36aa1dc1b5 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 f8f15fe470ffb..c94123e2eeadc 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.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* IEEE functions
diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c
index d7cf1ab9910ae..a34304f5fc98a 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.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index f28a80da0780f..13fa5ec06cb8b 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.10 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c
index 429eac7213f6e..7b44a0e8530d0 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 c3c0665d3182c..81ba654a2a062 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.2 2004/08/05 01:44:55 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index ba42e8e64a02a..e23658b0861ca 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.2 2004/08/05 01:44:55 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_scalbln.c b/lib/msun/src/s_scalbln.c
index 73b1d27de17f0..61e2bbd602519 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.1 2004/06/20 09:25:26 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c
index f3d37da9165d6..bb58765ac680b 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.9 2003/07/23 04:53:47 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_scalbnf.c b/lib/msun/src/s_scalbnf.c
index b0e20791a6b61..f768c7b8992d9 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.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_signbit.c b/lib/msun/src/s_signbit.c
index 01eb3ab8b2e62..ffc08f3d0dd73 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 a91bcde3c2d29..08bb303edc9ff 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 c11a08956e09d..b3e341dd5f027 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 4d3b9d50cb9a5..220cdc5815c84 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 8ea9e559a56d8..958560dbd1069 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 5094d3091ea33..bd070a632d200 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 c81caaf8f8c56..041be2e03fae8 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 e3bbf47e27dd0..4729145261d1e 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 74cb2db7f5a4f..c32bb2f9fe603 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 cce9e1592ef8a..d8c76a782178a 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 384eaee55006c..efec266531b77 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/w_acos.c b/lib/msun/src/w_acos.c
index 99bdcf1706a43..33031346662c2 100644
--- a/lib/msun/src/w_acos.c
+++ b/lib/msun/src/w_acos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acos.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acosf.c b/lib/msun/src/w_acosf.c
index 56bb1de5f48fb..d2cda4531f188 100644
--- a/lib/msun/src/w_acosf.c
+++ b/lib/msun/src/w_acosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acosh.c b/lib/msun/src/w_acosh.c
index 1b783e2a4df5d..bb99f34f5b01e 100644
--- a/lib/msun/src/w_acosh.c
+++ b/lib/msun/src/w_acosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acosh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acoshf.c b/lib/msun/src/w_acoshf.c
index 4b882844f123b..09fa646719873 100644
--- a/lib/msun/src/w_acoshf.c
+++ b/lib/msun/src/w_acoshf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acoshf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_asin.c b/lib/msun/src/w_asin.c
index 2c9491b5a600e..a93fcd54fa1e0 100644
--- a/lib/msun/src/w_asin.c
+++ b/lib/msun/src/w_asin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_asin.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_asinf.c b/lib/msun/src/w_asinf.c
index f3e65d867951f..b1097014d4d4b 100644
--- a/lib/msun/src/w_asinf.c
+++ b/lib/msun/src/w_asinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_asinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atan2.c b/lib/msun/src/w_atan2.c
index 22fd791289f7a..064220f3bcdc1 100644
--- a/lib/msun/src/w_atan2.c
+++ b/lib/msun/src/w_atan2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atan2.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atan2f.c b/lib/msun/src/w_atan2f.c
index 7b10abf0a98a1..f0db0367acd68 100644
--- a/lib/msun/src/w_atan2f.c
+++ b/lib/msun/src/w_atan2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atan2f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atanh.c b/lib/msun/src/w_atanh.c
index f9e26cf90b66f..d12772cd5020f 100644
--- a/lib/msun/src/w_atanh.c
+++ b/lib/msun/src/w_atanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atanh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atanhf.c b/lib/msun/src/w_atanhf.c
index 12165b45a8968..a095cd244d13e 100644
--- a/lib/msun/src/w_atanhf.c
+++ b/lib/msun/src/w_atanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atanhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_cabs.c b/lib/msun/src/w_cabs.c
index a33a41faabdc5..577e5e0bc9351 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 e7bfe220a9a5b..fac152f9ad316 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_cosh.c b/lib/msun/src/w_cosh.c
index c54e44110d6bc..81d8c236182f7 100644
--- a/lib/msun/src/w_cosh.c
+++ b/lib/msun/src/w_cosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_cosh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_coshf.c b/lib/msun/src/w_coshf.c
index 46952ca6a56da..ccf9c99227358 100644
--- a/lib/msun/src/w_coshf.c
+++ b/lib/msun/src/w_coshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_coshf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_dremf.c b/lib/msun/src/w_dremf.c
index 4bfcff27f7027..e83ac0e0b0d6b 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/lib/msun/src/w_exp.c b/lib/msun/src/w_exp.c
index f1759979e78da..1b1c41f2a0b59 100644
--- a/lib/msun/src/w_exp.c
+++ b/lib/msun/src/w_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_exp.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_expf.c b/lib/msun/src/w_expf.c
index 826b23426b151..211452ef44ec0 100644
--- a/lib/msun/src/w_expf.c
+++ b/lib/msun/src/w_expf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_expf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_fmod.c b/lib/msun/src/w_fmod.c
index 788f10c04090f..1b8fdba6ec2d5 100644
--- a/lib/msun/src/w_fmod.c
+++ b/lib/msun/src/w_fmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_fmod.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_fmodf.c b/lib/msun/src/w_fmodf.c
index 5caa674b79946..8c6e18b6b77fc 100644
--- a/lib/msun/src/w_fmodf.c
+++ b/lib/msun/src/w_fmodf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_fmodf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_gamma.c b/lib/msun/src/w_gamma.c
index eeee1e744e5be..6f001071aaf88 100644
--- a/lib/msun/src/w_gamma.c
+++ b/lib/msun/src/w_gamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* double gamma(double x)
diff --git a/lib/msun/src/w_gamma_r.c b/lib/msun/src/w_gamma_r.c
index be7b98cacc7eb..ba172ffafb42f 100644
--- a/lib/msun/src/w_gamma_r.c
+++ b/lib/msun/src/w_gamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_gammaf.c b/lib/msun/src/w_gammaf.c
index a82c25bf55910..f35d452d93d68 100644
--- a/lib/msun/src/w_gammaf.c
+++ b/lib/msun/src/w_gammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_gammaf_r.c b/lib/msun/src/w_gammaf_r.c
index 6df7e83abdd97..862d86a96275b 100644
--- a/lib/msun/src/w_gammaf_r.c
+++ b/lib/msun/src/w_gammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_hypot.c b/lib/msun/src/w_hypot.c
index 9d03c84f6b526..9c0df90f5499e 100644
--- a/lib/msun/src/w_hypot.c
+++ b/lib/msun/src/w_hypot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_hypot.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_hypotf.c b/lib/msun/src/w_hypotf.c
index c63146f3fb1ea..c03239a0b16a0 100644
--- a/lib/msun/src/w_hypotf.c
+++ b/lib/msun/src/w_hypotf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_hypotf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j0.c b/lib/msun/src/w_j0.c
index 24df31caa47b5..93898f99aa2bc 100644
--- a/lib/msun/src/w_j0.c
+++ b/lib/msun/src/w_j0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j0.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j0f.c b/lib/msun/src/w_j0f.c
index 8530626582e5c..cc799e1dc84d5 100644
--- a/lib/msun/src/w_j0f.c
+++ b/lib/msun/src/w_j0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j0f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j1.c b/lib/msun/src/w_j1.c
index aab8e680c3158..b78ff63e890fe 100644
--- a/lib/msun/src/w_j1.c
+++ b/lib/msun/src/w_j1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j1.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j1f.c b/lib/msun/src/w_j1f.c
index 74c8714a9f0a3..e2aae2a047ce0 100644
--- a/lib/msun/src/w_j1f.c
+++ b/lib/msun/src/w_j1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j1f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_jn.c b/lib/msun/src/w_jn.c
index 4094892d34391..17c9c1f09423f 100644
--- a/lib/msun/src/w_jn.c
+++ b/lib/msun/src/w_jn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_jn.c,v 1.9 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_jnf.c b/lib/msun/src/w_jnf.c
index 1c755142076d4..f332c55394a2c 100644
--- a/lib/msun/src/w_jnf.c
+++ b/lib/msun/src/w_jnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_jnf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_lgamma.c b/lib/msun/src/w_lgamma.c
index b98cfdeee9e86..8cf87ccd8218d 100644
--- a/lib/msun/src/w_lgamma.c
+++ b/lib/msun/src/w_lgamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* double lgamma(double x)
diff --git a/lib/msun/src/w_lgamma_r.c b/lib/msun/src/w_lgamma_r.c
index 34a69d8018ff7..36ea3bf3dcf70 100644
--- a/lib/msun/src/w_lgamma_r.c
+++ b/lib/msun/src/w_lgamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_lgammaf.c b/lib/msun/src/w_lgammaf.c
index 0bfd317ab7ff7..45afe6614df91 100644
--- a/lib/msun/src/w_lgammaf.c
+++ b/lib/msun/src/w_lgammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_lgammaf_r.c b/lib/msun/src/w_lgammaf_r.c
index a10328dea9b3f..d080f43257ddf 100644
--- a/lib/msun/src/w_lgammaf_r.c
+++ b/lib/msun/src/w_lgammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log.c b/lib/msun/src/w_log.c
index 7ee59ea98b7e5..fcd5e8b9cce9e 100644
--- a/lib/msun/src/w_log.c
+++ b/lib/msun/src/w_log.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log10.c b/lib/msun/src/w_log10.c
index f48ad9d528c72..5504d414a3982 100644
--- a/lib/msun/src/w_log10.c
+++ b/lib/msun/src/w_log10.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log10.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log10f.c b/lib/msun/src/w_log10f.c
index f25ffd0412e35..13ee10cc0d87f 100644
--- a/lib/msun/src/w_log10f.c
+++ b/lib/msun/src/w_log10f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log10f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_logf.c b/lib/msun/src/w_logf.c
index 5a9af66d99fca..600db779535d3 100644
--- a/lib/msun/src/w_logf.c
+++ b/lib/msun/src/w_logf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_logf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_pow.c b/lib/msun/src/w_pow.c
index c63bb72700b82..3223d33696d2b 100644
--- a/lib/msun/src/w_pow.c
+++ b/lib/msun/src/w_pow.c
@@ -20,7 +20,7 @@
 #include "math_private.h"
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_pow.c,v 1.3 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 double
diff --git a/lib/msun/src/w_powf.c b/lib/msun/src/w_powf.c
index 1ab76a4261357..ce2644150eba6 100644
--- a/lib/msun/src/w_powf.c
+++ b/lib/msun/src/w_powf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_powf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_remainder.c b/lib/msun/src/w_remainder.c
index 12f971fe843b2..dd6b979581b61 100644
--- a/lib/msun/src/w_remainder.c
+++ b/lib/msun/src/w_remainder.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_remainder.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_remainderf.c b/lib/msun/src/w_remainderf.c
index ef5381d90509e..8e15fe513a8c0 100644
--- a/lib/msun/src/w_remainderf.c
+++ b/lib/msun/src/w_remainderf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_scalb.c b/lib/msun/src/w_scalb.c
index 6a20164f83b02..c7400a5d8411d 100644
--- a/lib/msun/src/w_scalb.c
+++ b/lib/msun/src/w_scalb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_scalb.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_scalbf.c b/lib/msun/src/w_scalbf.c
index 2781833cf3bfd..a6d8ca11a6910 100644
--- a/lib/msun/src/w_scalbf.c
+++ b/lib/msun/src/w_scalbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_scalbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sinh.c b/lib/msun/src/w_sinh.c
index ad3a0a4080e0f..4aacdfb839474 100644
--- a/lib/msun/src/w_sinh.c
+++ b/lib/msun/src/w_sinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sinh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sinhf.c b/lib/msun/src/w_sinhf.c
index 1b3af08f231da..332b2b782b8c9 100644
--- a/lib/msun/src/w_sinhf.c
+++ b/lib/msun/src/w_sinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sinhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sqrt.c b/lib/msun/src/w_sqrt.c
index 008c88cd4248b..b0e0bca063cb2 100644
--- a/lib/msun/src/w_sqrt.c
+++ b/lib/msun/src/w_sqrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sqrt.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sqrtf.c b/lib/msun/src/w_sqrtf.c
index f49763871acae..28a58514577e5 100644
--- a/lib/msun/src/w_sqrtf.c
+++ b/lib/msun/src/w_sqrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sqrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y0.c b/lib/msun/src/w_y0.c
index 2d28e1a8aed0f..d0df031c2a90c 100644
--- a/lib/msun/src/w_y0.c
+++ b/lib/msun/src/w_y0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y0.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y0f.c b/lib/msun/src/w_y0f.c
index bd4d2c7530c55..8a769c7a4f1b3 100644
--- a/lib/msun/src/w_y0f.c
+++ b/lib/msun/src/w_y0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y0f.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y1.c b/lib/msun/src/w_y1.c
index 76bb3f08f0d57..01a2445a436ec 100644
--- a/lib/msun/src/w_y1.c
+++ b/lib/msun/src/w_y1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y1.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y1f.c b/lib/msun/src/w_y1f.c
index 75170392ac7da..ba15ffa53af89 100644
--- a/lib/msun/src/w_y1f.c
+++ b/lib/msun/src/w_y1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y1f.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_yn.c b/lib/msun/src/w_yn.c
index ee5942e255684..1236eeb8ed20d 100644
--- a/lib/msun/src/w_yn.c
+++ b/lib/msun/src/w_yn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_yn.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_ynf.c b/lib/msun/src/w_ynf.c
index 2dc3903a1c0e3..1bfabe2a96668 100644
--- a/lib/msun/src/w_ynf.c
+++ b/lib/msun/src/w_ynf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_ynf.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/libexec/Makefile b/libexec/Makefile
index bfda5e41aedde..2d2455b81a605 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.67.2.1 2004/09/26 03:10:14 des Exp $
 
 SUBDIR=	atrun \
 	bootpd \
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 05deedc6127fc..4c164445fa378 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 af8be572d5cd0..4b1b49dd3a264 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 aacbf2e407a69..7e453d80ad65e 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 1cb5e7ed57713..2183ceeaba59f 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 a8ce57cc0dfd6..581f976f331df 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 6cffe5a4cfec6..c4ecce647e8c8 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 48890ce54b59e..3ead6ca6843be 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 60838d5e978ef..2befcc8bd77dd 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 d797ea1fa9e55..668fdcdd44ec1 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 830577a57def6..d0eb2594f8738 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 5b2c186bcb4bb..09936d2023187 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 829da300445d3..52b80b3f59c6e 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 c7f9951946b3b..277d8ad15b440 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 a88cca5b64508..26a6f99431129 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 c3a3909287bad..9b2f3d242eada 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 b3818589017a7..694d7465249ad 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 c907ddf98def4..a8f8b35ef9b22 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.22 2004/02/13 09:26:54 roam Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/libexec/bootpd/bootpd.h b/libexec/bootpd/bootpd.h
index 86c1b3da8b647..ee25199cbbe4d 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 4a658533741fd..3a07520004c1b 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.4 1999/08/28 00:09:22 peter Exp $
 
 PROG=	bootpgw
 NOMAN=  true
diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c
index f180fd66713f0..e729a70cfb746 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 781a1e5f1919f..bc5a433c5bd6c 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.10 2004/07/03 00:06:28 ru Exp $
 .\"
 .Dd October 31, 1991
 .Dt BOOTPTAB 5
diff --git a/libexec/bootpd/bootptab.mcs b/libexec/bootpd/bootptab.mcs
index 9bce37e07f29b..1efbdd3e3fe84 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 e27cc832c5fec..933f34df9750b 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 3b2bd973cbf17..22ea7a63282ac 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 ef3b62de71262..c1342ff793e0f 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 43e94ec4cef2b..c739c0a58369f 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 e4dc1b66b9e21..a0f94bbdc2172 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 026df158b50ce..1435747395856 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 64e5edadb6799..6e368c15eb416 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 a2c86cfba04b6..9b02003a5faaa 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 146e87e69356f..a8d7f41e96ab3 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 22cdc04332c26..fa89957c72a5c 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 de264cc83a5f1..104c074566369 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 bd68857648a14..233e2d15982e2 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 54b3f62242f7f..b3ef9d23cf898 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 4940f054696ab..43d12895108b7 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 fc79f18b4068c..df5b94b00f6c0 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 ab583d485db4e..9cb1a2fa06721 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 be9cada237790..e24c2be86d793 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 290e19e74063d..38aabc89a730f 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 55cec5c76845a..15964fbca2688 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 45845699bfe0b..f51d46ef65503 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 e905bffa76969..49ce256edafd0 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 4d7876162d287..81a9bd902c36c 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 9436561d4a662..a3b6ae88a5c4c 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 841b01cd4ff6f..16f47777c99b4 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 04089c87b560b..2d662e7f95d7f 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 fae5127eebb3b..82e680778fd10 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 e6e48843f437d..6874d4e23a2df 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.4 2002/07/06 19:18:43 charnier Exp $
 .\"
 .\" bootptest.8
 .Dd June 10, 1993
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index 04909878f33f4..5e04af20fc726 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 a1891fe525562..88fcfbf79f983 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 9ea450e10d90e..a1e0cd658764a 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 0ae63a3a2fbaf..54b8b0c87ba12 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 0e2cca195b23d..1c4f28e9cea37 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 9484d04b6da3d..e6705a62076af 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 354fb54ed373d..f671cdb06365b 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 c501cccb8551f..9da389aa11335 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 e262f5535be2f..bf201455c989d 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.12 2002/08/16 03:08:25 johan Exp $
 .\"
 .Dd July 9, 2002
 .Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index 1221566c77367..68889a65da519 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.16 2002/07/09 02:16:49 johan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index ae92564cda96b..c6091db6115e7 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 79202c6c4ecbb..7ce3b62d4ec08 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.13 2004/07/02 21:28:48 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FINGERD 8
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 9a289339490d1..f26f90d4a0ed0 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.24 2004/03/29 09:29:51 pjd Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftp-proxy/Makefile b/libexec/ftp-proxy/Makefile
index 4aa4684a53981..9941a23fd718c 100644
--- a/libexec/ftp-proxy/Makefile
+++ b/libexec/ftp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/ftp-proxy/Makefile,v 1.1 2004/02/28 21:50:48 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/ftp-proxy
 
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index f4ff5ef6663c1..ca2ea1dfa837a 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.54 2004/07/31 15:07:33 yar Exp $
 
 PROG=	ftpd
 MAN=	ftpd.8 ftpchroot.5
diff --git a/libexec/ftpd/config.h b/libexec/ftpd/config.h
index 8e10bbb270dc6..5c42a5cbdf3ab 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 7c1cc8edd1db9..b0dab93704282 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 216ed3da4e278..5757742911507 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 e664914041edc..ea988a3423cbe 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -45,7 +45,7 @@
 static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.59 2004/07/31 15:03:17 yar Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 025fc36605716..1d1f57cb86f26 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.68 2004/07/02 21:28:48 ru Exp $
 .\"
 .Dd January 27, 2000
 .Dt FTPD 8
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 46b1101ff44aa..aa11253604772 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.163 2004/07/31 15:03:17 yar Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 6626c8f56bf35..d13df4d149e72 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/logwtmp.c,v 1.12 2002/11/17 23:46:45 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index a8837a90c446d..24b74645baa8e 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 abc4ec2cd5a23..1cba33264b984 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/popen.c,v 1.24 2003/09/01 04:12:18 kan Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile
index a88492c48eb95..7b75ebd88473d 100644
--- a/libexec/getNAME/Makefile
+++ b/libexec/getNAME/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/getNAME/Makefile,v 1.7 2001/03/26 14:22:04 ru Exp $
 
 PROG=	getNAME
 
diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1
index a6de3735a3d90..9ce7be9dbd991 100644
--- a/libexec/getNAME/getNAME.1
+++ b/libexec/getNAME/getNAME.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getNAME/getNAME.1,v 1.12 2001/07/15 07:53:38 dd Exp $
 .Dd July 8, 1996
 .Dt GETNAME 1
 .Os
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index 37429c86e1321..80741c5e88891 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)getNAME.c	8.1 (Berkeley) 6/30/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getNAME/getNAME.c,v 1.8 2002/02/06 16:38:40 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index 697e81ae0bb4f..c7e84226d6013 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 8256bb13fb6c4..361b45b82a77a 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.10 2004/03/14 05:27:26 bde Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index f8e8bda12a099..bfa3462d19940 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.8 2002/02/06 16:38:40 imp Exp $
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 0d65b0315fdfb..f3eb9de5e95e1 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.15 2002/12/23 16:04:50 ru Exp $
 .\" "
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index a20cebbd40463..c28ab3ba0fe70 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.40 2003/06/17 12:29:36 yar Exp $
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index e8b4143af6459..3addfe357e0f7 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 c83a83e487c0f..a8b3339ebd2a8 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.15 2003/06/18 13:22:44 yar Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index ceea009665648..17d2b1da5e573 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.45.4.1 2004/10/01 06:20:23 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 035e8b6c14b32..2c64fd1e4f01b 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 4938d7386dbf5..624e9edfb1eeb 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 fcb0921a87bbb..4fa209cc14be1 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.14 2001/08/07 15:48:32 ru Exp $
 .\" "
 .Dd November 17, 1996
 .Dt TTYS 5
diff --git a/libexec/lukemftpd/Makefile b/libexec/lukemftpd/Makefile
index dcec609bf960e..f32950b271ecc 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.14.2.1 2004/08/21 03:46:39 obrien Exp $
 
 LUKEMFTPD=	${.CURDIR}/../../contrib/lukemftpd
 .PATH: ${LUKEMFTPD}/src ${LUKEMFTPD}/libnetbsd
diff --git a/libexec/lukemftpd/config.h b/libexec/lukemftpd/config.h
index 0d4566a924c04..6ba94b325383a 100644
--- a/libexec/lukemftpd/config.h
+++ b/libexec/lukemftpd/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/config.h,v 1.3.8.1 2004/08/21 03:45:51 obrien Exp $ */
 
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/libexec/lukemftpd/nbsd2fbsd.h b/libexec/lukemftpd/nbsd2fbsd.h
index d060af6cd5b64..9802aec6cc83b 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 345f4bbd7e02c..a526d3eade56d 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 91ce241953ea4..32eacdd9c045f 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 92a68a4867876..9cfb8f677c20d 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.20 2003/07/07 03:54:03 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/mail.local
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index d09f8127dc21d..10fe87876b7e6 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 7f7f054d012b9..5afba778e57f5 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 2b541bf87b639..eb3cfb09fa198 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 6941b8fde4140..db0756b9fec43 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 b4a39cbc12ec0..16ec6443cdeed 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 7918ae2e95f03..5821e4fd4634d 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 cc74d2f70f002..dc18d258d22f0 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.15 2003/01/01 18:48:44 schweikh Exp $
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 66868664c3c51..a62fa57603c05 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 8e60090f898e8..2200eb30d0fcc 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.3 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd January 13, 1996
 .Dt NETID 5
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index b34ee11fcb39b..0749a39330a76 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 b9ba6e3c7ff95..ac629b7965d27 100644
--- a/libexec/pppoed/Makefile
+++ b/libexec/pppoed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/pppoed/Makefile,v 1.4 2002/02/04 02:33:50 kris Exp $
 
 PROG=	pppoed
 SRCS=	pppoed.c
diff --git a/libexec/pppoed/pppoed.8 b/libexec/pppoed/pppoed.8
index 9e0aeea725ab8..4015b84222e37 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.16 2002/07/06 19:19:09 charnier Exp $
 .\"
 .Dd November 8, 1999
 .Dt PPPOED 8
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index 3fdac99f6d592..86f711a4065ba 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.23 2003/11/15 15:26:34 harti Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/pt_chown/Makefile b/libexec/pt_chown/Makefile
index 974a730f0374a..ea39c7987e3ea 100644
--- a/libexec/pt_chown/Makefile
+++ b/libexec/pt_chown/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/pt_chown/Makefile,v 1.1 2003/01/02 20:44:41 jmallett Exp $
 
 PROG=	pt_chown
 SRCS=	pt_chown.c
diff --git a/libexec/pt_chown/pt_chown.c b/libexec/pt_chown/pt_chown.c
index d89ffeaba87ee..3deaac684caa2 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 3a4099e4a8be1..bdafffe2ed0f1 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 ddd9cfbc2ae6e..71a488cb9867a 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 74ff341095f9e..66e43ea90b808 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 ff640c1629b5c..4532cd935bf71 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 2eb33e0a370e6..8ee8a4674919b 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 c00186f48facd..f57de0e0a3ccf 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 78a4fd6bd5f91..6a41b77a8b345 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.13 2002/02/07 23:57:00 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 78c2488f9a841..5b8e0e0f26cc3 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 138bc4cc0078d..24f7246e9f126 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 708837141347f..2e6ca8281db3f 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 1180080235519..4e2ab98f83cad 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 2485901ed68e2..6e8a0eb31367e 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 67e1b14788d89..30dd328057299 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 9a6258a59fc30..4789bc945da8f 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.13 2004/07/02 21:28:49 ru Exp $
 .\"
 .Dd October 24, 1995
 .Dt REVNETGROUP 8
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 0d4f379d8eca6..9a5fcce343f58 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.12 2002/02/07 23:57:01 imp Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index cef972928d57c..441c9ef9763a8 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rexecd/Makefile,v 1.16 2002/05/02 05:06:32 des Exp $
 
 PROG=	rexecd
 MAN=	rexecd.8
diff --git a/libexec/rexecd/rexecd.8 b/libexec/rexecd/rexecd.8
index 3c5bcda90ee30..889b9e525dd96 100644
--- a/libexec/rexecd/rexecd.8
+++ b/libexec/rexecd/rexecd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexecd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rexecd/rexecd.8,v 1.17 2004/07/02 21:28:49 ru Exp $
 .\"
 .Dd September 23, 1994
 .Dt REXECD 8
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 4d678ebc6cae7..bc6caa41f1c92 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rexecd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.31 2004/05/24 13:21:24 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 8320152d5f2e4..fd91604ec66b9 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.19 2001/03/26 14:22:06 ru Exp $
 
 PROG=	rlogind
 SRCS=	rlogind.c
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index cd8d6fd41aac2..16d3b43bad24b 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.22 2004/07/02 21:28:49 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index b4a0418f5b37d..b1d8282b76f22 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.40 2003/05/04 00:43:39 obrien Exp $");
 
 /*
  * remote login server:
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 331f6ab6e2b62..3b88cc86aee84 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 1bde1758b404b..82682411c588e 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.11 2002/12/12 17:25:54 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 653ea15257b2c..86eb50da250eb 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.8 2003/09/01 04:12:18 kan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index be89814301716..5b092206f4f5a 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 ebaa766efd88f..024b78f94bf81 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 c8f2b97b6bf84..69452a4ee701d 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 e8aea4615b429..c1bb5f16b319b 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.10 2002/07/15 18:51:57 alfred Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index af43bd3e7cf3e..d272a997e7ca2 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 6efd47de9edeb..0e557e519add3 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 8bd96924b29a8..e2bec5934acb5 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 9ffc4b3ac2dd6..e9933cedef705 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.10 2002/07/15 18:51:57 alfred Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 83182e904b3ed..7c708d9f98cbd 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 d5e1472732a6e..841910b9b4d49 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 2984717e0e688..2d1518afe6521 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.12 2002/07/15 18:51:57 alfred Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 1dd582de0082c..e9d531f60d795 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 8840043e5ed21..d0f2cc2a11de9 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 20210d9722704..0af03a4d7e06a 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.8 2002/07/15 18:51:57 alfred Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index dbdf60bbf3a5e..da3839aba163b 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.24 2004/02/02 18:23:18 ru Exp $
 
 PROG=	rshd
 SRCS=	rshd.c
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 8b589b0dca83e..56a970dda3c9a 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.33 2004/07/02 21:28:49 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 323cb0a4e5920..024ef9c720bf4 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.47 2004/04/04 20:53:23 mux Exp $");
 
 /*
  * remote shell server:
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index 9bee50147f1c4..61e867b4d728c 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-aout/Makefile,v 1.31 2001/09/12 10:04:41 ru Exp $
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c shlib.c md.c support.c
 MAN=	rtld.1aout
diff --git a/libexec/rtld-aout/dynamic.h b/libexec/rtld-aout/dynamic.h
index 3c8bacdb45563..c4a032d9c89f6 100644
--- a/libexec/rtld-aout/dynamic.h
+++ b/libexec/rtld-aout/dynamic.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/libexec/rtld-aout/dynamic.h,v 1.6 2003/01/01 18:48:45 schweikh Exp $
  */
 
 #ifndef __DYNAMIC_H__
diff --git a/libexec/rtld-aout/i386/md-static-funcs.c b/libexec/rtld-aout/i386/md-static-funcs.c
index 77c25c5c2f679..d32802135d775 100644
--- a/libexec/rtld-aout/i386/md-static-funcs.c
+++ b/libexec/rtld-aout/i386/md-static-funcs.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/i386/md-static-funcs.c,v 1.7 1999/08/28 00:10:07 peter Exp $
  *
  * Called by ld.so when onanating.
  * This *must* be a static function, so it is not called through a jmpslot.
diff --git a/libexec/rtld-aout/i386/md.c b/libexec/rtld-aout/i386/md.c
index 63b9d17d5af81..d223f4d76988e 100644
--- a/libexec/rtld-aout/i386/md.c
+++ b/libexec/rtld-aout/i386/md.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/i386/md.c,v 1.17 1999/08/28 00:10:07 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/i386/md.h b/libexec/rtld-aout/i386/md.h
index ef5b632bbaeed..e7f4e16d43152 100644
--- a/libexec/rtld-aout/i386/md.h
+++ b/libexec/rtld-aout/i386/md.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/libexec/rtld-aout/i386/md.h,v 1.18 1999/08/28 00:10:08 peter Exp $
  */
 
 #ifndef __MD_H__
diff --git a/libexec/rtld-aout/i386/mdprologue.S b/libexec/rtld-aout/i386/mdprologue.S
index f111bcac6f953..d72d584047be0 100644
--- a/libexec/rtld-aout/i386/mdprologue.S
+++ b/libexec/rtld-aout/i386/mdprologue.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/libexec/rtld-aout/i386/mdprologue.S,v 1.9 1999/08/28 00:10:08 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-aout/rtld.1aout b/libexec/rtld-aout/rtld.1aout
index f7bca319862c3..86e641199949d 100644
--- a/libexec/rtld-aout/rtld.1aout
+++ b/libexec/rtld-aout/rtld.1aout
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rtld-aout/rtld.1aout,v 1.24 2004/07/02 21:28:49 ru Exp $
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c
index 8d165c19c2f2b..f2f402f94bda4 100644
--- a/libexec/rtld-aout/rtld.c
+++ b/libexec/rtld-aout/rtld.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/rtld.c,v 1.63 2003/01/01 18:48:45 schweikh Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 9fd2c66d5bf87..e9cbe81173768 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.23 2002/09/17 01:48:53 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.h b/libexec/rtld-aout/shlib.h
index d05690fe144e2..e10933cb7bcd4 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.5 1999/08/28 00:10:06 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-aout/support.c b/libexec/rtld-aout/support.c
index 71a84ffa12998..69b52671d0224 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.5 1999/08/28 00:10:06 peter Exp $
  */
 #include <sys/types.h>
 #include <string.h>
diff --git a/libexec/rtld-aout/support.h b/libexec/rtld-aout/support.h
index da0340783f272..b863a817926c0 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.4 1999/08/28 00:10:06 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index bbd5a52093ea7..1659f7d05063d 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.31 2004/06/17 19:01:53 cognet 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 0f34febdf49d7..4ebc4586ebe0c 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 2b5d535d1adc3..b90f23bfcf218 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/lockdflt.c b/libexec/rtld-elf/alpha/lockdflt.c
index 83ab3dc990d71..f50b34ad7e3d6 100644
--- a/libexec/rtld-elf/alpha/lockdflt.c
+++ b/libexec/rtld-elf/alpha/lockdflt.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/lockdflt.c,v 1.7 2002/07/06 20:25:52 jdp Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/alpha/reloc.c b/libexec/rtld-elf/alpha/reloc.c
index 1ec66ca66fc34..f6623856f0ae6 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.19 2004/08/03 08:50:59 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/alpha/rtld_machdep.h b/libexec/rtld-elf/alpha/rtld_machdep.h
index 397139e35ba0a..f83aae1f38238 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 8ab7605a5817d..6ea22139b1e5b 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/lockdflt.c b/libexec/rtld-elf/amd64/lockdflt.c
index b3b49350bab45..9069a11ebb0de 100644
--- a/libexec/rtld-elf/amd64/lockdflt.c
+++ b/libexec/rtld-elf/amd64/lockdflt.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/lockdflt.c,v 1.10 2003/12/11 04:47:53 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
index 985b4818500d3..67d6b3d49fb95 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 57bd0de1251f5..fc54dd8c290af 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 4cdad22b05576..10c1553d49f8c 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/debug.c b/libexec/rtld-elf/debug.c
index 3b7611c6e63d6..3a83b66360f93 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 3708df62cbe7e..68faa0aed243c 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/lockdflt.c b/libexec/rtld-elf/i386/lockdflt.c
index 42dc7fea1b96b..5565cc70087de 100644
--- a/libexec/rtld-elf/i386/lockdflt.c
+++ b/libexec/rtld-elf/i386/lockdflt.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/lockdflt.c,v 1.9 2003/05/29 22:58:25 kan Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index b02fdca8d5289..2f47d0fd605d7 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.13 2004/08/03 08:50:59 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h
index e104f868b5a44..3bc939e09ed39 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 76f1392625d7b..78ab838cc5f5b 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.3 1999/08/28 00:10:15 peter Exp $
  */
 
 	.text
diff --git a/libexec/rtld-elf/ia64/Makefile.inc b/libexec/rtld-elf/ia64/Makefile.inc
index 3ea0ac3391f66..70def0d1bf0e6 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/lockdflt.c b/libexec/rtld-elf/ia64/lockdflt.c
index 83ab3dc990d71..d1d3a2e5cf51c 100644
--- a/libexec/rtld-elf/ia64/lockdflt.c
+++ b/libexec/rtld-elf/ia64/lockdflt.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/lockdflt.c,v 1.2 2002/07/06 20:25:56 jdp Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/ia64/reloc.c b/libexec/rtld-elf/ia64/reloc.c
index d71829371457a..e18aa2e139ccd 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 21c3a8fd7a491..c2209e2092cc4 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 158520713e50c..b3c9df6aaa4b1 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 4705bc69d125b..fd17a2c4d8e46 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.12 2004/05/24 01:24:13 mdodd Exp $
  */
 
 #include <stdio.h>
diff --git a/libexec/rtld-elf/libmap.h b/libexec/rtld-elf/libmap.h
index e4bd0aeb9bd12..54f221f68112d 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.3 2004/03/21 01:21:26 peter Exp $
  */
 
 int	lm_init (void);
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 2fe69a78b22e0..c8fa19ed21c0c 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 33fb9a6053dc3..781c97e72a8fd 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.15 2004/08/03 08:50:58 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index a73bec30077ed..c5a8763eefa0b 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.38 2003/06/19 04:34:09 mdodd Exp $
 .\"
 .Dd May 31, 2003
 .Dt RTLD 1
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 3891f174236b2..b3a7dacedfa1a 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.99 2004/08/04 19:12:14 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index 69964d62b6757..765deb44dff81 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.34 2004/08/03 08:50:58 dfr Exp $
  */
 
 #ifndef RTLD_H /* { */
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c
index 77b16f602a1f8..65b13c6af23a5 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.2 2004/07/04 16:11:01 stefanf Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h
index cca4f18ed14ff..906e47218cd96 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 b85db59afb184..4e179343ee3a8 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 e8c0da7a1d7eb..fec0efc48c575 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/lockdflt.c b/libexec/rtld-elf/sparc64/lockdflt.c
index c60a32fff2471..5289583a6fd62 100644
--- a/libexec/rtld-elf/sparc64/lockdflt.c
+++ b/libexec/rtld-elf/sparc64/lockdflt.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/libexec/rtld-elf/alpha/lockdflt.c,v 1.6 2000/07/17
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/sparc64/lockdflt.c,v 1.3 2002/10/09 20:20:43 ru Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/sparc64/reloc.c b/libexec/rtld-elf/sparc64/reloc.c
index 0b44bec5f943c..9be3ea0e4c0ce 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.9 2004/08/03 08:51:00 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/sparc64/rtld_machdep.h b/libexec/rtld-elf/sparc64/rtld_machdep.h
index db2ce256c6cb5..9c445cdd3438c 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 58bdd1bbc944f..4834e0524266e 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 7ee4c570c6b81..785e162940743 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 40ed88a2b336f..38f6746574db2 100644
--- a/libexec/save-entropy/Makefile
+++ b/libexec/save-entropy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/save-entropy/Makefile,v 1.3 2003/04/01 12:37:54 ru Exp $
 
 SCRIPTS=	save-entropy.sh
 NOOBJ=
diff --git a/libexec/save-entropy/save-entropy.sh b/libexec/save-entropy/save-entropy.sh
index 82b96ca56912f..2faa4891b27c2 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.2 2001/01/14 07:18:31 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 458d93c12170c..60ed349c5856f 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.9 2003/07/07 03:54:03 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/smrsh
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index aa6df1bb9b67a..6c629ed8f4063 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 ca64541d80edd..841822b605c01 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 cb231a95d1348..3b7323643768a 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 6c39d8da72cc9..9fe04759e10ca 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 fb09300fc5509..5aa28c8e07313 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.10 2002/02/05 21:06:56 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 001e7d41db7a4..31aa498037aa3 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 b1944b7b56004..c2ab04c4ffcb0 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 e81cec6eb74d9..8712cb888322c 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 9e0e7ef4819d7..9287988d503f1 100644
--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/tcpd/Makefile,v 1.3 2003/06/04 15:59:13 markm Exp $
 
 PROG=	tcpd
 MAN=	tcpd.8
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 8b6ebf81d272e..11624daa1723a 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/telnetd/Makefile,v 1.24 2004/08/06 07:27:05 cperciva 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 75b16ae7f76e9..b16fde59dee8b 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 63e1e75d51a8b..f65ddc64696c7 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 dd253e401641b..e1ddaf337f5a2 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.34 2004/08/16 15:45:24 marius Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index 72978eb17d94c..0e525dd5becc9 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 488f9e4ad4462..57d7c5a9d795a 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 4e7b4d6002560..ed2e4020a80ca 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.18 2004/07/02 21:28:50 ru Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index f843b645b6dd1..7e04fcfe346e7 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 452b18667ad32..9b9e18a921f7a 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 f9e93b7b05b74..c258d27307a61 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.19 2003/10/26 04:32:53 peter Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index 9e847e70d742c..734eb2b992f1a 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.16 2004/02/16 10:03:44 das Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index b1424ac552fce..71bcee88744fc 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 c6415b33178e7..baa81e9f79359 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/Makefile,v 1.853.2.6.2.1 2004/10/24 12:43:26 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 5ff6eec153e9a..eb6ee49e63bca 100644
--- a/release/Makefile.inc.docports
+++ b/release/Makefile.inc.docports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/Makefile.inc.docports,v 1.24.2.1 2004/09/03 12:08:56 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 576d4c23893a6..ba1c869fcb41f 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.53 2004/01/28 10:15:47 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/alpha/mkisoimages.sh b/release/alpha/mkisoimages.sh
index f23ec6f06238f..d850482b8823a 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.10 2004/07/15 09:28:02 murray 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 576d4c23893a6..1c22afb764644 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.57 2004/01/28 09:38:40 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index 9668480361a2a..e0ea7c45641e9 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.10 2004/07/15 09:28:03 murray 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 51076c21309a0..2d0f5f9a1e5f7 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 8a8165ae0862c..df06f6fefd78c 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 a5288af45d953..7ce017cbe919a 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 8019ccac94ddc..8b8fec80472db 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 49d3af042562a..f4063dde7b24c 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 de5344dfeec16..ddc5925baee0a 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 e51c19a273be2..59ee9a09716c4 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.11 2003/05/27 16:11:08 alex 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 db8c7f9024aa8..462e186117035 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 6a72b8968270b..3456835c8d1a5 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 7b97c3801700e..f452d199f0db5 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 c09494b4f657f..01141689a7b66 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 30ceb44a084f7..fd139779fbf46 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 94a9d0fc8f5f7..fdf9ee6bfae36 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 020bffc69d2a7..48dd5985e7890 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 7a8048bd23798..5e1f5f92114b5 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 1ff4a5a9a12cb..2ed7842516241 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 e8ec75f3dbce9..1b1f26c0263eb 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 fdbf5d31d3b83..ed1b08d903bc1 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 5c5273b1244a3..6122d3f0ef5b3 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 5531a50226cd0..2ee93fc151a57 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 01c6ef708f539..e19ae4313ed58 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 9119a2a330fbf..05870d3d52ea6 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 7b3a0a86844ce..708b2a92d0825 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 5911d341237e6..f492c3cd1ca16 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 9dbc7047f4ea7..bcbe081ec7ce8 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 2ae7bfd36d182..0b0e7ce2d32cc 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 7e3b0ebc3d561..dfded69a29968 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 9563a4fc146c4..a9cc353701324 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 4b6b351adf470..71d4b3dfa6cea 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 6f461f7c52def..5ee90372b8061 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 91a7fde2db20f..1eb30c64716af 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 f0092048aecb8..9b5212260d748 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 16ca34e610fb0..0c44675a045e8 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 8dd1c02441166..62a3d616811ff 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 58396b8006e45..123b9f4c62a39 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 5ce38e015a2e2..55cb6efe25402 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 2138d5d1261d8..862b4bd2c4016 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 99fc17fef5fe2..6bb0ab0520f9d 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 0e7c726b95189..bc5f9e0072e60 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 54539debfca22..640961ae2ee82 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 c3eb92c6cf462..174c3c373ab25 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 5e5f42f9316b5..bfa65ffda1b95 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 b0e2b50807503..d20c898f5889b 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 bcf65ce7d0b10..7450db27b3e88 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 0e431f0899c9b..481a796c33392 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 916e1027e603d..19cc5545fcfbd 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 958e6aa03046d..6dd1f530c8371 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 473392e8002bd..da1ca31dfe7ce 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 91b240b453ccf..720600d2635a2 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 f65809eec366c..5a7e36c155fbe 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 08f5fbe396fe2..a5444315ccf68 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.11 2003/05/27 16:11:09 alex 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 968f906eb2712..49396cc9efc13 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 fbea3e1ebc79c..21c40ea75e26a 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 4d72656524979..e4c6cd110bb64 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 ca3bf375d81da..887e88cec450f 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 9476d6a5fde51..73605a077f6fb 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 e7dc5f5c46538..8597f29d24545 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 30d6a145ca332..9a2541b9221dc 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 2420f67f01fcf..de92eb88af866 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 e106b467ed965..584bf71639f41 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 769af0af2714c..be66bfe5eeb4b 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 33f8a62dbfe0d..cd9c619957c8b 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 49edccc09357c..6d3a1509e95fe 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 85ec1603c610a..908f20e202389 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 4b121e13b148d..0d981dc62c6d4 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 8530d26a582ba..9e648b293fbc1 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 79f4a8753bb27..1926d96f70447 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 ae6ed85203c0c..a685b91ce6aef 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.5 2004/08/06 08:41:22 simon Exp $
 
 RELN_ROOT?= ${.CURDIR}/..
 
diff --git a/release/doc/en_US.ISO8859-1/early-adopter/Makefile b/release/doc/en_US.ISO8859-1/early-adopter/Makefile
index 0004da3665851..2b516bb96aee7 100644
--- a/release/doc/en_US.ISO8859-1/early-adopter/Makefile
+++ b/release/doc/en_US.ISO8859-1/early-adopter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/Makefile,v 1.3 2002/10/26 01:37:09 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/en_US.ISO8859-1/early-adopter/article.sgml b/release/doc/en_US.ISO8859-1/early-adopter/article.sgml
index 417470a09b67a..060a95ecbd69f 100644
--- a/release/doc/en_US.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/en_US.ISO8859-1/early-adopter/article.sgml
@@ -19,7 +19,7 @@
       <corpauthor>The &os; Release Engineering Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.21.2.4 2004/10/06 05:55:51 bmah Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/en_US.ISO8859-1/errata/Makefile b/release/doc/en_US.ISO8859-1/errata/Makefile
index c8ac2093f88a0..ec989cf774fe4 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 e1fc42118cd31..b00482dfaf2f2 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.69.2.1 2004/10/08 16:07:56 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 0e6b4dc6eb767..07e7de907b2d6 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 37ebd11d4fce4..39a07261c536f 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 505825cfb8171..d99bd4e93e041 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 d8c3e793899e9..0d6e5d810b59d 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 463aa0ad07686..f345b236cffc7 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.69.2.1 2004/08/30 19:09:58 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 976e97a26eda8..27c346dd80e90 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 712367b5c509d..ef5e50460b58a 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 0c4ec8418a547..30c8dc110d3c2 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.3.4.1 2004/09/16 17:27:32 hrs 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 2d1cccfdf0741..c6ecd903ecdd5 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.5 2004/05/20 10:16:19 den 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 af9c491198053..de4c4151bd14a 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.227.2.14.2.1 2004/11/03 00:18:51 simon 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 c43b06b45fa83..22ff88f4fee82 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 ee9e53633050a..0411a62d87357 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.6 2003/05/22 15:51:45 bmah 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 ab08a81a928c9..10d603f409c79 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 1d9eb5d08ccd7..318d86579ecfb 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 8e377413f8fc4..9a4fa71445c06 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.13 2003/12/06 20:39:58 bmah 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 8896eccc6483e..2de5bd1334f4d 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 1f1e7d0a3881e..5e12270de65b6 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 597a5f7931a70..e21e95a3e005e 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 a4b5bc48e7594..8b9bb15944bbf 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 d312c4ce13b44..eea47dcd16ac3 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 f730eba0af740..e764438a57b6e 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.4 2003/01/12 18:27:03 roam 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 4414433400dad..a7da72a582d9d 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 fb55134390490..e2f4e352b213e 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 d58bdd7d91cbe..1d85f07b88b66 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.3 2003/01/12 18:27:03 roam 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 c8b503c5bc217..2a347ca5d8e6a 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.11 2003/01/26 06:09:32 jake 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 0e6b4dc6eb767..fbbd7bb6bd1e9 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 535d4a41bdd9e..cdd7fb83ed7fe 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 36f855e86d977..7ae3774f1cd89 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 f6c2a8bd78b28..1f5a7e4e262ac 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 36f855e86d977..9779fe4417316 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 7e71f15e4b3cb..939f5f57d7f36 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 527d9ea80f8e4..918df17bc1e96 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 68256dd93d615..3b4512da6b2af 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.5 2004/06/09 10:56:32 den 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 3e6060d08e44f..99b74787a3633 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 14c82a391e680..d256b74f01e07 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.27 2004/08/16 01:42:43 bmah 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 75bab9b59ea34..34521d06c59b9 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.8 2004/08/16 01:42:43 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 870d66ec06440..3d212a02e989a 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.14 2004/06/22 10:11:26 den 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 4d3fc96e8b0a7..cd8dde7118b8d 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.12 2004/07/07 13:11:59 den 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 36f855e86d977..c63db5b6b4ee1 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 c113a8c43021c..2fbfc7f71fa2d 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 36f855e86d977..a8337bc67258a 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 0a0e54c518bca..223d2b7ec1757 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 36f855e86d977..f1d41d8b645d3 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 84ff87ea5d216..137a9f9ce6f24 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 706d2971a6e4a..d4540481e9741 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 16c058277b75f..df4f6420c3256 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 2c19912eb0df6..387b17924aa52 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.14 2003/01/12 18:27:03 roam 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 05486df04aa9c..f76bd7c788f2a 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 1251cd0849755..743c8de079c0e 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.31.2.2 2004/09/17 16:28:58 bmah 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 0e6b4dc6eb767..de1d12a90df96 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 45c320c811176..641f4aa719681 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 f548b33ede17c..08e0212a68fc3 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 961662fa97185..6be59650c589f 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 f548b33ede17c..9144fd88a28b8 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 0b18339163084..7c8f68f2d3c3b 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 b5c982a67b39d..32f68af4b2694 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.761.2.12.2.3 2004/11/03 10:12:51 hrs 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 12086150fed82..776da7d727093 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 494ef81238381..962f7a1b77b5c 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 d49e02b39e761..8d1c9036a5f8a 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 f548b33ede17c..2cd1b2bfb373f 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 0c5323e095084..3ea2ce65ed536 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 f548b33ede17c..c1dc0cbb527a5 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 87027bfbb2bd2..cd40b39258e8c 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 f548b33ede17c..63c2012c14824 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 27636302e5d4d..ba4465f501a95 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 9995d5af1340f..7eb5ca7fa1f5a 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 0dee5652284eb..eaf8eca3893c9 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.2.1.2.1 2004/10/24 10:47:01 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 9147d3f78e321..feafb47180076 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 5bf7a1516988e..326dc96ca4336 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 40c16340cb95a..12183dc6d3b44 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 df21579da984b..bef1f3cb07cf6 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 6c8e5fe94f80e..843b8266f977b 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.5 2003/01/06 22:17:26 gioria 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.5 2003/01/06 22:17:26 gioria 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 81b8b6372da1f..c3067eadb7621 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 02eb4ca80394d..3e2a93a080bbf 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 68f2784af8a6b..e158d0d632b5f 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 f70bed890889a..9aaebb1e3792c 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 3e2cb1c4020eb..50247fc51a8fe 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 35883b1d00203..74d7716cdf9be 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 1fd74f0e5133f..aca62f5791985 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 103c5673858b2..59566fea9048f 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 0503345828d17..cf4f0a7bd06d3 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 4b7d052f03efc..310234fe3fae0 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 38228bb8e45ae..d1f37238dbfb1 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 91e09f36d7155..86c797e05fc7d 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 180657b8fc540..3d9d5c27347e5 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 48ecd83910b1a..9b8472883eea4 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 8319c1be9fd98..737a74720d819 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 c900c54f0dc4c..af96eb6d3432a 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 f1471b9dca3c8..922415c604517 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 5166bb128f136..8f53a8b4286b9 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 51acc371b5d39..6c03bb8457e31 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 de8b4913e9213..efca27d29cfcc 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 4bc54a39b215c..8decaca0a8fde 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 f434ac0874dc2..9f0f38291439a 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 81b8b6372da1f..b321a7da251be 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 a305abd65e883..63d634815689a 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 30b5589ddbb2c..46b5139a66db2 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 78045ad37f364..4b676161d8ae0 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 34e7da3e62942..a376c9ce44f01 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 8573012b061ac..e29fd6544797d 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 76db954deda96..dd80ea94fc589 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 9d29370f83052..4e53817584621 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 fe2147cbd4a5f..c097a269dd751 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 940f66f7aed3f..77c6376ae9bf8 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 a2609aa8cf8e1..72eb1fd5852e8 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 a377905e3dade..eee51096d3d64 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 dfbec1edd6918..51e7e10bc97d1 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 6ff53b66239bd..9c803a3811446 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 5e68d6e4d5557..4cd7811f36117 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 c3e7481e0ab38..e523041812db1 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 cdbbc68fecfc2..9c21f65cdfda8 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 56270ecaad71b..21b06b3be7037 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 f10e16dcbb1da..0590bebd9f564 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 0815194c50a51..562b2db96d606 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 eaff0b77c2ff0..78f15852f4913 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 f641c0a85f8bd..955a887774501 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 5263ca4e85b7b..a74832cf99f92 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 2051522133b8a..89753ea3ca85d 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 10faa9d1a6346..53b893a66914c 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 7c0714ee5dd62..35c2af83553d3 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 9995d5af1340f..57862d0eb5010 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 2de7155d09d1b..a48e7bfe5cd80 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 30a04cab55016..fe7bad78e6716 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.4 2002/11/17 19:45:00 hrs Exp $
 # Original revision: 1.3
 
 RELN_ROOT?= ${.CURDIR}/..
diff --git a/release/doc/ja_JP.eucJP/early-adopter/Makefile b/release/doc/ja_JP.eucJP/early-adopter/Makefile
index 196928ba05c69..6795150975501 100644
--- a/release/doc/ja_JP.eucJP/early-adopter/Makefile
+++ b/release/doc/ja_JP.eucJP/early-adopter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/Makefile,v 1.2 2002/11/17 20:38:27 hrs Exp $
 # Original revision: 1.3
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/ja_JP.eucJP/early-adopter/article.sgml b/release/doc/ja_JP.eucJP/early-adopter/article.sgml
index 24a2c1e6135a7..4d33ef16d8c60 100644
--- a/release/doc/ja_JP.eucJP/early-adopter/article.sgml
+++ b/release/doc/ja_JP.eucJP/early-adopter/article.sgml
@@ -36,7 +36,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.11 2004/01/17 03:20:48 hrs Exp $
     Original revision: 1.17
 -->
 
@@ -48,7 +48,7 @@
       <corpauthor>&os; ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.11 2004/01/17 03:20:48 hrs Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/ja_JP.eucJP/errata/Makefile b/release/doc/ja_JP.eucJP/errata/Makefile
index f9bbcfd977edc..33493355f145b 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 f660887a17ab0..45c8649cb0bed 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.30 2004/03/05 04:14:21 rushani Exp $
     Original revision: 1.65
 -->
 
@@ -52,7 +52,7 @@
 
     <corpauthor>&os; ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.30 2004/03/05 04:14:21 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 3154bd97d4a30..bfdf4e084bb5d 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 bfcc09c801c63..d12f3ab482c92 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.1.10.1 2004/10/24 14:46:46 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 f431bf9cb7a61..9ef154207576f 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.2.10.1 2004/10/24 14:46:46 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 65c72c08c63f4..b3a3fef73d2c0 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.1.10.1 2004/10/24 14:46:46 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 fa57ac6b3d9b5..06d5ad3ab82e5 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.1.6.1 2004/10/24 14:46:47 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 374409bb7e083..249fb95ef5280 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.1.6.1 2004/10/24 14:46:47 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 8741b88de973e..e8abe7d34ef62 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.3.4.1 2004/10/24 14:46:47 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 153f3054ccea7..933059663e554 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.2.8.1 2004/10/24 14:46:47 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
index 6a4df6f31251d..fa133de18fd41 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.23.4.2 2004/10/24 15:00:52 hrs Exp $
         Original revision: 1.259
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.23.4.2 2004/10/24 15:00:52 hrs 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 d31cd665c39a7..e302aafd24c68 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 aaee6dc2c48d3..edd6b56665ec8 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.3 2003/05/26 15:32:33 rushani Exp $
     Original revision: 1.6
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/Makefile b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
index 9673692d8a90c..fa6161f238494 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.1.10.1 2004/10/24 14:46:47 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 00acf40d65e65..ab56c39255537 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.2.8.1 2004/10/24 14:46:47 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 995a6fbc76937..9dc4de9ed6efb 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.7 2004/01/12 06:21:23 hrs Exp $
     Original revision: 1.13
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
index fa15086418836..ab42844b56f55 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.1.10.1 2004/10/24 14:46:47 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 928734626cf94..ae4798879be98 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.3.8.1 2004/10/24 14:46:47 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 162bd32f695c5..1154d30365b14 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.4.4.1 2004/10/24 14:46:47 hrs Exp $
     Original revision: 1.7
 -->
 <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 a83a68ca7908c..4d2c5d5f4c2d2 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.1.10.1 2004/10/24 14:46:48 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 ee77a3600d043..8ba746eaa88d5 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.1.10.1 2004/10/24 14:46:48 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 ecdf66c2a9a19..bf451f3fb016c 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.3 2003/01/12 22:33:39 hrs Exp $
     Original revision: 1.4
 -->
 <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 74724537b8fb7..976ca8cd9b5d8 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.3.8.1 2004/10/24 14:46:48 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 92e3a8f800d6e..34befecd609ed 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.3.8.1 2004/10/24 14:46:48 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 69f1d2a413ae4..0bfc796654c0e 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.4.8.1 2004/10/24 14:46:48 hrs 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 7a2bb96348603..761354bf16410 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 a6dfcbe16433d..d91ffbefcb3d2 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 baf44f5c7d95f..0df1e3b35866b 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 ca6dba2b4f960..cdaa57f9053f4 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.5 2003/10/12 20:11:05 hrs Exp $
 
     Original revision: 1.4
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
index 647128cdbda1e..0ac50cce5d3de 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 1c43dbab9bc83..172c53963b090 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.3 2003/10/12 20:11:05 hrs Exp $
     Original revision: 1.2
 -->
 
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml b/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml
index 2a9535604c61d..aab751fc16ae6 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml,v 1.2 2001/09/04 17:48:06 hrs Exp $
 
     Original revision: 1.1
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml b/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml
index 522083e85fb2d..264e21639613d 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml,v 1.3 2002/11/30 01:27:00 hrs Exp $
 
     Original revision: 1.2
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
index a695a35b50086..fe2fe191e6afb 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 5e47429942fbd..7c19c48a890e2 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.4 2002/06/25 18:54:38 hrs Exp $
 
     Original revision: 1.3
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml b/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml
index dae5859f10f9f..98e21e3298be9 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml,v 1.3 2002/11/30 01:27:00 hrs 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 baf44f5c7d95f..6d83aeb5f48a5 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.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/i386/article.sgml b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
index 560f35e6a608f..447edf6124e6c 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.6 2003/10/12 20:11:05 hrs Exp $
 
     Original revision: 1.5
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
index 647128cdbda1e..f167397134ef4 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 6a3f1baeb37f0..f51cc9a3801a0 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.3 2003/10/12 20:11:05 hrs Exp $
 
     Original revision: 1.2
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
index 647128cdbda1e..60981a1242701 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 c9bbdf2bcdd3f..36422e9a89174 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.3 2003/10/12 20:11:06 hrs Exp $ -->
 <!-- Original revision: 1.2 -->
 
 <!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 647128cdbda1e..1cf309d8e1fec 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 0d64e29c4fe4b..4153e7834a866 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.5 2003/10/12 20:11:06 hrs Exp $
 
     Original revision: 1.4
 -->
diff --git a/release/doc/ja_JP.eucJP/share/sgml/catalog b/release/doc/ja_JP.eucJP/share/sgml/catalog
index 19ce2927725b7..8260ca088b7a9 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.2.14.1 2004/10/24 14:46:48 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 644482420dfc6..f0b0603244cae 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.1.4.1 2004/10/24 14:46:48 hrs 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 af1d850c1215b..4337757ecfc3d 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.11.8.1 2004/10/24 14:51:38 hrs Exp $ -->
 <!-- Original revision: 1.8.2.1.2.1 -->
 
 <!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 5fdfb0f88ed38..7ff444a664794 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.8 2004/09/06 11:06:15 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/Makefile,v 1.5.2.1 2004/09/20 08:16:10 den Exp $
 # 
 # Original revision: 1.5
 #
diff --git a/release/doc/ru_RU.KOI8-R/early-adopter/Makefile b/release/doc/ru_RU.KOI8-R/early-adopter/Makefile
index a5d26c2e321c4..17fc07bea7bb9 100644
--- a/release/doc/ru_RU.KOI8-R/early-adopter/Makefile
+++ b/release/doc/ru_RU.KOI8-R/early-adopter/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/early-adopter/Makefile,v 1.1 2004/06/28 13:24:45 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/Makefile,v 1.1 2004/06/28 13:28:15 den Exp $
 #
 # Original revision: 1.3
 #
diff --git a/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml b/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml
index 32559c6af95f4..2d5d660930ea8 100644
--- a/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml
@@ -1,7 +1,7 @@
 <!--
    The FreeBSD Russian Documentation Project
 
-   $FreeBSD$
+   $FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.5.2.2 2004/10/08 09:26:12 den Exp $
    $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.6 2004/08/12 08:31:34 den Exp $
 
    Original revision: 1.21.2.4
@@ -28,7 +28,7 @@
       <corpauthor>çÒÕÐÐÁ ÐÏÄÇÏÔÏ×ËÉ ÒÅÌÉÚÏ× &os;</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.5.2.2 2004/10/08 09:26:12 den Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/ru_RU.KOI8-R/errata/Makefile b/release/doc/ru_RU.KOI8-R/errata/Makefile
index 569e28c75f037..5c8d096ab98bc 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.2.1 2004/09/20 08:16:10 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 cdedaef8472a3..149170aea5f0c 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.2.1 2004/09/20 08:16:10 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
@@ -31,7 +31,7 @@
     ðÒÏÅËÔ &os;
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.1.2.1 2004/09/20 08:16:10 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 f6063ce152ff5..b33a78cb482ca 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 a693cd58b4584..29b602adcb442 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 2db4c9d9b0451..8109c9b6aa59a 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.2 2004/08/11 10:25:20 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile,v 1.2 2004/08/11 10:04:26 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 af3fd75addd31..f3a50d8454826 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.4 2004/08/12 08:44:50 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml,v 1.5 2004/08/12 08:31:34 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 ae524866c9014..6d11e70a64c51 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.2 2004/08/11 10:25:20 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile,v 1.2 2004/08/11 10:04:27 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 436ab88139348..8bb0b32b36f25 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.4 2004/08/12 08:44:50 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml,v 1.5 2004/08/12 08:31:34 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 1cdd4a9e37432..d7426aa013500 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.1.2.1 2004/09/20 08:16:10 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 a606234b71779..07e9d53858b38 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.1 2004/05/31 11:43:22 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml,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/dev.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
index 22103c85ea676..bd685a0219e18 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.2.2.2 2004/09/23 06:12:03 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.10 2004/09/20 13:03:46 den Exp $
 
      Original revision: 1.257
@@ -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.2.2.2 2004/09/23 06:12: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 3f86696b7c590..323a1a794b1fc 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 739191ef7d4fa..1cb0ce4878a50 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.1.2.1 2004/09/20 08:16:10 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 fe4e3a81b495c..35fb745269c84 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.2 2004/08/11 10:25:20 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile,v 1.2 2004/08/11 10:04:27 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 89f7e3b283362..cb473ffc6f337 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.4 2004/08/12 08:44:50 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml,v 1.5 2004/08/12 08:31:34 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 20bc2f1b167a7..ddcf98150e6dc 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.1 2004/05/31 11:43:23 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.13
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
index 1ae8ceaac5dcf..382c5002ad719 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.2 2004/08/11 10:25:20 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile,v 1.2 2004/08/11 10:04:27 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 f17eef3cc52fa..8b8e00b4a539f 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.4 2004/08/12 08:44:50 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml,v 1.5 2004/08/12 08:31:35 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 4656bd6edeb58..336c481099682 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 a9653ba5f4465..dd7612b2b6ee5 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.2 2004/08/11 10:25:21 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile,v 1.2 2004/08/11 10:04:28 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 598a5deb717b5..a69012eb5f4aa 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.4 2004/08/12 08:44:50 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml,v 1.5 2004/08/12 08:31:35 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 4380ae07aa23a..bd3ddbf9afad7 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.1 2004/05/31 11:43:24 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.4
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
index dcbcf6fdd0889..924ea66aa6642 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.2 2004/08/11 10:25:21 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile,v 1.2 2004/08/11 10:04:28 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 a71a8a66db45e..ada9fdcb57d61 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.4 2004/08/12 08:44:50 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml,v 1.5 2004/08/12 08:31:35 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 95fcebf0c260d..86d9680c0c050 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.1.2.1 2004/09/20 08:16:10 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 53990ef4bfd91..3470922ab31fe 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 5f7b50f7de95e..36cc9d5cbee87 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 7241133f65b6d..32e66acb27c26 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 d43057bcbe270..14b0ae7a9ab7b 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 1c7ac4d9bbd54..fe8c536acc2c0 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 b46561a82b383..cfec337cae574 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 00bca530ae811..5ca0fe8344fb8 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 d95f156defd60..8667adbed8673 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.1.2.1 2004/09/20 08:16:10 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.2 2004/09/06 14:05:03 den Exp $
 
      Original revision: 1.6
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 cfe8a868d6173..2a2a933b89e85 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 209825568ae25..cef12eda4bd53 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.3.2.1 2004/09/20 08:16:10 den Exp $
 $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.5 2004/09/06 14:05:03 den Exp $
 
 Original revision: 1.28
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 5adc9eb75b716..f98d597026e2c 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.2.2.1 2004/09/20 08:16:10 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.4 2004/09/06 14:05:03 den Exp $
 
 	Original revision: 1.9
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 665a77dce8e5b..92a3813c499bb 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.1.2.1 2004/09/20 08:16:10 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.3 2004/09/06 14:05:03 den Exp $
 
 	Original revision: 1.16
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 dffe1a55541ff..3a93369d275fb 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.2.2.1 2004/09/20 08:16:10 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 b1d897d9b39fc..b88a88d31ace5 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 14199c01d8707..aade02982627a 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 adf6a2a28548a..f2eb5edcc291f 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 df280dba03dd9..621e62e9406d8 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 9cd2b17582bab..2816dc73bf2a2 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 b6c1767f7c5b2..3ab03d1c6ef11 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 ac6fb72e90aa0..78c17efa2d697 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 90b0ae44da0af..617a54de4092c 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 9b6f10fff3284..59c186b94964e 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 5c62cfd18b104..456bf7212d137 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.5.2.1 2004/09/20 08:16:11 den Exp $
    $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.9 2004/09/13 09:24:01 den Exp $
 
    Original revision: 1.35
@@ -21,7 +21,7 @@
 
     <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.5.2.1 2004/09/20 08:16:11 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 3729b20912845..abbf069c50846 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 214855f61379c..7399ec7fa761d 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 2587e1c086359..efc4df251651b 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 11ed2dc30d680..0ad1235b88737 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 97dedc60f8e26..02790744dab99 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 14ee728555311..a5568d37711fa 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 4037f94c7a8db..874704e82feb6 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.6.2.5 2004/10/11 12:59:07 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 96df30653d6e2..616d06d7b54f0 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 2bbe5e9a9f415..aa86353f4e679 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.1.2.1 2004/09/20 08:16:11 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 debdea7acc2c1..5dc37356fd3f2 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 62016749f7417..1882c7d555008 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 9c15d726694a3..d9a0adb647189 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 2abd4f2247171..aa4a868c5887a 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 ede9cc3f093dd..f368211335c36 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 6084f36a61603..bfb9fc38e46b6 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 957adaa190b40..cfd9dc8da3d4b 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/sgml/catalog b/release/doc/ru_RU.KOI8-R/share/sgml/catalog
index e1f4310d4af8d..7ab9f27e5887e 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.2 2004/03/23 08:11:01 den Exp $ --
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.1 2004/05/21 11:59:56 den Exp $ --
 
   -- Original revision: 1.1 --
 
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 00fcc5d1d5f56..c87438461acfa 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.2.2.1 2004/09/20 08:16:11 den Exp $
   
   Original revision: 1.8
 -->
diff --git a/release/doc/share/examples/Makefile.relnotesng b/release/doc/share/examples/Makefile.relnotesng
index c0c7036c91042..b9fac12dbe811 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.9.4.1.2.1 2004/10/24 11:05:49 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 0090a7883a386..628d07110b100 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.5.2.18 2004/09/30 18:34:58 simon Exp $
 #
 
 #
diff --git a/release/doc/share/misc/man2hwnotes.pl b/release/doc/share/misc/man2hwnotes.pl
index 809910e66ff2c..a9c60c2e92f32 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.4.2.2 2004/09/07 18:39:24 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 2fe30d76b1fcb..5a426fad8c8fd 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 6860cb229bfdd..6eec80545eab9 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 e456e6743159c..3dc20c751dceb 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 58d82314f960b..8caa0a4b3ebe5 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 8e5366e7834e0..656595c6d33ab 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.7 2003/05/23 10:30:27 hrs 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 6ea8421fbc8ee..83dd8dc8bb395 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.18.2.3.2.2 2004/10/24 10:45:59 hrs Exp $
 
      OS Release Information -->
 
diff --git a/release/doc/zh_CN.GB2312/Makefile b/release/doc/zh_CN.GB2312/Makefile
index 11e5ee1cdd3f0..fd1ad8a54d13d 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.3
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.1.4.1 2004/10/22 22:31:13 kensmith Exp $
 
 RELN_ROOT?= ${.CURDIR}/..
 
diff --git a/release/doc/zh_CN.GB2312/early-adopter/Makefile b/release/doc/zh_CN.GB2312/early-adopter/Makefile
index a8140026843f4..efacd5ff48566 100644
--- a/release/doc/zh_CN.GB2312/early-adopter/Makefile
+++ b/release/doc/zh_CN.GB2312/early-adopter/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.3
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/early-adopter/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/early-adopter/article.sgml b/release/doc/zh_CN.GB2312/early-adopter/article.sgml
index 4a35077c04bfe..9f975b1e34cb2 100644
--- a/release/doc/zh_CN.GB2312/early-adopter/article.sgml
+++ b/release/doc/zh_CN.GB2312/early-adopter/article.sgml
@@ -21,7 +21,7 @@
       <corpauthor>The &os; Release Engineering Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/early-adopter/article.sgml,v 1.1 2004/10/15 06:43:44 delphij Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/zh_CN.GB2312/errata/Makefile b/release/doc/zh_CN.GB2312/errata/Makefile
index 859dfaa9eb2f5..2061215e70216 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 fc900b6bc961e..d38e3375b2ded 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.1 2004/10/15 06:43:44 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 9c38bf4208719..fba8332f92ca4 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 29076342ea7af..8636a5e27541c 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 66193dccf89e1..2e9be20bf06c0 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 67f7aa5b345cd..c6131dddaf986 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 0c40d154b254c..037f4bbde2ba6 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.3.4.1
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml,v 1.1 2004/10/15 06:43:45 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 97c724db0aa94..88e54bc1f7f39 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.5
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml,v 1.1 2004/10/15 06:43:45 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 570e88340f5da..d32c0fcbaa412 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.1 2004/10/15 06:43:45 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 7ecdd63548508..cf29c8278c2a7 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 f35d1dc0b34f8..ecfa246fe144d 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.6
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml,v 1.1 2004/10/15 06:43:45 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 6558920c74d5f..76a098c9effd9 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 dd96e4344d84f..dfa8daf8332c8 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 3dd35121f7c78..2d604b83d7da9 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.13
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.1 2004/10/15 06:43:45 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 5283300b7d0a8..2a742ca24723d 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 b11ca6e6cd9ee..5c39494b2ca6c 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 79e7d0dd59d58..2089e900cc02f 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 a36fc1f5a2bf9..0bfdb0de04f1d 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 2ab78f7987c99..dabe49b721fda 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 9df4eb5d264f7..4717eaaacc778 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 4ecbadc8dd9b1..3714f9c2a3019 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 f60694a626019..0a6af4f8cc83c 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.5
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml,v 1.1 2004/10/15 06:43:46 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 5d1bfff1303f2..821972c2a8bc2 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 98d747b4e8de2..98fdca7e52957 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.27
-$FreeBSD$
+$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.1 2004/10/15 06:43:46 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 e5f710bffc3ee..ccb9b6a809117 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.8
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/layout.sgml,v 1.1 2004/10/15 06:43:46 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 6b215ac7a2f1c..a55340b4cd6ab 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.14
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml,v 1.1 2004/10/15 06:43:46 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 078a82b2df1c3..1c259e5d35f77 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.12
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml,v 1.1 2004/10/15 06:43:46 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 79e7d0dd59d58..dd8cd5818be96 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 f7e795edcc3bb..59b6b8b25ee61 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 2ab78f7987c99..397f2ee4056b5 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 8565f96b34ec8..ff87be47b886c 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 2ab78f7987c99..1301b19e25f57 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 a1343ca4e8f94..badf02423c995 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 5af96148f16f0..8b24473694e77 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 25be40c0968e2..40283799e04e8 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 38ab6c4249997..a29ba6c032e5d 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 c2d2cf843f818..768f3ea0be34a 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 d6d39e5b2bead..0c38d6fe246d2 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.4.1 2004/10/24 12:19:05 hrs 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 7858ebaeb18c5..5bdbfa27eebc5 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 29d07c92d6700..25bbd51ed5f12 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 3bbd40a32f87b..1bfb738de9c55 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 9177748cb4462..3613c49eaa5e3 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 fa21257f0f088..bc2c6a1984701 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 121d20ed82676..4a0e5f3d4d4cf 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 bdb1f828d8b00..f69ccdfe99b0f 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.1.4.1 2004/10/24 18:45:17 hrs 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 638ea7f47dd06..78def66a4778e 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 8d4b5f14fdc91..2a2b96686bf35 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 ef0fe8dd97e78..2d46ca2e3edb1 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 fa21257f0f088..bd68bb8ee68bd 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 b3a8c9b394fc1..12b99962b2b45 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 fa21257f0f088..bfd85b3a56e45 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 7f38047b1b761..fc91cc496e2b9 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 f548b33ede17c..7808464897e03 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 798563f3c5fbd..a6b8e03b6c47d 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 a4d71599493f9..0cd90984ee68b 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 b274f8e7fccce..5e0ef20d59135 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 b81395ce7f7fd..b7f81c5610aba 100644
--- a/release/fixit.profile
+++ b/release/fixit.profile
@@ -1,5 +1,5 @@
 :
-# $FreeBSD$
+# $FreeBSD: src/release/fixit.profile,v 1.9.8.1 2004/09/02 13:45:24 keramida Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
diff --git a/release/fixit.services b/release/fixit.services
index ff776b2b62658..a9f89f5ca5c45 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 576d4c23893a6..28d8aea510797 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.57 2004/01/28 09:38:40 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/i386/fixit_crunch.conf b/release/i386/fixit_crunch.conf
index 98baad3dc1bfe..9d38bc923f948 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.12 2004/02/19 02:48:46 matusita Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
index b02ca91814ae3..8de68e6896693 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.11 2004/07/15 09:28:03 murray 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 95c8cc3c5b628..ff298f58ec5e4 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.6.2.1 2004/10/02 04:16:30 marcel Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/ia64/mkisoimages.sh b/release/ia64/mkisoimages.sh
index 54ea8f79d2d2b..f89eca36717ef 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.9 2004/08/10 05:43:40 marcel 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 8af398a406cdd..7d984925372b5 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.57 2004/01/28 10:18:54 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/pc98/fixit-small_crunch.conf b/release/pc98/fixit-small_crunch.conf
index 9321dd72a4243..4309b563f7448 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.5 2004/02/19 02:48:46 matusita Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/pc98/fixit_crunch.conf b/release/pc98/fixit_crunch.conf
index 58abeddd017fa..4a7770be59a30 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.12 2004/02/19 02:48:46 matusita Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD
index 985c85de573cb..325a61ad01031 100644
--- a/release/picobsd/bridge/PICOBSD
+++ b/release/picobsd/bridge/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.16 2003/06/22 15:32:09 luigi 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 580dd1a3381e5..849fa8c839c68 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 f681057ad34e6..ea5b23b8c25a9 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.14 2004/03/24 07:30:54 luigi 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 c4f048b735d5b..e7a982daa4f33 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 5c8e70ce6b201..1ca6eee952e2b 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 c7d0bd21408a1..cf0416c8ce436 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.29 2004/03/21 10:46:13 luigi 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 cf9673af6fbd6..d7a8c4cc04fd0 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 d4f9c541def93..392e36849d00e 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.secret.sample b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
index bfaab7681aa59..c8f98aab5df57 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 8b8bdf3f0e96e..8c8e08ae34d78 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 408fe6087f026..00dcb85568e0f 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 780311d285ba0..2565c72c2ec65 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 f5b00975e20b3..a83ba852bafa1 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 09173321819f2..84ea3033ad498 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 4337b1fb74816..ffd4a6e26dfa5 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 0ef23af6cb38b..1d7bcb9d61a39 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 30137187d5768..9e3fa06fcab36 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 3cd6d5dcdb5b3..8a608846f9ab8 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 40fbd8a334cc6..195f22dc94499 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 8d17cc551a358..02c19005dd955 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.2 2001/04/24 07:46:27 joe 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 cd386f6321c21..58e5aac9ff9f8 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 5b8f9498cec45..58889c625f1b9 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 072493a12f896..5577b15162cea 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 cda9bdddba1cf..8c09255e0486b 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.2 1999/08/28 01:33:52 peter Exp $
 #
 PROG=ps
 SRCS+=main.c
diff --git a/release/picobsd/tinyware/aps/README b/release/picobsd/tinyware/aps/README
index f455c7bae3076..8f1c4f0e176ef 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 eece247af3bd2..0132d6c69b551 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 2bf727af61b71..4e2c5aaa169c1 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.2 1999/08/28 01:33:53 peter Exp $
 #
 PROG=help
 SRCS+=help.c
diff --git a/release/picobsd/tinyware/help/README b/release/picobsd/tinyware/help/README
index 9c9900feba3fd..1f2c2482cb669 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 b57b4f6f15577..5b771cdf15ac1 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 2fe2b5e52594d..ee3fff9324c1f 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.1 2001/10/01 16:58:28 luigi Exp $
 
 .PATH: ${.CURDIR}/../../../../usr.bin/login
 
diff --git a/release/picobsd/tinyware/login/README b/release/picobsd/tinyware/login/README
index 4dba3344e6daf..ca2ee67c07f29 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 333c2ca280fa3..cf21ed3ea031f 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 9d3ef4cce176c..9bb8384eeb61c 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.5 2002/10/10 00:25:33 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile
index 840868872c5e7..3a53cd54c2832 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.2 1999/08/28 01:33:54 peter Exp $
 #
 PROG=msg
 SRCS= 	msg.c
diff --git a/release/picobsd/tinyware/msg/README b/release/picobsd/tinyware/msg/README
index d26e38326a9e3..f8832f004c598 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 c9f87efbbb6a7..11d8148c894c6 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 e1a1b541ca351..3589f736f34ed 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 99fd4e4d91b45..eae2181e2a43a 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.8 2001/04/23 19:38:41 joe Exp $
 
 PROG=	ns
 SRCS=	ns.c
diff --git a/release/picobsd/tinyware/ns/README b/release/picobsd/tinyware/ns/README
index 8d5f50358415e..77bafe7ae3e66 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 777a7bed195f7..db499595609a5 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 c655bb7bb7dea..a14a9046eea25 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.3 2001/01/20 09:12:55 alex Exp $
 #
 PROG=		oinit
 
diff --git a/release/picobsd/tinyware/oinit/README b/release/picobsd/tinyware/oinit/README
index e34c404f4a8d3..ff7e891861419 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 b02434a7132b8..5e4b68bdb425e 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 203a5f4a3ba1b..911038ae724d8 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.3 2003/04/30 17:50:08 markm Exp $
 
 # Only NOPAM is used by PicoBSD and supported here
 
diff --git a/release/picobsd/tinyware/passwd/extern.h b/release/picobsd/tinyware/passwd/extern.h
index eae768c6e82a9..4dda6a5b887f4 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 6bbf24d3c47b8..6154e9c06b5cd 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 d24165037a5a4..a1690467f54b8 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 ba3c8865dde7c..fe9d4f1a855af 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 1c163d2d57ed7..5d71bd2811556 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 1000a9abdc7fd..622f7270ac816 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 524040efb5345..a7025f4fe96c0 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.6 1999/08/28 01:33:59 peter 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 6961954615d44..6b7fc1d85e332 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 ab35b55ae04c7..fa5492953a475 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 8997087da65e1..bd4d58d172775 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.2 1999/08/28 01:34:00 peter Exp $
 #
 PROG=sps
 SRCS= 	sps.c
diff --git a/release/picobsd/tinyware/sps/README b/release/picobsd/tinyware/sps/README
index 2357113bf2cad..b227dd0b10afc 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 f79d01983b9f3..7abaef212aed6 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 1c0399d127879..ba038e16e8c70 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.3 1999/08/28 01:34:01 peter Exp $
 
 PROG=view
 SRCS=view.c
diff --git a/release/picobsd/tinyware/view/README b/release/picobsd/tinyware/view/README
index df5f774a95f6f..20add44d15f96 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 2727ebe244260..29f39a6aa051e 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 359aa3e9cfc4c..53f32dc034e0c 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.2 1999/08/28 01:34:03 peter Exp $
 #
 PROG=vm
 #CFLAGS+=
diff --git a/release/picobsd/tinyware/vm/README b/release/picobsd/tinyware/vm/README
index c4a940c629e87..ef4a18eb73ccc 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 695f2afb5766b..4b4cffdcf2a69 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/scripts/base-install.sh b/release/scripts/base-install.sh
index c87a38bf86a96..c7e31ad38afad 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 2e618ca76eeb9..bd41425c166c7 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 755057d40ccb8..d9d3c3048160e 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 44612dcbee5c6..55a837fbda21b 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 d2b9e0eed8b75..4db2b4cba2cae 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 9bf67a338b446..9089a4e4400e3 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/compat1x-install.sh b/release/scripts/compat1x-install.sh
index b471caa9dfde9..2e953666cf8f5 100755
--- a/release/scripts/compat1x-install.sh
+++ b/release/scripts/compat1x-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/compat1x-install.sh,v 1.4 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/compat20-install.sh b/release/scripts/compat20-install.sh
index ec0faeca3427b..fd75fe0286be2 100755
--- a/release/scripts/compat20-install.sh
+++ b/release/scripts/compat20-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/compat20-install.sh,v 1.4 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/compat21-install.sh b/release/scripts/compat21-install.sh
index 5680c290139d4..b761e57cfb2c2 100755
--- a/release/scripts/compat21-install.sh
+++ b/release/scripts/compat21-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/compat21-install.sh,v 1.4 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/compat22-install.sh b/release/scripts/compat22-install.sh
index 97708c59617e1..02ad359d104e3 100755
--- a/release/scripts/compat22-install.sh
+++ b/release/scripts/compat22-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/compat22-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/compat3x-install.sh b/release/scripts/compat3x-install.sh
index e2168180f5c98..cf50f1af54977 100755
--- a/release/scripts/compat3x-install.sh
+++ b/release/scripts/compat3x-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/compat3x-install.sh,v 1.2 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/compat4x-install.sh b/release/scripts/compat4x-install.sh
index 2950a1b6b9fca..936566e50b5d8 100755
--- a/release/scripts/compat4x-install.sh
+++ b/release/scripts/compat4x-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/compat4x-install.sh,v 1.1 2002/04/26 13:33:46 matusita Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/dict-install.sh b/release/scripts/dict-install.sh
index 4f57aaa11ec99..5a4c5a152a017 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 c0ca6a5880ed9..4ff2f47db970a 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 b61c7edf4b752..f2e8132355376 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.58.2.1 2004/08/26 02:28:22 kensmith Exp $
 #
 
 set -ex
diff --git a/release/scripts/doc-install.sh b/release/scripts/doc-install.sh
index 5609720ada37b..dfbff0eaffe76 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 033554007abec..0f3d773bb9200 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 6c940776b55e8..cf8564d651a23 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 6e83d14747373..29eb462c8c545 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 30c12bf23850c..e5ba91ea53b65 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 12fd29d938731..ac1284e0c71e8 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 e25ceb73dbe98..8ba12b603adad 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/manpages-install.sh b/release/scripts/manpages-install.sh
index 35eb4b7a17ca8..0ef9cbd6271ad 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 bb1326f3d506b..bc3b018d39de3 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 c14b628680181..60507ee74c8c2 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 b70a258257df9..fb6b36c083e26 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/ports-install.sh b/release/scripts/ports-install.sh
index 81c4023c77eeb..57ddaac34ac75 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/print-cdrom-packages.sh b/release/scripts/print-cdrom-packages.sh
index e9125210d65be..c083f5c47bf6d 100755
--- a/release/scripts/print-cdrom-packages.sh
+++ b/release/scripts/print-cdrom-packages.sh
@@ -2,7 +2,7 @@
 #
 # Author:	Jordan Hubbard
 # Date:		Mon Jul 10 01:18:20 2000
-# Version:	$FreeBSD$
+# Version:	$FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.64.2.2.2.2 2004/10/23 19:57:26 scottl Exp $
 #
 # MAINTAINER:	re
 #
diff --git a/release/scripts/proflibs-install.sh b/release/scripts/proflibs-install.sh
index 5dd2b42399381..b6f2c7111cd4c 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 5ff447ac9068d..a7c47671b21fd 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 40b8eaa044e41..617120d4cff80 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.1.2.1 2004/09/09 12:20:47 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 be0f1dacd10c8..1481561ed67b1 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 e0933f29d7783..9e3310782b756 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 394265892f2c8..f153c4fd57ba7 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 576d4c23893a6..1f784ad649424 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.5 2004/01/28 10:15:47 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/sparc64/mkisoimages.sh b/release/sparc64/mkisoimages.sh
index bc91d62767fae..fd2b65a81c528 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.6 2004/07/15 09:28:03 murray 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 70986f8a409d4..4ef07ddf9c289 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 0945ed35a6abb..302ff938b3b6d 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 3a8cb463fe5ec..be420b6b1c738 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 c504eae031ac8..dabe0e8b68aee 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/rescue/librescue/Makefile,v 1.4 2003/07/17 06:29:10 obrien Exp $
 #
 
 # Certain library entries have hard-coded references to
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index b8326a09560be..e90cb7ade7b73 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.28 2004/08/16 03:16:48 marius Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	rescue
diff --git a/sbin/Makefile b/sbin/Makefile
index 28f0d85a3e1fd..686c3d262815f 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.141 2004/08/07 16:16:59 le Exp $
 
 # XXX MISSING:		icheck ncheck
 
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index 7a1ebd0745445..d9cd699d7f057 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.13 2004/08/06 00:07:26 gordon Exp $
 
 BINDIR?=	/sbin
 WARNS?=	2
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index 27c128916f9bb..cd38438b55d63 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 84e84914aad6e..174662dc8f59a 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.27 2002/08/21 18:09:45 trhodes Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index bf390107ea957..5afeb1e10dbc1 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 73b916080d42d..6cf21e7317ba9 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 4bb18be4f0b1e..c2c3ebc634979 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.24 2004/07/02 21:45:00 ru Exp $
 .\"
 .Dd May 17, 2001
 .Dt ATACONTROL 8
diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c
index 675174e0aa6c7..43a1bc72417f6 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.31 2004/05/20 15:01:26 des Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index ed7ca1a849a78..76d5a00fa59ac 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 3d5738afdbc4d..29cdbeba00cbc 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 973e5cce4cd4e..592ae9bc27d0b 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 25c4b75d1718e..d1b6afa6245fa 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 94cde38582d75..f6999274a520c 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 7ecae34a4b3fe..330bedef93c15 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.8 2003/07/29 13:37:04 harti Exp $
  *
  */
 
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index d6da017903927..39bf0f58570f1 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 2f916a091bdc1..eba21d30d6f31 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 a3f0ce3bfd0e1..edae60588913e 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 790bfc1799192..78d1368f90b1f 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 e744c755fd419..413f13694911f 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 a612beef20662..2ed18f07f2bc6 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 13160ca7d6dbf..df5062e04f89b 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.6 2004/08/12 12:31:43 harti Exp $
 
 PROG=	atmconfig
 .ifndef RESCUE
diff --git a/sbin/atm/atmconfig/atm_oid.list b/sbin/atm/atmconfig/atm_oid.list
index ca64afa44267d..e1f4efcf3cba9 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 1ff76a100cd8a..c17cc8589a700 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 5e5b04172cb08..3d781b7a55317 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 8c6e7cec7f2fc..30b79f5cdbfc7 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 082494df95a50..c2e2e6630c7d2 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 b96467e3f6be0..c638a75409e67 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.1 2004/08/12 12:31:43 harti 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 27237c8cb7b9a..020d0ee6be4c9 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 74d39011219c4..9e79ab9f120b8 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 8b36cd44e1f5d..1f3c1cb5e0514 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 d2543f7d1f36e..c59108f9f0a7f 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 29f5ce231e0a9..b250a9e9f491d 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 9dcf53979517a..9243bb8908500 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 f934d42937246..771e38e69db8e 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 abcec31b23631..f7484775d2ddc 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 7ffd0d2e51fcb..7f60928dac98b 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.8 2004/07/02 21:45:00 ru Exp $
 .\"
 .\"
 .Dd December 3, 1996
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index dc52effc97026..d7bfe024a63d8 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 c208a4ddf3a1b..4b7b87bca8642 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 67d9bab32b9c8..3f31368c3ca84 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 a3b526577e7ce..ca2d9b76700aa 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.5 2002/07/06 19:32:30 charnier Exp $
 .\"
 .\"
 .Dd September 14, 1998
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index f33212ca56108..14dcbc970cc18 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.33 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index a39227716b77a..57bdd837b4f5e 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 be24febcd0392..099b2c80f9e4b 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.21 2004/07/02 21:45:00 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 96c319de3023c..96ef221b95222 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.20 2004/04/09 19:58:25 markm Exp $");
 
 /*
  * badsect
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index 716dab3db69ec..3d404ec6ba6d8 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 a0bb82ee4e542..f4982d5f9d147 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 cbb4e345493b9..7e0384f72cefa 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.58.2.1 2004/09/14 03:44:58 brooks Exp $
 .\"
 .Dd March 15, 2003
 .Dt BSDLABEL 8
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 8d44e6878df05..7a94f30bc6ea7 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.108.2.1 2004/09/14 03:44:58 brooks Exp $");
 
 #include <sys/param.h>
 #include <stdint.h>
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index c8a9ef362e54e..51887855dee96 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 9d561f39ab82f..7513dce3512ce 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 bf2ba4a864e20..b0856cf878bbc 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 453999e0fab6e..09438637c86fe 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.38 2004/07/03 00:13:43 ru Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index acf9ae1ab3e1c..53fdb3f0fa7df 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.52 2004/03/03 01:51:24 ken Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index eebbe8553ed50..55b757870fa6b 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 3fb9587e206a4..b93ce2094398e 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 67f4e4f0cd157..57a9b195c5309 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 ac7558409ed61..66bbcb0ef7e77 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 e4ff4b3d9ae6c..982b37373efbe 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.29 2004/07/03 00:13:43 ru Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index c7baa9826c82e..fff0c86a72b73 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.34 2003/08/07 19:10:35 johan Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 538cfeda096dd..b762105f87884 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 c68c312f269b2..e89723640f7fe 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 c3c37960cbb24..60c57d61f36cc 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 d5a358d33d632..4d9c498b46bb3 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/clri/clri.c,v 1.14 2004/04/09 19:58:26 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index a7720d81b41e9..ca636f9d70ce5 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 bf719f9af3be5..f257c406c585e 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.27 2004/07/02 21:45:01 ru Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 753ded36d1a9f..a974a064003d1 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 ddd2434e6cc58..609206b5a594e 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 d746caff63d73..9906e6f70bb09 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.8 2004/06/18 20:06:04 green Exp $
 .\"
 .Dd October 23, 2001
 .Dt CONSCONTROL 8
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index d8e5bc52c11af..aef283cbc49c9 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 8e1122eaf3cbb..0b8b433875a9a 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devd/Makefile,v 1.5 2003/08/17 08:40:49 gordon 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 8c96eaf45796c..cde25ae621358 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.12 2004/07/07 19:57:14 ru Exp $
 .\"
 .Dd October 17, 2002
 .Dt DEVD 8
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 75b22c3f2329d..f64d3961327da 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.18 2004/07/01 07:24:18 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 1452eca524f21..638a8f07dd5e5 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 8a032e4d4db2c..80639b4b013b7 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.4 2003/10/24 22:02:29 imp Exp $
  */
 
 #ifndef DEVD_H
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index 4730267c938ee..e67bed7265ce6 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.2 2003/10/24 22:02:29 imp Exp $
  */
 
 #ifndef DEVD_HH
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 9269ef27800c9..b2489f0f90b78 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.4 2003/10/24 22:02:29 imp Exp $
  */
 
 #include "devd.h"
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 0aa8cb6df5dd5..e39fc4138f94f 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.5 2003/10/24 22:02:29 imp Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index 95d2540272e6b..a176a641d477c 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 1d7d442595457..9ef415b8e2c6e 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.8 2003/09/14 13:41:57 ru Exp $
 .\"
 .Dd July 1, 2002
 .Dt DEVFS 8
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index f531f7521cb15..d404dc408daea 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 a9f8d224838de..64218809e00b3 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 b179c9e2fb1ef..f2b97fe530b5f 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.5 2004/01/22 07:23:35 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 372adfdfd47a1..7a9d6b1655ef7 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ISC DHCP client.
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile,v 1.20 2003/06/29 18:46:17 gordon Exp $
 
 SUBDIR= common dst minires omapip dhcpctl client omshell
 
diff --git a/sbin/dhclient/Makefile.inc b/sbin/dhclient/Makefile.inc
index 090d20834e142..515bd9770374b 100644
--- a/sbin/dhclient/Makefile.inc
+++ b/sbin/dhclient/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile.inc,v 1.8 2004/02/23 20:17:32 johan Exp $
 
 MAINTAINER=     mbr
 
diff --git a/sbin/dhclient/client/Makefile b/sbin/dhclient/client/Makefile
index c82c9122b34ea..eea8cbde88e47 100644
--- a/sbin/dhclient/client/Makefile
+++ b/sbin/dhclient/client/Makefile
@@ -1,5 +1,5 @@
 # client
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/client/Makefile,v 1.3 2003/06/29 18:46:18 gordon Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/common/Makefile b/sbin/dhclient/common/Makefile
index 5d4bb92f6e83f..1031809481bc8 100644
--- a/sbin/dhclient/common/Makefile
+++ b/sbin/dhclient/common/Makefile
@@ -1,5 +1,5 @@
 # common
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/common/Makefile,v 1.3 2002/05/13 11:09:05 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/dhclient-script.sh b/sbin/dhclient/dhclient-script.sh
index d35eafeff1931..b1ba4cc754d24 100644
--- a/sbin/dhclient/dhclient-script.sh
+++ b/sbin/dhclient/dhclient-script.sh
@@ -35,7 +35,7 @@
 #############################################################################
 # $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $
 # $MindStep_Tag: CONTRIB_19991207 $
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhclient-script.sh,v 1.2 2002/02/01 18:46:58 alfred Exp $
 #############################################################################
 
 
diff --git a/sbin/dhclient/dhcpctl/Makefile b/sbin/dhclient/dhcpctl/Makefile
index 1f3ecbd071642..94db9910b3ace 100644
--- a/sbin/dhclient/dhcpctl/Makefile
+++ b/sbin/dhclient/dhcpctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhcpctl/Makefile,v 1.1 2003/03/25 03:16:52 mdodd Exp $
 
 DIST_DIR=	${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/dst/Makefile b/sbin/dhclient/dst/Makefile
index b501a2e8f6eaf..1917084098015 100644
--- a/sbin/dhclient/dst/Makefile
+++ b/sbin/dhclient/dst/Makefile
@@ -1,5 +1,5 @@
 # dst
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dst/Makefile,v 1.3 2002/05/13 11:09:05 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/minires/Makefile b/sbin/dhclient/minires/Makefile
index e0013b47737ce..81ebd5d15013f 100644
--- a/sbin/dhclient/minires/Makefile
+++ b/sbin/dhclient/minires/Makefile
@@ -1,5 +1,5 @@
 # minires
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/minires/Makefile,v 1.5 2002/05/13 11:09:05 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/omapip/Makefile b/sbin/dhclient/omapip/Makefile
index f2b5fbda968e6..70f3d7cf89a16 100644
--- a/sbin/dhclient/omapip/Makefile
+++ b/sbin/dhclient/omapip/Makefile
@@ -1,5 +1,5 @@
 # omapip
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/omapip/Makefile,v 1.3 2002/05/13 11:09:06 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/omshell/Makefile b/sbin/dhclient/omshell/Makefile
index 4bc5e7065cf50..f09cca5a783d4 100644
--- a/sbin/dhclient/omshell/Makefile
+++ b/sbin/dhclient/omshell/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/omshell/Makefile,v 1.1 2003/03/25 03:16:53 mdodd Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 777956357ae0c..999caf250779a 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.7 2003/02/23 13:25:02 johan Exp $
 
 PROG=	dmesg
 MAN=	dmesg.8
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index 9d05e6c70b755..0dd7f8a74b9a2 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 12789fd5619eb..58cefd16ac055 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.24 2004/04/09 19:58:26 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 608162aa570ef..e8eaa5705790f 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 906ac27169598..2a6ac95ab71df 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 ea35653374ae1..87d5075fd1014 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.66 2004/05/17 08:35:40 ru Exp $
 .\"
 .Dd March 1, 2002
 .Dt DUMP 8
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 75b33d5a074a7..42602a189c0a2 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.26 2004/04/13 02:58:06 green Exp $
  */
 
 /*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index dd02642bdbf63..cea9351357180 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 99d43ad772cc0..426b3c895a085 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.15 2004/04/09 19:58:27 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 09c27ab067606..a45ce03df7016 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.59 2004/04/13 02:58:06 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 8c1f3c1798677..d3b0ab0f05a8a 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.30 2004/06/19 22:41:18 iedowse Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index eb3ce3977af23..035f7f15ac373 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 490d3d97c3519..87c26fe71c300 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.26 2004/04/13 02:58:06 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 08e5e23e04c2c..bd69afd4f40b8 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.35 2004/07/28 05:54:38 kan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 3720ebf550fd2..538ca4af80de1 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 99faa77ad725a..ee8b003fa3c71 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 8e701d5ba0f60..0ed9b66fb32bc 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.14 2004/07/02 21:45:01 ru Exp $
 .\"
 .Dd January 19, 2003
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 325cdcbf9864d..8ac138b0af0d1 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 2134cd52b8d62..d3c67d62b9307 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpon/Makefile,v 1.9 2004/02/23 20:13:51 johan Exp $
 
 PROG=	dumpon
 WARNS?=	4
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index f1c8675ef00b7..a8d467d9bab17 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.30 2004/07/18 09:57:47 maxim Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 78a35a14ce257..6e180519e8d6c 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.19 2004/04/09 19:58:27 markm Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 4289dc80e29a2..445d12697c9f9 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/Makefile,v 1.11 2004/02/23 20:13:51 johan Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_mbr_enc.c
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index a7730ead34967..dfdb216e66150 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 4cb9dc07cd77f..bf583abde2c67 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.74 2004/06/14 07:21:19 phk Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/fdisk/runtest.sh b/sbin/fdisk/runtest.sh
index f25f4272bb0fe..3acca05045f20 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 d214888584a59..5cd52bd01122d 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk_pc98/Makefile,v 1.6 2004/02/23 20:13:51 johan 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 c4b25c75c9647..ccf28ffe8c6fd 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 8b8ce19f67822..d0effed997b2a 100644
--- a/sbin/fdisk_pc98/fdisk.c
+++ b/sbin/fdisk_pc98/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.13 2003/05/01 14:30:59 nyan Exp $";
 #endif /* not lint */
 
 #include <sys/disk.h>
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index a1ffef7989a09..e6fc5a578cf03 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 4508c5f908a84..d1aaf697516b9 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.14 2004/01/23 05:13:22 cperciva Exp $
 .\"
 .Dd September 8, 2000
 .Dt FSINFO 8
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 3e3a8c2465578..3af1e9b86d124 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.7 2004/07/26 15:04:57 stefanf Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index bc445fda26f7c..f27f719f04b7e 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 763e6a1e168fe..b62c93c5792f3 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: fsck.8,v 1.19 1999/03/10 00:08:33 erh Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck/fsck.8,v 1.35 2004/07/03 00:13:43 ru Exp $
 .\"
 .\" Copyright (c) 1996 Christos Zoulas.  All rights reserved.
 .\"
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 291cd37802244..0870c2edf5a31 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.17 2003/10/29 16:09:17 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index a4578bd63eb60..229e656aa7cba 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 84e72909592db..60bb9a8f32ee1 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 6204685833f4b..fb2ac196c180d 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 d61189c0333bd..3a3f5688a4e12 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.15 2004/07/28 05:57:48 kan 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 5fe189dc471ac..a9503e5f7ee69 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 3098b49f95763..9b67a6cfbf274 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 b294a6af3becc..841085ad2d7c5 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 522a222c3dc38..90aad68073b33 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 353fab3378fa7..4ecd2dc301903 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 9ddc06f097ae9..18b9ffd004774 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 a766c84045c19..723be4a418f1a 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.28 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index 2cdf71e3ebeb9..02e69064e0ca0 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 1763fa1b31695..5989da99e1029 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.31 2004/04/09 19:58:28 markm Exp $
  */
 
 #include <unistd.h>
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 4bfa11cb45e61..8bfe9c130d296 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.31 2004/07/02 21:45:01 ru Exp $
 .\"
 .Dd April 24, 2001
 .Dt FSCK_FFS 8
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 28d5399807959..579a07af2e6ab 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.24 2004/05/18 19:51:41 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 320450e977491..042e4e814f0fe 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.35 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 1648b941e8d47..c018e52303265 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.41 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 898f8970b7cdb..d5894c525e0ba 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.41 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index 45b6eac62ecb6..2a21476e18923 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.14 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 353d6ad143367..ad0e4070fb1a7 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.24 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 644fd698723ba..8291e7fd9eb0d 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.14 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 411f3bd6d393b..88285670bff08 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.14 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 0d8275ad8decd..064dc52f473a4 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.39 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index e95a6adbb4adb..68ce288b68509 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.47.2.1 2004/09/03 15:19:05 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 8e66820342149..f7d145a3ea874 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 fd539b94f9d79..ed85989721749 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 32ed8633e037a..8582596759c3f 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 48ae5ca20eb17..324a8b9cca676 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 b87a916c17ff0..0cb317fa8c5f6 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 3a5d4394c5067..5420e2580c6ce 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 0e93c2440200f..cce4381800c15 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.9 2004/02/05 15:47:46 bde Exp $
  */
 
 #ifndef EXT_H
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index 0b0bd9e11e899..6d7845c08c091 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 489906407d9a3..4cdb5bdd7ad18 100644
--- a/sbin/fsck_msdosfs/fsck_msdosfs.8
+++ b/sbin/fsck_msdosfs/fsck_msdosfs.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: fsck_msdos.8,v 1.9 1997/10/17 11:19:58 ws Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck_msdosfs/fsck_msdosfs.8,v 1.13 2004/05/17 08:35:40 ru Exp $
 .\"
 .\" Copyright (C) 1995 Wolfgang Solfrank
 .\" Copyright (c) 1995 Martin Husemann
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index 37bfb6e3cb52f..328a11247ea18 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.14 2004/02/05 15:47:46 bde Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 9c1ccda34cbed..a0066156182f4 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.18 2004/07/28 05:58:34 kan Exp $
 
 PROG=	fsdb
 MAN=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 194ba830c868d..7f1895a3d0a1a 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.26 2004/07/02 21:45:02 ru Exp $
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index f60f50c9852cd..05c7114c67f96 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.28 2003/11/13 19:08:43 johan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index a739c47f1a0a5..59773d655a2cf 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 b00061941e00b..4cd8311c9b03a 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 7e2da62408e34..56118b111b4ed 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 00f0eeee4c99b..f45c3dd362686 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 defdf5250d33d..f6d5acbc8bb3f 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 87058028533ec..3c26f5b9542a8 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 57208b56a1aac..38e27a1022356 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.12 2004/05/23 08:40:52 brueffer Exp $
 .\"
 .Dd October 19, 2002
 .Dt GBDE 8
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 0d75f38c02614..2dfa6509b1d00 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.23.2.2 2004/09/28 18:08:32 pjd Exp $
  *
  * XXX: Future stuff
  *
diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu
index 82e6f2e474891..1868464e5d868 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 3d22007befd9b..6bd638fa3a418 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 67d8b3809c377..2cc69f64b097c 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 95f00d914756b..6967e80d1b21a 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 94ca09f3889c2..153d99c883d31 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 0fb33b1566fbc..06cf571650887 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/Makefile,v 1.4 2004/08/16 06:36:21 pjd Exp $
 
 SUBDIR=	concat
 SUBDIR+=label
diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index 112756d5f73c3..65e1266bafe23 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.6 2004/08/02 09:05:29 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 b3a3e23c449df..70473f791d40b 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 e7e06a7c8801c..5883e093b4f16 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.11 2004/08/09 11:29:41 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 c97027aa85fc8..cb843f4d771a0 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.5 2004/08/09 11:29:41 pjd Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/label/Makefile b/sbin/geom/class/label/Makefile
index cba7ac6b44830..c6dee337c35e8 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 1c301c3bdb5da..845a6b32c391a 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.3 2004/07/18 08:00:30 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 15ccdb0def6e5..c1ea0560e7e62 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.6 2004/07/18 08:00:30 pjd Exp $
 .\"
 .Dd July 2, 2004
 .Dt GLABEL 8
diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile
index f07a790539b63..9e417c04fb04a 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.1.2.1 2004/09/14 16:11:00 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/mirror/geom_mirror.c b/sbin/geom/class/mirror/geom_mirror.c
index 5e8b2c31f18df..244052f4f3e10 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.3.2.2 2004/09/28 18:13:39 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 68d38263732c6..45180bc8abd75 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.4.2.3 2004/10/16 08:13:19 pjd Exp $
 .\"
 .Dd Jul 9, 2004
 .Dt GMIRROR 8
diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile
index 75a20376ff452..b7867a1c6fad8 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 a5edfdeeb357a..ca74b46c89446 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.4 2004/07/30 08:19:22 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 5ff7e07f78807..267119df83d51 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.12 2004/07/30 08:19:22 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GNOP 8
diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile
index 1791669dec92f..6873990db0fbe 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.1.2.1 2004/09/14 15:50:51 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/raid3/geom_raid3.c b/sbin/geom/class/raid3/geom_raid3.c
index 9c2b53f2c5a73..d0fa9114136bb 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.1.2.2 2004/09/28 18:13:39 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 9a2d16e58ba46..3379ca7cf1e42 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.4.2.1 2004/09/14 15:50:51 pjd Exp $
 .\"
 .Dd Aug 22, 2004
 .Dt GRAID3 8
diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile
index 53a35fff46bf8..9024ebd44ce05 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 251630f35d738..a7ff07d6b24c9 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.6.2.2 2004/09/28 18:15:19 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 ddf7d9085333e..c0cb759909aae 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.15 2004/08/09 11:29:41 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GSTRIPE 8
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index 13c6a09e24fdb..eff26bdd7a31f 100644
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/core/Makefile,v 1.9 2004/08/12 13:15:52 pjd Exp $
 
 .PATH: ${.CURDIR}/../misc
 
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index 3d2c359c57310..98d958980dcba 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.4.2.1 2004/09/14 15:52:00 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GEOM 8
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 95b8a990ad789..84de0bf2b4dcb 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.6.2.2 2004/09/28 18:12:32 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 06b97a0c2154d..c9f8fc2be30be 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.1 2004/05/20 10:09:55 pjd Exp $
  */
 
 #ifndef _GEOM_H_
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index a0525af6aff43..2a5ff14a0528f 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 2004/07/05 02:06:44 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 ee319a983bc55..2ab2e8f76e6ec 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 2004/07/05 02:06:44 pjd Exp $
  */
 
 #ifndef _SUBR_H_
diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index da51672240859..097198a2f0645 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.1 2004/04/30 16:12:20 pjd Exp $
 
 SUBDIR=	ggatel ggatec ggated
 
diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc
index e55271f7ddc5c..c46de58199357 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 5674aa156b388..df1042dad98e1 100644
--- a/sbin/ggate/ggatec/Makefile
+++ b/sbin/ggate/ggatec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.4 2004/06/21 09:20:06 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 22038e8b0ad22..edcbf19c5adba 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.3 2004/05/12 07:34:05 ru Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEC 8
diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index 84aa60eb4e6af..297d5af3260bc 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.3.2.1 2004/09/28 18:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile
index fa5c0fb177122..44d3484d1e275 100644
--- a/sbin/ggate/ggated/Makefile
+++ b/sbin/ggate/ggated/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.3 2004/05/20 20:05:05 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index 0b774ad65507b..8430f68b66c74 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.2 2004/05/12 07:34:05 ru Exp $
 .\"
 .Dd April 29, 2004
 .Dt GGATED 8
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index a0628ea357146..5bf286418886b 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.4.2.1 2004/09/28 18:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile
index 604a75480313a..72be0b5542b4f 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 f08edeefcc47d..5e6b99e07f0d5 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.3 2004/05/12 07:34:05 ru Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEL 8
diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c
index 4aa19eab4f272..fa1c4faa31bdc 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.2.2.1 2004/09/28 18:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index 08f13d7f7c543..54d50a04422a8 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.3.2.1 2004/09/28 18:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index d4d82533f7f1e..c40a1db221748 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.1 2004/04/30 16:13:45 pjd Exp $
  */
 
 #ifndef _GGATE_H_
diff --git a/sbin/gpt/Makefile b/sbin/gpt/Makefile
index 8e85b91eb1fad..95a0c0b6b5365 100644
--- a/sbin/gpt/Makefile
+++ b/sbin/gpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.6 2004/08/07 07:41:37 marcel Exp $
 
 PROG=	gpt
 SRCS=	add.c create.c destroy.c gpt.c map.c migrate.c recover.c remove.c \
diff --git a/sbin/gpt/add.c b/sbin/gpt/add.c
index 17ff86f2cae12..44852f65d5455 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.8 2004/08/07 06:24:25 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/sbin/gpt/create.c b/sbin/gpt/create.c
index a80714cdc42d6..199826bb142ff 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.6 2004/08/07 06:24:25 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/gpt.h>
diff --git a/sbin/gpt/destroy.c b/sbin/gpt/destroy.c
index 1a8bb539cf669..752d77883faf1 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.3 2004/08/07 06:24:25 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/gpt.h>
diff --git a/sbin/gpt/gpt.8 b/sbin/gpt/gpt.8
index 49d6132a49c1e..615b8f80d68f0 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.6 2004/08/07 07:52:31 marcel Exp $
 .\"
 .Dd August 7, 2004
 .Os
diff --git a/sbin/gpt/gpt.c b/sbin/gpt/gpt.c
index 7d42bfaa6ef73..297346a675864 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.8 2004/08/07 07:41:37 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/gpt/gpt.h b/sbin/gpt/gpt.h
index 75cfb0a67f435..dbbc625aad2f7 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.5 2004/08/07 07:41:37 marcel Exp $
  */
 
 #ifndef _GPT_H_
diff --git a/sbin/gpt/map.c b/sbin/gpt/map.c
index f8c433bdd6b06..84a5b57f32370 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 2004/08/07 06:24:25 marcel Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/sbin/gpt/map.h b/sbin/gpt/map.h
index f83824cf951d4..86ef926239586 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 2004/08/07 07:41:37 marcel Exp $
  */
 
 #ifndef _MAP_H_
diff --git a/sbin/gpt/migrate.c b/sbin/gpt/migrate.c
index 4f7d7956b35d5..8c46d1e661a00 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.7 2004/08/07 06:24:25 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/sbin/gpt/mkdisk.sh b/sbin/gpt/mkdisk.sh
index 97761d42b6569..fb04975f187a9 100644
--- a/sbin/gpt/mkdisk.sh
+++ b/sbin/gpt/mkdisk.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/gpt/mkdisk.sh,v 1.2 2004/08/02 19:22:11 marcel Exp $
 
 dd if=/dev/zero of=disk count=125307
 sudo mdconfig -a -t vnode -f disk -u 4
diff --git a/sbin/gpt/recover.c b/sbin/gpt/recover.c
index 375346a128bde..dafa43569b316 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.5 2004/08/07 06:24:25 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/gpt.h>
diff --git a/sbin/gpt/remove.c b/sbin/gpt/remove.c
index e5200c512c3bb..c78e7d6c01e26 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.1 2004/08/07 07:41:37 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/sbin/gpt/show.c b/sbin/gpt/show.c
index 62f8aff532c38..8c0d8afb2dd77 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.10 2004/08/07 06:24:25 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/gpt.h>
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index 21b559682b282..1e16d01d6bc29 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.11 2004/07/29 11:28:24 le Exp $
 #
 
 #GFSDBG=YES  
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index d97fae31af88f..7a593f7f26652 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 3cad9d97874c5..4d80bd053a59f 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 7bcc46ad7ecb2..af2d14004d5c7 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.22 2004/01/23 17:35:09 blackend Exp $
 .\"
 .Dd September 8, 2000
 .Dt GROWFS 8
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index cf580716806ca..1c1dfad01864d 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -48,7 +48,7 @@ All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/growfs/growfs.c,v 1.22 2004/07/29 11:28:24 le Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index f56580d94d082..009fb2b6580da 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gvinum/Makefile,v 1.1 2004/06/12 21:22:47 le 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 176c7c3d8aa75..7ede793194dfb 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.2 2004/08/04 00:23:00 le Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h
index d1b45a07749b0..f59801df88c7c 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 cd45007027afc..fd45f6bc9ddda 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.2 2004/02/23 20:13:52 johan Exp $
 
 PROG=	idmapd
 SRCS=	idmapd.c
diff --git a/sbin/idmapd/idmapd.8 b/sbin/idmapd/idmapd.8
index 8386949b5c7f9..bad0c90f7dfe2 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.3 2004/05/17 21:05:39 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt IDMAPD 8
diff --git a/sbin/idmapd/idmapd.c b/sbin/idmapd/idmapd.c
index e5dbe80afb5b0..c820696c2eb0c 100644
--- a/sbin/idmapd/idmapd.c
+++ b/sbin/idmapd/idmapd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/idmapd/idmapd.c,v 1.5 2004/04/15 16:12:12 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 252f8b60ea3b3..c269bfd19360d 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.25 2004/02/23 20:13:52 johan Exp $
 
 PROG=	ifconfig
 SRCS=	ifconfig.c
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 4c20ffd7b90a7..e600b0b03146d 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.85 2004/07/27 09:51:49 yar Exp $
 .\"
 .Dd July 26, 2004
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 858b8a4de6195..a622e114a8096 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.106.2.1 2004/09/07 23:21:10 brooks Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index fb340fc1b2c93..82b9fd7fb7206 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.12 2004/03/30 22:59:22 sam Exp $
  */
 
 extern struct ifreq ifr;
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 1e83e808c9575..f6ab1f320b9b3 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.10 2004/04/04 07:28:58 phk Exp $
  */
 
 /*-
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index 41b718b228c3d..9c26b71d41862 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.2 2002/10/23 22:50:04 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index cdbfc53530c05..815230dcd3628 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.16 2004/01/15 15:19:19 sam Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 7e089b9003a42..27a9a1523eb12 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.5 2002/04/18 17:14:09 imp Exp $";
 #endif
 static int			__tag = 0;
 static int			__have_tag = 0;
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index ce2e618ca4e5d..ba3000ca13fef 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.29 2004/02/23 20:13:52 johan Exp $
 
 PROG=	init
 MAN=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 4f08683424071..b65ae2e803197 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.45 2004/07/22 10:38:13 keramida Exp $
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 6daeab8b8d56d..7e35f3af84bd5 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.58.2.1 2004/10/01 06:08:38 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h
index 335445bb06347..563376e3307be 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 17f330d1f0f2d..07650b7cf0edf 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 dbc9084e2ff6f..5890bfae68e3c 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.23 2004/07/03 23:01:44 ru Exp $
 .\"
 .\"	$KAME$
 .\"
diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c
index 9ceabbff04c80..0b4c53efa722e 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 00641401f6e7c..b020a176bdfa5 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 1964def66ef8f..6422caf380f32 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipf/Makefile,v 1.14 2004/02/23 20:13:52 johan Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfs/Makefile b/sbin/ipfs/Makefile
index 9639352621336..a577601b26572 100644
--- a/sbin/ipfs/Makefile
+++ b/sbin/ipfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfs/Makefile,v 1.4 2004/02/23 20:13:52 johan Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index 80fff2bb8d53c..e254a355bc5bf 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.19 2004/02/23 20:13:52 johan Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index 023f682b25f51..48c61d7379823 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfw/Makefile,v 1.12 2002/07/11 17:33:37 bde Exp $
 
 PROG=	ipfw
 SRCS=	ipfw2.c
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index b38a32ef7038d..070962d510879 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.150.2.3 2004/10/10 00:57:23 csjp Exp $
 .\"
 .Dd September 19, 2004
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index d97285d89be6d..d019d4a966f10 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.54.2.3 2004/09/17 14:49:08 csjp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ipmon/Makefile b/sbin/ipmon/Makefile
index f1c006d57a52d..6c955e111323c 100644
--- a/sbin/ipmon/Makefile
+++ b/sbin/ipmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipmon/Makefile,v 1.14 2004/02/23 20:13:53 johan Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 6cb9d4abfe32a..edab8b313ca8f 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipnat/Makefile,v 1.16 2004/02/23 20:13:53 johan Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/kldconfig/Makefile b/sbin/kldconfig/Makefile
index e92daf6c6f7c2..d0fa74b7246fd 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 65766ec33ae24..2b2549ae15554 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.5 2002/08/21 18:10:46 trhodes Exp $
 .\"
 .Dd June 15, 2001
 .Dt KLDCONFIG 8
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 1f53d7cd0b2b0..2f7bf2b65273e 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.6 2004/03/05 08:10:18 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index da597d4594f9e..0c442b4e5e370 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 dd28d38454ba7..bf60be2eaf56a 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.21 2003/03/03 22:48:06 ru Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 9e841bccf9080..1822307eb9f4e 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 b602a3edfb1fa..fcea3e08bb9a2 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 bbabb73ee3ae1..b8dffdcfde280 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.11 2002/07/06 19:33:21 charnier Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index ce5ebf489ba07..998fcdf954623 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.15 2004/05/30 10:10:41 dwmalone Exp $");
 
 #include <err.h>
 #include <stdint.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 1f71a8f8313ef..855258d5380c1 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 935e5afb71ed5..38ab488c95a30 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.13 2004/07/13 19:36:58 phk Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index 29da28d07774e..be5d6f5bcf36e 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.14 2004/07/13 19:36:58 phk Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index f2a2e51e71f97..d131617349bac 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ldconfig/Makefile,v 1.19 2004/02/23 20:13:53 johan 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 9bdf56e4271e4..62ab6b0db883a 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 007d30d44a2ca..a1e637e1d4709 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 d6c889bb1c455..0d1990c968709 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.41 2004/08/14 17:46:10 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 859bcbd204bc0..23265ff334a77 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 0aeed64e6183c..a23d581299084 100644
--- a/sbin/mca/Makefile
+++ b/sbin/mca/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mca/Makefile,v 1.2 2004/02/23 20:13:53 johan Exp $
 PROG=	mca
 WARNS?=	4
 NOMAN=	yes
diff --git a/sbin/mca/mca.c b/sbin/mca/mca.c
index 0c4e1a0c5a804..1d761ae634fe0 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 007fb4cc1b2cb..e3db759797f30 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.9 2004/06/11 16:07:02 eik Exp $
 
 PROG=	md5
 
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 67daaa283adca..fed03f103b5a0 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/md5/md5.1,v 1.22 2004/07/07 19:57:14 ru Exp $
 .Dd June 6, 2004
 .Dt MD5 1
 .Os
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 454ada82de667..cf74142eb5732 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.33 2004/06/22 09:18:50 eik Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 3abf56b74a8e7..7400745d3d460 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdconfig/Makefile,v 1.7 2001/12/04 02:19:50 obrien Exp $
 
 PROG=		mdconfig
 MAN=		mdconfig.8
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index fb2b4067450da..113c537b97c20 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.29 2004/07/02 21:45:03 ru Exp $
 .\"
 .Dd March 10, 2004
 .Dt MDCONFIG 8
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index db3a733f1a080..d8fed90a7f334 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.33.2.1 2004/09/14 03:32:21 jmg Exp $
  *
  */
 
diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile
index 999793f0e1031..fa780fc3a9687 100644
--- a/sbin/mdmfs/Makefile
+++ b/sbin/mdmfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.5 2003/04/27 01:40:45 dougb Exp $
 
 PROG=		mdmfs
 LINKS=		${BINDIR}/${PROG} ${BINDIR}/mount_mfs
diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8
index 39af0cba69bf8..6af704b069190 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 bed6dc776e00c..77d24d3052c6f 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.20 2004/05/17 07:07:20 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/mdioctl.h>
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index d28d3a5953777..7e263caf8920a 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 7de2a1b7de580..e3320895388f6 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.29 2004/07/02 21:45:03 ru Exp $
 .\"
 .Dd December 29, 2003
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 4c0493c1ddb67..05dc55f295158 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 3c08f565225d1..bc4271f8047f2 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 2465f557f2ff4..dad6de648e940 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 a061286ba181c..4b6b5d4039650 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.7 2004/01/27 19:28:13 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 407abea2f1f3d..8d5e30971007c 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 638f8a4a1eb25..f24526a9d1cca 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 a033ac169dff4..a68a7e7951a1c 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 e284c09b87b8f..483d751de1ec3 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.12 2004/04/09 19:58:30 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 7fd807613d6ba..8667c3b76582b 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.21 2004/04/09 19:58:30 markm Exp $
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 02c8e40ef08de..af9800d8e5537 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.68 2004/05/17 08:35:42 ru Exp $
 .\"
 .Dd April 7, 2003
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index df97adbb88f80..c408e79126440 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.66 2004/04/26 15:13:45 bmilekic Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index ff1c126b63900..c77bb4efe8121 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.24 2004/04/09 19:58:31 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index aaa0a2c10e1ee..a49945ec1305a 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 f95a76efdb241..6e6e1b41c60be 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_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 80af58a5f19c1..904303cea27a4 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.9 2004/02/23 20:13:53 johan 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 b72bd6e633755..44f7471301510 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.25 2004/07/02 21:45:03 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 998939d602852..f3aeb882a13a5 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.27 2004/04/09 19:58:31 markm Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 3eefb92eb8c05..9f623e68b19a8 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 91a315e8bd399..a112f2f94be2f 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 4c7c401821fc1..0712d46044ccd 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.18 2004/04/09 19:58:31 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index 084377407787f..65750e9aad6df 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 0cdcb20e2e152..a75604c095347 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 95986f13fa0b1..bf8073f90cb71 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.4 2003/08/07 04:50:29 imp Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 7fedb6818fab0..46f85196f4548 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdosfs/Makefile,v 1.26 2003/10/23 16:09:20 trhodes Exp $
 #
 
 PROG=	mount_msdosfs
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 1fd704f7e1773..1fa721b6436c7 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.30 2004/05/17 08:35:42 ru 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 9013ae56d9a49..75523ae102cb7 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.33 2004/07/08 18:06:44 trhodes Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 68fe70ac3e13a..a9df9031a1fc4 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 48c55efc4c722..f6d03284ae884 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.42 2004/07/02 21:45:03 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 5a76d0d4c1c78..553d7388a4530 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.62 2004/04/09 19:58:32 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_nfs4/Makefile b/sbin/mount_nfs4/Makefile
index 881d11904ae13..38fcbca7021bb 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 7400270ec8f16..24b08b146e44a 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.4 2004/05/17 21:24:06 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 73e4d78183129..c9f5db3891925 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.4 2004/02/17 22:28:26 rees Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 8a3e75e08bb28..8d5507aba99af 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ntfs/Makefile,v 1.9 2004/02/23 20:13:54 johan Exp $
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 17902b2d31108..e82fcd08581b6 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.20 2004/05/17 08:35:43 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 3bd6528e7224d..b92dca1be72fb 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.11 2004/05/24 13:39:06 stefanf Exp $
  *
  */
 
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 9a6be28a960ca..38fe75aee4576 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 03060debda6bb..6d3197245be15 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.29 2004/07/02 21:45:03 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 175200bddbd2e..20db72f5042cd 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.22 2004/04/09 19:58:32 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 110a5256cf22b..b450a3f85df04 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 86284d6dab5ef..2b82f37051222 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.22 2004/07/02 21:45:04 ru Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 11f42c16e44a5..a22efe86692fd 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.19 2004/04/09 19:58:32 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index 3096c8e04566e..893cd044481d2 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_udf/Makefile,v 1.4 2004/02/23 20:13:54 johan 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 f91a866542c2d..27041ab4a5f10 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.5 2003/11/05 06:21:45 scottl 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 080fab8d19993..32ae86c426ebc 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.11 2004/04/09 20:34:51 markm Exp $
  */
 
 /*
diff --git a/sbin/mount_umapfs/Makefile b/sbin/mount_umapfs/Makefile
index 0f5891fb2bf8c..bf52d0868b62d 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 1fe47657ce568..7de42fbe7236b 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.21 2004/07/02 21:45:04 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 b375db6099802..bb30d163f6897 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.22 2004/04/09 19:58:33 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 02965042dd871..1107c9ed99f8b 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 4232a44f4e284..c75aeda9d9e56 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.18 2004/07/18 01:51:59 brueffer 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 49986bc286b2b..f1816bb490638 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.21 2004/04/09 19:58:33 markm Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index c6bf3267a7cfe..2c2367228f3e8 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 d2e8a9ae67097..f55a7ffe92d36 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 1509b965f4b81..4fb0f150c5e45 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 d8c7bf8f33a63..ad49755c069fd 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.61 2003/09/23 07:41:55 marcus Exp $
 .Dd February 28, 2003
 .Dt NATD 8
 .Os
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index 163a4ddd5622a..1f93551b15023 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.47 2004/07/04 12:53:54 phk Exp $");
 
 #define SYSLOG_NAMES
 
diff --git a/sbin/natd/natd.h b/sbin/natd/natd.h
index a05d1f7e4dcad..38a7d95f468c3 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 d4dcd714bd92f..db33c28aa2c91 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 efbe7abfe492e..c67ce2675f57e 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 66074c7850c99..4954e2a48aa3c 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.85.2.1 2004/09/03 15:19:06 jhb Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 8cba772a44abe..8fd595cc38ef7 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.67 2004/05/17 08:35:43 ru Exp $
 .\"
 .Dd May 18, 2002
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index f39b55b4619cc..786f24fa7e101 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.76.2.1 2004/09/28 18:25:48 pjd Exp $");
 
 /*
  * newfs: friendly front end to mkfs
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index feb9bcd8fcd98..7c94c7768f102 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.16 2004/04/09 19:58:34 markm Exp $
  */
 
 #include <libufs.h>
diff --git a/sbin/newfs/ref.test b/sbin/newfs/ref.test
index 1967e247d4e55..eee6b632255bd 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 a95dbcc83b250..1ef96f34bc93f 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 47128326ed243..f87aec93904ca 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 1c52095ce0db6..2d919bb3f24ec 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs_msdos/Makefile,v 1.8 2004/02/23 20:13:55 johan 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 b4189a5a9e94d..4e89e488b0ba3 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.17 2004/07/02 21:45:04 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 fe9d56aff6781..c4edcfd6f29c3 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.20 2004/02/17 02:02:18 tjr Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 22717c576f42b..d36527836fe24 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 126c5f7477e99..9136461b3efd5 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.18 2004/04/09 19:58:34 markm Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 5f4ec57b91045..d5661cce9c30e 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.17 2004/04/09 19:58:34 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile
index e128b62160f77..a42140407d608 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 9e7b9ae026926..8b7653bb06a26 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.15 2004/07/02 21:45:04 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 b54ef7258f4e7..6306bc4bd7087 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.13 2003/10/26 04:37:57 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index bcdea139a19c1..528b20ca10d5c 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pfctl/Makefile,v 1.3 2004/07/07 17:33:20 ru 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 c740ed359ad16..154b298ccf811 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 3c41c6bd836f5..1c1b68a7d7cbb 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 43045b25a6303..ab5dcc2f4bd62 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 ac242114c084c..19f0610e784cd 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 526b09235e397..8e73bbd264883 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 96e3fae94fc6a..7b25d3ee08aca 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 eda338ae2f1dc..a00bf58d26819 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 87e3e630bb8a1..c48ddf97c2c18 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 7fcc86ba129be..5131f55ede971 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 165b5afe32045..3c0ab7eb325e4 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 ca163cf3652dc..f455417b6d54e 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 285387a18377e..5f54f82309fca 100644
--- a/sbin/pflogd/Makefile
+++ b/sbin/pflogd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pflogd/Makefile,v 1.2 2004/06/16 23:39:33 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/pflogd
 
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 24882d3d7d6dd..f6837e8a99540 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 78ff83bf93778..45ec579b8efef 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 2004/04/09 19:58:34 markm Exp $
 .\"
 .Dd October 2, 2002
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index d312721bfcfdf..83b88391674d2 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.105 2004/08/14 17:46:10 stefanf Exp $");
 
 /*
  *			P I N G . C
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 4e6da277922d1..d52c1a6c0d6aa 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping6/Makefile,v 1.11 2004/02/23 20:13:55 johan Exp $
 
 PROG=	ping6
 MAN=	ping6.8
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index c2b24e41003a8..4f33592aac6cc 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.20 2004/05/17 08:25:15 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 07be95fc7c004..8c65fb30e0041 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -78,7 +78,7 @@ static 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.26 2004/07/26 08:18:37 suz Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index b54eda3128801..71174f3ef946d 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 93ce142cc362f..8d379b850cfb3 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 eb687e22f64c6..0642a49584982 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.15 2004/04/09 19:58:35 markm Exp $
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 28190670a3b62..3937e3c3fd926 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.24 2004/04/09 19:58:35 markm Exp $");
 
 /*
  * Fix up / report on disk quotas & usage
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 3f34be55206f8..f3c47aad67dbd 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 6a0c570c4e0df..c856d95fad473 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 61f0697888b8f..154e2de2283e2 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.13 2004/03/22 00:52:27 obrien Exp $
 
 PROG=	reboot
 DPADD=	${LIBUTIL}
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index ea2079c28c4ec..5c456037a8ecd 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.46.2.1 2004/09/30 04:33:52 brooks Exp $
 .\"
 .Dd September 23, 2004
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/nextboot.8 b/sbin/reboot/nextboot.8
index 765fa796fe040..d33b9fe3627be 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 56e53f60a1a97..8e937eb70a057 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 2b9cd401aa4d8..ae8ef689c6beb 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.22 2004/04/09 19:58:35 markm Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 9bc866a065ca6..e0d6de2616230 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.20 2004/04/09 19:58:35 markm Exp $");
 
 #include <sys/reboot.h>
 #include <sys/types.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index c06a3db9116c7..0b631d97fc6b3 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.22 2004/02/23 20:13:56 johan Exp $
 
 .PATH: ${.CURDIR}/../dump
 
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 327d3ed01d9b4..7b39a4ae84615 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.27 2004/05/24 16:24:26 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 603a561059425..9094c9db08d9a 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 209c5a54e99d5..e8350a4022813 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/interactive.c,v 1.16 2004/05/24 16:24:26 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index b2ace5db112fe..e15d6360d7caa 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/main.c,v 1.23 2004/04/13 02:58:06 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 1d57760212722..14a266af97b01 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.47 2004/07/02 21:45:05 ru Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index a1a8c88534874..79b910a73c3d4 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/restore.c,v 1.17 2004/04/09 19:58:36 markm Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 05ca6209783d5..cefb51ffccd77 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.8 2004/04/09 19:58:36 markm Exp $
  */
 
 /*
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index b7eff268e653d..fb1d5cec68fa8 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 28bca7f7104d1..e1bd8edbfaa41 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/tape.c,v 1.40 2004/05/24 16:10:57 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 6b984e4097495..ba8840bd605bd 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 fede01d4dcc4f..38179cf6bc4bc 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 18f995d2b85e4..8d5d4cda79ac8 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 30b807cd87c3a..e0bfaae0e1644 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.38 2004/07/02 21:45:05 ru Exp $
 .\"
 .Dd November 10, 2003
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index acb81942dc288..ae7f69bb88358 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.76 2004/06/16 06:29:41 bms Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 1ac16c41e32cb..75e0cedd1e3e1 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 265f86d1ed55a..5789693e70bc4 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 9860e4d77b7f9..07f7915ccb968 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 b6e7a539cc07d..6012f5b5b324f 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.14 2004/08/14 08:36:35 phk Exp $
  */
 
 #include "defs.h"
@@ -35,12 +35,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/if.c,v 1.14 2004/08/14 08:36:35 phk Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/if.c,v 1.14 2004/08/14 08:36:35 phk Exp $"
 struct interface *ifnet;		/* all interfaces */
 
 /* hash table for all interfaces, big enough to tolerate ridiculous
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 674a388691a93..9a9c334e94818 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.12 2004/04/09 19:58:36 markm Exp $
  */
 
 #include "defs.h"
@@ -34,12 +34,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/input.c,v 1.12 2004/04/09 19:58:36 markm Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/input.c,v 1.12 2004/04/09 19:58:36 markm Exp $"
 
 static void input(struct sockaddr_in *, struct interface *, struct interface *,
 		  struct rip *, int);
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 67d168af3e9a8..28ab8d0f037d2 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.17 2004/04/09 19:58:37 markm Exp $
  */
 
 #include "defs.h"
@@ -45,12 +45,12 @@ __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.17 2004/04/09 19:58:37 markm Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/main.c,v 1.17 2004/04/09 19:58:37 markm Exp $"
 
 pid_t	mypid;
 
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index e0befc8056c83..a31f2a449334c 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.11 2004/04/09 19:58:37 markm Exp $
  */
 
 #include "defs.h"
@@ -34,12 +34,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/output.c,v 1.11 2004/04/09 19:58:37 markm Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/output.c,v 1.11 2004/04/09 19:58:37 markm Exp $"
 
 
 u_int update_seqno;
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index 9472d82d9a43a..68ea37f4729ab 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.13 2004/04/09 19:58:37 markm Exp $
  */
 
 #include "defs.h"
@@ -36,12 +36,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/parms.c,v 1.13 2004/04/09 19:58:37 markm Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/parms.c,v 1.13 2004/04/09 19:58:37 markm Exp $"
 
 
 struct parm *parms;
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index c45405ed9e559..7908351043d6a 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 5e65b8f17de19..e373ae532a282 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.8 2004/04/09 19:58:37 markm Exp $
  */
 
 /*
@@ -40,12 +40,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/radix.c,v 1.8 2004/04/09 19:58:37 markm Exp $");
 #else
 __RCSID("$Revision: 2.23 $");
 #ident "$Revision: 2.23 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/radix.c,v 1.8 2004/04/09 19:58:37 markm Exp $"
 
 #define log(x, msg) syslog(x, msg)
 #define panic(s) {log(LOG_ERR,s); exit(1);}
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index 6cf196fa4da6d..21c95d61c346f 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 0cdbc7cab3529..7724274d42297 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.10 2004/04/09 19:58:37 markm Exp $
  */
 
 #include "defs.h"
@@ -37,12 +37,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/rdisc.c,v 1.10 2004/04/09 19:58:37 markm Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/rdisc.c,v 1.10 2004/04/09 19:58:37 markm Exp $"
 
 /* router advertisement ICMP packet */
 struct icmp_ad {
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index afee816fdee98..4d421132d66ff 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.33 2004/07/02 21:45:05 ru Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 7076158727f67..979a0cc683afd 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 4f16e88d5c095..775dfc6cfa359 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 1b3a47bef5dad..1fb65dde0df84 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 5dfd1954dddae..baaeecd9c811a 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.20 2004/06/15 00:23:26 bms Exp $
  */
 
 #include "defs.h"
@@ -34,12 +34,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/table.c,v 1.20 2004/06/15 00:23:26 bms Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/table.c,v 1.20 2004/06/15 00:23:26 bms Exp $"
 
 static struct rt_spare *rts_better(struct rt_entry *);
 static struct rt_spare rts_empty = {0,0,0,HOPCNT_INFINITY,0,0,0};
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 1435faab22137..c8fae4bb5976a 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.11 2004/04/09 19:58:37 markm Exp $
  */
 
 #define	RIPCMDS
@@ -39,12 +39,12 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/trace.c,v 1.11 2004/04/09 19:58:37 markm Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/trace.c,v 1.11 2004/04/09 19:58:37 markm Exp $"
 
 
 #ifdef sgi
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index 0bdbdaa0ba67c..aa0508555e9ee 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.9 2004/02/23 20:13:56 johan Exp $
 
 SRCDIR=	${.CURDIR}/../../usr.sbin/rtsold
 
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 6d7b5e0362d12..1391163748e52 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/savecore/Makefile,v 1.12 2004/02/23 20:13:56 johan Exp $
 
 PROG=	savecore
 WARNS?=	4
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index a17091c5ee677..cde4006587168 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.21 2004/04/09 19:58:38 markm Exp $
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 8d1e95a524946..7f20d4483ccf9 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.69 2004/08/16 07:02:14 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index 5923692aad472..220d58ae6b896 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 d319797884e5a..346da4f9e3f89 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.5 2004/05/20 16:40:06 ru Exp $
 .Dd May 19, 2004
 .Dt SCONFIG 8 i386
 .Os
diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c
index d2130dfb6109b..6416239d6963a 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 e22759fcc401d..57eeb25d8941a 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.8 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	shutdown
 MAN=	shutdown.8
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index d7073b2bc2f16..3744468fbbb1b 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.23 2004/07/02 21:45:05 ru Exp $
 .\"
 .Dd December 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index f719ebf3a2c8b..d2d5e5b41df2e 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.26 2004/04/09 19:58:38 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 84b0c1282865f..bd499b0aebaa9 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 a6355d884d4a7..96ffa9e18fe95 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.25 2004/07/02 21:45:05 ru Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index 613332cfff9bc..d5fc5ce53b51a 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.40 2004/04/09 19:58:39 markm Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile
index b394c39a4e83e..05c5387811824 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 0b038c2e49fa6..d15b4fb915697 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.14 2004/07/02 21:45:05 ru Exp $
 .\"
 .Dd December 30, 2001
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index a1df0f49942b3..c708aa7944cd4 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 1bf91dd821697..69171e25e194f 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 e18506547d5ec..47cbec1ec2950 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 2004/07/02 21:45:05 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index f7238701f772b..b62a3c61a8537 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.37 2004/08/02 08:10:28 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile
index 143b6c72bb0f4..c5e5e5bc3167e 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 73833e0b7fee4..fe784b8bae18f 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 1662b0e800639..0f3ee5dbf239f 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.4 2004/06/02 20:21:28 joerg Exp $
 .\"
 .Dd June 1, 2004
 .Dt SUNLABEL 8
diff --git a/sbin/sunlabel/sunlabel.c b/sbin/sunlabel/sunlabel.c
index c520b3a3beffa..abc29909d929d 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.11 2004/06/18 15:08:08 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 85b0f0ab60bb6..bb0e1788a0171 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 283912284cc09..0c72e0afe2914 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.27 2004/04/09 19:58:39 markm Exp $
 .\"
 .Dd December 28, 2002
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 1c13205cd354d..d0f9db5ecd59f 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.20 2004/04/09 19:58:39 markm Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 381f19918be3d..69d85ab7b9cee 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 4462fe3e88afd..6514549091c12 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.54 2004/04/09 19:58:39 markm Exp $
 .\"
 .Dd March 10, 2002
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index efa8825c46199..7e1cbddedcc52 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.61 2004/04/09 19:58:39 markm Exp $";
 #endif /* not lint */
 
 #ifdef __i386__
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index d501d104b4b79..682fcdc9c7ee5 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 f84ea7b3e7075..4182ad5f7f17d 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.34 2004/04/09 19:58:40 markm Exp $
 .\"
 .Dd May 18, 2002
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index e8ab8d3677111..b9b09068c9191 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 70ccc5a066247..370e748525eee 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 d19ea9ae7a49d..c732e449c6ecc 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 e1bd26790e48e..94abb6ea84387 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.44 2004/04/09 19:58:40 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index ce1bcaaf9ad93..7294f31419f7a 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/vinum/Makefile,v 1.26 2004/02/23 20:13:57 johan Exp $
 
 PROG=	vinum
 SRCS=	v.c list.c vinumparser.c vinumutil.c vext.h commands.c
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index c0038e4979093..b838a4626693a 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -37,7 +37,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: commands.c,v 1.52 2003/05/08 00:33:57 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/commands.c,v 1.60 2004/07/24 19:11:40 le Exp $
  */
 
 #include "vext.h"
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index ee5602aa3cced..89f65a32544df 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -40,7 +40,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: list.c,v 1.32 2003/04/28 06:19:06 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/list.c,v 1.40 2003/10/26 04:47:31 peter Exp $
  */
 
 #include "vext.h"
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index e00f7340768ad..b8d894a1d4fdc 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -37,7 +37,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: v.c,v 1.38 2003/05/01 01:39:42 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/v.c,v 1.40 2004/02/16 09:23:59 le Exp $
  */
 
 #include "vext.h"
diff --git a/sbin/vinum/vext.h b/sbin/vinum/vext.h
index 63f668fd0cabb..aae2377ccb281 100644
--- a/sbin/vinum/vext.h
+++ b/sbin/vinum/vext.h
@@ -36,7 +36,7 @@
 
 /*
  * $Id: vext.h,v 1.22 2003/04/28 06:19:06 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/vext.h,v 1.28 2004/02/16 09:23:59 le Exp $
  */
 
 #define MAXARGS 64					    /* maximum number of args on a line */
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index f71ac23eb6cc9..8f4dec9b196cd 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" $Id: vinum.8,v 1.15 2001/05/14 01:10:37 grog Exp grog $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.70 2004/07/03 00:13:43 ru Exp $
 .\"
 .Dd May 5, 2003
 .Dt VINUM 8
diff --git a/secure/Makefile b/secure/Makefile
index 0ac35f2841b75..632356d5ce34a 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/Makefile,v 1.25 2004/05/02 17:38:27 marcel Exp $
 
 SUBDIR= lib libexec usr.bin usr.sbin
 
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 346c0eee38dc3..6c76e4f312604 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 049fd398f31c9..b31d01568c2fd 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 002a3f70ef335..84e4673e7dc7f 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 5b33f025fdfdd..c830cdafbd486 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 2ea64749b9f1c..902befcc8b358 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 649d07cb30fdb..10dd7f5f76431 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 9adff936f3adf..72ce1d63e9066 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 22c367f7a2fd4..b0987964911d8 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.69 2004/08/14 13:38:35 markm Exp $
 
 LIB=		crypto
 SHLIBDIR?=	/lib
diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
index 9199027a44f01..4c66d78a0b5c8 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.4 2004/03/23 08:32:29 markm 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 d6e9cc5c9e957..656133f7c59be 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.39 2004/04/19 11:35:15 ru Exp $
 
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
 LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl/doc
@@ -42,7 +42,7 @@ man-update:
 
 man-makefile-update:
 	rm -f ${.CURDIR}/Makefile.man
-	echo '# $$FreeBSD$$' >> ${.CURDIR}/Makefile.man
+	echo '# $$FreeBSD: src/secure/lib/libcrypto/Makefile.inc,v 1.39 2004/04/19 11:35:15 ru Exp $$' >> ${.CURDIR}/Makefile.man
 	echo '# DO NOT EDIT: generated from man-makefile-update target' >> \
 	    ${.CURDIR}/Makefile.man
 	for i in ${LCRYPTO_DOC}/${_docs}/*.pod; do \
diff --git a/secure/lib/libcrypto/Makefile.man b/secure/lib/libcrypto/Makefile.man
index 9a5f259080c80..77beb3df14aa4 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.2 2004/03/17 16:15:45 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 73e0042430ce7..aa97f39d3017e 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 d3b4cb8955864..ab47c92f8dcdb 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 88c73fa3c9f91..684c4aab6eba2 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 bb31376b57474..40b48f1b9a8a1 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 4e554b0387ed1..efe5582bc6b70 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 dc594e4809e36..7391e0b8588df 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 b7612905cf20c..5a8f6cdbe98fd 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 b97c357411695..b04275ecf3558 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 ad274986ac25b..88b07be6dc327 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 a33eff94806e7..266d5c9f34de7 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 fb541db16e7a5..bf11cddd3354f 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 4a35f9ddb9629..05966e9f26cb5 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 14e5af5bf0187..274a691544c01 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 14e5af5bf0187..743a19846fd87 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 736c996ce4c3c..291759cff3bd4 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 736c996ce4c3c..f8e940826a28f 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 14e5af5bf0187..cf90ceaf39849 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 736c996ce4c3c..e71f4f334647e 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 14e5af5bf0187..0524750b499c1 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 3fe9175d78c39..32890e94f2e93 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.28 2004/02/26 11:26:46 des Exp $
 
 LIB=	ssh
 SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.c \
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index a3d109fd3af18..6cf94169eaef9 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.19 2004/05/13 07:51:47 ru Exp $
 
 LIB=		ssl
 SHLIB_MAJOR=	3
diff --git a/secure/lib/libssl/Makefile.man b/secure/lib/libssl/Makefile.man
index 402bdb7a8770f..444c135b6afab 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 b60b4cea0d062..32a89daa84210 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 6d620e245bffc..e721456742780 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 b6bf897d660ca..00d596c5857a0 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.10 2004/02/05 22:44:24 ru Exp $
 
 PROG=   sftp-server
 SRCS=   sftp-common.c sftp-server.c
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 82476ab1a8674..095f5da031668 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.3 2004/01/07 11:17:22 des Exp $
 
 PROG=	ssh-keysign
 SRCS=	ssh-keysign.c msg.c readconf.c
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 4d78845f6c6f7..ef3450388a6c0 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 4cec6fe01a452..355a54c9b4a5c 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 306fc2cfe0540..d60cff6be703e 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 367d32d5065c2..d4dd9f4290100 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 8efa179ce1453..20c194216dbe5 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.7 2003/06/02 19:10:59 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 4e65be01a211a..b08de56ef4acd 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.23 2003/02/27 23:07:26 ru Exp $
 
 PROG=	openssl
 
diff --git a/secure/usr.bin/openssl/Makefile.man b/secure/usr.bin/openssl/Makefile.man
index 51f677d4c0976..37a33b11b58d8 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.1 2003/02/10 19:57:55 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 d6d5abafc3837..26ae59c8badf0 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.12 2004/01/07 11:17:23 des Exp $
 
 PROG=	scp
 CFLAGS+=-I${SSHDIR}
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 9a2bef7c8e612..699e1f72648bb 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.9 2004/02/26 11:26:46 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 2716a62ed5b35..d87b22e38fe2e 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.12 2004/01/07 11:17:23 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 2f88a6d969c58..a2201ae8b5c65 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.12 2004/01/07 11:17:23 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 5dc86992ec965..91d766746a3fe 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.13 2004/01/07 11:17:23 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 1c5ab3ed6b80d..238bb5aa5a159 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.7 2004/01/07 11:17:23 des Exp $
 
 PROG=	ssh-keyscan
 CFLAGS+=-I${SSHDIR}
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index ef5f0c938df6d..b0bd6eec5d8ec 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.28 2004/02/26 11:26:46 des Exp $
 #
 
 PROG=	ssh
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile
index b8636e5c43332..8f1add5641c0f 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 282198ea8d8c4..81e5a154c7753 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 fcfd989cc17b0..2d161a70901cf 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.39 2004/02/26 11:26:46 des Exp $
 #
 
 PROG=	sshd
diff --git a/share/Makefile b/share/Makefile
index 8483c39ed3dcc..5346f2e163d19 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.32 2004/04/24 19:54:54 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 dbe7ccfdebca6..78a5172019018 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 0b533d680bf14..431c195bfce9e 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/Makefile,v 1.66 2004/04/21 15:28:22 tjr Exp $
 #
 
 NOMAN=YES
diff --git a/share/colldef/README b/share/colldef/README
index b2fc9f2d650c7..c294cf37a4a51 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 ed9f3cb0bb419..dd4d23b22a530 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 aae4c7de78f6f..b9e89a58bd56f 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 bd1e08be2ae28..ae35705509fa7 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 6c3ed8febac0f..587438e3778c0 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 138ff848de270..eebbf5b5c3c3e 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 7aa54f60f7deb..19ad5d1caff9f 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 2a7c798641559..0f44e341606c4 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 888623f65383d..b4ceddec566fd 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 4bb6bbc94b7ad..164c40a31bfac 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 c345b81595e0b..8ee6d6c15f101 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 138ff848de270..cd841b1012157 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 7aa54f60f7deb..9528615e33886 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 e05a90ac2956b..c0bee860fd08c 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 fcd8b21b6f636..8119124f6faaf 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 8fa1ed092985c..cbb51667a883b 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 68a96c7d26e96..85aa51aedeaf0 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 0fcbe63b5d47d..882e4846fc108 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 a9cde3e51fbf0..df762a9b658b2 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 89e1abb171636..24961ae6d4876 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 40d0bf4cca32b..55fe7c88246fe 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 6672d87825762..e5ad30bb7ed9e 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 5b8417dbca99b..0668af3b364d3 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 df3c340887648..b868b824685d7 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 811db89f7c8bc..118b19e140565 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 961ce6ea73882..8bc5f56efe9a1 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 b9dc826817a37..e85504fbcebdf 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 1f49cdcc9bb0d..8c1d7bffb8ef4 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 dac8eb7c7791c..af8f6000bb653 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 16f09b4143706..452fbbad8d1b2 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 93ef1564b7df0..62995fbbe0db9 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 8cb2afe0f2cdf..3907ef0bbb3c3 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 8bbeb57ea1dc2..f9681096f6fdd 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 230b559c659bb..37fe88bccc4d0 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 b45066a32b731..46b528a5cccec 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 62dd2f45dbdd4..3fef2915565bc 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 fd6a6e302c806..46ca161a6d59a 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 79b2fb31fe3cf..ac780af9bddb1 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 6518d7200bc69..23760580b8857 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 06e064197a0e0..9cd8b3d9a0257 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 425cb30805c3e..066527ae76ce0 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 2fd9f5ac32236..e04601ba87869 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 f7c69d2fb6429..32e9332f314b0 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 db5db89a981bf..22d1b55f19674 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 ce2f4d28f850d..382e4d208a4b9 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 567d7a0d8bed0..430f940679bae 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 e5946b3e8a593..098a5d80e429f 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.ISO8859-5.src b/share/colldef/uk_UA.ISO8859-5.src
index 4024e2d996991..1d90ea548933a 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 bb31d239e01fc..f579e39b62101 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 34d25c30f19ee..d8addcb066ba4 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.12 2002/04/01 13:58:14 phk Exp $
 
 NOOBJ=		noobj
 
diff --git a/share/dict/README b/share/dict/README
index 1a51c20a95a12..767c561c87c7c 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 33f0a67dc8e71..fdaa997c7bc86 100644
--- a/share/dict/freebsd
+++ b/share/dict/freebsd
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/dict/freebsd,v 1.10 2004/07/22 02:45:57 murray Exp $
 ABI
 ACL
 ACPI
diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION
index bd7bb915f0267..713ffb14428ad 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 4e4f34fbbe847..1668e1f87623e 100644
--- a/share/doc/IPv6/Makefile
+++ b/share/doc/IPv6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/IPv6/Makefile,v 1.2 2001/12/17 13:59:30 ru Exp $
 
 NOOBJ=		noobj
 FILES=		IMPLEMENTATION
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 6f2742ac8e4da..b83c8c3349e7a 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.17.8.1 2004/09/30 23:36:08 dougb Exp $
 
 SUBDIR=	${_bind9} IPv6 papers psd smm usd
 
diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
index 6fe2bc6431e4d..22bc32b644501 100644
--- a/share/doc/bind9/Makefile
+++ b/share/doc/bind9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/bind9/Makefile,v 1.1.2.1 2004/09/26 03:10:14 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 SRCDIR=		${BIND_DIR}/doc
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index ecab6f4e58626..8f3c3663c48e5 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/Makefile,v 1.13 2004/01/20 13:08:33 ru Exp $
 
 SUBDIR=	beyond4.3 \
 	bufbio \
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index 7d1fa492d9a57..bc08c6acd2299 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 b682ffc0d836d..a59698fc3f3fd 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 524ee04ea347b..66c0766d76ef5 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.4 2002/10/30 15:20:50 ru Exp $
 
 VOLUME=		papers
 DOC=		bio
diff --git a/share/doc/papers/bufbio/bio.ms b/share/doc/papers/bufbio/bio.ms
index 123f8e7699b73..77795cc55a14f 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 2396ac62aa403..6dee88740fcb4 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 d15ff9c3b4eab..b2051f0314d1f 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 bc57cbbbb2a0e..ef945c5fe8dd4 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.7 2001/06/01 10:07:26 ru Exp $
 .\"
 .OH '''Papers Contents'
 .EH 'Papers Contents'''
diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile
index 8683c94c20aa7..5553e2eacd3e4 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.3 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=		papers
 DOC=		devfs
diff --git a/share/doc/papers/devfs/paper.me b/share/doc/papers/devfs/paper.me
index 9b775e938b925..a0940bbdb38cc 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 41acd7a8b0fa8..39614fd510b4d 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.6 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=		papers
 DOC=		diskperf
diff --git a/share/doc/papers/diskperf/conclusions.ms b/share/doc/papers/diskperf/conclusions.ms
index 9e20f1a647089..f01b51d013f61 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 d5fde9d1b933e..69f82f0c7bf12 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 e9379311301cd..0247b1cb80bbc 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 f11021b0d27c1..32d185f6909e9 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 453cc7e9d594f..797ca41f761b7 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/jail/Makefile b/share/doc/papers/jail/Makefile
index 8e9fd287d7917..618613729fc28 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.5 2002/10/30 15:20:50 ru Exp $
 
 VOLUME=		papers
 DOC=		jail
diff --git a/share/doc/papers/jail/future.ms b/share/doc/papers/jail/future.ms
index 01c325d4d19ca..d1e0097789792 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 eafc8f25c9c7c..edff4ddc19fa7 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 ffcfa30386f17..56289171a205e 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 d4ef1655e195d..5486df0894853 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 e2835d7f4947e..ec39c5ecfffeb 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 60be9f2748bd6..0024a56b398ae 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 ebb5cdefcf91c..cc100a39fcf1c 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.6 2002/10/29 14:56:07 ru Exp $
 
 VOLUME=		papers
 DOC=		kernmalloc
diff --git a/share/doc/papers/kernmalloc/kernmalloc.t b/share/doc/papers/kernmalloc/kernmalloc.t
index d074c9ed48d45..65fcf35c8fc46 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 49b653f501f80..f5ebcd55ee61e 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 53e5a4987030a..34aced2daef2d 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.7 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=		papers
 DOC=		kerntune
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index 00e1e3d87a3ed..b95e3f5636b0e 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 f58d719f4c28d..28ff9782175fd 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 5a46f9520984a..7d4e147ef5a6c 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 da7d7e98bdb59..10fa994163908 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 2507e4cb1b770..24713e1305506 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 0ee87c959a2b4..f147b283a3cee 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 952e95ccd9629..65000418638fe 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 4f3cf7d80def3..7f18ccea33074 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 773f92ab7832d..5a67f36805ec7 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 980f2e97ddba8..e638145846db1 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 02ac8be22d1ab..c3cbf983deb94 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 6b1a9e32bc039..92b64cff9e992 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 bb20df115a558..86b845bc2c794 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/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index 788873c921fc5..06c523d647d4f 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/nqnfs/Makefile,v 1.6 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=		papers
 DOC=		nqnfs
diff --git a/share/doc/papers/nqnfs/nqnfs.me b/share/doc/papers/nqnfs/nqnfs.me
index 9502ae153044b..fba0408453c4c 100644
--- a/share/doc/papers/nqnfs/nqnfs.me
+++ b/share/doc/papers/nqnfs/nqnfs.me
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nqnfs.me	8.1 (Berkeley) 4/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/nqnfs/nqnfs.me,v 1.3 2000/11/30 13:07:14 ru Exp $
 .\"
 .lp
 .nr PS 12
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 54a8e1c39cb24..14e07ae9b63ef 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/px/Makefile,v 1.9 2002/10/29 14:56:07 ru Exp $
 
 VOLUME=		papers
 DOC=		px
diff --git a/share/doc/papers/px/fig3.2.n b/share/doc/papers/px/fig3.2.n
index e99f21b9ae170..cf1128cb1c31c 100644
--- a/share/doc/papers/px/fig3.2.n
+++ b/share/doc/papers/px/fig3.2.n
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fig3.2.n	5.2 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/px/fig3.2.n,v 1.2 2000/11/30 17:06:28 ru Exp $
 .\"
 .KF
 .TS
diff --git a/share/doc/papers/px/pxin0.n b/share/doc/papers/px/pxin0.n
index ba020f319ca30..38651cab2cc5f 100644
--- a/share/doc/papers/px/pxin0.n
+++ b/share/doc/papers/px/pxin0.n
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pxin0.n	5.2 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/px/pxin0.n,v 1.2 2000/11/30 17:06:28 ru Exp $
 .\"
 .RP
 .TL
diff --git a/share/doc/papers/px/pxin1.n b/share/doc/papers/px/pxin1.n
index c70f729791e6a..474f3f022b0e7 100644
--- a/share/doc/papers/px/pxin1.n
+++ b/share/doc/papers/px/pxin1.n
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pxin1.n	5.2 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/px/pxin1.n,v 1.2 2000/11/30 17:06:28 ru Exp $
 .\"
 .tr _\(ru
 .nr H1 0
diff --git a/share/doc/papers/px/pxin2.n b/share/doc/papers/px/pxin2.n
index d0edf98bdccf6..7b26136ec9d46 100644
--- a/share/doc/papers/px/pxin2.n
+++ b/share/doc/papers/px/pxin2.n
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pxin2.n	5.2 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/px/pxin2.n,v 1.2 2000/11/30 17:06:28 ru Exp $
 .\"
 .nr H1 1
 .if n .ND
diff --git a/share/doc/papers/px/pxin3.n b/share/doc/papers/px/pxin3.n
index d0f78d5adaa87..6c787d9eef5f7 100644
--- a/share/doc/papers/px/pxin3.n
+++ b/share/doc/papers/px/pxin3.n
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pxin3.n	5.2 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/px/pxin3.n,v 1.2 2000/11/30 17:06:28 ru Exp $
 .\"
 .ta 8n 16n 24n
 .nr H1 2
diff --git a/share/doc/papers/px/pxin4.n b/share/doc/papers/px/pxin4.n
index 53d3a780090b2..af2c669c1a00a 100644
--- a/share/doc/papers/px/pxin4.n
+++ b/share/doc/papers/px/pxin4.n
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pxin4.n	5.2 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/px/pxin4.n,v 1.2 2000/11/30 17:06:28 ru Exp $
 .\"
 .nr H1 3
 .if n .ND
diff --git a/share/doc/papers/px/tmac.p b/share/doc/papers/px/tmac.p
index 6d917becd4184..4001d423851f3 100644
--- a/share/doc/papers/px/tmac.p
+++ b/share/doc/papers/px/tmac.p
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tmac.p	5.2 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/px/tmac.p,v 1.3 2000/11/30 17:06:28 ru Exp $
 .\"
 .if n .nr FM 1.2i
 .if t .tr *\(**=\(eq/\(sl+\(pl
diff --git a/share/doc/papers/relengr/0.t b/share/doc/papers/relengr/0.t
index 569be698d4fd2..1703d32e0a9ff 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 ad7e38ed4e9de..191d2c8e63d04 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.9 2002/10/30 13:07:33 ru Exp $
 
 VOLUME=		papers
 DOC=		releng
diff --git a/share/doc/papers/sysperf/4.t b/share/doc/papers/sysperf/4.t
index 373a0d0ce14a2..2d407c3c226f9 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 ff008c336c34a..821e57a6dc73a 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 a6e89f538fbb0..209f6decebfbb 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.8 2002/10/29 14:56:07 ru Exp $
 
 VOLUME=		papers
 DOC=		sysperf
diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile
index 252dba347761f..47a142b84938d 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.2 2003/09/05 09:38:54 jkoshy Exp $
 
 # You really want:
 # PRINTERDEVICE=ps
diff --git a/share/doc/papers/timecounter/fig1.eps b/share/doc/papers/timecounter/fig1.eps
index 012fed28d80fa..998350473996c 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 67714356dccdd..002f7df1db85b 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 997282374dcfb..45a5e531c5cd6 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 7a5684f26a715..b19321dffdc3a 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 b6274c1f6d405..ab7224adbeb95 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 aaaae8173f7f9..f1971ba4eea7b 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 a6bb7ce078a2e..8fce26705ba36 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 96ac3d900b28b..3121456232b12 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 c0c13c20cd086..9efc48c9e1431 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 78c7eb0279296..f87d9df453927 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.7 2002/10/30 13:07:34 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 5450b5dc96f76..d75be7584d245 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 88987e02bb068..5a4ccfd5ca2b7 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 8373c0ed9d583..4e711715e2a5b 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 2dc86d28e7553..d63414d9c161b 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 09adb2bb6e8b7..de0a2f5678da6 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 cf40f2d6b0168..bdab82a85eecb 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 77af7e7622929..52b649e06dc85 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 c4283b5806c3a..679ab97205fd3 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 51aaa80d54ab1..9c10495ad47e4 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.7 2002/10/30 13:07:34 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 2d4b3d3c22313..43bc9035e4f36 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 2dc291556d022..370ddff5adedc 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 f6ad7d7591912..0f9f21b0e72d7 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 34140640e8bc3..84e5b140e10b6 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 113bf90fd4fec..cbb9211ddf817 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 ce63bc25319a6..0c1a41d2fb017 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 f149dcf274230..e6efff7e9b233 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 7f9295c729ac8..22e3d63c28122 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 5aaf32555f91d..9a86f5c1832a6 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 848862ec7942f..6248cef20a97a 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 280f65cd51cdc..95e8b2edebafd 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 201c4a904af25..fb69fd41f2df6 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 fe23ac31d5400..68ded4c62d2cb 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 652641fbfe7db..713589bd0b0c0 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 c323d94b64e4d..c6dec5f7a079e 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 3c7c7b4c20842..36a8345aa3d99 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 2366444ea52e5..5bb5b92e7623e 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 223cf831e556f..fa7682ac5ec18 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 8527a75f8f3e5..999ea68cfdacf 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 edf3e10fb52ed..f0262358cf4b6 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 48b9414e31232..a3cd7309f9765 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.6 2002/10/29 15:01:56 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 639591349e82c..ba17d6550b19e 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 cbd9af2cfe970..1717dfe953e24 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.6 2002/10/29 15:01:56 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 fdc38a78aecff..8c7a710bdbebb 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 ed497da4d8db0..093121983f1e0 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 666dbd862ff25..06329a502192e 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 41a630e9a8c7f..79ee9e111eaf9 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.5 2002/10/29 15:01:56 ru Exp $
 
 SRCS=		rcs.ms
 USE_PIC=	YES
diff --git a/share/doc/psd/13.rcs/rcs_func/Makefile b/share/doc/psd/13.rcs/rcs_func/Makefile
index 09e5a9b226c2b..214722a9df27c 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 e597df292a0be..14e1275dea60a 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.7 2002/10/30 13:07:34 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 a1364f608f519..e5d36f23459b6 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 7dd9ea84cdf9c..b265b4c8b7ea8 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 223e90fbac54e..33558614f539d 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 f9369fb4bf5de..b4b4f04758554 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 f1fdb44075815..341f582d556ce 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 fa06acb75b097..fe60a16ce9cda 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 e548d53cfc7d6..b5dc99573f48a 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 e2c34626f3333..5a43cb080f09c 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 513d042a82031..64b424c26b4fc 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 b6440c793857d..adb02e765dd0d 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 75c66ab383a5a..da9b489da58fe 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 9d05fecd4abde..9ee7b426e20c5 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 f6f1702de803e..6dbe760b8c149 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 c16bb52b94220..8e37ae2b7c1f4 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 17e815edfcb16..318099c48d0f1 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 2dba020cd0151..5389fe7dd12ed 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 95fca5c516b0a..eda188ee9896d 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 988e0a0da09e6..b0757caac10d2 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 4049bd6f34f05..d9424e1c45708 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.6 2002/10/29 15:01:56 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 8b3c82ee23b3a..3772c5674c82c 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 c48921f09a154..58c3df8840934 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 c7a2fd941a86c..8f127cf4c417b 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 30ec4e09810ec..1c3b74f4687be 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.6 2002/10/29 15:01:56 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 aabef1087790f..cc36793eb7cca 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.6 2002/10/29 15:01:56 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 6e7eb06223644..d792087583c73 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 22e6836d28a40..85c7e38deb159 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 8ce44b2018c1b..6bcddcb7b3af1 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 67ceab8c22db4..9c099d7276c7c 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.6 2002/10/29 15:01:57 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 4d14019317ef8..32a21e11c8c63 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.5 2002/10/29 14:56:08 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 00e15d81f03ba..6ea4ddfa65a97 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.5 2002/10/29 14:56:08 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 23381523d9bfd..356ab77e29db5 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.5 2002/10/29 14:56:08 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 07e5ec11d8a2e..e1a6d0edce518 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.5 2002/10/29 14:56:08 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 233aa999d6fde..f95ce1aaf462d 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.5 2002/10/29 14:56:08 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 3eaa6e8265e03..0d40164fdccec 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.5 2002/10/29 14:56:08 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 92f9339e9ca24..0ff946244d08b 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.3 2002/10/29 15:01:57 ru Exp $
 
 VOLUME=		psd/28.cvs
 SRCS=		cvs-paper.ms
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index d50f05b1b2c64..2c1031c2ee493 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 38864e96a4fe0..920983fc95760 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 9f374dc47cdda..158e228d91d6b 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 d073730b322c0..cc169548664ab 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 014b3d54dcdbe..2cfd2c4be2d91 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 1951cd024d88e..e4a1c8d56e483 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 4220a6d9b8114..1837329bb8c33 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 5b0afd4775ca8..5601eb4f5629a 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 3572f4cd33b40..6bb3fcae89a93 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.8 2002/10/29 15:01:57 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 b26f4d5fcbbe6..d557360f1f112 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 e801d6ba50fd9..dca0eec5d0434 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.6 2002/10/29 15:01:57 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 fbdc0091f8efe..48a3fbe47daba 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 e3c68ff48c566..13f5b353131d5 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 23db86aead859..eebc05ba499d8 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 4454d63166542..d08b3ab0cc1f5 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.6 2002/10/29 15:01:57 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 96415dabec0ec..a8ecc22246c73 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 85e28963fd3f8..a547252393681 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 99f0762ac6ef8..7f38cea52460e 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 a23664729ae01..77a6cf0b2a3b1 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.8 2003/07/07 03:54:03 gshapiro 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 ad09e787076ac..f998f67aaff05 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 b926b87724fce..20965b60fabb7 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.6 2002/10/29 15:01:58 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 e165de0e8f4a4..3936367c857bd 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 47e7e11bd201e..7518c6d0a434c 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 6f8afc463703d..ea6a65dac376a 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 aa73faaf4e95d..16a2e53795dbd 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 1b8038a22d44f..5b38a8481ec48 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 c1f1c9b64419c..e30e02692389d 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 5faa11f6960c8..b447d146cf39e 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 e917c82a2f730..87af2d1d9ac63 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.6 2002/10/29 15:01:58 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 f858309dfab91..f8622b1dbbcab 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.5 2002/10/29 15:01:58 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 8df4f72087267..5c9bf9fd5a603 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 c5c2f55a2d1f1..bf02d9e2d053d 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 7af18f93ef38b..fcef84d588381 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 17fbbecea1391..46c670e3e667a 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.5 2002/10/29 15:01:58 ru Exp $
 
 DOC=		summary
 SRCS=		ex.summary
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index ab44651fb028b..2793c87ce14dc 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.6 2002/10/29 15:01:58 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 7b2c080434cf0..bb3da501c5fb4 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 42d417f046bf2..34e60e7256214 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 ab55a90f08a5d..49ff73b591064 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.5 2002/10/29 15:01:59 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 3809036327ce5..06020488a90bc 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.5 2002/10/29 15:01:59 ru Exp $
 
 SRCS=		vi.in vi.chars
 USE_TBL=	YES
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index f20582dda5aa4..cc95be49b5dc9 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 ac9f088c36572..0a62db89e4695 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.14 2002/10/29 16:13:21 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 faf76bbb64f39..e1043e5c32b2f 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 10eb449281e47..e14cc1c455b7e 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 2003/01/01 18:48:47 schweikh 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 4966e36f611f9..81fe800f35add 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 af30e9b64fa56..366ccd55611ac 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 0f9bfa2804f97..31e24c789b28a 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.5 2002/10/29 14:56:09 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 6e68c4ee7983c..694c564e6f880 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 d91c08f6313a2..8c26f793290b6 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 1a0be6c58f545..23f3a6bc9bd82 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 0df1d52ac56ca..3d329324bb716 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 b94f4788164fb..4f8daa215d942 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 01e0023d03a40..e822622f96f8e 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 931ac480a2e0c..0d712f69206d9 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 692db286d85c8..47b30429274ba 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 d0fad8f31ecd1..c9fb8cfa07e8f 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 7d212c0e6a246..fff039c961f1e 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 a3f32fd27d075..396670c8c3dce 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 4bc3bb7d9f569..0466774b96402 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 f8c5ea7cf4b87..dafebb1c213fa 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 ff6fb83e4f2d1..6ff83bafa72b5 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 4d14a5297e2f3..ba8b978f35647 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 e475d45c8265a..a95177fbc45cd 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 c44c94baa51f4..3be9f4349e0f2 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 b7bff82a3ee11..2383cdaf67fa0 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 3f739582c4e98..8a0f3fa08a036 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 3a8cf5748e216..1be9bde54c744 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 8f5075d97b2bb..19096ba90e3c0 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 4a44d34bbd6a7..80911d7467bf3 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 a63bebdfd43fe..c42308b8b5ccf 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 538fac77920d2..cb0266f1397ae 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 8cb389365e5d8..d18f1e19e2c9a 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 67c97e285a017..0ac1326f53773 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 6a83f5129ade7..88d62edc4afa0 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 ee633f7294831..ac5d41ebeadc5 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 551e79d8d570c..a076afb9bab68 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 ca032e829145f..3ed5154e1c85d 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 e7939feb6630f..ed0afd25e76e6 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 ec0c508f39ba2..49a18d078e6b2 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 15bc07a6467af..507ccf8b9022e 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 b773fc3c13587..b30dc073c00a2 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 1de72972dd67c..664198737649f 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 bcd7c70aff634..8da55dcaa3d9d 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 9aa1173836a9e..ef05d4903d253 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 587fe508c36bb..d2bedd88620d2 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 1c156ca5ecedb..98fc89cda61e5 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 984921449a1ce..38b4132f1cde0 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 1407701029f0a..2ffe89ae67a0a 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 69dc00b759a77..a9fd3dac3bdcc 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.4 1999/08/28 00:19:04 peter Exp $
 
 PROG=	FreeBSD_version
 NOMAN=
diff --git a/share/examples/IPv6/USAGE b/share/examples/IPv6/USAGE
index 7e40f76bcb536..cf99e45fda7e4 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 d28482110131b..8caced50ab7c0 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/Makefile,v 1.42.2.1 2004/09/17 18:27:15 mlaier Exp $
 #
 # Doing a make install builds /usr/share/examples
 
diff --git a/share/examples/atm/NOTES b/share/examples/atm/NOTES
index aad41906178e7..d2acda0fcf683 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 a2e23f28bbbfc..bdbae0ac4ce0d 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 8898e45c88211..9be739794fd41 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 b15060e837145..d39843e0b4c33 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 b4cc8e9d00d17..f1a0d49291c3f 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 94901f23998eb..d589ecefbf319 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 8abcaf23e4de0..2c542e725c742 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 5334d74bdbacb..814a487738e77 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 2b546bd6aeac8..b1b01d9969353 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/bootforth/README b/share/examples/bootforth/README
index b8eb8a0f3a169..887d3f8374138 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 8f26e0d0a38dc..1a4809a2f5e0b 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 3b1f4046891fe..9ff2c81785eb4 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 617bc3db41046..ecdfdff3f9ee8 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 5c5c3e98c74e8..e0c83afad3263 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 a769f77e35433..0db589ed0a771 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 3ea79e453d800..b0cea0b6be978 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 e025e8fefb146..a6e8a72d882fa 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 a1f80de330877..901e2d68c535d 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 dfd306e9fbefd..4da60d2941363 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 0862766826426..6e691698acdfb 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 1e0bc9668473b..5f0e0fa6643f5 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.32 2004/05/24 06:23:15 cjc 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 7e98f574dfecd..479d5debd871d 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.11 2003/11/16 17:55:54 ceri 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 1833e135a0d46..e6dec241f1d9c 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.28.4.1 2004/10/24 09:18:18 scottl 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 3e24dc2a05f11..76f7495e47f53 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.2.1.2.1 2004/10/26 02:58:54 kensmith 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 722c65c638cdb..7e38958a3ffa9 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 ff06be2c53932..563a45164d9b2 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 5ee53437a6f6a..466fdfeba071a 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 b094267ceb267..886d7c4ebc2be 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 100128beb7603..08d8c766dd059 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.1 2001/04/16 06:37:03 luigi Exp $
 #
 # clone root filesystem for diskless root stuff
 #
diff --git a/share/examples/drivers/README b/share/examples/drivers/README
index d74089b9feabe..fa2a3e499037a 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 14e3d3ba16166..df32fb3e51a00 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 1a3641f437752..a04873be7c234 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.8 2002/08/02 10:37:22 markm Exp $
 #
 #-------cut here------------------
 cd /sys/i386/conf
diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples
index e947529352a4c..9d040a60d16c2 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 d84aed540eaf6..9f0884caf0d8c 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.229.2.5 2004/10/09 18:38:57 dougb 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 184c6417702bb..bc28aaa20058c 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.4 1999/08/28 00:19:17 peter Exp $
 
 PROG=	find_interface
 NOMAN=
diff --git a/share/examples/find_interface/find_interface.c b/share/examples/find_interface/find_interface.c
index 73a7fe839d79f..f793f86af82e0 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/ipfilter/Makefile b/share/examples/ipfilter/Makefile
index 5ddabd3fd70d6..e427828456978 100644
--- a/share/examples/ipfilter/Makefile
+++ b/share/examples/ipfilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/Makefile,v 1.3 2001/12/17 13:59:30 ru Exp $
 
 NOOBJ=	noobj
 
diff --git a/share/examples/ipfilter/README b/share/examples/ipfilter/README
index aefd2cd5ec8f4..0c298df37030b 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 f1f2be450fb8e..dcb476c9f8810 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 a323a8457752b..ecb829b649a4d 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 47acb5cd3a223..c1db27ddde15c 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 ba00504a37c80..fa324b145ca29 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 73a1ecf54611f..f69f67305e506 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 714d7d99bc696..5393203454f9f 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 ad3de82f58c8d..2e233717761ea 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 c5d47bc1c9f90..7ec4dc1acb46b 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 67956bceae064..ce995b5b85c65 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 26a51d02b0649..44fd082755435 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 be7f7644064e5..73c16ca2b27b2 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 b32ce7ba7dcd2..5ce74b45823dd 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 a80dcce47f5d0..6d188c5688b22 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 831350630b572..ae09500cbde48 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 0a817f1235824..cdae585f33eeb 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 33cc055b5125b..2f58c83c41b3b 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 cf93e6559113e..9a3cff0ae0b2f 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 c26aec0927fcb..83ec7c6172562 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 1c470021c0279..eed5309f515f8 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 3ad4cb06c55d4..0dfcfef054a82 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 ae5969f09e846..e9a9a4caa43af 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 01466e2f48808..7853b392f9fc8 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 aac431f17e014..218d2534b8804 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 34073d359923b..6cd2ec1af9824 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 b4a6e7d8d8522..49a067af07e06 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 10660ac7b7b15..d788227c21511 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 7d6c4b0870aea..b6889a6ef3143 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 57fab4561cc6a..ddec9ff274c4f 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 21223b7cd0f4f..30a8acf77fc5d 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 03062160104d8..7db40c22ac722 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 318ebfcb937ee..1536d1122c85e 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 bdc9671883acf..dd02ee19873bc 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 d18a6a475c69d..149e6eb7aae7b 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.3 2002/07/29 09:40:12 ru Exp $
 
 PROG	 =	i4brunppp
 SRCS	 =	i4brunppp.c
diff --git a/share/examples/isdn/i4brunppp/README b/share/examples/isdn/i4brunppp/README
index 81ebe75cf30d0..65e586f4536aa 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 962022045cae5..f9a4c8e8cce46 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 bc4799032ea2e..00c5595b21585 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 7d1fe3cd51dca..662201fd76f26 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 5fa4f0c8647e6..6e9be100d95fc 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.2 2004/02/05 22:01:28 ru Exp $
 
 PROG=		v21modem
 NOMAN=		1
diff --git a/share/examples/isdn/v21/README b/share/examples/isdn/v21/README
index 52f553c313073..1acdb5f5c1e2f 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 f49eb06bf6f70..7bcca16288eaf 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 6c539bd50ac4b..548b17272e120 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 5c8f8f608f385..83afe978ec949 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 dc650f111358c..a85d4f11a7fdf 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 a35c5001395d9..6f44c34b66e82 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 dda63c4fa70ec..defd6567ec4e6 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 b09e53ae3dbaa..bc717db78d42f 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 7b9a4531cff09..5c093ee9bc16b 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.6.2.1 2004/09/28 18:27:27 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 ac228f9a4affe..db44c5b9dae55 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.4 2003/08/03 10:39:29 mbr Exp $
 #
 PROG=	testcdev
 NOMAN=
diff --git a/share/examples/kld/cdev/test/testcdev.c b/share/examples/kld/cdev/test/testcdev.c
index 0a6118103c039..915e02f7e9aff 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 695320de6080d..fba809c111149 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 4dfa3c6bdfbdd..ee73d2a099e7f 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 bcef7d472c5e5..3a84a4cea25e3 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.2.8.1 2004/09/28 18:27:28 pjd Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/syscall/Makefile b/share/examples/kld/syscall/Makefile
index 5c8f8f608f385..3f2b3dcd052e9 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 17066d141fce6..6ff2e5837b675 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 f65668b3a907b..4c724cef97419 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.3.8.1 2004/09/28 18:27:28 pjd Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/syscall/test/call.c b/share/examples/kld/syscall/test/call.c
index 9183997821cdf..23cfb338ccfd6 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 080a74d134a47..8e54062d2367b 100644
--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/libvgl/Makefile,v 1.3 2004/02/05 22:01:28 ru Exp $
 
 PROG=	demo
 NOMAN=	yes
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c
index 781f6a1a063be..16f36a8a98e8e 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/example.1 b/share/examples/mdoc/example.1
index 736d2fe7bb9b7..7da143e962571 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.21 2001/08/01 04:27:48 obrien 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 0ea0228692024..64397c27937fe 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.27 2004/07/30 08:31:29 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.4 b/share/examples/mdoc/example.4
index 7acd9aa01e05f..9d53883d8255c 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.18.8.1 2004/08/23 16:06:33 simon Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/meteor/rgb16.c b/share/examples/meteor/rgb16.c
index a3e965fe6ee1d..be552dea36604 100644
--- a/share/examples/meteor/rgb16.c
+++ b/share/examples/meteor/rgb16.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/examples/meteor/rgb16.c,v 1.3 2003/12/08 07:22:42 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/share/examples/meteor/rgb24.c b/share/examples/meteor/rgb24.c
index ef9dfe74342ce..6ad1a1e60d488 100644
--- a/share/examples/meteor/rgb24.c
+++ b/share/examples/meteor/rgb24.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/examples/meteor/rgb24.c,v 1.2 2003/12/08 07:22:42 obrien Exp $");
 
 #include <sys/fcntl.h>
 #include <dev/bktr/ioctl_meteor.h>
diff --git a/share/examples/meteor/test-n.c b/share/examples/meteor/test-n.c
index 22889574c90d1..702bf224daa24 100644
--- a/share/examples/meteor/test-n.c
+++ b/share/examples/meteor/test-n.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/examples/meteor/test-n.c,v 1.3 2003/12/08 07:22:42 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/share/examples/meteor/yuvpk.c b/share/examples/meteor/yuvpk.c
index c9efec3164bb7..efa573d82f083 100644
--- a/share/examples/meteor/yuvpk.c
+++ b/share/examples/meteor/yuvpk.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/examples/meteor/yuvpk.c,v 1.3 2003/12/08 07:22:42 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/share/examples/meteor/yuvpl.c b/share/examples/meteor/yuvpl.c
index 9e694659fdcc5..2ec7023e622e6 100644
--- a/share/examples/meteor/yuvpl.c
+++ b/share/examples/meteor/yuvpl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/examples/meteor/yuvpl.c,v 1.3 2003/12/08 07:22:42 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/share/examples/netgraph/bluetooth/rc.bluetooth b/share/examples/netgraph/bluetooth/rc.bluetooth
index 6d11c81af7424..a08df719d7824 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.1 2003/05/10 21:53:43 julian 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 273e4c4c26d04..ab8a491b7734f 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 0becb471c810b..78421e35a35f1 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 80a7f22d13fde..3a2096177053d 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 e0970f3c0b33d..4bcfc4ce1fc22 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 fc5810b844368..dc92827e8b58e 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 03bc1d00f7e93..f188954b28b89 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 cb8b631f0b7d9..55d39176cd93f 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 e1e7e9faf090d..02a76d9eae48a 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/perfmon/Makefile,v 1.4 1999/08/28 00:19:25 peter Exp $
 
 PROG=	perfmon
 NOMAN=
diff --git a/share/examples/perfmon/README b/share/examples/perfmon/README
index ffa2cafa92c8a..e9f00acf27dfd 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 34e38849b22b1..57c40ff95ca85 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 fbc655cb65b4a..7fbe0fb0865ce 100644
--- a/share/examples/pf/Makefile
+++ b/share/examples/pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/Makefile,v 1.1.2.1 2004/09/17 18:27:15 mlaier Exp $
 
 NOOBJ=	noobj
 
diff --git a/share/examples/pf/ackpri b/share/examples/pf/ackpri
index 18f008d0b3fd8..40cf20f5f84d7 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.2.1 2004/09/17 18:27:15 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 2981203b8b80e..cd89f2b95ba2a 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.2.1 2004/09/17 18:27:15 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 66e2f25a95921..f9fe5839f8e75 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.2.1 2004/09/17 18:27:15 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 c6b7355eeb011..549d9cfec47a7 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.2.1 2004/09/17 18:27:15 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 73c38398d1513..8ea9bed5838c2 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.2.1 2004/09/17 18:27:15 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 20684e9ac05b1..ced639ae1380a 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.2.1 2004/09/17 18:27:15 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 855e74f9e048d..92c128d17d09a 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.2.1 2004/09/17 18:27:15 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 0a24a066f8961..2750aeaa82f58 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.2.1 2004/09/17 18:27:15 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 780e879b89f00..32b0d69ac6fee 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.2.1 2004/09/17 18:27:15 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 d8dc1fc6aeea6..86f7f8d89ecc9 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 1836d8abc17cc..0a772da908a2c 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.4 2001/05/18 13:58:08 ru Exp $
 
 PROG=	ppilcd
 NOMAN=	YES
diff --git a/share/examples/ppi/ppilcd.c b/share/examples/ppi/ppilcd.c
index f586677344ca4..2eee505b2539f 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.5 2003/08/07 04:40:54 imp Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/ppp/chap-auth b/share/examples/ppp/chap-auth
index 1e56b07575c07..cc1ce175016ba 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 0ceef6d2f8367..324d90e711d04 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 e866e1d9c092d..1507c92e0ff80 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 1da908b34a787..09b56b61a2659 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.11 2003/04/10 21:33:02 keramida 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 8bb1a5461d33c..16b9b62c99d5b 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.33 2003/04/10 21:33:02 keramida Exp $
 #
 #################################################################
 
diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp
index 42cbc955dcb14..3615a29a2f54b 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.5 2003/04/10 21:33:02 keramida 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 d12a2257870b5..f4e49b6596571 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.6 2003/04/10 21:33:02 keramida 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 c7da79ead8ebf..d1baa6789f103 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 795a55951b257..bbf557dd5fe47 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 ba34d05dddd60..87f783019ee3a 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 18073cf712e72..ccdb16ac6898c 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 8768bea25b726..56b39412ea5b5 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 274296e73dbd4..28584f99d6917 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 57d2375fb6b06..fd979fd875a2b 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 8370f379717ed..8b05afc2032d6 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 cc8bc3d63dbeb..afffb5d047bfa 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 b2da150dc040d..b68c6cf92d291 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 3d9c07e803440..73b0a39fbc70c 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 40d5dfdc86e32..c01f018bece97 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 6418ebfdf6a45..62016be361ae2 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 45b8eb45675d9..8999def213a04 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 a0fc1b02aaafe..3c6256389384a 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 fd861b7ad842a..be1335fe3e477 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.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/options file.
 #
diff --git a/share/examples/pppd/pap-secrets.sample b/share/examples/pppd/pap-secrets.sample
index 8896bdd7a65f9..7e55283b793d9 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 653766f7c731f..ede4cb1e06a24 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.12 2004/06/30 16:47:08 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 93b68406c2167..e211574c4f3ed 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 f83eaa9c236a7..cc598f82f91b5 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 bab70b2f5d036..31a8c3b50e35f 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 3e152aabe4229..b5ebbe9a001b9 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 34a85cd580330..eb331862ec340 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.4 2004/06/26 19:35:30 pjd 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 ef4fd976c85ff..f509897e31d36 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 4ae80e5bee149..f001c9b29cf4e 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 2a332d5b87163..6c564e516eeec 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 abea2c8c43390..e226b8b5d679b 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 076cbc31f8e89..9c1642144cd62 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 a1624fa9b036c..55d54b544caf2 100644
--- a/share/examples/ses/getencstat/getencstat.0
+++ b/share/examples/ses/getencstat/getencstat.0
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/examples/ses/getencstat/getencstat.0,v 1.4 2004/07/03 18:29:19 ru Exp $
 .\"
 .\" Copyright (c) 2000 Matthew Jacob
 .\" All rights reserved.
diff --git a/share/examples/ses/sesd/Makefile b/share/examples/ses/sesd/Makefile
index 0e44ce30e5013..a7e591ab94392 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 e517e38d192b8..c88b637168fa1 100644
--- a/share/examples/ses/sesd/sesd.0
+++ b/share/examples/ses/sesd/sesd.0
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/examples/ses/sesd/sesd.0,v 1.4 2004/07/02 19:07:31 ru Exp $
 .\"
 .\" Copyright (c) 2000 Matthew Jacob
 .\" All rights reserved.
diff --git a/share/examples/ses/setencstat/Makefile b/share/examples/ses/setencstat/Makefile
index ece20145d03f5..e5469941fa34a 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 a2a46eeab0978..a64f4feadc716 100644
--- a/share/examples/ses/setencstat/setencstat.0
+++ b/share/examples/ses/setencstat/setencstat.0
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/examples/ses/setencstat/setencstat.0,v 1.3 2004/07/02 19:07:31 ru Exp $
 .\"
 .\" Copyright (c) 2000 Matthew Jacob
 .\" All rights reserved.
diff --git a/share/examples/ses/setobjstat/Makefile b/share/examples/ses/setobjstat/Makefile
index a54b4fc18ed71..dd25f0c63d252 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 3363b2384e681..729145ecde4ac 100644
--- a/share/examples/ses/setobjstat/setobjstat.0
+++ b/share/examples/ses/setobjstat/setobjstat.0
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/examples/ses/setobjstat/setobjstat.0,v 1.4 2004/07/03 18:29:19 ru Exp $
 .\"
 .\" Copyright (c) 2000 Matthew Jacob
 .\" All rights reserved.
diff --git a/share/examples/ses/srcs/chpmon.c b/share/examples/ses/srcs/chpmon.c
index 1b537c7ba11e4..25ff09040f5de 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 5fae6653d41f0..4532c60626e6e 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 bf45e576fb727..ed8b1c3ea80a2 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 680a6cdbc1731..73e5247bf0f4c 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 7f4d1b7837458..8e8025297962e 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 bf703cf47ff41..106247635a9ae 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 d6fb262ef7ee2..130924f75e65b 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 5262b639bfd49..9b00a8c56311c 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 58e0dafc18797..c7b5cc7e612b6 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 34e8ea65d97a2..eb39b808a04de 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 609dfc39239a7..abfde20f81cc1 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/smbfs/Makefile,v 1.3 2002/04/02 07:48:30 ru Exp $
 
 NOOBJ=	noobj
 BINDIR=	/usr/share/examples/smbfs
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index 2370801e8e5b4..aaac0bc77a3d1 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.2 2002/04/02 07:48:32 ru Exp $
 
 NOOBJ=	noobj
 BINDIR=	/usr/share/examples/smbfs/print
diff --git a/share/examples/sunrpc/msg/msg_proc.c b/share/examples/sunrpc/msg/msg_proc.c
index ed088839e52a8..75d37bf82fcd6 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 681007c4b1fe0..debcd87078aa3 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 2f19ee8674f8c..52873e861d9a1 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.12 2002/07/29 09:40:12 ru Exp $
 
 NOOBJ=  noobj
 
diff --git a/share/isdn/0.al.uu b/share/isdn/0.al.uu
index 84ed15f65e0f9..c8289174b5cb1 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 60e59ca0cdce6..188769a8b616c 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 2fdae7d241430..7f05ff19cf64e 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 5b8b56cfc39ef..670430c5fac24 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 c08e17e1288af..fef11e4671dde 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 b818efdd94a09..4eb823e87e5be 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 fad3d5cc54430..395e7ad9c2ed9 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 697ae296b52c0..58829a662fbbb 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 d7c69bab185ae..2ca255e34cce9 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 fd206143eeb29..fbb98f5b54639 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 0999d77928074..56d414c632041 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 57324004dbfdc..1e1839c335aba 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 8375ab43a3e21..1dbc470155bab 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 2175d0e976998..1006e49028b4f 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.17 2003/09/04 21:24:18 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 89534c96c72fb..a1ef0c4bb6db6 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 f14c84557a7f6..9215ccf4e85e3 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.20 2002/07/23 14:38:07 tjr Exp $
 .\"
 .Dd September 1, 1999
 .Dt BUILTIN 1
diff --git a/share/man/man1/intro.1 b/share/man/man1/intro.1
index f0102198ef76c..3c76071c0f38f 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 e817406a4cdba..52d95c8df1377 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.32 2004/08/13 22:43:12 stefanf Exp $
 
 MAN=		assert.3 \
 		bitstring.3 \
diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3
index 88805357b929a..0bf6cf74b8c32 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 ed7b0f3dfd0c6..659cba9260872 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 42e73fe586a4a..afe277bf9b8e2 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 5d608f0e66699..10c189c0bb41a 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 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd August 23, 1993
 .Dt FPGETROUND 3
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index 5645ad94f996c..4098d5c08b54f 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 faf7ec2e95904..d95c04db741a0 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.26 2004/04/08 23:04:54 simon Exp $
 .\"
 .Dd January 15, 2004
 .Dt PTHREAD 3
diff --git a/share/man/man3/pthread_attr.3 b/share/man/man3/pthread_attr.3
index a09e790395214..ebac8e400c5c4 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 6a31d338877f6..4e226a7b2397a 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.11 2004/01/15 15:59:00 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 9adcb5505ec76..a0ed4aed57320 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 c579e7d4ae36f..90b7128dd3b8d 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.3 2004/06/21 14:54:43 mpp 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 cb9e6e29223fc..fb56da125416b 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 fea6c47166cd1..015b53cdfb5e4 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.10 2004/07/03 18:29:20 ru 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 92b67306de55e..d7bb7abe30788 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 b61f58d4dc691..2225e209d8589 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 16c7888dd9052..cd1679213a3a0 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 ed6758f95f5aa..1995bd58379bf 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 835f22f3e602b..289a0470416c9 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 f58f783d44707..20eb8913c6fb7 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 68a25e45ec031..953e03def0dfa 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 e3c83404153ca..e4653db11860f 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 443a58bf4f45c..e669ad7d0d9fd 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 9c331eedfa82b..557e172bc25c6 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 5893934fac4e8..400c7f249236e 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 b48190d5d4b62..3a755bb130e0d 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 dbc451efda933..246661f205442 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 94fdb71c88fae..dfdc8a7ef0088 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 7d577e25805f5..da726c9318b0e 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 dfeffb9267b98..7d7ecf6a2a912 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 7d1902117cfbd..29dcbd2686906 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 f26db3ae8dc5f..1cb1a49fefb4c 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 3368cc9773228..d9ba03cb8d2b8 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 df879b877a17e..bc0a3888178bc 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 f3b8f3e25db5b..a2a110c34fd8e 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 6be911de54868..6fad064052679 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 641e7f155a689..a0cc564ad05cc 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 6b5c06a1b114c..0910ebcbfa3b1 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.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_LOCK 3
diff --git a/share/man/man3/pthread_mutex_timedlock.3 b/share/man/man3/pthread_mutex_timedlock.3
index a42b158587546..4fe30cb2b42e8 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 5fc4590c2c8f7..d450da7d632fa 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 6842997713f35..5587fb4bb8848 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 700f1d2783f9d..79d76b16209dd 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 85f9f128db676..09e0279cf7fe3 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.4 2004/01/15 15:59:00 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 00c5bdb99a303..2d6c65317e5f5 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.18 2004/07/03 18:29:20 ru 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 9e3513a7915c0..9de8e38e89ec1 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 dcfe184b482d8..734a6cdada0b4 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 f44aea68a97fa..696e22473e325 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.9 2004/07/03 18:29:20 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 baee4446bf8c1..eba06a49d7d4b 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.8 2004/07/03 18:29:20 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 6b8affdc8fd8f..4d52afa683221 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.7 2004/07/03 18:29:20 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 752c7754de5a0..7a0c495c87546 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 ff0e167a7dd59..908508eb66956 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 91ba9f088dba4..549bd63b91511 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.7 2004/07/03 18:29:20 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 5349504c6fdb8..b1a7906f051e4 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.8 2004/07/03 18:29:20 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 8ccc219e875be..d462fe559dbb8 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.10 2004/07/03 18:29:20 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 acda6e94b0948..e7c93a9ec25e5 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.12 2004/07/03 18:29:20 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 0020386a4cf26..d87244da4bff6 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.10 2004/07/03 18:29:20 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 b4d2ecb867480..b31414f4a89d2 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.12 2004/07/03 18:29:20 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 5bf0ddf0cfd5a..7e7ff274946b8 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 f404c9deae712..7a27a471cb7b5 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 e69d4eb2471ae..41354a2de39ec 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 48bcbdf990385..fc792889882d8 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.14 2004/01/15 15:59:00 ru 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 282bd07e7dec2..bcef7650e639b 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 884753dc96aa5..77a16c36ed483 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 0f8c5c2b8c4f1..b9399d5ab2c42 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 98e8983daebc5..16b4e870c4ca7 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 2d6b72bce3b44..a35ac53008438 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 6a120d7e3f3d5..412b06624ac59 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 4bbd0ccfeb23b..37518f9746b79 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.11 2004/01/15 15:59:00 ru 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 6b689ac14030b..66adb1c0886e3 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.34 2004/07/07 19:57:14 ru Exp $
 .\"
 .Dd January 24, 1994
 .Dt QUEUE 3
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index 7f29f2ab58e05..3ac6d78650c8c 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.14 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd October 25, 2002
 .Dt STDARG 3
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index b1ba47aa0b216..f801c7fb1c88b 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.13 2004/07/03 18:29:20 ru Exp $
 .\"
 .\" "
 .Dd March 31, 1996
diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3
index dac7a51d8a395..ef0f42e5900d9 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.1 2004/08/13 22:43:12 stefanf Exp $
 .\"
 .Dd Aug 14, 2004
 .Os
diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3
index 7b6293f0dbfbe..6e08a4d37cf8c 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 c01aa8accf474..8aa5215197e22 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 08bf67e47ccc3..820ff6c7df89f 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.276.2.5 2004/10/09 15:29:14 mlaier Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 875ae936adfc6..81f9d8f5f481e 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.25 2004/08/13 03:55:35 scottl Exp $
 .Dd Augyst 12, 2004
 .Dt AAC 4
 .Os
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index f2dcf0a5fac18..57d32e07a731e 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.39.2.1 2004/10/08 18:08:13 njl Exp $
 .\"
 .Dd June 30, 2004
 .Dt ACPI 4
diff --git a/share/man/man4/acpi_thermal.4 b/share/man/man4/acpi_thermal.4
index 28467fa1eff8c..d7d44dee20e94 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 2004/02/03 04:18:55 njl 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 49443d7c600e7..a3552e095ea02 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.2 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd March 3, 2004
 .Dt ACPI_VIDEO 4
diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 5c2a543bde18f..20a16584851da 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.20 2004/08/08 22:27:02 simon Exp $
 .\"
 .Dd August 8, 2004
 .Dt ADV 4
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index 79d305c243c51..689c2dbe4c3e0 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.17 2004/07/14 21:58:17 simon Exp $
 .\"
 .Dd July 14, 2004
 .Dt ADW 4
diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4
index a0f1ef8cd6dfe..17c85984ca17d 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 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd October 5, 2001
 .Dt AGP 4
diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4
index 5ea060b560eb0..9a529d5857790 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.24.2.1 2004/08/24 18:07:16 simon Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHA 4
diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4
index b08e318d0d0e9..3290e5a17d9fc 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 9213dc0fabe9d..b42b668c777c2 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.37 2004/07/04 14:17:41 simon Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHC 4
diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4
index 03c9452dd12e3..78ab2e1e4bf64 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.5 2004/07/04 14:17:41 simon Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHD 4
diff --git a/share/man/man4/aio.4 b/share/man/man4/aio.4
index 3ea71b05d77cb..261328fb6aa86 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 eb17e62232d1c..4d5c243aff6e0 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.2.2.1 2004/10/09 15:29:14 mlaier Exp $
 .\"
 .Dd October 7, 2004
 .Dt ALTQ 4
diff --git a/share/man/man4/amd.4 b/share/man/man4/amd.4
index 758676011acf2..a459cdf0dbac7 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 e2d1c9fbd6d48..dccf25a477a76 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.21 2004/07/14 21:58:17 simon Exp $
 .\"
 .Dd July 14, 2004
 .Dt AMR 4
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 9c4fbc309ca81..7a1190e4cc0f4 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 2003/11/08 22:48:23 bmah Exp $
 .\"
 .Dd September 10, 1999
 .Dt AN 4
diff --git a/share/man/man4/asr.4 b/share/man/man4/asr.4
index 955eb0f3655a8..777836a3434f9 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 e00c923d2ac73..c599ee4ff6b10 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.46 2004/06/21 17:42:48 mpp Exp $
 .\"
 .Dd November 4, 2003
 .Dt ATA 4
diff --git a/share/man/man4/atapicam.4 b/share/man/man4/atapicam.4
index fb9fa7ec8ebd4..7d70072e07dec 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.4 2004/05/03 12:03:15 thomas Exp $
 .\"
 .Dd October 23, 2002
 .Dt ATAPICAM 4
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 0a7d402a7f50b..a2da2cf82b5b9 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.19.2.1 2004/09/04 19:26:08 simon Exp $
 .\"/
 .Dd August 26, 2004
 .Dt ATH 4
diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4
index 346f5b0c3243c..fef013bacab0b 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.8.2.1 2004/09/04 19:26:08 simon Exp $
 .\"/
 .Dd August 26, 2004
 .Dt ATH_HAL 4
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index f40b1ab4f2fb0..dc062da068ca5 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.24 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd May 21, 1999
 .Dt ATKBD 4
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 46d30c1ec24e3..8284514525af7 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.16 2001/10/13 09:08:30 yokota Exp $
 .\"
 .Dd February 9, 1999
 .Dt ATKBDC 4
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index a5bf6588bdf66..6ae7a6086c6ca 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.20 2004/08/01 19:29:21 simon Exp $
 .\"
 .Dd December 25, 1999
 .Dt AUE 4
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 3e5036b2eaee3..5278736d853d5 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.17 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd October 31, 1999
 .Dt AWI 4
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index 1c6d27a599971..7ae2431f87663 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.6.2.1 2004/08/30 23:22:12 brueffer Exp $
 .\"
 .Dd August 25, 2004
 .Dt AXE 4
diff --git a/share/man/man4/bfe.4 b/share/man/man4/bfe.4
index 8e2295f6668c0..f9dee7d322dce 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 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd September 4, 2003
 .Dt BFE 4
diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4
index 3849520725649..78f66335bfd48 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.13.2.1 2004/09/07 00:33:31 brueffer Exp $
 .\"
 .Dd July 4, 2004
 .Dt BGE 4
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index d90a7b4b748d6..f8e6aaaa07c13 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.24 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 28, 1998
 .Dt BKTR 4
diff --git a/share/man/man4/blackhole.4 b/share/man/man4/blackhole.4
index 1f0e3dbacba0d..c08f54a8f48de 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.11 2003/06/28 23:53: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 c36bbfb8d3037..45b48e7d21bb3 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.42 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 16, 1996
 .Dt BPF 4
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index 1098f2e4fe85f..2f17f4440ea21 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.23 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd September 20, 2003
 .Dt BRIDGE 4
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index 6a2c33f5b52f6..9ac919b46a131 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.23 2004/08/08 22:27:02 simon Exp $
 .\"
 .Dd August 8, 2004
 .Dt BT 4
diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4
index b1b810fabe9d1..18acbab4f0826 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/ccd.4 b/share/man/man4/ccd.4
index 0f65ea6789bf9..83f076e834872 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.29 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd August 9, 1995
 .Dt CCD 4
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 7898e71b3756d..4f6547762b591 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.36 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt CD 4
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 48db43c24e824..ccea31c20154c 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.33 2004/07/03 18:29:20 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 864e6483595a5..75743f164f3aa 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.10 2004/08/03 20:52:28 simon 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 1f9bb6dca7a69..e84b62cdc6ee2 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.5 2004/08/01 19:26:42 simon Exp $
 .\"
 .Dd July 28, 2004
 .Dt CM 4
diff --git a/share/man/man4/cnw.4 b/share/man/man4/cnw.4
index c46fa4a4fdffd..c4121ddb436c3 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.1.2.1 2004/09/14 01:14:30 brueffer Exp $
 .\"
 .Dd September 5, 2004
 .Dt CNW 4
diff --git a/share/man/man4/crypto.4 b/share/man/man4/crypto.4
index 3cf8a50e38249..62f76f647eb38 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 2ac919c61f810..7177de9eabe7f 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.18.2.1 2004/08/30 23:24:14 brueffer Exp $
 .\"
 .Dd August 26, 2004
 .Dt CUE 4
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index 3cd45dfac5194..196d077a24222 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.23 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd May 24, 2004
 .Dt CY 4
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 4a6068a6321f5..7c8f934d173e7 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.45 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt DA 4
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index 9952163ee13ad..dca30e89876e4 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.29.2.1 2004/09/08 14:54:24 brueffer Exp $
 .\"
 .Dd August 15, 2004
 .Dt DC 4
diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4
index 3353cfccdc8d1..3a9095526fd0b 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.5 2004/06/17 19:51:17 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 b9c5ca09deb19..ccfbe6ce09224 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 58ed5c7c4dbb5..b733aa1de8c6d 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.25 2004/06/16 08:33:54 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 14105376f0bbe..6dd825dbbdac6 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.16.2.2 2004/10/13 21:54:14 brueffer Exp $
 .\"
 .Dd August 15, 2004
 .Dt DE 4
diff --git a/share/man/man4/devctl.4 b/share/man/man4/devctl.4
index e4eb5ef9c1c02..d48d379926ccd 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 e3324cf43951f..a2096bfd4a1f5 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.3 2004/05/14 20:07:49 simon Exp $
 .\"
 .Dd December 7, 2003
 .Dt DIGI 4
diff --git a/share/man/man4/disc.4 b/share/man/man4/disc.4
index 300e712272fc5..a90f611160e8e 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 60870830eea03..afec52b4dacb5 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.29.2.1 2004/09/16 17:53:22 andre Exp $
 .\"
 .Dd September 14, 1996
 .Dt DIVERT 4
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index 01b3f229d07a1..e4ef40b8b1446 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.17 2004/07/04 14:17:41 simon Exp $
 .\"
 .Dd July 4, 2004
 .Dt DPT 4
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index 56d31409b35de..1f11b6ae4d579 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.20 2002/11/29 11:39:19 ru Exp $
 .\"
 .Dd October 28, 2002
 .Dt DUMMYNET 4
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 7a63c36f2613d..54f1e45020763 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.36.2.1 2004/09/19 02:28:29 brueffer Exp $
 .\"
 .Dd September 5, 2004
 .Dt ED 4
diff --git a/share/man/man4/ef.4 b/share/man/man4/ef.4
index ba712fea1b509..d18572483d929 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.10 2003/12/27 15:35:09 brueffer Exp $
 .\"
 .Dd June 20, 1999
 .Dt EF 4
diff --git a/share/man/man4/ehci.4 b/share/man/man4/ehci.4
index e18c903ab2490..86cbcf609e707 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.1 2003/05/18 19:55:39 trhodes Exp $
 .\"
 .Dd November 5, 2001
 .Dt EHCI 4
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index 9e8a04d0f2dc5..cbcd02c97863b 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.13.6.1 2004/09/12 15:10:12 brueffer Exp $
 .\"
 .Dd September 5, 2004
 .Dt EM 4
diff --git a/share/man/man4/en.4 b/share/man/man4/en.4
index fd435ccd13563..c3a45d09f457a 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 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd June 3, 2003
 .Dt EN 4
diff --git a/share/man/man4/esp.4 b/share/man/man4/esp.4
index ea30b40791ae4..d9055a646f9a2 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.3.2.1 2004/09/13 01:34:46 brueffer Exp $
 .\"
 .Dd July 28, 2004
 .Dt ESP 4
diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4
index 90b13307fdd31..3b827b7ced917 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 acc8f5eac3502..6a78691e38c54 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.12 2002/05/29 06:55:06 brooks 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 38c75e9ba8ed0..e0de12546ae27 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.2 2003/03/03 11:51:30 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 6e7448f9d4ebb..87f145ee082c7 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.5 2004/07/08 10:31:12 ru Exp $
 .\"
 .\" fatm(4) man page
 .\"
diff --git a/share/man/man4/fd.4 b/share/man/man4/fd.4
index 3b76b7aea711e..58dcf54488717 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.6 2001/07/14 19:40:47 schweikh Exp $
 .\"
 .Dd June 9, 1993
 .Dt FD 4
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 976885dfda4ec..98e90af6837ff 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 aac88affc435b..60bd5990278e7 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.10 2004/03/18 18:27:04 brueffer Exp $
 .\"
 .Dd May 23, 2002
 .Dt FIREWIRE 4
diff --git a/share/man/man4/fla.4 b/share/man/man4/fla.4
index 1a02deb9912af..163c8edc93455 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 b751e296d0dad..1cd6c75e93c4e 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 85daeffab952e..5ef7abf2d6055 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.5 2003/12/17 01:44:14 brueffer Exp $
 .\"
 .\"
 .Dd November 8, 2002
diff --git a/share/man/man4/fwip.4 b/share/man/man4/fwip.4
index ad76ec1d8f089..2a24043136ccf 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.3 2004/06/14 14:12:29 dfr Exp $
 .\"
 .Dd June 14, 2004
 .Dt FWIP 4
diff --git a/share/man/man4/fwohci.4 b/share/man/man4/fwohci.4
index 5593f6e0d8601..a515736c9246a 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.7.2.1 2004/09/16 22:41:58 simon Exp $
 .\"
 .\"
 .Dd September 12, 2004
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index 15046107c9575..79ea1c38d9609 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.32 2004/07/04 14:17:41 simon Exp $
 .\"
 .Dd July 4, 2004
 .Dt FXP 4
diff --git a/share/man/man4/gbde.4 b/share/man/man4/gbde.4
index c337744201a09..1f48415a06a24 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 349bf11d1646b..c16b2373b49d2 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.9 2004/01/28 00:02:10 grog Exp $
 .\"
 .Dd December 30, 2003
 .Dt GDB 4
diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4
index 62c0094c46249..f20f05f791a5b 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 1ba1ec64971f2..16579453f48af 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.11 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd March 27, 2002
 .Os
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index 0012765eb2290..c5e1227923296 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.22 2003/02/24 22:53:22 ru Exp $
 .\"
 .Dd April 10, 1999
 .Dt GIF 4
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index 88064c7a477fa..3f7e50cb530be 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/gx.4 b/share/man/man4/gx.4
index a7ca146a01238..e8e9137c49c80 100644
--- a/share/man/man4/gx.4
+++ b/share/man/man4/gx.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/gx.4,v 1.6.2.1 2004/09/08 15:01:52 brueffer Exp $
 .\"
 .Dd September 5, 2004
 .Dt GX 4
diff --git a/share/man/man4/harp.4 b/share/man/man4/harp.4
index 6f4d9410233f5..9aa04065c00d5 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 df854563d67b1..b57d66225e33c 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.8 2004/07/08 10:31:12 ru Exp $
 .\"
 .\" hatm(4) man page
 .\"
diff --git a/share/man/man4/hfa.4 b/share/man/man4/hfa.4
index 494bda418380c..9b7a4c35d03a9 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.2.2.1 2004/08/31 04:37:31 trhodes Exp $
 .\"
 .Dd August 6, 2004
 .Dt HFA 4
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index 7a0b4078b65e5..98b41ad0f1baf 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.4.2.1 2004/09/16 22:38:44 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt HIFN 4
diff --git a/share/man/man4/hme.4 b/share/man/man4/hme.4
index 7d0ee19c5739e..953358563180f 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 2004/08/14 21:44:35 marius Exp $
 .\"
 .Dd August 14, 2004
 .Dt HME 4
diff --git a/share/man/man4/ichsmb.4 b/share/man/man4/ichsmb.4
index 0cc4fad51dcfb..11483d21e4fd5 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.6 2002/08/12 16:25:20 mp Exp $
 .\"
 .Dd October 5, 2000
 .Dt ICHSMB 4
diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4
index 252537ff41873..e3b5eb7c5ab76 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.15 2004/06/21 17:42:49 mpp Exp $
 .\"
 .Dd March 21, 2003
 .Dt ICMP 4
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index ccaf05947eb80..b587f9767a305 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -57,7 +57,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	KAME $Id: icmp6.4,v 1.1 1999/12/17 09:47:01 itojun Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/icmp6.4,v 1.14 2003/09/10 19:24:34 ru Exp $
 .\"
 .Dd March 13, 2000
 .Dt ICMP6 4
diff --git a/share/man/man4/ida.4 b/share/man/man4/ida.4
index 86b45b4677c3f..65543bc1e9268 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.5 2004/08/08 22:27:02 simon 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 adf1cf79c0284..cff394fa3cfa6 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 d882b9a177b29..3b30fc0691fd9 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.7 2004/03/31 02:53:46 bms Exp $
 .\"
 .Dd February 23, 2001
 .Dt IEEE80211 4
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index e1c69b65ead39..dee8822c92864 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.20 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd November 15, 1996
 .Dt IFMIB 4
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index 45d669c6d3ca8..eee78d7fcba74 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 e048c5d9bc75d..f4ccf2d2f743d 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 17d5c70eed626..0114741d094b7 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.11 2001/07/10 15:30:37 ru Exp $
 .\"
 .Dd August 6, 1998
 .Dt IICBUS 4
diff --git a/share/man/man4/iicsmb.4 b/share/man/man4/iicsmb.4
index 4fdf6d497b8cd..45103479adc38 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 dbce281ba1284..34bb0bb72892e 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 a8e9c876f2f73..be50aa6829491 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.32 2004/08/16 06:30:58 maxim Exp $
 .\"
 .Dd August 15, 2004
 .Dt INET 4
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 18d7451f2d441..eea207ec01caa 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/inet6.4,v 1.18 2003/09/08 19:57:19 ru Exp $
 .\"	$KAME: inet6.4,v 1.21 2001/04/05 01:00:18 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 3553844cff90c..a739e17921e48 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.14 2001/09/18 02:50:24 murray Exp $
 .\"
 .Dd January 8, 1999
 .Dt INTPM 4
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index 93a9ab59d25d1..326d1f2d85f52 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 aa68b78111892..91b067ce98a6b 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.40 2004/06/21 17:42:49 mpp Exp $
 .\"
 .Dd June 14, 2004
 .Dt IP 4
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index a3e38dee38fe0..138d8b0c3199b 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -58,7 +58,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.16 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd March 13, 2000
 .Dt IP6 4
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index 873a7c113cafe..05cfdbd0b283f 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.29.8.2 2004/09/22 19:23:36 andre Exp $
 .\"
 .Dd September 22, 2004
 .Dt IPFW 4
diff --git a/share/man/man4/ips.4 b/share/man/man4/ips.4
index 25ee2a4712e86..4fe5c6a9aaeb9 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 7aa8cf8df9cf1..b9bc77c95d8ec 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/ipsec.4,v 1.13 2001/10/01 16:09:21 ru Exp $
 .\"	$KAME: ipsec.4,v 1.17 2001/06/27 15:25:10 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index 3b88253fead53..0605fb9794817 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -1,4 +1,4 @@
-.\"     $FreeBSD$
+.\"     $FreeBSD: src/share/man/man4/isp.4,v 1.17 2004/08/03 20:46:23 simon Exp $
 .\"     $NetBSD: isp.4,v 1.5 1999/12/18 18:33:05 mjacob Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2001
diff --git a/share/man/man4/ispfw.4 b/share/man/man4/ispfw.4
index c5376d764c7d0..c4ec6b48a114c 100644
--- a/share/man/man4/ispfw.4
+++ b/share/man/man4/ispfw.4
@@ -1,4 +1,4 @@
-.\"     $FreeBSD$
+.\"     $FreeBSD: src/share/man/man4/ispfw.4,v 1.5 2004/07/03 18:29:20 ru Exp $
 .\"
 .\" Copyright (c) 2000
 .\"     Matthew Jacob
diff --git a/share/man/man4/ixgb.4 b/share/man/man4/ixgb.4
index 988e9a2f25201..b1c2ba656b981 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.2.2.1 2004/08/30 23:09:05 brueffer Exp $
 .\"
 .Dd August 19, 2004
 .Dt IXGB 4
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index d645593859acf..64050313f213c 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.25 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 23, 1995
 .Dt JOY 4
diff --git a/share/man/man4/kame.4 b/share/man/man4/kame.4
index a9d57c3082930..d701fc9a7335a 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.13 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd April 13, 1999
 .Dt KAME 4
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index e68c6a1ec0d80..d83800cebfc01 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.26 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 8, 1995
 .Dt KEYBOARD 4
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index 3601ca2c972f8..f095e2b2b28ae 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.19 2003/10/26 14:21:30 kensmith Exp $
 .\"
 .Dd November 8, 1998
 .Dt KLD 4
diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4
index 3b381e991539a..9e67b5e5056ec 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.9 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd February 16, 2001
 .Dt KTR 4
diff --git a/share/man/man4/kue.4 b/share/man/man4/kue.4
index de0a6692b8f84..6e891300981ba 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.19.2.1 2004/08/30 23:25:41 brueffer Exp $
 .\"
 .Dd August 26, 2004
 .Dt KUE 4
diff --git a/share/man/man4/led.4 b/share/man/man4/led.4
index c60230d224908..cde8a49cfc37a 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.7 2004/06/30 17:24:27 ru Exp $
 .\"
 .Dd November 3, 2003
 .Dt LED 4
diff --git a/share/man/man4/lge.4 b/share/man/man4/lge.4
index 1c1620eb23923..0bc64d79ab5d0 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.7.2.1 2004/08/30 23:18:53 brueffer Exp $
 .\"
 .Dd August 24, 2004
 .Dt LGE 4
diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4
index 86dd47eb597ae..b1ba9f3d9cfc7 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/lomac.4 b/share/man/man4/lomac.4
index b0cfa761dc165..856441c7c8829 100644
--- a/share/man/man4/lomac.4
+++ b/share/man/man4/lomac.4
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lomac.4,v 1.6 2003/09/10 18:45:26 ru Exp $
 .\"
 .Dd November 20, 2001
 .Dt LOMAC 4
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index 7efff98c0dc84..bfdcca8d54630 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.12 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd March 4, 1996
 .Os
diff --git a/share/man/man4/lpbb.4 b/share/man/man4/lpbb.4
index 77e70c57b1186..b9c601b9676e8 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 121fda29cc4ee..ad2bc8eec2b4b 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.14 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd February 14, 1999
 .Dt LPT 4
diff --git a/share/man/man4/mac.4 b/share/man/man4/mac.4
index 38b060d9c371f..e6af97f00ca80 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 307cc42dd9dc2..48ef4133fd2be 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.17 2004/07/16 02:04:41 rwatson Exp $
 .\"
 .Dd November 18, 2002
 .Os
diff --git a/share/man/man4/mac_bsdextended.4 b/share/man/man4/mac_bsdextended.4
index bef07a87f9a22..4cf68294f69b9 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.11.2.2 2004/09/13 20:21:31 trhodes Exp $
 .\"
 .Dd September 10, 2004
 .Os
diff --git a/share/man/man4/mac_ifoff.4 b/share/man/man4/mac_ifoff.4
index 425b9a2479284..f0e78c9a906d6 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.8 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 10, 2002
 .Os
diff --git a/share/man/man4/mac_lomac.4 b/share/man/man4/mac_lomac.4
index 8133ad8a83337..6764cadd55c11 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 128e1a24ddd3e..ccd709e862dcd 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.18 2004/07/16 02:04:41 rwatson Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_none.4 b/share/man/man4/mac_none.4
index 50a34af7c9e00..386489089cb54 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.11 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_partition.4 b/share/man/man4/mac_partition.4
index b1224ddd89a4b..446997e3d5bfe 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.10 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 9, 2002
 .Os
diff --git a/share/man/man4/mac_portacl.4 b/share/man/man4/mac_portacl.4
index 39b819f12666e..87b9cbea42aac 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.5 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd February 13, 2004
 .Dt MAC_PORTACL 4
diff --git a/share/man/man4/mac_seeotheruids.4 b/share/man/man4/mac_seeotheruids.4
index 0c0bb707b0f1b..5240234b3e2b8 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 ded95e2c08185..f02ddcf2fe7b1 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 dde744589a22b..e57d1e52b9ea5 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 a9beac5e78990..bd3b74c65a937 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 9ff8a0d2f377d..c6d2562d9f4c4 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 f41937f1f5d1b..8737e9459952a 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.5 2004/07/03 18:29:22 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 7fe774170384a..1974b1409bc02 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 7513a8ad8f9d3..a0724ed79c1ef 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.173 2004/07/24 20:41:45 trhodes Exp $
 
 MAN=	acpi_asus.4 \
 	acpi_panasonic.4 \
diff --git a/share/man/man4/man4.i386/acpi_asus.4 b/share/man/man4/man4.i386/acpi_asus.4
index f9ae9798cc803..292fce6bfd900 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.4 2004/07/06 16:24:02 ru Exp $
 .\"
 .Dd April 22, 2004
 .Dt ACPI_ASUS 4 i386
diff --git a/share/man/man4/man4.i386/acpi_panasonic.4 b/share/man/man4/man4.i386/acpi_panasonic.4
index 76ee5546b6e74..99bd54e1e40c9 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.1 2004/07/21 14:47:53 nyan Exp $
 .\"
 .Dd July 11, 2004
 .Dt ACPI_PANASONIC 4 i386
diff --git a/share/man/man4/man4.i386/acpi_toshiba.4 b/share/man/man4/man4.i386/acpi_toshiba.4
index fc6d9eee12297..84b26724b7173 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 2004/04/14 00:23:58 njl 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 c537bc9b413cd..ba77b4520efe7 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.15 2004/08/01 19:08:04 simon 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 f288b72c42f95..c213baed45c55 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 df513f0564534..59b88b4444c47 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 e9c78b343fcac..475c7a5166208 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.21 2004/07/03 18:29:22 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 114bbc7522401..f7a126daa9e3c 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.27 2004/07/03 18:29:22 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 4f2a2ee577d0b..f518f382c5ded 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 2004/07/06 19:51:31 ru Exp $
 .\"
 .Dd August 26, 2003
 .Dt ARL 4 i386
diff --git a/share/man/man4/man4.i386/cp.4 b/share/man/man4/man4.i386/cp.4
index 93a08250ef031..db6b635c4e44f 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.6 2004/07/07 19:41:42 simon Exp $
 .\"
 .Dd July 7, 2004
 .Dt CP 4 i386
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index 1687a3234ca21..13420e77a5084 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.15 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd July 20, 1998
 .Dt CS 4 i386
diff --git a/share/man/man4/man4.i386/ct.4 b/share/man/man4/man4.i386/ct.4
index ac8d6c2ae1e8f..75bc121d554b1 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 e18dc347ad321..f22fe79313bb2 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.4.2.1 2004/09/09 19:03:40 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 6e9f9f6ea7e5a..f465b3ae17fcb 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 2004/07/07 19:36:12 simon Exp $
 .\"
 .Dd July 7, 2004
 .Dt CX 4 i386
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/man4.i386/el.4
index 88d16732906da..87ab1ee4695e2 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.16.2.1 2004/09/08 14:56:04 brueffer 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 94466881b7180..43e4261ec8e80 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.30.2.1 2004/09/08 14:57:01 brueffer Exp $
 .\"
 .Dd September 5, 2004
 .Dt EP 4 i386
diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4
index f76725fe32fc2..93dd985477c6e 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.19.2.1 2004/09/07 18:34:45 simon Exp $
 .\"
 .Dd September 4, 2004
 .Dt EX 4 i386
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index eb9426ef8d6ff..164bba5ebb568 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.30.2.1 2004/09/12 15:07:57 brueffer Exp $
 .Dd March 3, 1996
 .Dt FE 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/ichwd.4 b/share/man/man4/man4.i386/ichwd.4
index 24e351186beee..d389fc1b1a57a 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.2 2004/05/11 20:47:17 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 cf8783648a3a3..2199172ff2c08 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.18.8.2 2004/09/12 15:09:20 brueffer Exp $
 .\"
 .Dd September 4, 2004
 .Dt IE 4 i386
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index a3cb91211d4e0..9f6640b7f5eba 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.12 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd January 1, 1996
 .Dt IO 4 i386
diff --git a/share/man/man4/man4.i386/linux.4 b/share/man/man4/man4.i386/linux.4
index 926b4ab4dbb5a..ea3f8162270b8 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 f547cc96f9ae3..c3d47d4ec9ae4 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.21.4.1 2004/09/16 18:42:22 brueffer Exp $
 .\"
 .Dd September 13, 2004
 .Dt LNC 4 i386
diff --git a/share/man/man4/man4.i386/longrun.4 b/share/man/man4/man4.i386/longrun.4
index 9ca29b17645d7..22567cf54770e 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.6 2004/07/02 18:00:03 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 33b9d046877a1..2731866712948 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.21 2003/09/10 19:24:34 ru 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 c3b07c8b146d1..2c6981e08c9fa 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.18 2004/07/03 18:29:22 ru 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 75d0b18c45cee..4b2b969f6f262 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.7 2004/07/06 19:51:31 ru 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 7eea3723a47ee..2786216daf0f1 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/pae.4 b/share/man/man4/man4.i386/pae.4
index 718e2b2e20c20..e363c5e064ff4 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/pcf.4 b/share/man/man4/man4.i386/pcf.4
index f5e9088454c51..76d79580bc8be 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 f39ed07bae6bd..fd77f7a744d9a 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 f87789d1f7c35..c7ff244d6a2a0 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -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/man4/man4.i386/pnp.4,v 1.14 2001/09/23 08:41:12 yokota 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 f1ff238d994d5..e7906e5f5d57e 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 2001/11/21 17:14:56 ru 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 397dde469d37f..9f4a8c1a9f685 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.10 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd March 21, 2000
 .Dt RAY 4 i386
diff --git a/share/man/man4/man4.i386/sbni.4 b/share/man/man4/man4.i386/sbni.4
index 31cf610b0095d..463129e04fa53 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 bca2be9577fc6..e0b93e0e8c2f0 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.20 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd January 1, 1995
 .Dt SCD 4 i386
diff --git a/share/man/man4/man4.i386/smapi.4 b/share/man/man4/man4.i386/smapi.4
index 71c45afbd64c3..714029da7c3f5 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.1 2003/04/05 19:12:51 trhodes 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 a85e7acffddf3..1c7367142f297 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.1.2.1 2004/09/07 00:41:50 brueffer 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 e29ad6c18d524..b816aa4f6862c 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.23 2004/07/03 18:29:22 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 ffb104aef7186..f5652988a9a3c 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.24 2001/10/13 09:08:37 yokota Exp $
 .\"
 .Dd July 4, 1996
 .Dt SR 4 i386
diff --git a/share/man/man4/man4.i386/streams.4 b/share/man/man4/man4.i386/streams.4
index 84a572caa480f..e143bdeea8017 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.6 2004/07/03 18:29:22 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 4d31568b61b5f..9ff8fa8336b52 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.10 2003/11/12 02:35:20 hmp 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 7457952950f1a..67fecc6fc268f 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 f47c5c97b40c6..beb328fe3ec43 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.2 2003/05/29 21:28:36 ru Exp $
 .\"
 .Dd April 4, 2003
 .Dt VPD 4 i386
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index 8681c449057aa..e3363931ba209 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.18.2.1 2004/08/30 23:20:28 brueffer Exp $
 .\"
 .Dd August 24, 2004
 .Dt VX 4 i386
diff --git a/share/man/man4/man4.i386/wd.4 b/share/man/man4/man4.i386/wd.4
index 051e69d3bdc80..256ae1b95097e 100644
--- a/share/man/man4/man4.i386/wd.4
+++ b/share/man/man4/man4.i386/wd.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/wd.4,v 1.25 2003/11/08 10:28:31 rushani Exp $
 .\"
 .Dd August 31, 1994
 .Dt WD 4 i386
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index b6b7860182a8a..b141eb88bcfbc 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.19 2004/07/03 18:29:22 ru Exp $
 .Dd July 7, 1997
 .Dt WL 4 i386
 .Os
diff --git a/share/man/man4/matcd.4 b/share/man/man4/matcd.4
index 955d0db412416..7a47283baddd2 100644
--- a/share/man/man4/matcd.4
+++ b/share/man/man4/matcd.4
@@ -46,7 +46,7 @@
 .\"<5>  Aligned with version 3(42) (FreeBSD pre5.1 support)
 .\"	Frank Durda IV  10-May-2003
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/matcd.4,v 1.7 2004/07/08 13:24:58 ru Exp $
 .\"
 .Dd May 10, 2003
 .Dt MATCD 4
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index 71ed28f2b7c10..1fd9d94ae9e8e 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 dc3514dc00a7c..af99ea389cfd6 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.17 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd May 2, 1991
 .Dt MEM 4
diff --git a/share/man/man4/meteor.4 b/share/man/man4/meteor.4
index a71507cac10c5..04bcc7ae387cd 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.6 2004/07/06 19:56:09 ru Exp $
 .\"
 .Dd August 15, 1995
 .Dt METEOR 4
diff --git a/share/man/man4/miibus.4 b/share/man/man4/miibus.4
index e82c22e9911a0..6301614ea8adb 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.12 2004/02/28 02:55:12 brueffer Exp $
 .\"
 .Dd February 15, 2003
 .Dt MIIBUS 4
diff --git a/share/man/man4/mlx.4 b/share/man/man4/mlx.4
index ade0b707f303e..07461ab634dcf 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.17 2004/08/10 21:07:27 simon Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLX 4
diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4
index 7cfd8ee3e4c5d..4f58c15077c2a 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.8 2004/08/10 21:07:27 simon Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLY 4
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index 8a75fb8e2ff14..4e682ad20217d 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.13 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSE 4
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 70283a7778832..a5acfa9d53184 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.6 2004/08/15 21:02:48 simon Exp $
 .\"
 .Dd August 15, 2004
 .Dt MPT 4
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 735da63583574..cc12d101b4150 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 0c7830f1d800a..21e24b254bfd8 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 38c11ced2eef5..b228160f5388a 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 2004/07/14 21:58:17 simon Exp $
 .\"
 .Dd July 14, 2004
 .Dt MY 4
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index 19dd592656204..4ba605dd39846 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.16 2003/09/12 21:54:10 ru Exp $
 .\"
 .Dd December 29, 1997
 .Dt NATM 4
diff --git a/share/man/man4/natmip.4 b/share/man/man4/natmip.4
index 154e97da66818..47fb2851f8739 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 c7c8563b15e1f..bd0a79b07f6df 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.14.4.1 2004/08/24 18:24:19 simon Exp $
 .\"
 .Dd August 19, 2004
 .Dt NCR 4
diff --git a/share/man/man4/ncv.4 b/share/man/man4/ncv.4
index 753075c568ba0..cc9bfd8f5a56f 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 e62e29ead206e..6418edd64bd91 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.47 2004/07/20 17:15:37 julian Exp $
 .\"
 .Dd July 1, 2004
 .Dt NETGRAPH 4
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index f5d479bc18cf0..962432c8a4b1a 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 0f48d4b7a9b71..61eed7ad9c0f5 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 01d3c6ddb7b59..bee04c8b923f8 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.13 2004/07/03 18:29:20 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 174d603427bc3..4e7cfa2e12a71 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.10 2004/07/09 07:26:15 ru Exp $
 .\"
 .\" ng_atm(4) man page
 .\"
diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4
index 81768b54da7cc..9938c9d610982 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 b98eb9d9301bd..062d9b54176bc 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.8 2004/07/09 07:26:15 ru Exp $
 .\"
 .\" ng_atmpif(4) man page
 .\"
diff --git a/share/man/man4/ng_bluetooth.4 b/share/man/man4/ng_bluetooth.4
index 2214172b1ada7..67c9d4035f2fc 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 c63c89cd97fa8..1d7848de63e9c 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.19 2004/07/03 18:29:20 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 b9a04dbfd525f..05f64aef6f9d4 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 00e148b2d500d..03bac7a5075de 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.7 2003/11/11 03:27:08 emax Exp $
 .\"
 .Dd June 14, 2002
 .Dt NG_BT3C 4
diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4
index c84d7128d684a..31d61b66b5b25 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.8 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd July 8, 2002
 .Dt NG_BTSOCKET 4
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index 491437e77c1a0..b7a3c9d79ed24 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.12 2004/07/03 18:29:20 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 12d8a42602331..0955934d15984 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.2 2002/12/12 15:27:26 ru Exp $
 .\"
 .Dd June 15, 2002
 .Dt NG_DEVICE 4
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index f502c621ac00c..e60bfda2227bc 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 2bcca3cc2c8ff..7c5c751f6e796 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.2 2004/06/22 09:11:01 ru Exp $
 .\"
 .Dd March 9, 2004
 .Dt NG_EIFACE 4
diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4
index 0e6a1680d1fd6..2edade1790195 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.5 2003/11/15 15:26:35 harti 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 15934102c22c4..683b21416136f 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.22 2004/05/17 14:21:00 archie Exp $
 .\"
 .Dd May 16, 2004
 .Dt NG_ETHER 4
diff --git a/share/man/man4/ng_fec.4 b/share/man/man4/ng_fec.4
index 6ec93454a0086..ec5421c492df5 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 83a6489aca037..eba70c64ac6e3 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.12 2004/07/03 18:29:20 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 28a058897c952..f19d96e00d0f7 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 e549728c4cd52..71a9371d49d9f 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 d3a944b10f01c..6a47e8aabfb1e 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.6 2003/11/11 03:27:08 emax 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 97548a4274f6d..850bdd88a984e 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.9 2004/07/03 18:29:20 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 fd956adf56bf0..db23baa4fb9b0 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.11 2004/05/19 11:26:33 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 a1ad0680171cd..1d5fec55bf9eb 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 abc5243009853..5f4301543db05 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.15 2004/07/03 18:29:20 ru Exp $
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_ip_input.4 b/share/man/man4/ng_ip_input.4
index 430f43c6eaa10..9091d20e7b2a7 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_ksocket.4 b/share/man/man4/ng_ksocket.4
index 11d9e4ec27bd0..150e2dd18ab31 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.19 2004/07/03 18:29:20 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 b2abe515f1896..3a8070956f3f1 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.9 2004/07/03 18:29:20 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 f45484f314076..3a6a773948fa7 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.4 2004/08/03 06:52:55 bz 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 15d1617ccfcee..92667fed8e45c 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.12 2004/07/03 18:29:20 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 242a1b7d592a1..f85dfd1a01a6e 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.13 2002/03/20 18:16:18 archie Exp $
 .\"
 .Dd December 8, 1999
 .Dt NG_MPPC 4
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index c70a142fea793..01951e76c0f61 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.20 2004/07/04 20:55:49 ru Exp $
 .\"
 .Dd January 26, 2001
 .Dt NG_ONE2MANY 4
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index c7262e31a9401..9d228b82a1fc0 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.21 2004/08/03 06:31:30 bz 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 7746baf2e4f44..0f415b360a3c8 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.28 2004/07/30 11:33:52 glebius Exp $
 .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd July 27, 2004
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index fb7146e43db7e..e5647285a8aca 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.19 2004/04/26 14:26:53 archie 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 bcba26d617990..8ce5909c3250d 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.14 2004/06/16 08:33:54 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 1b237d641e583..ef637c8e9b714 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.16 2004/07/03 18:29:20 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 bdae89bec2f1d..8f4e8c5b749e2 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.5 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd November 1, 2002
 .Dt NG_SOURCE 4
diff --git a/share/man/man4/ng_split.4 b/share/man/man4/ng_split.4
index 9b74863a66416..8a5eacadd456f 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 572cc52f1981e..d37fb741ee495 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.6 2004/07/09 07:26:15 ru Exp $
 .\"
 .Dd March 29, 2004
 .Dt NG_SPPP 4
diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4
index 0679d58056219..4b9b8cc5033d3 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 86d9c2a783548..2cc7c31c9d697 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.7 2004/07/09 07:26:15 ru Exp $
 .\"
 .\" ng_sscop(4) man page
 .\"
diff --git a/share/man/man4/ng_tee.4 b/share/man/man4/ng_tee.4
index 63144e06e3c9f..77b78698aeb03 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.13 2004/05/29 07:21:45 julian 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 e5485d5e6afa3..76f61da22e8fb 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.15 2004/07/03 18:29:20 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 75e31136428d5..100d4988aca95 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.6.4.1 2004/09/16 22:09:52 brueffer 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 b1d3118364024..91896d4846441 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.8 2004/07/09 07:26:15 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 8db5b4ce71226..4b76e9b5058f4 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.20 2004/07/03 18:29:20 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 97947b1350f13..5d48af4958db6 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.1 2004/03/01 17:22:16 ru Exp $
 .\"
 .Dd March 1, 2004
 .Dt NG_VLAN 4
diff --git a/share/man/man4/nge.4 b/share/man/man4/nge.4
index ad4708fea8d3f..93429958effa7 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.13.2.1 2004/09/06 15:34:11 brueffer Exp $
 .\"
 .Dd September 3, 2004
 .Dt NGE 4
diff --git a/share/man/man4/nmdm.4 b/share/man/man4/nmdm.4
index 1fcc17b04adb8..b88baa82cee20 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.3 2001/08/11 00:59:40 mp Exp $
 .\"
 .Dd July 7, 2001
 .Dt NMDM 4
diff --git a/share/man/man4/nsp.4 b/share/man/man4/nsp.4
index 7a742709353cd..4d7aacfef7814 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.5 2004/08/08 22:27:02 simon Exp $
 .\"
 .Dd August 8, 2004
 .Dt NSP 4
diff --git a/share/man/man4/null.4 b/share/man/man4/null.4
index cedfaeb9c7b41..d5a9fe26992dc 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/ohci.4 b/share/man/man4/ohci.4
index db950304eb312..07cb59851fd5e 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.16.2.1 2004/09/09 19:05:34 simon Exp $
 .\"
 .Dd September 6, 2004
 .Dt OHCI 4
diff --git a/share/man/man4/oldcard.4 b/share/man/man4/oldcard.4
index ff92304f5f33f..ab38d591dfee2 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.8 2003/08/20 06:49:57 imp Exp $
 .\"
 .Dd August 25, 2001
 .Dt PCIC 4
diff --git a/share/man/man4/orm.4 b/share/man/man4/orm.4
index 2ef54a0b5d320..e7d8fda898aa0 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 e3f8c01104d5c..ec8b81dc51f57 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.13 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd October 10, 1998
 .Dt PASS 4
diff --git a/share/man/man4/patm.4 b/share/man/man4/patm.4
index 3ab2f7aec5530..c728429186cea 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 01c242e1a907b..edd700e8afa83 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 477b113500e69..19a6d3ae39e67 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.5 2004/07/22 20:22:36 imp Exp $
 .\"
 .Dd July 21, 2004
 .Dt PCCBB 4
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 07bdc96edebcd..6527f9068ce84 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.15 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd October 24, 1999
 .Dt PCI 4
diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4
index 2c81ce3c2c578..65aaaa7136282 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.8 2003/08/20 06:49:57 imp Exp $
 .\"
 .Dd July 9, 2002
 .Dt PCIC 4
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index fbc542702206c..235adfec1612d 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.36.2.1 2004/09/16 20:18:15 ru Exp $
 .\"
 .Dd August 28, 2004
 .Dt SOUND 4
diff --git a/share/man/man4/pcn.4 b/share/man/man4/pcn.4
index 497af0bef4ed9..c30173885ce1e 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.9.2.1 2004/09/16 18:41:41 brueffer Exp $
 .\"
 .Dd September 13, 2004
 .Dt PCN 4
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 9d8ae6682cb65..8fbf360a7a72f 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.43 2004/07/03 18:29:20 ru 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 f022ea7bedb4a..65be51c396fd3 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 c468f4fb1e4ce..aecf1d9053537 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.11.2.3 2004/10/12 00:08:02 brueffer Exp $
 .\"
 .Dd April 5, 2004
 .Dt POLLING 4
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index 73a85e346d2bd..3fddb9c3a09fc 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.22 2004/07/08 13:49:39 keramida Exp $
 .\"
 .Dd March 1, 1998
 .Dt PPBUS 4
diff --git a/share/man/man4/ppc.4 b/share/man/man4/ppc.4
index 6fea973fe99b9..9198b139b932a 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.18 2002/11/25 13:49:31 johan Exp $
 .\"
 .Dd March 5, 1998
 .Dt PPC 4
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index a6041d2a8fa76..147c1c8c55807 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 4e9ad61e19f3b..afb01a5af9141 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 238351572e544..530615785be6a 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.43.2.1 2004/10/01 06:26:51 philip Exp $
 .\"
 .Dd September 29, 2004
 .Dt PSM 4
diff --git a/share/man/man4/pst.4 b/share/man/man4/pst.4
index 1214070405c3b..6680019082cf0 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.3 2002/12/20 12:41:26 ru Exp $
 .\"
 .Dd November 21, 2001
 .Dt PST 4
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index 170956e7ff1dc..f072157a54108 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 5c6ef101f54eb..13df7a7183082 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 9ecc5de151ac7..f04a8a2398746 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/random.4 b/share/man/man4/random.4
index 7b54c732b68ad..bad8a6e1a3e0e 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.16 2004/07/04 20:55:49 ru Exp $
 .\"
 .Dd February 10, 2001
 .Dt RANDOM 4
diff --git a/share/man/man4/rc.4 b/share/man/man4/rc.4
index 72b0c3babdc47..6dd45df039696 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.2.2.2 2004/09/13 01:34:03 brueffer Exp $
 .\"
 .Dd August 20, 2004
 .Dt RC 4
diff --git a/share/man/man4/re.4 b/share/man/man4/re.4
index ac85bdebab389..f05aaff938c08 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.6.2.3 2004/10/12 21:51:19 jmg Exp $
 .\"
 .Dd September 28, 2004
 .Dt RE 4
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index 17fe1df704de7..bdfad5c4f62bf 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.36 2004/08/15 21:59:15 simon Exp $
 .\"
 .Dd August 15, 2004
 .Dt RL 4
diff --git a/share/man/man4/rndtest.4 b/share/man/man4/rndtest.4
index 67448d80dd917..b9ef07bc2ead1 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 96f3a5b022da7..ac980ca26a15c 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.18 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 18, 2002
 .Dt ROUTE 4
diff --git a/share/man/man4/rp.4 b/share/man/man4/rp.4
index a9d1b60075f39..ec2911bbcabfd 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.4 2003/06/08 19:49:37 ceri Exp $
 .Dd November 15, 1995
 .Os
 .Dt RP 4
diff --git a/share/man/man4/rue.4 b/share/man/man4/rue.4
index b1b82d22bd996..d650d2a704670 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.7.2.1 2004/08/30 23:23:15 brueffer Exp $
 .\"
 .Dd August 25, 2004
 .Dt RUE 4
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index 9ffcca9fd98ec..a46406c26d150 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.36 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd June 6, 1999
 .Dt SA 4
diff --git a/share/man/man4/sab.4 b/share/man/man4/sab.4
index aa23d1dabd862..358020b116a8b 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 4931dfb0e2533..f59dc88dd8f0e 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.5.2.1 2004/09/16 22:38:44 simon Exp $
 .\"/
 .Dd September 12, 2004
 .Dt SAFE 4
diff --git a/share/man/man4/sbp.4 b/share/man/man4/sbp.4
index 866a9171598e4..622e0d371f94a 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 112838074831d..d8aaa149f9d49 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 fbd1dd457a0f1..530dee9888753 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.2 2003/05/29 21:28:35 ru Exp $
 .\"
 .Dd April 11, 2003
 .Dt SBSH 4
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index 2f76f59375414..87c31dcd68c5d 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 743a036e9b349..4d0b5f76956ec 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.30 2004/07/03 18:29:20 ru Exp $
 .Dd October 15, 1998
 .Dt SCSI 4
 .Os
diff --git a/share/man/man4/sem.4 b/share/man/man4/sem.4
index 580f4136bad95..871d29f64c25c 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 4070c89d753ea..d4dbd9201e068 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 53438c8622f19..c5aa72b735c09 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.17.6.1 2004/08/30 23:12:10 brueffer Exp $
 .\"
 .Dd August 24, 2004
 .Dt SF 4
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 65176bdb78ba0..aca430ad13f0e 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 8f4201c72d251..c06324b580865 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.53 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd July 10, 2002
 .Dt SIO 4
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index 84e2a796fc1dd..c3d22c07d4ce7 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.16.2.1 2004/09/07 00:45:13 brueffer Exp $
 .\"
 .Dd September 4, 2004
 .Dt SIS 4
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index 45fed0b6655d9..45cfc6fa17b0c 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.21.2.2 2004/08/30 23:15:24 brueffer Exp $
 .\"
 .Dd August 24, 2004
 .Dt SK 4
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index a861b4e3c660d..205ef0649625e 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 1c6556bea59eb..2ae31fc34f34f 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.11 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd October 25, 1998
 .Dt SMB 4
diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4
index 9dda4646b7433..8841356b4679a 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 81a42d0825363..882b063f3cf0e 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.19 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd December 5, 2002
 .Dt SMP 4
diff --git a/share/man/man4/sn.4 b/share/man/man4/sn.4
index 7c23d9f5150a2..5a0f5cfda58f0 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.4.10.1 2004/09/08 14:55:20 brueffer Exp $
 .\"
 .Dd September 5, 2004
 .Dt SN 4
diff --git a/share/man/man4/snd_ad1816.4 b/share/man/man4/snd_ad1816.4
index 78dbceed6aaa2..f9ff9145780cf 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.2.2.2 2004/10/08 20:29:35 simon 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 407d9851dc357..6cfd5d7810842 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.2.2.2 2004/10/08 20:29:35 simon 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 5181f9bc88e2a..55b3d1dee8cdf 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.2.2.1 2004/09/16 20:18:15 ru Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_CMI 4
diff --git a/share/man/man4/snd_cs4281.4 b/share/man/man4/snd_cs4281.4
index 38395349d89ae..f2ce5d0e5066d 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.2.2.2 2004/10/08 20:29:35 simon 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 a3d9a72b18db5..ce7c109ce55a8 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.11.2.1 2004/09/16 20:18:15 ru Exp $
 .\"
 .Dd August 28, 2004
 .Dt SND_CSA 4
diff --git a/share/man/man4/snd_ds1.4 b/share/man/man4/snd_ds1.4
index a0bec0f537860..ce5e27b698777 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.2.2.2 2004/10/08 20:29:35 simon 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 db87a47890a02..107454e7aae65 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.2.2.2 2004/10/08 20:29:35 simon Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_EMU10K1 4
diff --git a/share/man/man4/snd_es137x.4 b/share/man/man4/snd_es137x.4
index bb5c6ebc86bae..b0c84fff724ab 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.2.2.2 2004/10/08 20:29:35 simon Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_ES137X 4
diff --git a/share/man/man4/snd_ess.4 b/share/man/man4/snd_ess.4
index 3ce91de7e3111..296ec9d02e251 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.2.2.1 2004/09/24 19:39:14 simon Exp $
 .\"
 .Dd September 13, 2004
 .Dt SND_ESS 4
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 1c97866ba061b..5a642a52684b1 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.10.2.1 2004/09/16 20:18:15 ru Exp $
 .\"
 .Dd August 28, 2004
 .Dt SND_GUSC 4
diff --git a/share/man/man4/snd_maestro3.4 b/share/man/man4/snd_maestro3.4
index cb9e3b31ce5f0..c8bcccde51503 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.4.2.2 2004/10/08 20:29:35 simon Exp $
 .\"
 .Dd August 28, 2004
 .Dt SND_MAESTRO3 4
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index ea847a103d14c..253fc93ce86e2 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.11.2.1 2004/09/16 20:18:15 ru Exp $
 .\"
 .Dd August 28, 2004
 .Dt SND_SBC 4
diff --git a/share/man/man4/snd_solo.4 b/share/man/man4/snd_solo.4
index c36f6d68d3313..3499ada9c5674 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.2.2.1 2004/09/16 20:18:15 ru Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_SOLO 4
diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4
index bf84b04ac3384..6735fe61cd240 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.2.1 2004/09/16 20:18:15 ru Exp $
 .\"
 .Dd August 28, 2004
 .Dt SND_UAUDIO 4
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index 96a0663e3eef7..935bad8790556 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.25 2002/11/11 10:59:28 tmm Exp $
 .\"
 .Dd February 24, 1995
 .Dt SNP 4
diff --git a/share/man/man4/spic.4 b/share/man/man4/spic.4
index 3c43bb304cfc2..9e88e12988826 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.2 2002/05/30 12:29: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 f66bdbee2a44c..77fcea764ed82 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.24 2004/04/08 16:31:17 schweikh Exp $
 .\"
 .Dd February 9, 1999
 .Dt SPLASH 4
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 32acec1b1c953..cb85c7146cc5e 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.18 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 30, 2001
 .Dt SPPP 4
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index c11da9980b73d..d415dc3bce09d 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.15.2.1 2004/09/06 15:35:08 brueffer Exp $
 .\"
 .Dd September 3, 2004
 .Dt STE 4
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 4baa1b2f71ed4..a022f65ccc097 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/stf.4,v 1.13 2002/11/29 11:39:19 ru Exp $
 .\"     $KAME: stf.4,v 1.35 2001/05/02 06:24:49 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/share/man/man4/stg.4 b/share/man/man4/stg.4
index 2c0afb2257602..659150df1570d 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 2f07deb3a0f49..230a8e1491245 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.17.2.1 2004/08/24 18:24:19 simon Exp $
 .\"
 .Dd August 19, 2004
 .Dt SYM 4
diff --git a/share/man/man4/syncache.4 b/share/man/man4/syncache.4
index 380e937bf483d..b479fcf5eeb3c 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 2002/11/23 19:43:44 ru Exp $
 .\"
 .Dd August 31, 2001
 .Dt SYNCACHE 4
diff --git a/share/man/man4/syncer.4 b/share/man/man4/syncer.4
index 30b38e40ee4a3..123f45b7cae3f 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 cd2000ba1b357..851b293f45abf 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.38 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd June 30, 1999
 .Dt SYSCONS 4
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index db5b724a0956c..ecd7679e4aed1 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.24 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 3, 1997
 .Dt SYSMOUSE 4
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index c05bff6bb5f0a..13d1c154efbb6 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.15 2003/09/08 19:57:19 ru Exp $
 .\" Based on PR#2411
 .\"
 .Dd July 9, 2000
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index f3618c038fddd..dc1160d8b6ae7 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.5 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd November 15, 2002
 .Dt TARG 4
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index d9adfebf0e22f..4a5b5b7e68029 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.46 2004/08/03 13:54:11 andre Exp $
 .\"
 .Dd July 10, 2004
 .Dt TCP 4
diff --git a/share/man/man4/tdfx.4 b/share/man/man4/tdfx.4
index b9207e19e15dc..141c6b355e6e0 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.5 2004/01/20 10:31:52 ru Exp $
 .\"
 .Dd February 19, 2001
 .Dt TDFX 4
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 1a9d846c3282d..f225d2876a7bc 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.29 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt TERMIOS 4
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 0dcc98ab649a4..48db07de79004 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.27.2.1 2004/09/06 15:36:23 brueffer Exp $
 .\"
 .Dd September 3, 2004
 .Dt TI 4
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index b7bf46208099c..6911596503bc2 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.18.2.1 2004/09/06 15:37:15 brueffer Exp $
 .\"
 .Dd September 3, 2004
 .Dt TL 4
diff --git a/share/man/man4/trm.4 b/share/man/man4/trm.4
index d56ed436fc21f..002d14884c4c4 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/ttcp.4 b/share/man/man4/ttcp.4
index 454b2085b2402..7fd89f06e3198 100644
--- a/share/man/man4/ttcp.4
+++ b/share/man/man4/ttcp.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/ttcp.4,v 1.17 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 18, 1995
 .Dt TTCP 4
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index cade15a068849..10cc1884ba5a4 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.21 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd August 14, 1992
 .Dt TTY 4
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 955d3ddaade4c..c35c1a7769228 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.20 2004/05/14 20:07:49 simon Exp $
 .\" Based on PR#2411
 .\"
 .Dd June 5, 2001
diff --git a/share/man/man4/twa.4 b/share/man/man4/twa.4
index 650c1c21cf49e..e40c98012dac7 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.3 2004/08/15 17:40:06 simon Exp $
 .\"
 .Dd August 15, 2004
 .Dt TWA 4
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index 6eb8ebe9ea561..b0af91816c739 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.11 2004/08/15 17:40:06 simon Exp $
 .\"
 .Dd August 15, 2004
 .Dt TWE 4
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index bfbd42539aad4..6856b6ee421ff 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.26.2.1 2004/08/30 23:27:04 brueffer Exp $
 .\"
 .Dd February 8, 2001
 .Dt TX 4
diff --git a/share/man/man4/txp.4 b/share/man/man4/txp.4
index ef845dad0331a..5fdf404055a9c 100644
--- a/share/man/man4/txp.4
+++ b/share/man/man4/txp.4
@@ -1,5 +1,5 @@
 .\"     $OpenBSD: txp.4,v 1.8 2001/06/26 02:09:11 pjanzen Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/txp.4,v 1.5 2004/07/04 14:17:41 simon Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index 68e643943d3da..d16f90eb20061 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 f35e5ec1b7f79..82fb6a2e82fa9 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.2.10.2 2004/09/16 22:16:30 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt UBSA 4
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 62995d5ff2d52..d87b2741e8150 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.3.6.1 2004/09/16 22:38:44 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt UBSEC 4
diff --git a/share/man/man4/ubser.4 b/share/man/man4/ubser.4
index 4d0522a8362fe..5e017cc827b19 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.2.2.1 2004/09/16 22:11:46 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt UBSER 4
diff --git a/share/man/man4/ubtbcmfw.4 b/share/man/man4/ubtbcmfw.4
index 76de90494951d..259e2e0e5b3ee 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.5 2004/06/24 05:09:15 imp Exp $
 .\"
 .Dd April 28, 2003
 .Dt UBTBCMFW 4
diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4
index c8431f28dd50c..f1053add486da 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.4.2.1 2004/09/09 11:42:16 brueffer Exp $
 .\"
 .Dd November 25, 1999
 .Dt UCOM 4
diff --git a/share/man/man4/udav.4 b/share/man/man4/udav.4
index dd55e67d494bf..ee4447136c818 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.2 2004/07/08 12:40:42 ru Exp $
 .\"
 .Dd August 22, 2003
 .Dt UDAV 4
diff --git a/share/man/man4/udbp.4 b/share/man/man4/udbp.4
index 2bba76cd10498..2ddcb704d8bb5 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.14 2002/10/30 22:27:54 thomas Exp $
 .\"
 .Dd April 30, 2000
 .Dt UDBP 4
diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4
index 4ae65eddd6dd4..08228c887b872 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.16 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt UDP 4
diff --git a/share/man/man4/ufm.4 b/share/man/man4/ufm.4
index 630a25a1b59a6..ea8b3c6635599 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.4 2004/07/08 12:45:46 ru Exp $
 .\"
 .Dd November 7, 2003
 .Dt UFM 4
diff --git a/share/man/man4/uftdi.4 b/share/man/man4/uftdi.4
index e253fb004e548..b0ad8bc44a235 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.3.2.2 2004/09/16 22:16:30 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt UFTDI 4
diff --git a/share/man/man4/ugen.4 b/share/man/man4/ugen.4
index f16606ad7c378..f1e5f308e3b37 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 beb82fe435bcd..e825778ec9357 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.14.8.1 2004/09/09 19:09:53 simon Exp $
 .\"
 .Dd September 6, 2004
 .Dt UHCI 4
diff --git a/share/man/man4/uhid.4 b/share/man/man4/uhid.4
index b4cc2308f527d..5da726a871a08 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 2004/06/24 05:09:15 imp Exp $
 .\"
 .Dd July 12, 1998
 .Dt UHID 4
diff --git a/share/man/man4/uhidev.4 b/share/man/man4/uhidev.4
index f469cc68098a1..7dca8e399d1e0 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 6eb2b6e962ce3..98860d3759df0 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 e687a8e8c4e59..66a31cf4e9043 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.6.2.1 2004/09/30 18:36:33 simon Exp $
 .\"
 .Dd September 26, 2004
 .Dt ULPT 4
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index cb8fcec982c1b..1563f0f012402 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.37 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd February 10, 2004
 .Dt UMASS 4
diff --git a/share/man/man4/umct.4 b/share/man/man4/umct.4
index 2860a4c4f9fef..2df607bc7785b 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.4 2004/08/07 23:45:04 sanpei Exp $
 .\"
 .Dd February 29, 2004
 .Dt UMCT 4
diff --git a/share/man/man4/umodem.4 b/share/man/man4/umodem.4
index 86063fb02e89b..202ad22359f66 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.3.2.2 2004/09/06 15:49:35 brueffer Exp $
 .\"
 .Dd August 19, 2004
 .Dt UMODEM 4
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 1fea37e1317f1..a9ef180a75052 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.21 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd April 11, 1999
 .Dt UMS 4
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index 8b84a7df62e8c..a5ba6c3689bde 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.8 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd July 15, 2001
 .Dt UNIX 4
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index 742a624cb316b..ba1870f421b75 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.7.2.2 2004/09/16 22:22:03 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt UPLCOM 4
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index 3b3176eb6f506..c832b373716c7 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.9.4.1 2004/09/30 18:37:21 simon Exp $
 .\"
 .Dd September 26, 2004
 .Dt URIO 4
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 10582c54d8adc..34e1358f7d26e 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.31 2004/06/23 23:25:58 markus Exp $
 .\"
 .Dd February 21, 1999
 .Dt USB 4
diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4
index 4b7eab58da123..1e20fc4afc891 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.15.2.3 2004/10/07 13:52:14 sanpei Exp $
 .\"
 .Dd August 19, 2004
 .Dt USCANNER 4
diff --git a/share/man/man4/utopia.4 b/share/man/man4/utopia.4
index 08f530db8d549..170381c0afe66 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 206bc7d7d0d76..5f76c3653f1b7 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.4.2.1 2004/09/16 22:23:14 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt UVISOR 4
diff --git a/share/man/man4/uvscom.4 b/share/man/man4/uvscom.4
index 44a7eb6ad912f..e463bdfe2f2e9 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.3.2.1 2004/09/09 11:43:12 brueffer Exp $
 .\"
 .Dd September 6, 2004
 .Dt UVSCOM 4
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index ce7d66c976837..3d9b82afd93e2 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 1f5602cfb11d2..98d759e68c54b 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.5.2.1 2004/09/14 21:22:34 wpaul Exp $
 .\"
 .Dd September 10, 2004
 .Dt VGE 4
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 01334884138c3..ab401fce29c59 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.49 2004/06/24 05:09:15 imp Exp $
 .\"
 .Dd May 16, 2002
 .Dt VINUM 4
diff --git a/share/man/man4/vinumdebug.4 b/share/man/man4/vinumdebug.4
index a157ae080affb..8f33cc19ba71e 100644
--- a/share/man/man4/vinumdebug.4
+++ b/share/man/man4/vinumdebug.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/vinumdebug.4,v 1.2 2004/01/02 05:07:57 grog Exp $
 .\"
 .Dd December 30, 2003
 .Dt VINUMDEBUG 4
diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index ec91907b52a42..6795fc6d152f7 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.14 2004/05/27 11:12:07 yar Exp $
 .\"
 .Dd May 26, 2004
 .Dt VLAN 4
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index 6c5bc016e734d..22e894c96b228 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.20 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd March 5, 1998
 .Dt VPO 4
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 986bdfa1cba53..351fd9294a28a 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.21.2.2 2004/09/06 15:48:51 brueffer Exp $
 .\"
 .Dd August 15, 2004
 .Dt VR 4
diff --git a/share/man/man4/watchdog.4 b/share/man/man4/watchdog.4
index ad9a105e438ab..8ee5521a116ae 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 84e60ccbd12f8..5a33ea3c35290 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.16.6.1 2004/09/06 15:37:57 brueffer Exp $
 .\"
 .Dd September 4, 2004
 .Dt WB 4
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index df144c0be188e..730b585718a58 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.60 2004/07/03 18:29:20 ru Exp $
 .\"	$OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $
 .\"
 .Dd February 17, 2003
diff --git a/share/man/man4/witness.4 b/share/man/man4/witness.4
index 8b95182e4712f..1b5a856e9222d 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.5.2.1 2004/09/14 03:51:21 jmg Exp $
 .\"
 .Dd February 18, 2001
 .Dt WITNESS 4
diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4
index e5601955efc88..0e43d0064e75b 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.4 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd September 25, 2003
 .Dt WLAN 4
diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4
index 727fb6253df14..fcec3de838cf0 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.27 2003/09/06 17:46:16 hmp Exp $
 .\" "
 .Dd October 15, 1998
 .Dt WORM 4
diff --git a/share/man/man4/xe.4 b/share/man/man4/xe.4
index 096b255630384..c14ba49a68016 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.7 2004/07/08 12:52:33 ru Exp $
 .\"
 .Dd July 4, 2004
 .Dt XE 4
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index bd2c4619d1dac..be8b993b0f47d 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.29 2004/08/01 19:26:42 simon Exp $
 .\"
 .Dd July 28, 2004
 .Dt XL 4
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index e670acb199c87..e4ad758f8fe73 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 cb73a2c6549f7..f651d9281baf4 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 ce8c23647d097..e0ba0403ea0be 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.56 2004/05/26 22:58:05 brooks 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 e816a57a38e22..1b9fa1fa3ec82 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.18 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt A.OUT 5
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index 8541081b4cbe4..4639a3b7c51df 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/bluetooth.hosts.5 b/share/man/man5/bluetooth.hosts.5
index bda4d920496d7..3aec7009748bd 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 64a7dd56367bc..30c081d428bf5 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 63d7b32b5acb1..62d1099dc90a1 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.5 2004/06/16 08:33:55 ru Exp $
 .\"
 .Dd May 13, 2004
 .Dt CONFIG 5
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 437d676a47001..3a9b8db5172e5 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.17 2003/09/08 19:57:20 ru Exp $
 .\"
 .Dd January 9, 2002
 .Dt CORE 5
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 173ab19d74f73..74511afddfd7c 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/device.hints.5 b/share/man/man5/device.hints.5
index 578d278f1ce54..51d98bfe0edbf 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 6c5a38722a41e..0194a581c3bf1 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.20 2003/09/10 19:24:35 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt DIR 5
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index cf33790c5d990..53aa0fab105a2 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.13 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKTAB 5
diff --git a/share/man/man5/drivers.conf.5 b/share/man/man5/drivers.conf.5
index f5df4ccfb8c95..452c04c95c84c 100644
--- a/share/man/man5/drivers.conf.5
+++ b/share/man/man5/drivers.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/drivers.conf.5,v 1.9 2002/12/14 15:46:50 ru Exp $
 .\"
 .Dd March 23, 2002
 .Dt DRIVERS.CONF 5
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 5f52875e76cac..24369cb21f62c 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.28 2004/07/03 18:29: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 5716acc73ebbf..750c49c5f7c20 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.12 2002/01/14 16:59:01 ru Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 5
diff --git a/share/man/man5/eui64.5 b/share/man/man5/eui64.5
index 4e2dda6159c79..e002e4da1a097 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 0598fd1199035..cf0b7ff079803 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 27f08b0feda17..b97b08e551627 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 2234ff3590918..6be74188aa69d 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 368f11cffc8cc..655f45799846d 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.21 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt FS 5
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 7e8f10ca85cbc..f55c213cd93f1 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 7dc1fc643082b..27d8f7229293f 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.27 2003/09/08 19:57:20 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 a81b00fb02c7d..6294f6a05689c 100644
--- a/share/man/man5/hesiod.conf.5
+++ b/share/man/man5/hesiod.conf.5
@@ -1,5 +1,5 @@
 .\"	$NetBSD: hesiod.conf.5,v 1.2 1999/01/25 22:37:06 lukem Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man5/hesiod.conf.5,v 1.2 2001/01/15 17:54:19 ru Exp $
 .\"
 .\" from: #Id: hesiod.conf.5,v 1.1 1996/12/08 21:36:38 ghudson Exp #
 .\"
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index 218a4df37196d..a37884dfab488 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 c180d2a73ea62..c84574ae20ebf 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.18 2004/07/03 18:29:22 ru 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 910ac66c59643..8a73e2800d4d9 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 bf9af6d43e48f..3a9a7d2989524 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.6 2001/07/10 15:30:50 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 4299e58f07f92..4b1bd9f5720fe 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.8 2004/06/16 08:33:55 ru Exp $
 .\"
 .Dd January 31, 2004
 .Dt LIBMAP.CONF 5
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 73f0a45553572..e1fd5efeab0b5 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 dbd8cabede7e3..d3bd5c4386acd 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.12 2003/07/03 06:07:26 jkoshy 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 87c12499ce128..ec957aefc5db4 100644
--- a/share/man/man5/mailer.conf.5
+++ b/share/man/man5/mailer.conf.5
@@ -1,5 +1,5 @@
 .\"	$NetBSD: mailer.conf.5,v 1.2 1999/05/29 18:18:30 christos Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man5/mailer.conf.5,v 1.9 2004/07/03 18:29:23 ru Exp $
 .\"
 .\" Copyright (c) 1998
 .\" 	Perry E. Metzger.  All rights reserved.
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 60a6ef56fa43c..e72f1077a101e 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.89.2.4 2004/10/09 18:38:58 dougb Exp $
 .\"
 .Dd October 5, 2004
 .Dt MAKE.CONF 5
diff --git a/share/man/man5/moduli.5 b/share/man/man5/moduli.5
index 32d7989236f33..1bb718783b803 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 2ffbc9e419bf5..122f8557c224b 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 d2ee45cc2268b..f42d1ebb771fc 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 2003/02/24 22:53:23 ru 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 ff622674b7a00..10a4af735b882 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.9 2004/07/03 18:29:23 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 1c439bec88b75..123169663d72e 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 ad5db67156617..1db018d6dfa1b 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -1,5 +1,5 @@
 .\"	$NetBSD: nsswitch.conf.5,v 1.14 1999/03/17 20:19:47 garbled Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man5/nsswitch.conf.5,v 1.10 2004/07/07 19:57:15 ru Exp $
 .\"
 .\"  Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 9476ec05d8f3f..79061a5fe965c 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.42 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd January 16, 1999
 .Dt PASSWD 5
diff --git a/share/man/man5/pbm.5 b/share/man/man5/pbm.5
index 55d2c5c1be39a..bd7be1e958cf8 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 dc6a9b8addfd8..3b71e83e3802e 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.50 2004/06/16 08:33:55 ru Exp $
 .\"
 .Dd May 30, 2004
 .Dt PERIODIC.CONF 5
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index 59b491b61eb91..f99566d5bed92 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/procfs.5 b/share/man/man5/procfs.5
index 47f5f9addfa00..d93f3d859a1fc 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.30 2004/07/03 18:29:23 ru 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 fb9577e8da347..9c9008a1cf303 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.6 2004/07/03 18:29:23 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 6d713bbff8aea..bc4df2779eda2 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 cf7220baf73c2..8b4fc54f9f495 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.221.2.4.2.1 2004/10/28 13:59:44 keramida Exp $
 .\"
 .Dd October 28, 2004
 .Dt RC.CONF 5
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index edc3e1786cec6..ca76eb2971bf3 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.16 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd October 20, 2003
 .Dt REMOTE 5
diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5
index 51b730e3da212..e31493b67947b 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.11 2004/06/16 08:33:56 ru Exp $
 .\"
 .Dd December 7, 2003
 .Dt RESOLVER 5
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index 738573dd5a76f..005524d226008 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.11 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt SERVICES 5
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index 585cc8385dd72..aac9caf00ca0a 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 397a58b218c96..d882c0e1338f4 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.11 2004/07/03 18:29:23 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 08aa423466ece..e980f6996ace3 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.11 2004/06/20 12:35:16 mpp Exp $
 .\"
 .Dd February 28, 2003
 .Dt STYLE.MAKEFILE 5
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 0e69bcc13859d..fd5611fc257a1 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 c342041874154..776d79aecaa9f 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 be6547e592b53..136a77a015d24 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 f6eac24bdd7db..0fc1087f5a478 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.9 2004/01/21 18:57:45 schweikh Exp $
 .\"
 .Dd February 16, 1997
 .Dt INTRO 6
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index 82240442bccf2..c55e2f88ece71 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 feba23385c215..619522fddcb0d 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 0526214ca43c7..e68d3802721bd 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.27 2004/08/13 12:59:46 ru Exp $
 .\"
 .Dd August 13, 2004
 .Dt BUILD 7
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index 74af31ddca7df..4f7f63d3a9095 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.22 2002/11/29 11:39:19 ru Exp $
 .\" "
 .Dd April 1, 1996
 .Os
diff --git a/share/man/man7/development.7 b/share/man/man7/development.7
index 937c0f595a3d3..3d71d1afca48f 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.13 2004/08/07 04:40:20 imp Exp $
 .\"
 .Dd December 21, 2002
 .Dt DEVELOPMENT 7
diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7
index d4987a6b2c36e..f1a8d1385ebd2 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 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt ENVIRON 7
diff --git a/share/man/man7/ffs.7 b/share/man/man7/ffs.7
index 34d083e3e87c7..7910a058bc337 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 2002/12/12 17:25:57 ru Exp $
 .\"
 .Dd December 26, 2001
 .Dt FFS 7
diff --git a/share/man/man7/firewall.7 b/share/man/man7/firewall.7
index e0a97711899d4..c50e01348ec3d 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.21 2004/08/07 04:40:20 imp Exp $
 .\"
 .Dd May 26, 2001
 .Dt FIREWALL 7
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 14bfb267d5b2f..c09a4923a4377 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.110 2004/08/16 15:45:24 marius Exp $
 .\"
 .Dd August 16, 2004
 .Dt HIER 7
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 713a8b1555254..49704f373cbbb 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 1d9968c215df7..b84dc07a98168 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 05c3654aa9e75..9b0edd2a7a8bb 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 07370fb99b907..74f7331c2b271 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 b092befa8ea98..ed77963480034 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 0aa5404740be1..78288cf9a0313 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.45 2004/06/16 07:29:21 krion Exp $
 .\"
 .Dd June 16, 2004
 .Dt PORTS 7
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 5d427cc3d28f6..6096f64db6abe 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.47 2004/08/16 10:25:43 obrien Exp $
 .\"
 .Dd August 10, 2004
 .Dt RELEASE 7
diff --git a/share/man/man7/sdoc.7 b/share/man/man7/sdoc.7
index bbbc84b22f231..272ca79e3a412 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.9 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd October 12, 2001
 .Dt SDOC 7
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index d44d9ddc87f8b..d9157f1dfeb76 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.39 2004/08/07 04:40:20 imp Exp $
 .\"
 .Dd September 18, 1999
 .Dt SECURITY 7
diff --git a/share/man/man7/sprog.7 b/share/man/man7/sprog.7
index cde04b2f7cbb9..e6e91c35c033c 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 2f36953d9a16d..734333b040f6b 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 9c3f62570292f..f86b4f0d649c7 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.67 2004/08/07 04:40:20 imp Exp $
 .\"
 .Dd June 25, 2002
 .Dt TUNING 7
diff --git a/share/man/man8/MAKEDEV.8 b/share/man/man8/MAKEDEV.8
index 29f6cd2675d41..bcde20d2e2897 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 4c9678cd2ad7a..44bdbaf33c666 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 007c3bfaf2748..3d2df3e139900 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.9 2004/07/03 18:29:23 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 03d125aed4490..c3878ffce774d 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.20 2002/12/12 17:25:58 ru Exp $
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index acdfe1d4de5e9..57bad0058f813 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.24 2004/06/21 14:23:31 mpp Exp $
 .\"
 .Dd January 10, 2004
 .Dt DISKLESS 8
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 31f33a2b7496c..dfb78e6776625 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 9207b82404d59..89a79b8f67e54 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.25 2004/07/03 18:29:23 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 fed004a0a890f..65c5845492823 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.25.2.1 2004/10/10 09:50:52 mtm 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 7b05ced128d03..3fe145a3d7820 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 fa177319f1602..f583267635455 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 878e92f3cc91b..c6d4177ea62f1 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 cbf886d890eb5..fe679a49751fd 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.9 2003/09/10 19:24:35 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 2903c89a5ce94..153f86261385c 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.35 2004/07/03 18:29:23 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 d4a239bbb70d2..95af4a2829022 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.7 2001/12/26 23:14:04 davidc 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 5f5d71d0d2fdc..6f0417071e0c1 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.6 2001/12/26 23:14:04 davidc 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 f7e0d77f2dd74..4616cab8ac355 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.6 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_LOCKINIT 9
diff --git a/share/man/man9/BUF_REFCNT.9 b/share/man/man9/BUF_REFCNT.9
index a28589350bb2e..003a6e2f7fbe4 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.6 2001/12/26 23:14:04 davidc 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 2c9c6d459ac14..46d8ede936719 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.8 2002/01/09 11:43:45 mpp 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 b6081db74e0df..ab00fba65aae3 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.6 2001/12/26 23:14:04 davidc 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 8a76d33ddafd4..f53e53965b5b8 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.3 2004/07/07 07:56:58 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 90dc81f7be520..eff609e996149 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.4 2004/07/07 07:56:58 ru Exp $
 .\"
 .Dd September 23, 2003
 .Dt BUS_CONFIG_INTR 9
diff --git a/share/man/man9/BUS_PRINT_CHILD.9 b/share/man/man9/BUS_PRINT_CHILD.9
index 483db02e40076..983c9a8846026 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.14 2003/10/23 06:22:40 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_PRINT_CHILD 9
diff --git a/share/man/man9/BUS_READ_IVAR.9 b/share/man/man9/BUS_READ_IVAR.9
index 153b324b56a45..2a95b42face69 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 9310038b9a396..6c22a07672d29 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.17 2004/02/10 20:34:44 jmg Exp $
 .\"
 .Dd March 28, 2003
 .Dt BUS_SETUP_INTR 9
diff --git a/share/man/man9/CTASSERT.9 b/share/man/man9/CTASSERT.9
index 5c9d30eb2361d..c18f7f9131d83 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 7c21587338d42..cea8227467140 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.2 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt DECLARE_GEOM_CLASS 9
diff --git a/share/man/man9/DECLARE_MODULE.9 b/share/man/man9/DECLARE_MODULE.9
index 190ccb7dfe04e..db0afc1896900 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.7 2003/09/10 19:24:35 ru Exp $
 .\"
 .Dd March 3, 2001
 .Dt DECLARE_MODULE 9
diff --git a/share/man/man9/DELAY.9 b/share/man/man9/DELAY.9
index a8e059b9d5300..88b9c92f627f2 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.7 2003/10/23 01:31:24 hmp Exp $
 .\"
 .Dd November 21, 2000
 .Os
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index 01154b5168a56..464c2e93bbd7e 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.8 2004/04/11 06:37:50 imp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ATTACH 9
diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9
index ae88a286fd6a8..616f9c071935e 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.11 2004/07/03 18:29:23 ru 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 bdea57ba4e3b9..516a756e6ee4e 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.12 2004/07/03 18:29:23 ru 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 a18afecaf984c..cfff8bb5f23d2 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.19 2004/08/11 21:52:31 imp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_PROBE 9
diff --git a/share/man/man9/DEVICE_SHUTDOWN.9 b/share/man/man9/DEVICE_SHUTDOWN.9
index 4718c3aacf0c6..90fb377b6301f 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.7 2001/10/01 16:09:23 ru Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_SHUTDOWN 9
diff --git a/share/man/man9/DEV_MODULE.9 b/share/man/man9/DEV_MODULE.9
index 13a81c1986367..f206686de4074 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 346177a6aabca..85976561b35c1 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/KASSERT.9 b/share/man/man9/KASSERT.9
index e53e9b605a8e0..f78d5bf949591 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 d51a9fc231fc8..fe2eb8b08b2e7 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 8bd40b4dfcae2..8eb329891b971 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.4 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd March 11, 2001
 .Dt MODULE_DEPEND 9
diff --git a/share/man/man9/MODULE_VERSION.9 b/share/man/man9/MODULE_VERSION.9
index 2f284b874b916..f7462931b1d57 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 507344bf24639..be1217c39b8cf 100644
--- a/share/man/man9/MUTEX_PROFILING.9
+++ b/share/man/man9/MUTEX_PROFILING.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/MUTEX_PROFILING.9,v 1.6.2.1 2004/08/25 21:05:41 jmg Exp $
 .\"
 .Dd January 25, 2004
 .Dt MUTEX_PROFILING 9
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 3731b6a5610dc..4e2c49f40a616 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man9/Makefile,v 1.239.2.2 2004/09/30 18:27:13 jmg 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 434ea477c507a..c74356ff455fa 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.5 2003/09/08 19:57:21 ru Exp $
 .\"
 .Dd April 27, 2001
 .Dt SYSCALL_MODULE 9
diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9
index 457c7945e31a0..4f5ae7922aad3 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.10 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_CHECKEXP.9 b/share/man/man9/VFS_CHECKEXP.9
index 16885bf1ef7c4..b510093c52575 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.11 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd September 10, 1999
 .Os
diff --git a/share/man/man9/VFS_FHTOVP.9 b/share/man/man9/VFS_FHTOVP.9
index b4552951c3763..de4040814f54d 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.16 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_INIT.9 b/share/man/man9/VFS_INIT.9
index e03b608db74f6..d96fad3357ebb 100644
--- a/share/man/man9/VFS_INIT.9
+++ b/share/man/man9/VFS_INIT.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_INIT.9,v 1.10 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_MOUNT.9 b/share/man/man9/VFS_MOUNT.9
index 369a100dce26c..214fcd4523815 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.13 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_QUOTACTL.9 b/share/man/man9/VFS_QUOTACTL.9
index 4c3620a6e135a..46c40029f5a32 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 32b4f2f62147e..b31ccdeffe0f5 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 cd4a08f323eca..a2fa681b7bf55 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.7 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd December 2, 2001
 .Dt VFS_SET 9
diff --git a/share/man/man9/VFS_START.9 b/share/man/man9/VFS_START.9
index 9cbc0392c4fae..f7caccc4863a1 100644
--- a/share/man/man9/VFS_START.9
+++ b/share/man/man9/VFS_START.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_START.9,v 1.10 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_STATFS.9 b/share/man/man9/VFS_STATFS.9
index 7bcaa7272b162..61347bd526566 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.10 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_SYNC.9 b/share/man/man9/VFS_SYNC.9
index c0e90520d2891..e5e378259c2e8 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.12 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_UNMOUNT.9 b/share/man/man9/VFS_UNMOUNT.9
index ee5f9b7ae157c..b0e32614d3d6b 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.10 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_VGET.9 b/share/man/man9/VFS_VGET.9
index b18f3a3c17c20..4e8971ca50607 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.14 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_VPTOFH.9 b/share/man/man9/VFS_VPTOFH.9
index 4fa891614768e..d8d08c257db43 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 cbd5a37f07c83..337821e8046cc 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.19 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ACLCHECK.9 b/share/man/man9/VOP_ACLCHECK.9
index a527189b9e2b8..1e74332f9bb9c 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.11 2003/10/23 02:11:14 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_ADVLOCK.9 b/share/man/man9/VOP_ADVLOCK.9
index a10b87d11abe5..de961ea219d79 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.12 2003/10/23 02:11:14 hmp Exp $
 .\"
 .Dd June 30, 1999
 .Os
diff --git a/share/man/man9/VOP_ATTRIB.9 b/share/man/man9/VOP_ATTRIB.9
index 885edc4147169..3533320dc9ee3 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.23 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_BWRITE.9 b/share/man/man9/VOP_BWRITE.9
index eb2b2c031a329..e46fe741a4f42 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.10 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_CREATE.9 b/share/man/man9/VOP_CREATE.9
index fb4e65a4dfdcf..004d719b2a133 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.15 2004/07/08 00:08:18 alfred Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index 6f4cbb6803b09..7e3e204c4df53 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.13 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_GETACL.9 b/share/man/man9/VOP_GETACL.9
index c9dbf7f298743..137a89a6176a1 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.13 2003/10/23 02:11:14 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_GETEXTATTR.9 b/share/man/man9/VOP_GETEXTATTR.9
index 6c46467001090..a066efb9f6608 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.21 2003/10/23 02:11:14 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_GETPAGES.9 b/share/man/man9/VOP_GETPAGES.9
index 3ead1af1f4185..fd3fed060adfa 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.10 2004/06/16 08:33:57 ru Exp $
 .\"
 .Dd September 27, 2003
 .Os
diff --git a/share/man/man9/VOP_GETVOBJECT.9 b/share/man/man9/VOP_GETVOBJECT.9
index 19b4c847910e8..6733afb7aed2b 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.6 2002/12/12 17:25:58 ru Exp $
 .\"
 .Dd September 10, 2000
 .Os
diff --git a/share/man/man9/VOP_INACTIVE.9 b/share/man/man9/VOP_INACTIVE.9
index 8a73efa0bb749..20736e6a883e1 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.14 2003/10/23 03:07:56 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_IOCTL.9 b/share/man/man9/VOP_IOCTL.9
index a25e44170a724..2df515a7b37c8 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.12 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LEASE.9 b/share/man/man9/VOP_LEASE.9
index becf68b543c30..547362218ef65 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 a7f81fbcce2bd..69b46568f336a 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.21 2004/07/04 20:55:49 ru Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LISTEXTATTR.9 b/share/man/man9/VOP_LISTEXTATTR.9
index cfb8e4e8ceb2b..0f869d66aceff 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.5 2004/07/07 07:56:58 ru Exp $
 .\"
 .Dd June 5, 2003
 .Os
diff --git a/share/man/man9/VOP_LOCK.9 b/share/man/man9/VOP_LOCK.9
index 3e31f09f53a1f..3fd022ed0b399 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.14 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index 76e86cb4722e8..9feaca0d46390 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.21 2004/07/08 00:36:58 alfred Exp $
 .\"
 .Dd November 24, 1997
 .Os
diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9
index ff2cc710156ee..83ac182e5c569 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.15 2004/05/11 14:13:52 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PATHCONF.9 b/share/man/man9/VOP_PATHCONF.9
index a5cd400992fa1..8ad21b4667f98 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.10 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PRINT.9 b/share/man/man9/VOP_PRINT.9
index ac3d142c06cd1..904c7805dcf60 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.8 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RDWR.9 b/share/man/man9/VOP_RDWR.9
index dfe25f34bf7c9..72a8b3bb57ce1 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.17 2004/07/08 00:43:50 alfred Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READDIR.9 b/share/man/man9/VOP_READDIR.9
index 9726a5520e698..8ccacecb4c1fb 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.12 2003/10/23 02:11:14 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READLINK.9 b/share/man/man9/VOP_READLINK.9
index 213883cdb55a8..5ce16b0e24d8d 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.11 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REALLOCBLKS.9 b/share/man/man9/VOP_REALLOCBLKS.9
index 08a512a89be68..907ec0fc9296c 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.9 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REMOVE.9 b/share/man/man9/VOP_REMOVE.9
index 63e40cc99c1f6..801c40183ef23 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.12 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RENAME.9 b/share/man/man9/VOP_RENAME.9
index 22b3df0f60730..86d5c7b6876f4 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.20 2004/07/08 00:38:28 alfred Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REVOKE.9 b/share/man/man9/VOP_REVOKE.9
index 3c381b08171ad..50b4954c0994f 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.5 2002/03/18 16:40:07 ru Exp $
 .\"
 .Dd February 5, 2002
 .Os
diff --git a/share/man/man9/VOP_SETACL.9 b/share/man/man9/VOP_SETACL.9
index 96c1db25e9a63..1dfe372ce4b42 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.11 2003/10/23 02:11:14 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_SETEXTATTR.9 b/share/man/man9/VOP_SETEXTATTR.9
index aa680c5069a4a..c7d054155d8dd 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.18 2003/09/12 21:54:11 ru Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_STRATEGY.9 b/share/man/man9/VOP_STRATEGY.9
index 84ea59542dd1a..d7fa0cb30e7a9 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.15 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/accept_filter.9 b/share/man/man9/accept_filter.9
index af9e888a52f1c..ca9971996f986 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 4b465d3006bb8..788b672787633 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.7 2002/12/24 13:41:46 ru Exp $
 .\" "
 .Dd November 15, 2000
 .Os
diff --git a/share/man/man9/accf_http.9 b/share/man/man9/accf_http.9
index 69e724b0b72cc..20facbdbd4fdf 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.10 2002/12/24 13:41:46 ru Exp $
 .\" "
 .Dd November 15, 2000
 .Os
diff --git a/share/man/man9/acl.9 b/share/man/man9/acl.9
index 9ea49dee67cc1..393d4202f0e9f 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.12 2002/12/12 17:25:58 ru Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/alq.9 b/share/man/man9/alq.9
index bcea3ccb8cecf..bb31141eb4ab8 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.2 2004/07/07 07:56:58 ru Exp $
 .\"
 .Dd May 16, 2003
 .Dt ALQ 9
diff --git a/share/man/man9/altq.9 b/share/man/man9/altq.9
index c4d2cc7bda2bf..16a1730830d5b 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.2.2.1 2004/08/30 01:34:01 mlaier Exp $
 .\"
 .Dd August 25, 2004
 .Dt ALTQ 9
diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9
index 747b81d1eac33..1f579805f8757 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 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd October 27, 2000
 .Os
diff --git a/share/man/man9/bios.9 b/share/man/man9/bios.9
index b3a2ab64cab15..c2f4d97c4ce76 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 2003/10/23 01:14:18 hmp Exp $
 .\"
 .\" Copyright (c) 1997 Michael Smith
 .\" All rights reserved.
diff --git a/share/man/man9/boot.9 b/share/man/man9/boot.9
index cbd0099e4e184..a0370b22dea88 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 1afe998fc3993..8b2ee3dbf704b 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.1 2004/05/19 20:39:22 dwmalone Exp $
 .\"
 .Dd May 19, 2004
 .Dt BPF 9
diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9
index 2343e27aa5bff..aa359e431c216 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.16 2004/07/03 18:29:23 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 eb5b3e824e79d..5055919e83843 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 c6865b54f3085..fa15323db4864 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.19 2004/06/16 08:33:57 ru 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 9e8b37daaf816..2933b2fe048da 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.3 2004/06/21 14:11:45 mpp 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 be1dfdd046cf5..48e2f2690d5d9 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.14 2004/08/11 14:52:33 jmg 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 1bae1e68cb606..0b4f1d1d90a96 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.7 2003/10/23 01:54:06 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 0151d49a52510..7f8ad6c5f3254 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.7 2003/10/23 01:54:06 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 ae7780d933c61..aff51f31333d9 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.9 2001/10/01 16:09:24 ru 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 100bdb0452bf6..54a06b000d9a2 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.8 2001/10/01 16:09:24 ru 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 5cb7738a270ad..4be3f33726469 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.7 2003/10/23 01:54:06 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 e4322af9a4343..640ab2a3f3455 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.9 2004/07/03 18:29:23 ru 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 bbd061affb110..cbac1152b4671 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.4 2004/02/22 00:29:04 njl Exp $
 .\"
 .Dd March 29, 2003
 .Dt BUS_SET_RESOURCE 9
diff --git a/share/man/man9/byteorder.9 b/share/man/man9/byteorder.9
index f47f609758d3c..3ba6943e455ed 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 96a4504ad81e7..8349f8b7e18ce 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.22 2004/06/16 08:33:57 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt CD 9
diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9
index 46aec66556d66..7f08b967930ca 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.10 2004/06/21 14:11:45 mpp Exp $
 .\"
 .Dd December 11, 2000
 .Dt CONDVAR 9
diff --git a/share/man/man9/contigmalloc.9 b/share/man/man9/contigmalloc.9
index 4368e496c1784..4c87429c68251 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.3 2004/08/10 16:38:19 green Exp $
 .\"
 .Dd August 10, 2004
 .Dt CONTIGMALLOC 9
diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9
index b6b975f828402..e2a4071d1dda8 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 1f5f4ee05dbad..c6af67adf64e8 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 e79363f225eb1..0aabbdf028447 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 84f64cac5c070..eed85d53c45eb 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 2002/04/12 05:06:38 davidc Exp $
 .\"
 .Dd March 22, 2001
 .Dt CRITICAL_ENTER 9
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index d4386dc92042e..376e9022f158c 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.4 2003/01/28 17:10:29 sam Exp $
 .\"
 .Dd October 14, 2002
 .Dt CRYPTO 9
diff --git a/share/man/man9/devclass.9 b/share/man/man9/devclass.9
index af169155df8f5..3f3f5992863b3 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.11 2003/10/23 01:54:06 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 0b7b827165c5f..a1b35849f42dd 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.8 2003/10/23 01:54:06 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 6c1ef44f0d126..13b55fcce8dbb 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.8 2003/06/02 15:34:14 ru Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_FIND 9
diff --git a/share/man/man9/devclass_get_device.9 b/share/man/man9/devclass_get_device.9
index 54eafb9327321..0f94f58404218 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.8 2001/10/01 16:09:24 ru 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 2872adcf87b2f..6b4846d761423 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.7 2001/10/01 16:09:24 ru Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_DEVICES 9
diff --git a/share/man/man9/devclass_get_maxunit.9 b/share/man/man9/devclass_get_maxunit.9
index 75fb90fa07575..dabc8b9394424 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.6 2001/10/01 16:09:24 ru Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_MAXUNIT 9
diff --git a/share/man/man9/devclass_get_name.9 b/share/man/man9/devclass_get_name.9
index 03d9f4a7aefe7..53351fc754a92 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.6 2001/10/01 16:09:24 ru 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 ebe2eaa804266..7e36c415da570 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.7 2001/10/01 16:09:24 ru 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 246aac07efecb..fadda48de9ed1 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.15 2003/10/23 01:54:06 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 eedc8cca5204a..2ac9bef98ce2e 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 df56c599e9b92..ec023915fb730 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 85b4f6ea5e6cb..0b278b71d9b79 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 4dd6a2cb5d2ab..9006d2edac1e4 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.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_FIND_CHILD 9
diff --git a/share/man/man9/device_get_children.9 b/share/man/man9/device_get_children.9
index bad2fdd6d2d79..2c30ef0032d8c 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 fcf869565aebe..287bba33af086 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 d764768b11f60..c0f6bcb96d53f 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 dd1450c32f933..a48e9b367fdcc 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 3149f8c6c9cf2..b27ccf7ab6f2c 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 63669d33a16e8..be22a081d1620 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 8321e1a044903..d7dd39331b4a5 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 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_SOFTC 9
diff --git a/share/man/man9/device_get_state.9 b/share/man/man9/device_get_state.9
index 384395a302885..cb419e7593c22 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 0b222e96dd6dc..31c467bf4b4dd 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 fc7c9fd36c758..12484434383a5 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 297cce731a153..f0262b130955c 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 8f8c4af18d223..b02a5b4cb2918 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 0e5526d689aab..bd163ab3443bf 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 ae29010450b16..1645898a905d5 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 56d4bb928c684..267fef89b06a1 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 aed306950e169..0bffd80dc244e 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 ceaec6ec727e9..33816dae86f7f 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.21 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd May 22, 1998
 .Dt DEVSTAT 9
diff --git a/share/man/man9/devsw.9 b/share/man/man9/devsw.9
index 66e82b62bb743..8e857bd74e8cc 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.6 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd July 9, 2001
 .Dt DEVSW 9
diff --git a/share/man/man9/devtoname.9 b/share/man/man9/devtoname.9
index 9a62a5ededb6b..cf38aacb95504 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 d8d446baf44a0..02eaccbaebc18 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 56164ac777544..53f7c48f94f00 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.4 2002/10/10 00:29:22 alfred Exp $
 .\"
 .Dd December 7, 2001
 .Dt DOMAIN 9
diff --git a/share/man/man9/driver.9 b/share/man/man9/driver.9
index 88fdb9eea584c..1b21a3141c50b 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.10 2003/10/23 01:54:06 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DRIVER 9
diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9
index 77384ea688f58..dfb8bb75f7077 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.14 2003/10/23 02:33:03 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/fetch.9 b/share/man/man9/fetch.9
index 7de3ff7fbb992..eec328c5f8e75 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 5bb8d5261f6ef..2db01b3ce970e 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.8 2004/07/06 08:21:12 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 96ba0ebc44026..48ccce75e3613 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.8 2004/07/06 08:21:12 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 c839b31f5885b..cd498341f627c 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 aa1e33a028567..38e95730ab3c5 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 6b9441ea44863..7b58c4415d2ce 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.6 2004/07/06 08:21:12 ru 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 0cb574dd3e036..3b32930769f9d 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.6 2004/07/06 08:21:12 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 19c4910980182..f5f84446effe6 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 05e4addabf368..8bf8f0eda1468 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 58da421a243d5..b57a03e6472fa 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 2c4b10eeaa348..915dca70dcba7 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 5bacf69ee7854..4bcb73eaaee26 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.9 2002/03/01 18:43:15 markm Exp $
 .\"
 .Dd November 20, 2000
 .Dt GET_CYCLECOUNT 9
diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9
index d1790ffb88a23..d7a835d7a9a09 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.4 2002/12/12 17:25:58 ru Exp $
 .\"
 .Dd November 21, 2001
 .Dt GETNEWVNODE 9
diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9
index 70b2d9d3dcfdc..56a214b626e07 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.1 2001/07/13 18:35:48 ru Exp $
 .\"
 .Dd July 9, 2001
 .Dt GROUPMEMBER 9
diff --git a/share/man/man9/hexdump.9 b/share/man/man9/hexdump.9
index 2d044e6adeab8..9e40d04dfe091 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.4 2004/07/07 07:56:58 ru Exp $
 .\"
 .Dd December 7, 2003
 .Os
diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9
index 1864ea64e6768..82f320fc5f154 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.3 2004/07/07 12:59:39 ru 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 e93775536cdc2..3ba4c6189c871 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.2 2004/07/07 12:59:39 ru 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 b1628d84aa3ff..b0be098159058 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.2 2004/07/07 12:59:39 ru 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 13dd3cd062deb..0e272aa494d2c 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.2 2004/07/07 12:59:39 ru 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 2c56ec1994ec3..79f5b865dd1d1 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.3 2004/07/07 12:59:39 ru 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 807e02cd7623f..2b3c46dc687d8 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.2 2004/07/07 12:59:39 ru 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 4b822a1c5bcf4..bab9b6e7b51e8 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.2 2004/07/07 12:59:39 ru 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 3749826a9352d..7ce247f061d9e 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 1f462f81a12a7..38964a8202157 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.43.2.1 2004/09/22 04:40:21 brooks Exp $
 .\"
 .Dd June 8, 2004
 .Os
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 61524f2062966..56a8ae6264888 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 0d927e9246a76..a6a501d29ac48 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.15 2001/07/14 19:41:16 schweikh Exp $
 .\"
 .Dd December 13, 1995
 .Dt INTRO 9
diff --git a/share/man/man9/ithread.9 b/share/man/man9/ithread.9
index 9ad0dff54e995..c7bbc40f46223 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/jumbo.9 b/share/man/man9/jumbo.9
index 667078962ef65..6ae22b92441d2 100644
--- a/share/man/man9/jumbo.9
+++ b/share/man/man9/jumbo.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/jumbo.9,v 1.2 2002/12/12 14:17:24 ru Exp $
 .\"
 .Dd June 23, 2002
 .Dt JUMBO 9
diff --git a/share/man/man9/kernacc.9 b/share/man/man9/kernacc.9
index 8a28b080c2385..00b06e020f7e4 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/kobj.9 b/share/man/man9/kobj.9
index ee013d149ed8e..3e8095168d67b 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.15 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd April 4, 2000
 .Dt KOBJ 9
diff --git a/share/man/man9/kthread.9 b/share/man/man9/kthread.9
index 7006b33a67240..c627fb92d2e04 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.12 2002/10/19 01:39:44 benno Exp $
 .\"
 .Dd October 24, 2000
 .Dt KTHREAD 9
diff --git a/share/man/man9/ktr.9 b/share/man/man9/ktr.9
index c7f8a68191bdf..b28191b9653de 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.7 2003/09/08 19:57:21 ru Exp $
 .\"
 .Dd February 15, 2001
 .Dt KTR 9
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index d02a7e266a7ab..1fea86e225082 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.11 2003/09/08 19:57:21 ru Exp $
 .\"
 .Dd July 9, 2001
 .Dt LOCK 9
diff --git a/share/man/man9/mac.9 b/share/man/man9/mac.9
index 5218fa947c5bf..f59f7c0af9678 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.11 2004/07/03 18:29:24 ru 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 629984370fffa..e82f9ef9ebe3a 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.15 2003/10/23 01:54:06 hmp Exp $
 .\"
 .Dd May 27, 2001
 .Os
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 442e41ec96d09..3c0e7244a95f0 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.40 2004/06/21 14:11:45 mpp Exp $
 .\"
 .Dd June 12, 2003
 .Dt MALLOC 9
diff --git a/share/man/man9/mbchain.9 b/share/man/man9/mbchain.9
index c7cdf3ad63a5d..5654937fe85f6 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.5 2002/01/09 11:43:48 mpp Exp $
 .\"
 .Dd February 20, 2001
 .Dt MBCHAIN 9
diff --git a/share/man/man9/mbpool.9 b/share/man/man9/mbpool.9
index b042973ac84d5..0d74be6239aef 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 d65724440d8b6..482e70844360e 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.51.2.1 2004/09/10 20:59:38 jmg Exp $
 .\"
 .Dd August 27, 2004
 .Dt MBUF 9
diff --git a/share/man/man9/mbuf_tags.9 b/share/man/man9/mbuf_tags.9
index ab74791698ef3..898b735be3942 100644
--- a/share/man/man9/mbuf_tags.9
+++ b/share/man/man9/mbuf_tags.9
@@ -16,7 +16,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbuf_tags.9,v 1.1 2004/05/20 09:34:19 ru Exp $
 .\"
 .Dd May 20, 2004
 .Dt MBUF_TAGS 9
diff --git a/share/man/man9/mdchain.9 b/share/man/man9/mdchain.9
index a20f4cdb82981..ee2550a15698c 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.7 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd February 28, 2001
 .Dt MDCHAIN 9
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index bfc2fbe0e363a..9831c868a0fb4 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.18 2004/07/03 18:29:24 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 c4197d9134e4e..ad6b1594e3fb6 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.18 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd June 6, 1998
 .Dt MICROSEQ 9
diff --git a/share/man/man9/microtime.9 b/share/man/man9/microtime.9
index 7926dba92bbdf..ff0c80b3002f4 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.7.8.1 2004/09/22 04:43:33 brooks Exp $
 .\"
 .Dd September 16, 2004
 .Dt MICROTIME 9
diff --git a/share/man/man9/microuptime.9 b/share/man/man9/microuptime.9
index 3e0b6ac00b664..841fd485994ff 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.5.8.1 2004/09/22 04:43:33 brooks Exp $
 .\"
 .Dd September, 16 2004
 .Dt MICROUPTIME 9
diff --git a/share/man/man9/module.9 b/share/man/man9/module.9
index 39b95a40fd81c..2ab75b35aa377 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.8 2004/07/13 19:36:58 phk 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 660dbd1454c15..98c7fd101d026 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 1fef49b338337..fbd6570c9d40f 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.43 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd February 12, 2001
 .Dt MUTEX 9
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index 72ad4d1f3a0a8..10321a961eea0 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -30,7 +30,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.25 2003/06/02 15:02:06 ru Exp $
 .\"
 .Dd May 27, 2003
 .Os
diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9
index a24a6886dfd79..9c16307fbe456 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 44439dd913b0d..9668444c6d714 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 4329ac9c84fe1..4ff281ec80a5e 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 611a6f045eb52..0caa5c4fd423e 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.5 2004/07/07 13:21:46 ru Exp $
 .\"
 .Dd May 21, 2003
 .Dt PCI 9
diff --git a/share/man/man9/pfil.9 b/share/man/man9/pfil.9
index b02ca89c5af8f..6248909bc59a6 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.14.2.3 2004/10/11 18:42:12 green Exp $
 .\"
 .Dd September 29, 2004
 .Dt PFIL 9
diff --git a/share/man/man9/pfind.9 b/share/man/man9/pfind.9
index c573c5b272d15..e86fc240c950c 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.3 2003/11/08 13:41:22 jkoshy Exp $
 .\"
 .Dd July 11, 2001
 .Os
diff --git a/share/man/man9/pgfind.9 b/share/man/man9/pgfind.9
index 0957398eea989..2b16a34aa2f96 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.4 2003/11/08 13:41:22 jkoshy Exp $
 .\"
 .Dd August 8, 2001
 .Os
diff --git a/share/man/man9/physio.9 b/share/man/man9/physio.9
index 1906d8ede4ea6..f53d900d7dfa4 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.15 2004/07/10 01:10:17 imp Exp $
 .\"
 .Dd July 8, 2004
 .Dt PHYSIO 9
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index 437043362010a..13193137d0115 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.9 2004/07/06 07:02:31 ru 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 840d8a19c270b..78d900b959333 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 5313b2660c7dd..b84b8158a7038 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 f3952f89b6cfe..c97b645b42d3c 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 002300b5625eb..3a099984bb2e7 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 1541fa5e09b1a..0456caa3f997b 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 2e524532b1176..a5ab26e49348c 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 07e2ad740ad6d..c6a2f74df3f14 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 f038fb53d93be..33c025df3c00c 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 d62783d311376..279e3b39e07e6 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.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_INIT 9
diff --git a/share/man/man9/pmap_is_modified.9 b/share/man/man9/pmap_is_modified.9
index 591a985394008..3c19437e2b173 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 c6f28709b6665..3e84d470e5d72 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 2c472fe97b497..b4eafb19da725 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 d0e45ea5db3aa..5b8018d6ead82 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 90ae75f44621d..83d63c82003ff 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 f0db837b5c836..b08f2da1bb2ca 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.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_PAGE_EXISTS_QUICK 9
diff --git a/share/man/man9/pmap_page_protect.9 b/share/man/man9/pmap_page_protect.9
index f77d57def77e1..832466af1531a 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 d52172934c3ac..fa332905e1dfa 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 b148b69f694a1..8d08a17624aa6 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 ef2964161802d..52fc73ec9bd53 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 1c377dc839f0b..f020fc19540ed 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 bf39548cea095..9569eae79a9e9 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 541eef06104bd..9287966744348 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 8a8d34044978f..1cfba73da93a8 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.4 2004/08/10 09:19:08 joerg 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 a8ba040131aa8..eb40b2a2f0ed2 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 6230b14ff0f50..21233637641aa 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 f8e65622457d8..667ca94099ebc 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.9 2001/10/01 16:09:25 ru Exp $
 .\"
 .Dd June 22, 1996
 .Dt PSIGNAL 9
diff --git a/share/man/man9/random.9 b/share/man/man9/random.9
index 426774e9083f6..f65097539d292 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 7b72f3e996daf..37ff8aff3b2e5 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 9818c8fd435b4..4f62e31ccecdc 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 e82853513c199..09a4043a0ae29 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 5ee423971de13..484cfff18ea57 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 01339e41f9116..2c3ce6586c292 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.3 2004/05/17 21:25:02 hmp Exp $
 .\"
 .Dd May 12, 2003
 .Dt RMAN 9
diff --git a/share/man/man9/rtalloc.9 b/share/man/man9/rtalloc.9
index 717384d3c33ff..0424793fc5a2a 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.15 2003/10/23 02:15:46 hmp Exp $
 .Dd October 8, 1996
 .Os
 .Dt RTALLOC 9
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index a86d5b4e56f8c..3cbfd4dc1ea05 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.21 2004/06/15 19:26:11 ru Exp $
 .\"
 .Dd October 8, 1996
 .Os
diff --git a/share/man/man9/runqueue.9 b/share/man/man9/runqueue.9
index 09b46d4a10b99..45ed423dd84a2 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 5fdb7aaa7bff4..4d5d5d2cb383d 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 c56fd0b6c6538..f0f53a5c27b46 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 bcf9975d33386..311047eda85ba 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 879a30b0e4ce1..d3d3ce2098d1e 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.2 2002/05/30 13:29:17 ru Exp $
 .\"
 .Dd March 20, 2002
 .Dt SELRECORD 9
diff --git a/share/man/man9/sema.9 b/share/man/man9/sema.9
index 020790085381e..8917c0235d596 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 946d65eb9467c..d182a9ecb2cc3 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.8 2004/07/08 10:47:13 ru Exp $
 .\"
 .Dd June 9, 2002
 .Dt SIGNAL 9
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index ff6ddf433f77b..d6ffa1b01f606 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.43 2004/02/17 13:31:36 maxim Exp $
 .\"
 .Dd December 17, 1998
 .Os
diff --git a/share/man/man9/sleepqueue.9 b/share/man/man9/sleepqueue.9
index 5ac0b6c34d8b9..a611dab99d51c 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.9 2004/06/21 14:11:45 mpp Exp $
 .\"
 .Dd March 10, 2004
 .Dt SLEEPQUEUE 9
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index fd9e3bc8ecd7b..ddedbfff3447e 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.19 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd July 21, 1996
 .Os
diff --git a/share/man/man9/store.9 b/share/man/man9/store.9
index 4438d84ca5aa7..c8d30835c69c6 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 5038c18437896..34397c00952bd 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -43,7 +43,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.110 2004/07/03 18:29:24 ru Exp $
  */
 
 /*
@@ -86,7 +86,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.110 2004/07/03 18:29:24 ru 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 bf7e981ae9829..8b776b4c8ee89 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.25.2.1 2004/08/24 20:43:10 simon Exp $
 .\"
 .Dd April 2, 2002
 .Dt SUSER 9
diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9
index 4ef98204498c0..87d9d9c676aee 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.13 2004/07/07 07:56:36 ru Exp $
 .\"
 .Dd October 30, 2000
 .Dt SWI 9
diff --git a/share/man/man9/sx.9 b/share/man/man9/sx.9
index 17ab2066e7519..a5369820ca46d 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.29 2004/07/11 16:08:25 darrenr Exp $
 .\"
 .Dd August 14, 2001
 .Dt SX 9
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index cb16d263ff192..ddff2dc71d940 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 44d34ae93edff..f8ba3211db44e 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 f15beca4fdf40..867148564efd2 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.12 2004/08/08 02:37:22 jmg Exp $
 .\"
 .Dd May 12, 2000
 .Dt TASKQUEUE 9
diff --git a/share/man/man9/thread_exit.9 b/share/man/man9/thread_exit.9
index 9dc8acb1b3cc3..14d21a4dfcda2 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 8153a8687f0d9..832aacb55d94d 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.12.2.1 2004/09/22 04:43:33 brooks Exp $
 .\"
 .Dd September 17, 2004
 .Dt TIME 9
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 94325ceaac962..c002a30bf1949 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.23 2004/06/16 08:33:57 ru Exp $
 .\"
 .Dd September 10, 1996
 .Dt TIMEOUT 9
diff --git a/share/man/man9/tvtohz.9 b/share/man/man9/tvtohz.9
index b8b58a5621398..c87a94c858f64 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.3 2001/10/01 16:09:25 ru Exp $
 .\"
 .Dd January 3, 2000
 .Dt TVTOHZ 9
diff --git a/share/man/man9/ucred.9 b/share/man/man9/ucred.9
index 6da8519fe8635..dccadbd9bc36e 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.8 2002/08/13 14:57:33 ru Exp $
 .\"
 .Dd March 3, 2002
 .Dt UCRED 9
diff --git a/share/man/man9/uidinfo.9 b/share/man/man9/uidinfo.9
index 0919e140c61dd..222e95939abfd 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.4 2002/08/13 15:01:26 ru Exp $
 .\"
 .Dd July 10, 2001
 .Dt UIDINFO 9
diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index 01267548360ba..65103b70afe3a 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.15 2004/04/15 07:24:10 markm Exp $
 .\"
 .Dd February 2, 1997
 .Os
diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9
index 61334ad20116d..5cb683bb6d52f 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 fd05071e84a39..4cc46e78f8416 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.8 2002/12/12 17:25:58 ru 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 3284ec6347082..70953efefbde4 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.4 2002/01/09 11:43:48 mpp Exp $
 .\"
 .Dd August 22, 2001
 .Os
diff --git a/share/man/man9/vcount.9 b/share/man/man9/vcount.9
index eaca44544469d..904a0a48e55d6 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.4 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd February 6, 2001
 .Os
diff --git a/share/man/man9/vflush.9 b/share/man/man9/vflush.9
index 1123ea3a6984c..2b61b203eb290 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.3 2004/07/12 09:06:51 alfred 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 4021e124c8918..557e3dbbb3f74 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 b6f12382fe130..bde877389570e 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 c563adcddca33..ddbbc89181b35 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 83a7279771157..fb559fd673880 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.11 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd July 8, 2001
 .Dt VFS_MOUNT 9
diff --git a/share/man/man9/vfs_mountedon.9 b/share/man/man9/vfs_mountedon.9
index 8ffdbbed314bb..b672744ad18af 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 ecad73e3af200..b7c8a8686f72a 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 3073afc84829c..846c8a924d97c 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.1 2004/07/09 22:33:43 alfred 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 455d6f6ba427f..112eb5eac45a5 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 7a6b911d43c3d..1ccb3702c0348 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 d31507705130b..885b6e5776671 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.6 2002/12/12 17:25:58 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 638052db98458..f44b797d2d7e6 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.3 2002/12/12 17:25:58 ru Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFSCONF 9
diff --git a/share/man/man9/vget.9 b/share/man/man9/vget.9
index c5c5e02275919..6e18863f7ef0e 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.10 2003/10/23 02:22:07 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vgone.9 b/share/man/man9/vgone.9
index 3731f930f51cb..57e75714eb71e 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.3 2002/12/12 17:25:58 ru Exp $
 .\"
 .Dd November 21, 2001
 .Dt VGONE 9
diff --git a/share/man/man9/vhold.9 b/share/man/man9/vhold.9
index b2218e75fb9d3..6c8248630a23c 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.2 2001/12/14 09:11:13 ru Exp $
 .\"
 .Dd November 21, 2001
 .Dt VHOLD 9
diff --git a/share/man/man9/vinvalbuf.9 b/share/man/man9/vinvalbuf.9
index c00f654ef1697..a1068be2ce914 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.7 2002/12/12 17:25:58 ru 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 dcc7e7abfa373..6ce956b0bb7d9 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 f8f3351d89a49..a2d5f6e85aa53 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.4.2.1 2004/10/10 19:53:16 alc 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 21037b52fa5aa..37f844fd7a4c4 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.3 2004/07/06 07:02:31 ru 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 85af33c63f89c..d9ac005d67a42 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.3 2004/07/06 07:02:31 ru 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 2fe3474f7b1ed..3345105bb364e 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.3 2004/07/06 07:02:31 ru 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 4319518623e77..afd3efe66e5b1 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.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_DELETE 9
diff --git a/share/man/man9/vm_map_find.9 b/share/man/man9/vm_map_find.9
index 769a43868d95b..3ed4e4be59506 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.3 2004/07/06 07:02:31 ru 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 b8514731aa853..6ec6b22bed332 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.3 2004/07/06 07:02:31 ru 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 14b6d38fffc89..ff65ec1b20b16 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.3 2004/07/06 07:02:31 ru 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 167f182c1d157..c76ae00287a1c 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.3 2004/07/06 07:02:31 ru 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 cae2609fd14b8..0644f7a92eb0c 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.4 2004/07/06 07:02:31 ru 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 c38d39ff2abff..640c2f7e60fff 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.3 2004/07/06 07:02:31 ru 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 65e3159b70507..4300e56fc4f20 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.3 2004/07/06 07:02:31 ru 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 bc4480cffd47a..6ac7029e2392f 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.3 2004/07/06 07:02:31 ru 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 e694983ba6aa0..a2966427b889d 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 06f8a341a1312..18d062c949786 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.3 2004/07/06 07:02:31 ru 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 ba8fb1679860d..29dd98cc2dfdb 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.4 2004/07/06 07:02:31 ru 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 1b800aa293f2a..92d4e13eab32a 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.3 2004/07/06 07:02:31 ru 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 f1c5adb1ebef0..f334665e1602f 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.3 2004/07/06 07:02:31 ru 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 0417e89689726..6d9c2e5428131 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.3 2004/07/06 07:02:31 ru 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 e0d0a0fba892f..359c3ad7a07b8 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.3 2004/07/06 07:02:31 ru 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 c364488fe62a9..eb2ca380e24c5 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.5 2004/06/16 08:33:57 ru 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 71e67b57bb8ef..4043a01e3edd3 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.2 2001/12/14 09:11:13 ru 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 0379e8c7a9c12..d0cbb42458eaa 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 3cf7304883c63..246dbe0181ee2 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 c94b7f705c549..5748959f955e3 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 99baa330816d3..ed9194a4a8502 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 637e69cd96423..4f19ba0c3c30f 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.2 2001/08/08 10:04:08 ru 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 a78e577adbd4c..acdc68a683498 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 4ceaef6efa513..ef4ad8ef0b15f 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.2 2001/12/14 09:11:13 ru 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 183fa4020d56a..48c44c2ad345d 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 53f1eba82933d..203f05c0953b3 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 6ed5af8bc0f90..2e6dff80e1e55 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.4 2004/05/05 10:01:06 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 ae0c6ad204695..10ccc901144a0 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.1 2001/07/18 06:09:13 alfred 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 34f0e73db0fac..1034f8e9944b8 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.2 2001/08/08 10:04:08 ru 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 bb8591fae3ab9..8b6e0365e904b 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 760ce505abc21..975f113aa085d 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.1 2001/07/18 06:09:13 alfred 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 0d1a9e3d794c0..1e806a89624e7 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.2 2001/12/14 09:11:13 ru 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 4ca59c2d1299d..ef1e191930127 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.1 2001/07/18 06:09:13 alfred 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 59bbce925b705..b8d5204cf3229 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.2 2001/12/16 07:46:15 arr 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 b79f46a8c6996..22e7e6f52b538 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.2 2001/11/30 07:18:23 logo 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 9433a05baaf6e..5a26f3cd26943 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.3 2003/09/10 19:24:35 ru 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 bf6d158af4c49..ccf2f034175db 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.3 2004/07/06 07:33:49 ru 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 ac19e18cb4cff..5fadbb723a115 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.5 2001/07/13 09:09:52 ru Exp $
 .\"
 .Dd July 9, 2001
 .Dt VN_ISDISK 9
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index e568c756b86cf..d6d9495b6f8dd 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.27 2003/10/23 02:22:07 hmp Exp $
 .\"
 .Dd May 20, 2003
 .Os
diff --git a/share/man/man9/vput.9 b/share/man/man9/vput.9
index 3d504300fbea4..6b91192852a40 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.10 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vref.9 b/share/man/man9/vref.9
index 6fffb8b1c1720..d75a5f3fc118f 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.12 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vrele.9 b/share/man/man9/vrele.9
index acc656675b7ec..861b574b25300 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.11 2003/05/31 14:07:25 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vslock.9 b/share/man/man9/vslock.9
index fdab0eb52e8ce..5a0bf7f0407d0 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 4c9a365bf70a9..1fa58ec8528df 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 e1e493111773b..2622db1437fed 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.5 2004/05/25 17:02:20 brueffer Exp $
 .\"
 .Dd June 23, 2002
 .Dt ZERO_COPY 9
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index d6e9d727883e5..16e0faa6fc330 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 6a9d6de5b33c2..8d5014fbb8ee2 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 df2671c442951..29e53843ca856 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 afb7cb95b0704..0df3f893bea58 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 87c1687a3e045..491e4cf397c1f 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 2303dddcad10f..8265752743111 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.21 2002/08/18 16:57:45 schweikh 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 5d218cebd154f..d5cc7329de707 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -471,4 +471,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.82.4.2 2004/11/04 19:11:55 scottl Exp $
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index 3e6b02907b26a..cc0841ed39c90 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 57d62a0c40501..d934ab9aadb26 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 a4144e678dfca..28844bb637b43 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 53b402192c493..2544723906b4c 100644
--- a/share/misc/mdoc.template
+++ b/share/misc/mdoc.template
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/misc/mdoc.template,v 1.4 2001/04/17 12:51:21 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 b293f31da9b27..bcd0abb3d8cdc 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 2026efc6087ba..da82ca7564952 100644
--- a/share/misc/pci_vendors
+++ b/share/misc/pci_vendors
@@ -1,4 +1,4 @@
-; $FreeBSD$
+; $FreeBSD: src/share/misc/pci_vendors,v 1.30.2.2 2004/10/05 20:11:30 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 4fc36e4e61211..1ba137fa57853 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.11 2002/02/24 13:27:57 joerg 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 bb0f40cad7185..d046cc39205f4 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 7cedf1f498c88..b526b30817407 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/Makefile,v 1.43 2004/02/05 00:06:45 des Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 521f8ac778800..c02ca881f3d60 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.27 2004/08/13 14:30:26 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.cpu.mk b/share/mk/bsd.cpu.mk
index c013668fa9545..09f00d96aae86 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.40 2004/08/11 21:51:27 obrien 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 1b51834679a64..34a7d10f1cca2 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.46 2004/03/12 21:36:12 trhodes 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 79a8e8c7259a4..97c23343444b6 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.58 2002/10/30 17:03:48 ru Exp $
 #
 # The include file <bsd.doc.mk> handles installing BSD troff documents.
 #
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index bf3a5df111180..218d94d88bae9 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.3 2002/07/29 09:40:12 ru 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 615d8bb83cfe0..8e51e8360d3fb 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.3 2002/07/03 12:28:03 ru 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 67b1ab36bfab2..b445eaaf2569b 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.68 2004/01/27 23:22:15 ru 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 ff6517ce1609a..dcab370ddecad 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.1 2002/04/17 13:49:28 ru 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 8cc15b09c5c41..bd6a97b586592 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 e93a3ab93bad8..d3acc944db33c 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.160 2004/05/07 09:58:36 des Exp $
 #
 
 .include <bsd.init.mk>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index b325960b585e8..2c089fa8d8514 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.85.2.1 2004/09/30 23:36:09 dougb 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 49f557a7e1fb9..009095bb0cff1 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 4a06c583ec1c1..e332d286f2066 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.53 2003/09/07 12:59:22 ru 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 34896ccaaf5bf..6bdbd324448ff 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.10 2002/07/02 12:37:07 ru 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 40735ae515484..06d400c7008ec 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.51 2004/04/13 12:36:00 ru 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 94f048431480a..e5847945eb3e7 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.41 2004/02/05 20:48:44 ru 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.port.mk b/share/mk/bsd.port.mk
index 2392b8fd69edf..f4b0f598a1d76 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 d64dc1276b44f..b0446d07f27c5 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 dff464ec32da6..7430d9c814d3f 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 51156023efff7..643b95e9e925f 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 792b49cc1cf79..819d14958c07f 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.136 2004/08/13 14:30:26 ru Exp $
 
 .include <bsd.init.mk>
 
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 793272d70d626..8553e4b69a4e4 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.45 2004/08/09 10:54:05 harti 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 3821801a7f6d2..0c7594531ccf7 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.35 2004/03/12 21:36:12 trhodes Exp $
 #
 # This file contains common settings used for building FreeBSD
 # sources.
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index e08f3e512b8b6..a44069fcb9464 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.80 2004/08/09 10:54:05 harti Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 .FreeBSD	?=	true
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index d463b16c160a3..9c01cb2188bb8 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mklocale/Makefile,v 1.60 2004/04/21 15:28:22 tjr Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/mklocale/README.locale_name b/share/mklocale/README.locale_name
index 08faffe5e3bed..cc9111ecb8fe6 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 edc1617088c09..c5134766e0b09 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 312a268ca9999..fef5bfa864a46 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 52cc548a40544..21b804ab72b06 100644
--- a/share/mklocale/be_BY.CP1131.src
+++ b/share/mklocale/be_BY.CP1131.src
@@ -1,7 +1,7 @@
 /*
  * Belarusian language. Standard (1933) grammar.
  * Prepared by Yury Tarasievich <spytar@yahoo.com>
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:42 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/bg_BG.CP1251.src b/share/mklocale/bg_BG.CP1251.src
index 4540c47c446d2..458717357da1f 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 aeaba38a30c28..28ebf7413d7f3 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 59916e8c8d5f4..194980e8c6733 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 7ccc8d6672abf..bb1d036c16393 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 1d9f924fdcc40..3e633d37aa08a 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 d4ec767e2b514..d270a6f51dc81 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 2c6ac798dd559..7a27caf3a510e 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 cda9626164ebd..2c20f0086ff1d 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 cb91eae3d8196..4b4faa4291f24 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 0545dd1195384..724eacd99aa0f 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 ac780d3ad483d..cfa2ec72d119b 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 9a28807bf9df7..7f7fd4fc0e8e9 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 2a4d8339de1e4..f3922554cb72f 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 2c22f70b93646..ca7296ff0fc90 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 ddd248f1cc1e7..1777ea8324e3a 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 081f75752b898..3b594a257011d 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 4b6f637051066..cecc054ab6380 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 d9eac8f791ea8..901c12d1e10b5 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 6abe203793fa9..850b543c8b4eb 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 9c2d8751b6557..6572f038aa856 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 8836089c8b742..147e6a8466d2c 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 f0c0e8e1fd94d..1d36985ce366d 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 99d8de54e6162..e5d1a607b67d7 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 aa2600e92ba9f..06a2a6e1f3861 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 2f170ac15f57e..f42ce0bc2d0e9 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 a3f6f23360df4..6bdbc75837485 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/Makefile,v 1.58.2.1 2004/09/05 04:21:07 tjr Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/monetdef/af_ZA.ISO8859-1.src b/share/monetdef/af_ZA.ISO8859-1.src
index 4a17750e0a0fb..88fdd3fa5dd82 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 dfabaec0e5534..5b4b0e985b4ad 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 a39e5f30d5149..b4e2a638608cf 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 ec4f95f63b1da..d1afd2e12c7a6 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 e49691c93c3f2..d64cb98f312e5 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 a103547f787d9..ec1e2c436f2ff 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 4d8efffa438db..c82f64a0db95a 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 be1d6882f18d3..f0d71ddf1d042 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 c6b2a13345b94..a4e8624a71a5c 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 2ca0f33b8f6b3..dea589faac488 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 cc10a621212e8..4bb71f7c719ac 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 a18b4cb4b0144..274e20b6b5bc0 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 63f77740326f8..d48b310710b88 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 9bb3e8e23cd4d..23e680b948fe0 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 c95cd1e9612fb..911abc0f2cc7e 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 8b1a9a503a5a5..3e38c0186ddb5 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 32c4298364106..4022454c973b1 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 75e31f60cc5db..2fd5c2f7c81c1 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 a0472d3079686..8e6dd9da46605 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 e187d8c0cee31..32ccffc86aa4d 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 1ddcc5ccaf68e..74943b6272050 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 1cb82617599f7..592410bedc138 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 faf42e5ae7809..16bf488be979b 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 c6b2a13345b94..bfd9092568206 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.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/et_EE.ISO8859-15.src b/share/monetdef/et_EE.ISO8859-15.src
index a03ad1a2afbf6..7dd29cc1bcff1 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 372e77b3facda..51928d5f5ad42 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 23c0fcdfded60..c0f0c752c8272 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 64ff444dae09f..e41d7c072bc10 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 8211d1449dc71..b56aeae2ee457 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 b0bf2dc4cb5a8..4a4f5b24d92e1 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 cc6de7446dfe4..29359dd06f12f 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 ea1cc94f0829f..48e44e2cac847 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 183f155d2c3e4..45795b9f4e578 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 5d8ed16090c9e..b3e8c614aa444 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 80396b1e982db..6f79911ff7ec8 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 66a80374e449e..d85f75e1075a3 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 c6b2a13345b94..c1aefbc2ddd92 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 fce3288abd003..8680cf3e87e32 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 462a88dc286c9..53f6c4d46cfe3 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 8b61e80973306..443ceccea47fb 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 ddf0353e82392..e96895f0b4223 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 5d69ac5fdc7e7..1f253f50aa0b4 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 0723dfa245969..17b492d31829d 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 790e0c9a41c3c..a65209388fc87 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 23c0fcdfded60..2b53c0d5ce8f2 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 b5a0992b36c98..0503e09345060 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 181953389aa16..079bb457a1758 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 b749031e99604..550ed7bb1134e 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 5138186d82dd1..7faf038a86568 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 0614e9fcba241..ef1dfa7b3608d 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 e729d54eb0040..dd737c57608a6 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 4f543c4a2ad31..4571d681fb0ea 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 bd3de23b499c1..0ac42939459c1 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 cae485aa7d8f4..21bbcb047926b 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 0f14f0e8ba0df..374a4d62d1bb7 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 e4064bc19693b..01835982604c4 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 cab01daeea750..e1f7362ae808b 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 dc2ac34f5564d..217c6b9e34b53 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 2448e452bc536..c7f36e7634a28 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 b706e29154e09..46b082059dbee 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 e5e9f4c967ae1..66fcebc66667b 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 6e8b013707e2f..3fcb35806f634 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 a835567ef9be6..23a673473cfe3 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 41d45477cd931..b83e6d1c18506 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.ISO8859-5.src b/share/monetdef/uk_UA.ISO8859-5.src
index b95e3bd3be7ff..b25fb3f71ed3e 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 5464d142d093e..6e11244cd64fc 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 842c02f176a1e..5c2aae59f3f46 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 e1c0ef28d3e02..3e37216b9ef9c 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 e1c0ef28d3e02..7cec677b7e0ad 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 136d66cddd02f..a97c6c70ac142 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 3f5fc2409c1e4..7720e17d3fa18 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 64921a9e56dca..a356d801f9c7d 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 1e86417df204d..077fa98baedf0 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 498864fb51bdc..437cec755c283 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/Makefile,v 1.56.2.1 2004/09/05 04:21:07 tjr Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/msgdef/af_ZA.ISO8859-1.src b/share/msgdef/af_ZA.ISO8859-1.src
index a87da07feee20..383ff8b151f14 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 6e68080193a92..058dd01a9511c 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 ed0a05eea079a..4a16b0e175fb4 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 a401228e58b2b..2da6d1b9d5648 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 a36e12673ee1c..2470ebaf4d684 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 8d23237784f7e..193c05e181891 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 e52d30d64cf3d..a8a64a691902e 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 72dca12b49a97..219141f05e5d2 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 e839a0a217bac..a69e430f1586b 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 a6fc836343976..7767ba0663a12 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 a87da07feee20..4d3ae18bc199f 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 a87da07feee20..620f81bdbdf6c 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 85d433e990cf3..8de0021570ba4 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 560675e005c0e..0f515973f2884 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 7a66f558ef570..6fd62d5a92c06 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 f80c8facd17be..7d3695787b575 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 bc2594ded3dfc..d2b351bd8a060 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 e839a0a217bac..3ca4c74524826 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 0d31afd0a2ecd..86ede7cb083e0 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/fi_FI.ISO8859-1.src b/share/msgdef/fi_FI.ISO8859-1.src
index ac0092a84b3fd..790b56aed208d 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 14f8e236ee4a5..2f6db327e7823 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 4af763873c0d0..3af8b42bd1c28 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 80d0218e78e66..ea0f663bdabdf 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 ef87399e0769f..ba4a90cfa2ce4 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 f9ec934117f47..65012913da8e5 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 a711ff76db9d9..547c250641f25 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 4f009c700567c..6d0e8602253fb 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 c11b38e51caf1..677f81f4fa60f 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 749637de33c3b..2893b34196c27 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 a87da07feee20..0d1222f699cef 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 e839a0a217bac..59b3b3a1b99e6 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 8a209e5b8526d..e3ccfb58b1cd7 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 476ef44b3d62f..2fc9a45a04595 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 2f06e015abae7..3d8630b679d19 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 583096f3ef5ef..808a71a0ccd8b 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 23cd9cbb88a79..f31009257d6b9 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 e839a0a217bac..4d33e216d739d 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 296f1584c1b05..a0743bc4fb1bf 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 a87da07feee20..0dad08b7ceb53 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 a87da07feee20..566201569dc59 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 a7acd2adf1f00..ce1e0b75a3f41 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 e839a0a217bac..e3734a69117a1 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 c14e034a7e287..723a8b720a855 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 5774d94f6f542..4069f34075f5c 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 df2b035bb4b6e..1dfc6a7818a72 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 360485e980e44..8fdede3b2dfd5 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 465cfa69f2599..90f566d0f6d37 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 21882ca80b382..8e5fcfe4a0603 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.1.2.1 2004/09/05 01:47:33 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 9686b4f232fc1..a80b02783a7cb 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 a711ff76db9d9..3274b36c001ca 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 24ec0c74090de..244265ecfc871 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 72dca12b49a97..8ed8d731cd9e7 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 a87da07feee20..075fc59b2d76f 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 47329944b0400..150f37efafce8 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.ISO8859-5.src b/share/msgdef/uk_UA.ISO8859-5.src
index cc508146e8278..aefec88dd86a4 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 5eec97264d5d1..66ab25b996bb4 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 cfc5a2e64bc06..71052e676c263 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 6e9cd83e04e36..3d15aa19344d0 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 6e9cd83e04e36..f7aad9e00acb1 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 975134e8173ef..a2420e5a364a2 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 6e9cd83e04e36..4152049045bc0 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 cc1bfce720273..74e5e05e517fd 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 975134e8173ef..0a8b96140f1eb 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 0c32e26eedac7..35d998ae5de62 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/Makefile,v 1.55.2.1 2004/09/05 04:21:07 tjr Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/numericdef/af_ZA.ISO8859-1.src b/share/numericdef/af_ZA.ISO8859-1.src
index 9c48fd3b15931..7a8679c529beb 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 cd49d3608dc5a..b45fc76dd8e2a 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 0b0b623dac02f..4c6ae214c387c 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 68677812c3555..88f849a44a450 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 0036ad362aaea..65f4d1eb04a60 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 68677812c3555..b8107c0c279e2 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 9c48fd3b15931..f5ca876de9359 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 0036ad362aaea..11c1749af22f4 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 20911c9719686..5cfa8e9b3de66 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.2.10.1 2004/10/15 19:46:44 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 cd49d3608dc5a..7220e4f32d03e 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 0036ad362aaea..ec30db51cb534 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 4ebc899962aab..06d6a2e2d0e21 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/fi_FI.ISO8859-1.src b/share/numericdef/fi_FI.ISO8859-1.src
index 9c48fd3b15931..fee1267e780a1 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 f182a559619c2..78d69a634ad9c 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 0036ad362aaea..3d75dfb273ce2 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 99d11f681e1cb..d12487b540249 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 27148ff2de298..fe4828dd721d2 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 68677812c3555..72b9722ecdb6d 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 70aeb8d163b03..86ee3bba3ace4 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 4ebc899962aab..69bf543ac2aff 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 8e5095d653a4c..8515f521a7e34 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 cd49d3608dc5a..4f8ae2b1c50b3 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 4ebc899962aab..d08a5504570f2 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 cd49d3608dc5a..2aa23b1f50f8b 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 4ebc899962aab..85ede21faa4c1 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 0036ad362aaea..ac8d35bf8d07f 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 9c48fd3b15931..a7efef4ec95f9 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 68677812c3555..534224670c1a9 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 9c48fd3b15931..b95cf397ee57e 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 27148ff2de298..258a738c6138c 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 4ebc899962aab..6e1e046e48d39 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 4ebc899962aab..96516273b7ffd 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 19776246f8ca6..66352426039ab 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 900949a3652d2..b1bcab8f40695 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 27148ff2de298..3d93ebbf0a81d 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 4ebc899962aab..f085a09b74f83 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 4ebc899962aab..af5f24e3e7736 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 27148ff2de298..96c81720ab58e 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 4ebc899962aab..db1a4981e3571 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 cd49d3608dc5a..5a1e34cf1cc25 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 0484e0dedf0ec..47885a519a7c9 100644
--- a/share/security/Makefile
+++ b/share/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/security/Makefile,v 1.2 2003/11/08 17:56:53 rwatson Exp $
 
 FILES=	lomac-policy.contexts
 NOOBJ=	noobj
diff --git a/share/security/lomac-policy.contexts b/share/security/lomac-policy.contexts
index e01bd2842c60a..fcc6424b0c2a0 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 9574e68840646..bc29eb2747a41 100644
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/sendmail/Makefile,v 1.8 2003/07/07 03:54:03 gshapiro Exp $
 #
 # Doing a make install builds /usr/share/sendmail/
 
diff --git a/share/skel/Makefile b/share/skel/Makefile
index 1626964e9cd44..08472d44ff188 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.9 2004/01/19 13:40:51 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 89993eccc9f4f..2505aa9833bca 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 894021a83794e..ac4f9f511eda2 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 3c4b025f2000e..5d94fdcd03a55 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 e319ef8e79828..4f34ffb5ed027 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 9ab6ac0c8e8c3..be99f5b707dfb 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 07da036b68735..fa83cc21151ab 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 30132d57c4bee..875e9bfb0b567 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 73491698e8e7b..c1ddfe5247aea 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 1bfc5b9b5e744..420bb62a5e21a 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 ca96c7a990197..5ebb150073cd7 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 c7aad2d9d8bcc..0b2f7bc4d7b07 100644
--- a/share/snmp/mibs/Makefile
+++ b/share/snmp/mibs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/snmp/mibs/Makefile,v 1.1 2004/04/24 19:54:55 phk Exp $
 
 FILES=	FREEBSD-MIB.txt
 NOOBJ=	noobj
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 9cbf100f13b97..452901010f130 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 b7a786cce3ccb..f02eed7401504 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 44db821fcb790..4c72df420d631 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/Makefile,v 1.35 2004/01/19 13:40:51 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 edc81c96cf991..b0f019ddcb773 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 2a7767fb1702f..2bb3aabca1031 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 338e465bec373..29f8dde8398b0 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 ae7075a66ec9e..0b1dbaae097e8 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 184728e966dc5..ccc6b401279ec 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 9cb2270221276..97954c43e1500 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 9251f5e5d19e8..f5147d983c668 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 78965b06aec84..67cf656f9ca8f 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 f979393c3135a..5183726327ace 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 ce9fead1108d4..db7cd683f9ea7 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 6ada66060788b..d444b9266e3ed 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 84b61b5ec7628..0a29a10eb49c3 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 45d93a7e6d8eb..c74a0d84c93b4 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 e596679f0e1a1..5d90c0322acfa 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 2a5b4bb8254cd..86cb38f83fffb 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 50abaca08f0bd..87b17d6194b7e 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 68b9c0d1ea2c2..86884b1e110bc 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 da3fe09f6100f..75efeb8dd7a09 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 4246950a8c09c..7596bffae75bc 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 f6e1b339d2507..a54c92671cf76 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 861a6cf9ecd11..77c75cd1464aa 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 8d9fdc6bb5071..c5cb55a40f31a 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 0cf883883b942..6a19c8379ce78 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 42cf6312facea..a563abfd55007 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 53b81a285623d..3520cba478f14 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 7f78bb70fa1e7..2e2c3a0b3d922 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 e216b5b957277..cff22b9ee5c85 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 f1df5408830a2..c7c3df7ab2dc0 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 3fdaa20b9afd6..6449e3a446460 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 e34a79bd2e77a..a942eb33fce70 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 e89426b224f36..25e8d6cb642bd 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 932b19eb1d53c..6f30d4c023f49 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 956b39948f200..d433c154dd880 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 560c46c8671ab..6e1aef87561da 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 a89d77073868e..9b83154ba4163 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 ca563fcf1e6b3..e5d5040d5a17c 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 8eff1b795a866..f6bb1acddc593 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 2c8adda91e0e1..3e60c474ff132 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 617f16619c7c3..17f6d1f645468 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 c0e65fa41ce47..97d432b0e04e2 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 1cb4d678b25f1..69d2029117e3a 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 1a137c6586387..a50aa24ed60ff 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 6d088c79b1611..4a3a8db669e01 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 1c08eabdd91b6..4f5c8e2d68c15 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 698971962661e..1e69de3291938 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 36ec698f1d79b..eb41cfc0e04f7 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 919d0422c9f5e..31bebf2a52a5a 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 5b7b880fcee1f..2900f04fba732 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 a27eb8ac82199..0718e8d24f089 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 c5ed88754e929..58f68a32004cd 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 c6862069dfefe..9c1de17798e94 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 7264466c2bbc8..261ec25024b77 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 5a189e4d4e6a8..4ed7b0d082a69 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.68 2004/03/15 20:34:18 fjoe 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 83a093c61df81..4b66deebd32cb 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 8d16a81805c63..89c4488ce7c10 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 5c76466e1a5a2..0d82629c2e2c4 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 20a22ad10c119..2107ba93ed065 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 36ab3edd38108..0342a1c2319dc 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 01d04f69fcd84..debf844691ca9 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 cec66de355b21..71765c1e92f97 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 1c526e6265de0..71f05386a6cbb 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 596507de55cd5..28112fe047775 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 bd17ec0d873ea..edc3e52d7ef10 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 68d2bf84c39a9..baf2b6ee8e70a 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 fefebe0c4e4d2..21229c2ffb08f 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 50626c0091ed5..0acd71887f48c 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 026af06ca06d8..2c982d6394414 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 7286ba0d4a65f..ae729dd1dde67 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 79169a9c25449..24afffdb5031a 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 dccf68e87df27..371e22b31354e 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 b1003ff07863a..d3f3bc9955986 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 94394f4023dd3..ea6c67a05ff1f 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 3e3c33b2ebb5c..07a38136e4cab 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 11b42eef17dab..6e411bee1515e 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 07a448787d198..deceed0b90bbf 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 c473f8d12f342..635366cf6bf6c 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 99483be569326..a74b8ccd6473e 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 1eb4626ccafe9..37fb3cd2a8c6c 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 e758eb242cb0a..63e3ccb39dfb8 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 64b7dc92c453e..5329664c00b0f 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 6a9223bc6321e..4a518dc2288c1 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 ca987c8001282..4464b49475826 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 2abc97dc93ce3..b783f03c247e2 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 a3a4f41c408cf..a23e91a835f36 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 1353027c1d300..4168248d698fc 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 71862585aa485..54334e8c745b0 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 3166a6719a134..027498c602fce 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 d7e8cc9217956..66e27e55c3899 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 3b93007317b8a..74446fcd9db66 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 4d4b1508132d8..2ac204d5f1b7e 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 9097696d7422d..ca89e92787ecf 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 1c047b83b893e..00e1dc602dc9a 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 c12fbf5f6e5f1..d00077065f3d8 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 cca3a9ec0238f..abbc94d5d1170 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 43719f51737c7..6e53334dd723c 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 d9a5d44a36b0d..00b0f8d78818f 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 1f1727a3dde9e..7f371a5c860ff 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 6bc6ca0cd54a9..5f3c13d849d93 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 aa4f16c987f76..cb94e704d9630 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 0663b69b825b0..845290e48bd2a 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 dbc6c36a4ad7a..d8d6dbf08152c 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 83e8d46765125..d7a21e03d5a9c 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 bf112e5d954e9..b5ca2637c68d9 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 ee7adaa7a1574..95371ae33e1b3 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 8d77f0b6b5537..96702a78a173e 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 fda53334af8f8..f92e29b3285b1 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 84fbb68be8b1d..49427400eefa4 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 fec878f106fde..6f714fa3f7e2e 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 3f15711c8290e..9db859228670e 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 0d67778fc0c1a..3ec2eb9c61017 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 e5c862241d55e..5bdb6ad3daa75 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 1353027c1d300..f2139b2831cdc 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 14466e80371f1..4e9dec27e06d9 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 ae1fd42cd1046..a75be58421a4a 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 9c08898bb1d29..c69080325c3a3 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 e3fc3cb9b4b2b..53746418ccbb0 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 11b42eef17dab..30569796be842 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 07a448787d198..e424cc908998c 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 8ca6d5e5cef4e..feb7813de9f6e 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 212308d393528..21a7ce97007cd 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 1241c3bd6edee..d9914ed77ffe0 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 f50be73651ed0..293c6a03ba9ce 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 9ca34bd7318b4..37c7d6a1ca529 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 091a6281e386f..f484c744e294b 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 665171368a0c8..16b2e642149c7 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 a96d89fe3cd7e..4a9948f472531 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 112a45bf6f273..a5220a8e69868 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 82cd95f32d98a..20b6506434d98 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 a60410e5db9f3..ffee31305a30d 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 5cbbb4f089c03..a5161d7a33910 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 986ec754c60a1..f8bae4954569a 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 adaf9d068d6ad..9f99c447d1f93 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 bc475b25d4d89..c760d431701a4 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 bc44397d32404..17ebbe23b0325 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 94abba89d76c8..e507a5b672888 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 18f05fe0cbfbd..0f48e33098dd2 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 553a617338eb0..6a3d759a07889 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 a7faa514fc967..e57df7579491a 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 e213392e6ae0d..c7ac998a8626f 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 58b66f3e2ee58..c128b1564d602 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 b883eaba21695..7a2e682aa421f 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 1c5dc88382a17..dd5bff78fd9ca 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 f6bc35d74701d..351b0386e9e56 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 c18e62f046675..9e337a975be96 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 e096bdcd771ec..e06d715a68fea 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 12c467a360f2c..1d15e784906ae 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 15f2847fa9b3d..6f39eaee7cc6a 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 7fd86ad51bb7c..6ea207a833e36 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 c981b23bf57bc..9a76fc987d19d 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 e1155aa137c42..12473d2f28978 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 846ef461afdac..ec4c3ff2a2672 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 2d9b9ff75687a..2352eb00aea9e 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.17 2002/04/04 07:30:46 ru 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/map3270 b/share/termcap/map3270
index 306ac437844f6..5ea24258b13e0 100644
--- a/share/termcap/map3270
+++ b/share/termcap/map3270
@@ -31,7 +31,7 @@
 #
 #	@(#)map3270	8.2 (Berkeley) 4/1/94
 #
-#	$FreeBSD$
+#	$FreeBSD: src/share/termcap/map3270,v 1.2 2002/12/30 21:18:05 schweikh Exp $
 
 # This file contains mappings between characters entered from the keyboard,
 # and 3270 keys, for use by programs (like tn3270) doing 3270 emulation
diff --git a/share/termcap/reorder b/share/termcap/reorder
index 8fc94a755db3a..61e3cd5385e01 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 f981899be1a2e..8397f64aeb9e8 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -51,7 +51,7 @@
 .\" *                                                                          *
 .\" ***************************************************************************/
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/termcap/termcap.5,v 1.24 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd April 16, 1994
 .Dt TERMCAP 5
diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index 22e4c683b36ae..31aa7171af4e0 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 36f6f763084bf..009ef4aa7bb3e 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/Makefile,v 1.44 2004/04/21 15:28:23 tjr Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/timedef/am_ET.UTF-8.src b/share/timedef/am_ET.UTF-8.src
index ed0e148954582..82a553e1ba763 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 e8907d34f0371..8834d4c08e255 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 1738592fc6397..cf164391eb82b 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 e8a4ad2a87a59..b44bf4074ab6b 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 33ec00a90cfe0..cb1ae7ca0bae2 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 eb6299a70cac5..6f379e7a1e178 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 ded92409b277c..b3769a81c4bd6 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 26e319dd3e01c..3405d099897dc 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 2a3f85b4aaaeb..7bc526ad00155 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 62a9c98e46ab2..ebba9a1053bae 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 a34501a507ded..074507dffdbfa 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 5f84abf6894ff..1dd14159487fa 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 5776822b1c54c..2b6f424ef0aa2 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 a07193dd61989..aae6c50f80e2c 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 4b78c046771f2..e458fa0bf17e1 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 64085022b4203..55df66c3c0032 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 535d8dd088ddb..ec87ce9eef2d1 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 c608672e5f7b3..6ac2ebdacd6d7 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 3125320bd5ac1..3e3978011f328 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 8c10578cdcbae..41729858ccb3b 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 7fee051b5fcd1..f7ec05c382cf6 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 78d2cb848838e..dfd4bd7ecd5ba 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 fb7d7f750209d..3ed80d85608f8 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 82595e877c93a..020eb4d3252bf 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 d0a97e6733842..2cc66b22b7790 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/fi_FI.ISO8859-1.src b/share/timedef/fi_FI.ISO8859-1.src
index fffed1848a960..38c99d2ed9d67 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 bd16a0971739f..bc9853d5c027e 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 d905c99429b46..c4dbc547e3d12 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 4a98ab4e34158..7f56d910455c2 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 5194c8bf40d5e..2c15738fb0a9b 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 c1f3904b025d4..bf49c806d0284 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 2b8d2cca1cf31..0a56a17a703e3 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 1d952a7437642..b573f1df7b874 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 724e24ad1df7b..3e0896696056d 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 62d891c240c79..9a6ebf4265448 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 35c1ec677ecfc..9c5355b120cac 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 b8ec9461dccb2..70f36da553429 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 9da9efcd66b60..d4ae648c8b6fa 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 be04488fddbc8..0826bae830556 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 27e5aae4fe8a5..4b8e29784e888 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 3ffe0308347e3..3da21bf681134 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 e5b44d7386aef..d0906cb1427ad 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 b3431da4214b8..ad2854655bc69 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 c73c47d572439..43eea27d87dfd 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 5bed53e245d3f..5213054c0d946 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 5c1f59febae16..2f46126a18957 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 e7bf058f268b6..c8af3af663283 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 59c24244b89c4..2b00481fda4bf 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 30038445e1180..ceb765fcac8e8 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 2d45e3ebddacc..9caa2f377431e 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 157597c016c41..d7a5d012a9257 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 cc332de766562..7458d1309b0f9 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 f94f212718277..1f860ff5b29b0 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 04c7a950b631a..fad46330a6647 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 f352023792bce..69d46c640c7ca 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 2631e6d11b33f..c38c867ebae27 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.7 2001/03/21 13:52:11 ache Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/pl_PL.UTF-8.src b/share/timedef/pl_PL.UTF-8.src
index 76d25d457f9a2..b004803d7fe95 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.1 2004/03/27 08:14:15 tjr Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/pt_BR.ISO8859-1.src b/share/timedef/pt_BR.ISO8859-1.src
index fde08a1a68a0e..a8f530704508b 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 66c49a39204cf..8906f9ca6a26b 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 452834d1349ff..45ffd2b9da75e 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 b24d9cb5eca5a..e32db54ce7aab 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 515066c46a3fb..a09836be1439e 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 5f7db7a701367..e701925febda0 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 f121786c9e03c..3a8284a604dbc 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 db15000322ee3..19f235f1258d0 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 750bd189f4581..eebcd59babf8a 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 f5a250f62186a..bcd992ca28be5 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 4660c22272154..02a52db0a261a 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 a10c861f4dd61..d1fa670d45464 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 652b3b2b9907e..045a94088c29b 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 ea9306ea7349d..3e07f81dc75b6 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.7.10.1 2004/08/29 05:55:58 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 d0fab378acbf2..34ef5c139a1a2 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.1.2.1 2004/08/29 05:58:11 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 f3840503c7e27..9458dc75173a2 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 c7b962aa698ac..7e5929c10406c 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 845b37291751d..2668bb02819e4 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 416b110edfc07..4ecbdf99f197d 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 dac8e3b1a646a..dc20f4721b916 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 7a32eb80ef09a..441d752e7240c 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 0a1eff9848697..8d89af9f1cc3d 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.ISO8859-5.src b/share/timedef/uk_UA.ISO8859-5.src
index f4be516312e01..e5b4c977a0295 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 647a5f363ed93..30c4660988c77 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 1962c133fdabe..d7a1f505507e9 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 ff7bba4f083c9..edfb9da2b4e55 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 ff7bba4f083c9..4b8b0b54f6efd 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 b1527b2970e1b..691cd86651a23 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 ff7bba4f083c9..d46496c4bd2a6 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 d8c28a51f58f0..785c3495f73d3 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 27b74ddc2b1de..4780850904053 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 bd7ea0b164eba..0919ba4a99a39 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/zoneinfo/Makefile,v 1.19 2002/07/29 09:40:14 ru Exp $
 
 CLEANFILES+=	yearistype
 
diff --git a/sys/Makefile b/sys/Makefile
index 5e599b46562d7..684f09593f309 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/Makefile,v 1.30.2.1 2004/08/22 14:19:53 des Exp $
 
 # The boot loader
 .if !defined(NO_BOOT)
diff --git a/sys/alpha/Makefile b/sys/alpha/Makefile
index da04916256da1..b5bffdf219393 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 b2577b08544c4..14eff2027de19 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 03b866f283818..bb7d050484cc3 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 d467ef79ac630..667842bd7879c 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.60 2004/07/28 21:54:56 phk 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 0dc361cf422f2..570b41c4561fa 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.45.2.1 2004/09/09 23:05:00 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/alpha/alpha/busspace.c b/sys/alpha/alpha/busspace.c
index bd9e52b617321..31b85dc1905eb 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 6817ab70addc1..6c1ed59035901 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.36 2004/04/05 21:00:49 imp Exp $");
 
 #include "opt_clock.h"
 
diff --git a/sys/alpha/alpha/clock_if.m b/sys/alpha/alpha/clock_if.m
index 9665135b22def..571d9fe1e8be8 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.5 2000/04/08 14:16:54 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c
index 0669b30d5f962..554d5d23b171c 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.16 2003/08/17 06:42:07 marcel Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/alpha/critical.c b/sys/alpha/alpha/critical.c
index 52aac72f5c6a7..ee71a97bb7a67 100644
--- a/sys/alpha/alpha/critical.c
+++ b/sys/alpha/alpha/critical.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.6 2003/08/12 23:24:03 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/db_disasm.c b/sys/alpha/alpha/db_disasm.c
index 8d98121a8d2fc..8372a2bc0d78a 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.10 2004/07/10 23:47:18 marcel 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 d66ebe5c9a297..e0a38c6c78bd0 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.6 2004/01/04 23:30:47 obrien Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c
index 7a7553f2ec5fa..2c32786c87587 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.29 2004/07/10 23:47:18 marcel 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 615bd2edff28c..04739653da0e9 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.20 2004/07/21 05:07:08 marcel 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 16ba0e51905c8..4f80e325ea650 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.18 2004/07/10 22:29:40 marcel 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 ba9e4340399e4..f0a89cbb992af 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.19 2004/07/10 22:29:40 marcel 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 e202b2f51be98..8a7f334879f8e 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.18 2004/07/10 22:29:40 marcel 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 b98fbd3547408..ddbaa6a4b78c8 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.6 2003/08/17 06:42:07 marcel Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/alpha/dec_3000_500.c b/sys/alpha/alpha/dec_3000_500.c
index 05902c69db61c..099a0444d480a 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.6 2003/08/17 06:42:07 marcel Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 476ec0f4af024..012438a6b2214 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.22 2004/07/10 22:29:40 marcel 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 f3ac0e8dc1ee3..d56b7c30c3d72 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.20 2004/07/10 22:29:40 marcel 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 36d6afc0fcbe2..bb85bd5ad7729 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.17 2004/07/10 22:29:40 marcel 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 38ec292ba735b..1410d2e2737e0 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.19 2004/07/10 22:29:40 marcel 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 b4f7f3ecadfa4..2b6313eb929c6 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.14 2004/07/10 22:29:40 marcel 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 aa4fc35cdfd38..48b2f31c342a0 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.14 2003/08/17 06:42:07 marcel 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 73af900826253..cd52e5f8244ea 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.17 2004/07/10 22:29:40 marcel 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 275094613acf4..8182fb46a5831 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 5afaed1713b2a..92e7ce7906ae5 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.3 2000/05/01 20:17:45 peter 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 42523d75ddb23..c763504766596 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 6937e843386b1..cf540c39cbee8 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 3359b8454351e..82e1a6205c76f 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.17 2003/02/17 09:55:08 julian Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c
index 243c17273466d..bfba3c2e76ee3 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.14 2004/05/06 09:35:57 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 cbc38a8a9cafd..914948049973d 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.1 2004/07/10 17:47:20 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c
index f16b47f2e8f0b..dcce55f18bdcf 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.44 2004/04/05 21:00:49 imp 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 003068bca6b4c..6816553f13d2e 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 ae5b8701a944e..b16606e182dc4 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 5ac80093a078e..41c5ca1a1fc9f 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.8 2003/08/22 07:20:25 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 a9e0834cd3bf8..22f855551f3ec 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.82 2004/07/20 06:32:32 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/locore.s b/sys/alpha/alpha/locore.s
index e5a7f654dc2e0..4efae0e61ea14 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.22 2002/10/25 19:10:55 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 693d139468d0f..20058298a7e50 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.222.2.1 2004/09/09 10:03:17 julian Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index fdc59caa6fd2a..5b644eda1b582 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 d6d0dd6abc320..46981544f0b1d 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.52 2004/01/07 23:00:20 jhb Exp $");
 
 #include "opt_kstack_pages.h"
 
diff --git a/sys/alpha/alpha/pal.s b/sys/alpha/alpha/pal.s
index f3714418d54a3..2145901d98475 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.8 2002/04/15 23:28:10 obrien Exp $");
 
 	.text
 	.loc	1 __LINE__
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index cdb1e8e22b9e8..c558db4011009 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.166 2004/08/15 20:54:25 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c
index fe0a6957b8815..62ee6b4c835e0 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.28 2003/08/17 06:42:07 marcel 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 c61e4f2212fe3..a28091a957fee 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.5 2002/04/15 21:44:19 obrien Exp $");
 #endif
 
 	.globl	prom_dispatch_v
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index 30db04d0a3078..05439aea6f2b2 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.40 2004/07/15 20:47:36 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/alpha/sgmap.c b/sys/alpha/alpha/sgmap.c
index baa606486b6da..11c6a5e24604b 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 a340d7514ec62..6ac327621521b 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.17 2004/06/06 21:26:47 phk Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/swtch.s b/sys/alpha/alpha/swtch.s
index 8523a24579739..bae92b2a1b7a5 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 e6b9f30fa995e..006525dc857a5 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.27 2004/04/05 21:00:49 imp Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/alpha/alpha/timerreg.h b/sys/alpha/alpha/timerreg.h
index 21eba904db61a..4f6992aada7ae 100644
--- a/sys/alpha/alpha/timerreg.h
+++ b/sys/alpha/alpha/timerreg.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/alpha/alpha/timerreg.h,v 1.3 2004/04/07 20:45:55 imp Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index 634a0cd9e5b58..d91eaa1aa056a 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.118.2.2 2004/09/03 06:40:24 julian 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 7116364f3db74..3072080f85240 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.4 2004/06/03 10:22:45 tjr 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 1847022ea29fd..6f9945bd43178 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 e77e0fed633ea..72a80a0f44da9 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.104 2004/05/26 12:09:36 tmm 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 232298edb15fe..0000000000000
--- a/sys/alpha/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index bd28ab2b74904..c5743b1183c07 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.174.2.5 2004/09/22 19:23:36 andre Exp $
 
 machine		alpha
 cpu		EV4
diff --git a/sys/alpha/conf/GENERIC.hints b/sys/alpha/conf/GENERIC.hints
index 0c268d3cae4bc..fa444c7d6652b 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 2c006e9c2c80d..55cdda7fb56b8 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 cdaabe03353b6..8e54f92295dc9 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.154.2.1 2004/09/13 21:15:05 wilko Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/alpha/conf/gethints.awk b/sys/alpha/conf/gethints.awk
index a2de29e278215..25fc6b7bbd493 100644
--- a/sys/alpha/conf/gethints.awk
+++ b/sys/alpha/conf/gethints.awk
@@ -6,7 +6,7 @@
 # 'hints' directive.  See how GENERIC and GENERIC.hints fit together for
 # a static example.  You should use loader(8) if at all possible.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/gethints.awk,v 1.2 2002/07/26 03:52:29 peter Exp $
 
 # skip commented lines, empty lines and not "device" lines
 /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; }
diff --git a/sys/alpha/include/_inttypes.h b/sys/alpha/include/_inttypes.h
index e6b2536ff379b..6a19622b66b67 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 bd0886b9c85cb..4bf00aa2bd028 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 2004/04/05 21:00:50 imp Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/alpha/include/_stdint.h b/sys/alpha/include/_stdint.h
index 1aed3e3b4efc1..9ede4e1010804 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 885b2415935c6..07ebf316e7129 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.5 2004/03/20 20:41:39 marcel Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/alpha/include/alpha_cpu.h b/sys/alpha/include/alpha_cpu.h
index 32b00ffaf10ac..dfae70cd46faa 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.10 2003/07/24 07:41:08 marcel 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 20253de247c13..38c4639125386 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.15 2003/01/18 23:43:12 obrien Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/alpha/include/atomic.h b/sys/alpha/include/atomic.h
index 599700b5fc2c8..9473eafa824dd 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.18.6.1 2004/09/13 21:52:04 wilko Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/alpha/include/bootinfo.h b/sys/alpha/include/bootinfo.h
index 07484b26151d3..8f1ef251f7a2e 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.6 2002/03/20 18:58:45 obrien 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 4fe12862b6847..45bb95df0953b 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.25 2003/11/07 23:29:42 scottl Exp $ */
 
 #ifndef _ALPHA_BUS_H_
 #define _ALPHA_BUS_H_
diff --git a/sys/alpha/include/bus_memio.h b/sys/alpha/include/bus_memio.h
index f111ca9a7ba54..4a125617a477e 100644
--- a/sys/alpha/include/bus_memio.h
+++ b/sys/alpha/include/bus_memio.h
@@ -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_memio.h,v 1.2 1999/08/28 00:38:40 peter Exp $
  */
 
 #ifndef _ALPHA_BUS_MEMIO_H_
diff --git a/sys/alpha/include/bus_pio.h b/sys/alpha/include/bus_pio.h
index 1e437c86a66e9..cd98822ddd398 100644
--- a/sys/alpha/include/bus_pio.h
+++ b/sys/alpha/include/bus_pio.h
@@ -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_pio.h,v 1.2 1999/08/28 00:38:41 peter Exp $
  */
 
 #ifndef _ALPHA_BUS_PIO_H_
diff --git a/sys/alpha/include/bwx.h b/sys/alpha/include/bwx.h
index bb2866b389f6c..5ffafba8a9742 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 048fbed490001..1e69faa53597d 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 b3f2e45b54c57..767c3bf6d0751 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.7 2002/03/20 18:58:45 obrien Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/alpha/include/clockvar.h b/sys/alpha/include/clockvar.h
index f13d1dff3977c..18b2aa0e643fd 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.2 2000/05/01 20:17:47 peter 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 64dc773b2bb4b..68d524eefa53b 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.40 2004/08/03 18:44:26 mux 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 6ca8daf6832c2..547899e6da040 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.12 2002/03/20 18:58:45 obrien 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 05bdbd4a345a6..2fff33512269a 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.15 2002/04/01 23:51:22 dillon Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/alpha/include/critical.h b/sys/alpha/include/critical.h
index 22ff08cecb22c..005341363767f 100644
--- a/sys/alpha/include/critical.h
+++ b/sys/alpha/include/critical.h
@@ -33,7 +33,7 @@
  *	related support functions residing
  *	in <arch>/<arch>/critical.c	- prototyped
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/critical.h,v 1.5 2004/07/27 16:41:00 rwatson Exp $
  */
 
 #ifndef _MACHINE_CRITICAL_H_
diff --git a/sys/alpha/include/db_machdep.h b/sys/alpha/include/db_machdep.h
index 3f130ab1b94bd..74a1b9abdd349 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.9 2004/07/10 23:47:18 marcel 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 a0fb7068aee66..68c1163b45f64 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 1b11ffb5798b0..d86e097157c3e 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.15 2004/04/05 21:00:50 imp Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/alpha/include/exec.h b/sys/alpha/include/exec.h
index 4a964e790779c..40673694868a5 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.2 2000/05/01 20:17:48 peter Exp $
  */
 
 #define __LDPGSZ	8192
diff --git a/sys/alpha/include/float.h b/sys/alpha/include/float.h
index b2bfa110c936b..15d520e4a98f5 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.6 2004/04/25 02:36:28 das 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 e2faa5efd1a4b..c1ae24c24ab67 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.3 2000/05/01 20:17:49 peter Exp $
  */
 
 #include <machine/ieeefp.h>
diff --git a/sys/alpha/include/fpu.h b/sys/alpha/include/fpu.h
index ad539e90451c8..774f0a8a1a9dd 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 7b25696d841df..e196fc3b5e367 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.5 2001/02/02 10:20:30 dfr 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 5ca5d69f58902..aa82d43ebb926 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.1 2004/07/10 17:47:20 marcel Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/alpha/include/ieee.h b/sys/alpha/include/ieee.h
index 53d5cff6ea0bf..ab8c2b7b52502 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.3 2004/04/05 21:00: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 d6735075bc9f0..419a5b910b990 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.5 2000/05/10 19:41:40 jhb 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 a899ef0d84880..9b0f0736c1f2b 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.6 2004/04/05 21:00:50 imp Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/alpha/include/inst.h b/sys/alpha/include/inst.h
index b4088bc009c8e..a6b8fc91333e9 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 90a0bbf9f39dd..d94f9a4435f5c 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 4f7dcf4633330..6900bea58515a 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.5 2001/06/01 13:22:59 tmm 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 7ef237b00e2f4..e6bcfc97add2f 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.3 2003/12/08 07:22:41 obrien Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_BT848_H_
diff --git a/sys/alpha/include/ioctl_meteor.h b/sys/alpha/include/ioctl_meteor.h
index 69d033e6573eb..c875b57925453 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.4 2003/12/08 07:22:41 obrien Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_METEOR_H_
diff --git a/sys/alpha/include/kdb.h b/sys/alpha/include/kdb.h
index 849b140b4bff3..a01cc82986859 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.1 2004/07/10 18:40:11 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/alpha/include/limits.h b/sys/alpha/include/limits.h
index 59071c82351ae..f13a8b3ed3e46 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.13 2004/04/05 21:00:50 imp Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/alpha/include/md_var.h b/sys/alpha/include/md_var.h
index d57664786e415..292e12d166b15 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 32cc1fc1f4222..f37de09f6f9a8 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 7300c08b15f7e..5af41e1e45ed2 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 b3393ce70c5a2..36d1470ebb477 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.2 1999/08/28 00:38:48 peter 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 1a9c9af545a50..49b7558abd8f0 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.35.2.1 2004/09/10 00:04:16 scottl 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 ff5edd6de4db2..74cae1bd9d918 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 fad568c0cb815..05604ac102d80 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/msdos.h b/sys/alpha/include/pc/msdos.h
index d1b777fc613e3..8b8b449b49107 100644
--- a/sys/alpha/include/pc/msdos.h
+++ b/sys/alpha/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/msdos.h,v 1.6 1999/08/28 00:38:56 peter Exp $
  *	from: i386/include/pc msdos.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/vesa.h b/sys/alpha/include/pc/vesa.h
index c2c2b168b932b..c65ef3b33492b 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 4375ef2f66db7..a0aced3194188 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.10 2004/07/10 19:55:58 marcel 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 807f259f56148..751b3ab85a27a 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.14 2001/12/11 23:33:39 jhb Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 66aa9b4a37143..e04939d4f21af 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.33 2004/07/19 18:12:04 alc Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/alpha/include/proc.h b/sys/alpha/include/proc.h
index 754ccb02202d7..d5a26340d61a5 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.16 2003/04/17 21:57:16 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 37e85cfe19986..9d901c8161f80 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.6 2004/05/19 15:41:25 bde 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 05cb4fb7032a3..f3ffd4ea8dcb9 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.9 2003/02/20 20:54:43 phk Exp $
  */
 
 #ifndef	ASSEMBLER
diff --git a/sys/alpha/include/pte.h b/sys/alpha/include/pte.h
index 6899dde5116d4..1838eab8bc46a 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.4 1999/11/22 15:14:55 peter 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 7f74278357f0d..8d8db9adc759c 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.12 2004/07/13 16:11:04 kensmith Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h
index 6e1b1d3c26e69..4a7a5f55eb0e3 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.12 2002/08/29 06:17:46 jake 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 a8ce0b106ab07..c2a4e7c29405f 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.2 2000/05/01 20:17:49 peter Exp $
  */
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h
index 28fcc98ea1beb..35d099fe392ef 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.4 1999/10/14 21:38:28 dfr Exp $ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/alpha/include/rpb.h b/sys/alpha/include/rpb.h
index 3ea53a13613f3..789ac9a0d2bf4 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.9 2001/03/30 22:04:08 gallatin Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/include/runq.h b/sys/alpha/include/runq.h
index 9f844b69fe5f9..d20dbf61e4cf7 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.2 2002/06/20 06:21:19 peter Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/alpha/include/setjmp.h b/sys/alpha/include/setjmp.h
index bf1bec6b564b9..d8d5fbb9a23c9 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 d000e30328045..84367d67d7795 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 08ccbc7b7a47b..283112a6e0ac7 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 01196e569e83e..690cf422428d3 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 37a969efb5e93..3191be62cbe48 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.11 2002/11/16 06:35:51 deischen 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 05af7f47e1b43..ca763497c63f7 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.6 2001/08/13 22:41:15 jhb Exp $
  *
  */
 
diff --git a/sys/alpha/include/stdarg.h b/sys/alpha/include/stdarg.h
index bd67f1f2cf762..b8c23da6fbf69 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.6 2002/10/06 22:01:06 mike Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/alpha/include/swiz.h b/sys/alpha/include/swiz.h
index 465a81a233713..ac5d2d065b361 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 b953d2fd98076..6fa7685eb60c6 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/ucontext.h b/sys/alpha/include/ucontext.h
index d60cc6c3523b1..25a8fa35e497c 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 8565a3c63f24e..b89936b5f57ec 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.6 2003/09/01 03:01:45 kan Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/alpha/include/vmparam.h b/sys/alpha/include/vmparam.h
index ab2562aad8993..c67b4b16faeb0 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.9 2004/04/05 21:00: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 ac08c7b7e6469..1cee76dd5fad1 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 0c01fc57e9931..de793733cf7b2 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.11 2004/04/05 21:00:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/isa/isavar.h b/sys/alpha/isa/isavar.h
index adadbf7f1eb6b..fb8b7a5f2341c 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 edfb517370318..ed65edd45fcb0 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.10 2003/08/22 07:20:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/linux/Makefile b/sys/alpha/linux/Makefile
index bd6b32a7d4a84..e2a216262084d 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 07753649cfa37..cbf6b6a4599a0 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 d27b52a48c18c..0a53b4517cc04 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 d06831dca0b54..de987522b2fbd 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 e91c4fd922b49..259bfb5b61310 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 1ed699d15933b..2a8b636140388 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 6cd0834e44d5f..0ffcd27603936 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.33.2.1 2004/09/09 09:45:25 julian 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 324cb9a2abb78..b51882a165ef6 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.18.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h
index 10f9384ccd05e..37bd1a389e867 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.16.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c
index ab4be9e42857e..99b5ef431c371 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.16.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index e3b91eeb2e563..e9f69b6f6d41f 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.93 2004/07/15 08:25:59 phk 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 74b687eb12012..0c847a8cba16e 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 250ede35efb7c..58d8d7bc41737 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.58.2.1 2004/09/03 15:30:20 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 7046b2bbca5e3..a4096a56fcfd6 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.5 2003/08/17 06:42:08 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/mcbus/mcbusreg.h b/sys/alpha/mcbus/mcbusreg.h
index 5130d0eb2f98d..ad0678aa8b72d 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.2 2001/02/13 22:45:53 mjacob Exp $ */
 
 /*
  * Copyright (c) 1998, 2000 by Matthew Jacob
diff --git a/sys/alpha/mcbus/mcbusvar.h b/sys/alpha/mcbus/mcbusvar.h
index 50d9da936fa95..85dc23dc01acd 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.2 2002/03/26 19:46:40 dfr 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 e979959d292d4..1b7c981242eec 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.3 2003/08/22 07:20:26 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 0761bc0363389..696baa4c5e4ce 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.29 2004/07/01 15:07:26 gallatin Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/mcbus/mcpciareg.h b/sys/alpha/mcbus/mcpciareg.h
index 75ae6987fdb49..26ea9efdd21b4 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.2 2001/02/13 22:44:21 mjacob Exp $ */
 
 /*
  * Copyright (c) 2000 by Matthew Jacob
diff --git a/sys/alpha/mcbus/mcpciavar.h b/sys/alpha/mcbus/mcpciavar.h
index 7bbae1b9a484c..6cb8b8f18a2c6 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.3 2002/03/26 19:46:40 dfr Exp $ */
 
 /*
  * Copyright (c) 1998, 2000 by Matthew Jacob
diff --git a/sys/alpha/osf1/Makefile b/sys/alpha/osf1/Makefile
index 874065834c86a..20128136fba88 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 2000/01/15 19:40:08 bde Exp $
 
 # Makefile for syscall tables.
 
diff --git a/sys/alpha/osf1/README.mach-traps b/sys/alpha/osf1/README.mach-traps
index bbc1a790a1ea7..41519c72b4fb4 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 246fa48bde697..15f9aeeb1d8fe 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.1 1999/12/14 22:35:31 gallatin Exp $
  */
 
 #ifndef	_SYS_EXEC_ECOFF_H_
diff --git a/sys/alpha/osf1/imgact_osf1.c b/sys/alpha/osf1/imgact_osf1.c
index 3bf9473a053d9..092f075b78600 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.20 2003/08/22 07:20:27 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
diff --git a/sys/alpha/osf1/osf1.h b/sys/alpha/osf1/osf1.h
index c8bf275cb7161..413ff79bebbec 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.5 2002/06/02 20:05:41 schweikh Exp $ 
  */
 
 extern struct sysent osf1_sysent[];
diff --git a/sys/alpha/osf1/osf1_ioctl.c b/sys/alpha/osf1/osf1_ioctl.c
index 1b4a6b1513e24..e9eb4f0fecf4e 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.12 2003/10/31 18:31:55 brooks 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 9cebf524dbfba..55e3179f7ace1 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.47.2.1 2004/09/03 15:30:20 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 def2e170a9576..6152f9b73ea40 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.18 2003/11/16 21:53:05 kris 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 c5853c0d1ad35..7906df76f5811 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.10.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/alpha/osf1/osf1_signal.c b/sys/alpha/osf1/osf1_signal.c
index 0aecf0170f62c..3d84315fa9cee 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.36 2004/01/03 23:36:31 davidxu 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 ec1fbeba43ae2..dca4a2e03d46c 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 7b03b12248740..06e7e9e3ff28f 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.9.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/alpha/osf1/osf1_sysent.c b/sys/alpha/osf1/osf1_sysent.c
index da3cca14b3a89..a1c4b49cf2d00 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.9.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/alpha/osf1/osf1_sysvec.c b/sys/alpha/osf1/osf1_sysvec.c
index 0dea307c9d911..d9168d3dd62bf 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.11 2003/09/25 01:10:22 peter 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 273480816a375..be2fc0b337e0e 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.7 2002/12/14 01:56:24 alfred Exp $
  */
 
 #include <vm/vm.h>
diff --git a/sys/alpha/osf1/syscalls.conf b/sys/alpha/osf1/syscalls.conf
index 466046a4a5676..2e9e016e67c7f 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 2c15f25f22c81..6e6472fcdf4f5 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.9.2.1 2004/09/03 15:30:20 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 1525af9877bb0..0c8ba847dc30f 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.1 2000/08/28 21:48:02 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index e6e56f47d0124..605bac76a5cfc 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.26 2004/07/01 15:07:27 gallatin 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 d074563b3bf46..6c4fd924bd49d 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 385df1e4801ac..e8cde3d89998a 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.2 2000/05/01 20:17:50 peter 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 2c6987edc54fe..176b7ff8498d8 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 fd63ebb78f886..71150261cb01d 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 cced5054fe8c4..098926da14d53 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.43 2004/07/01 15:07:27 gallatin Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index f2fc5d4c669d9..dbd48aa43db71 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.17 2003/08/22 07:20:27 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 8da36a401ed15..fc222096596e6 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.2 1999/08/28 00:39:01 peter 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 1e50032dec90e..fd16237f12063 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 a744c3db8e3aa..5bb9db432ce0f 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 e3bdf6983a4ba..96167d66415fe 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 0d10d15147179..2c1cd6b791055 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 31012d97f8d59..75c5142e8e355 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 b00cadb5ca8a0..882b6a2193012 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.20 2003/08/17 06:42:08 marcel 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 54a55d4064599..5a57a6217d5db 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 d7fe568d1b0a9..8d3ae67d98bf3 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.2 2000/05/01 20:17:50 peter 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 ee53b755ffdd9..aad57bff712e8 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 089f79d7a0a33..b1f920ff0a470 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.4 2000/12/04 17:21:46 mjacob 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 9e69223960f53..945cb17ef2de4 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.3 2001/06/14 19:33:16 mjacob 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 a6102e40f558f..c1841c9ce91a1 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.34.2.1 2004/09/02 06:12:19 marcel Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/alpha/pci/pcibus.h b/sys/alpha/pci/pcibus.h
index 608b2a5cda3e4..8b0031a4d522f 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 fe25038970db7..0e3b9bc02f1e7 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 7efa27aa77cd0..0d33cdc18da10 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.21 2004/07/01 15:07:27 gallatin 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 44288a0daa23c..dea2fc61e88eb 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 86f04e93967d3..0429ffa9f79a2 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.2 2000/12/07 01:06:19 gallatin Exp $
  */
 
 
diff --git a/sys/alpha/pci/t2var.h b/sys/alpha/pci/t2var.h
index 73ec13e64fa54..d6401c2c550d4 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 23dd370916d85..51616813726df 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 d0ee84d8d742c..0a5f803edc98c 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 36ecaaf9779de..ca2cfca544353 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 89cb2aba65cd2..3140fa61baa3d 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 74b19bb03aeb5..cb895809a767d 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.27 2004/07/01 15:07:27 gallatin Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/tlsb/dwlpxreg.h b/sys/alpha/tlsb/dwlpxreg.h
index 9bce1f591b07d..6ababb498cf0e 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.4 2000/01/29 17:23:41 mjacob 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 4720638e1f761..a80391de2dfd5 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.1 2000/03/18 07:30:06 mjacob 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 793901fd7bdab..6896f3e501bb1 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.12 2003/08/22 07:20:27 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 3402185ac8b1d..af6ec576b6b5e 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 cc0bd8e47835f..d0ff8c2fe8dea 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 d43d8fea6eb8f..9c866e34ea1f4 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.12 2003/08/22 07:20:27 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 b4505d5d3a88c..18cfb284fe27b 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.4 2000/03/18 07:48:15 mjacob 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 2bdb24882dd28..e6f7ba1840d43 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 fe8ab8a7b8eb4..790803bef5ccb 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.9 2003/08/22 07:20:27 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 10e5cfce4a98c..1c7dbf9cdf477 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.16 2003/08/17 06:42:08 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/tlsb/tlsbcpu.c b/sys/alpha/tlsb/tlsbcpu.c
index 9d85de1c374fe..818a5a60f2ffc 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.5 2003/08/22 07:20:27 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 de8326893fa85..c127dc60e2d99 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.5 2003/08/22 07:20:27 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 478865d5bbf47..cd3e5f95ff724 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.2 2000/01/29 16:41:08 mjacob 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 81fe23ccad42e..b1585eadcf5c9 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.4 2000/01/29 16:40:17 mjacob 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 420d685e8c681..7d0469e33ef85 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.47 2004/07/15 20:47:36 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 f087a7ba55fea..ccf7167fc46fa 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 84701544274bc..c4abb3ad4f04e 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 b7d021a7d3d1e..1cf099312a620 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 f12b42fd0bfa1..e477f8ba238ce 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 352842f99100d..71a1afae8c213 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.15 2004/08/16 23:10:18 peter 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 a82fbcd3c6adb..53b544220122f 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 34ee387200007..2cc08d3f41cd9 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.14 2004/06/10 21:30:08 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 9264a2b2a81cb..2c1336cb0fd70 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 75d2372e92510..9fa09d18e720b 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.100 2004/05/24 12:08:56 bde Exp $
  */
 
 /*
diff --git a/sys/amd64/amd64/atomic.c b/sys/amd64/amd64/atomic.c
index 1b4ff7eaa6937..b112258b93b1a 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 f638bc83b6590..9bbc11db42b29 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.181 2004/07/28 21:54:56 phk Exp $");
 
 /*
  * Setup the system to run on the current machine.
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index c10bad3ea092a..bee34ad4fde1e 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.57.2.1 2004/09/09 23:05:00 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 881d514fed1d2..3d9d1b3b413fc 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/critical.c b/sys/amd64/amd64/critical.c
index 925a91ca28656..9d631e423de8e 100644
--- a/sys/amd64/amd64/critical.c
+++ b/sys/amd64/amd64/critical.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.14 2004/03/05 14:31:21 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index e4c227d663ed7..713b93b7a484b 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.27 2003/07/25 21:15:44 obrien Exp $");
 
 /*
  * Instruction disassembler.
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 27fc3b35e96cc..41b8a90d750c6 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.80 2004/08/16 23:10:46 peter Exp $");
 
 /*
  * Interface to new debugger.
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 5928dbe48d682..200b7e4189c9e 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.62 2004/07/21 05:07:08 marcel 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 b8067914303fa..ed57585ccac54 100644
--- a/sys/amd64/amd64/dump_machdep.c
+++ b/sys/amd64/amd64/dump_machdep.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.9 2003/07/25 21:15:44 obrien 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 11a71a5f3876c..158f2999a30eb 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 c5aec6f20ff8d..31d50874fb316 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.120 2004/08/16 12:51:32 obrien Exp $
  */
 
 #include "opt_atpic.h"
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 38f1c161e7941..6753e64c0c00f 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.154 2004/06/18 04:01:54 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 820824b1731a7..52a23fe5052be 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.1 2004/07/10 17:47:20 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 5152be53131ed..fef117c62a8a9 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.154 2004/05/16 22:43:57 peter 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 cf6e93e80f6a1..892e406403a19 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.134 2004/06/08 01:20:37 peter Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/amd64/in_cksum.c b/sys/amd64/amd64/in_cksum.c
index 159d0d9667d22..c2794f6adc885 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.4 2003/07/25 21:15:44 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index 88b7dc01f5b66..16cf708882d55 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 c544251289d45..a97202e2596aa 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.9 2004/08/16 23:12:29 peter Exp $
  */
 
 /*
diff --git a/sys/amd64/amd64/io.c b/sys/amd64/amd64/io.c
index 1aaf2ef63282a..34336647732d5 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 8cc14d33282cf..5313ac741be70 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.11 2004/08/16 23:12:29 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 f6e5008a6eb29..470361ca1d085 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.56 2004/08/16 22:54:50 peter 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 5e8d8b139501c..7ef9b1fa24577 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.10 2004/08/16 22:55:32 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 55cda3ab18636..50827fc7ecf1c 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 0a0287764ac41..b2165a4827e4e 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.618.2.1 2004/09/09 10:03:17 julian Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index f3280d0dfc750..adf2df61d4a6d 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 0e8a16f13734f..133d6e3b83269 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.242.2.2 2004/09/09 09:56:58 julian Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index ec30c72ecb9ba..33921960a7f67 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 ac56bf1650018..8f8e21fb80f49 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.232 2004/07/08 01:42:49 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 660ced6988e10..1c3d18c15248c 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 2004/05/16 20:30:46 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index 0b6fdfa7bd3e3..7f02bc4bf26b3 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.62.2.1 2004/08/31 05:26:36 njl 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 7412546abc92d..761b39158019e 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.491.2.4 2004/10/10 19:07:59 alc Exp $");
 
 /*
  *	Manages physical address maps.
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index 60e34e8c1d4b0..1d3816cbd1f0f 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.21 2004/05/26 09:43:37 bde Exp $");
 
 #ifdef GUPROF
 #if 0
diff --git a/sys/amd64/amd64/sigtramp.S b/sys/amd64/amd64/sigtramp.S
index a05ea8587b56a..0ce6d87a1b2a9 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 ba6f3c22f0b5f..88634b0019ae1 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.113 2004/07/10 22:39:17 marcel Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index fcc657a033f0f..06d2ccdcd8bb8 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.88 2004/04/05 23:55:13 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index a3adaa4303403..92b3751061853 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.279.2.2 2004/09/03 06:40:24 julian Exp $");
 
 /*
  * AMD64 Trap and System call handling
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 6a5b17c2e90da..d91e27584f1ec 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 81c74924d90e5..358d4acd686af 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.5 2004/06/03 10:22:45 tjr 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 85cf720bc3f55..7770df4631713 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 a33679d215496..7d98690363110 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.237 2004/08/16 22:57:13 peter 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 232298edb15fe..0000000000000
--- a/sys/amd64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6f3f130334136..35c967059104c 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.421.2.4.2.1 2004/10/23 20:04:00 kensmith Exp $
 
 machine		amd64
 cpu		HAMMER
diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints
index 4d28c16ad9b98..5186f968d3685 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 2c006e9c2c80d..b4888a02a6dd1 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 897cb24690d5b..1de7ba1043e18 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.18 2004/08/16 12:39:27 tjr Exp $
 #
 
 #
diff --git a/sys/amd64/conf/SMP b/sys/amd64/conf/SMP
index e2c6c43241121..9d58edf43d5d7 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.4.1 2004/10/23 20:04:00 kensmith Exp $
 
 include GENERIC
 
diff --git a/sys/amd64/conf/gethints.awk b/sys/amd64/conf/gethints.awk
index 1ed876a2923a1..00a93459863e7 100644
--- a/sys/amd64/conf/gethints.awk
+++ b/sys/amd64/conf/gethints.awk
@@ -6,7 +6,7 @@
 # 'hints' directive.  See how GENERIC and GENERIC.hints fit together for
 # a static example.  You should use loader(8) if at all possible.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/gethints.awk,v 1.3 2003/11/08 03:33:38 peter Exp $
 
 # skip commented lines, empty lines and not "device" lines
 /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; }
diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S
index c65634e268f1f..afbe140c1fc76 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_signal.c b/sys/amd64/ia32/ia32_signal.c
index 58aeb3d4c74cd..2feeb73ffdcc7 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 0387cb7f34f72..3d9d904aa106a 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 39eb81afdd1b2..72a29ca543376 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.6.4.1 2004/09/03 06:11:57 julian Exp $");
 
 /*
  * 386 Trap and System call handling
diff --git a/sys/amd64/include/_inttypes.h b/sys/amd64/include/_inttypes.h
index e6b2536ff379b..849e6501a05ba 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 330e86e98d101..7039dee8d4b6a 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.9 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/amd64/include/_stdint.h b/sys/amd64/include/_stdint.h
index 0c56c6d4e1faa..b72eade0fdda5 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 4a7b6e7edcdee..e3994d0447df1 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.6 2004/03/20 20:41:39 marcel Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/amd64/include/acpica_machdep.h b/sys/amd64/include/acpica_machdep.h
index 07029e1037ce6..cc57a694bba2c 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.5 2004/05/05 20:04:14 njl Exp $
  */
 
 /******************************************************************************
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index 7b584a075e05f..9116f823a52f2 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.26 2003/12/11 02:48:25 peter Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_
diff --git a/sys/amd64/include/apicvar.h b/sys/amd64/include/apicvar.h
index e6804d7e46b64..f1e57f23df95d 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.9 2004/07/08 01:42:49 peter Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index 80720caefe026..297477aa69169 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.16 2004/06/10 22:02:26 peter Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 7ca8c62afdb84..c98acd3c9bca8 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 cbee2715929d8..816adeb205d59 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.32 2003/11/21 03:02:00 peter Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define _MACHINE_ATOMIC_H_
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index 2edd5da32aee4..e8ae1395913b1 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.12 2003/05/12 02:44:37 peter Exp $
  */
 
 #ifndef _AMD64_BUS_H_
diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h
index b0bc61b6096a9..acd3135eeff23 100644
--- a/sys/amd64/include/bus_amd64.h
+++ b/sys/amd64/include/bus_amd64.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/amd64/include/bus_amd64.h,v 1.26 2003/09/23 08:22:33 nyan Exp $ */
 
 #ifndef _AMD64_BUS_AMD64_H_
 #define _AMD64_BUS_AMD64_H_
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 7b94b88f716d3..b169ef5827990 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/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/amd64/include/bus_dma.h,v 1.26 2003/11/21 03:02:00 peter Exp $ */
 
 #ifndef _AMD64_BUS_DMA_H_
 #define _AMD64_BUS_DMA_H_
diff --git a/sys/amd64/include/bus_memio.h b/sys/amd64/include/bus_memio.h
index 96607037f3d24..126961780456e 100644
--- a/sys/amd64/include/bus_memio.h
+++ b/sys/amd64/include/bus_memio.h
@@ -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_memio.h,v 1.3 2003/05/12 02:44:37 peter Exp $
  */
 
 #ifndef _AMD64_BUS_MEMIO_H_
diff --git a/sys/amd64/include/bus_pio.h b/sys/amd64/include/bus_pio.h
index 87aeebe0cb66e..60dd54e453678 100644
--- a/sys/amd64/include/bus_pio.h
+++ b/sys/amd64/include/bus_pio.h
@@ -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_pio.h,v 1.3 2003/05/12 02:44:37 peter Exp $
  */
 
 #ifndef _AMD64_BUS_PIO_H_
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 9e3e4e5b988e1..2fca8f0bcd791 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.49 2003/11/17 08:58:14 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index f069d2ebebb8d..ed001d54b933a 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 e558858762045..067f88309304b 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.145 2004/07/30 16:44:29 ps Exp $
  */
 
 /*
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index f06aa7145b1d4..f6770fe314214 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.18 2004/06/03 20:18:15 peter Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/amd64/include/critical.h b/sys/amd64/include/critical.h
index 0e02e1fab6402..b96fd58bcc8a4 100644
--- a/sys/amd64/include/critical.h
+++ b/sys/amd64/include/critical.h
@@ -33,7 +33,7 @@
  *	related support functions residing
  *	in <arch>/<arch>/critical.c	- prototyped
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/critical.h,v 1.8 2004/07/27 16:41:00 rwatson Exp $
  */
 
 #ifndef _MACHINE_CRITICAL_H_
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index 0c57aa76877f1..7ca042f8b68b8 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.20.2.1 2004/10/10 18:54:30 peter Exp $
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h
index be1d3a032b3f2..975357afa5f8f 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 459126bdac076..4623b5d4b548c 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.6 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index 4a89552deea77..1aa9c04cca4a7 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.9 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index ea2df3cc57c28..6de5e4d3ae6fb 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.14 2004/07/19 08:17:24 das Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index fd328a9d739b7..9d9d89c3ecb41 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.13 2003/01/19 06:01:33 marcel Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 88932ed391354..04b205b15ec68 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 199654696dec1..8ca236e83242b 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 458f2f6eb9b5c..9949c1bfa2e92 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.1 2004/07/10 17:47:21 marcel Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index 214f3b5616718..0f1a78ef8968f 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.11 2003/11/08 04:39:22 peter Exp $
  */
 
 /*
diff --git a/sys/amd64/include/in_cksum.h b/sys/amd64/include/in_cksum.h
index a899ef0d84880..59bed7418c35c 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.3 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/amd64/include/intr_machdep.h b/sys/amd64/include/intr_machdep.h
index af9e6725287e9..0f274bf59062a 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.4 2004/08/16 23:12:30 peter Exp $
  */
 
 #ifndef __MACHINE_INTR_MACHDEP_H__
diff --git a/sys/amd64/include/iodev.h b/sys/amd64/include/iodev.h
index 2273620ccba43..cf51165a7f6e9 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 2cc6f718a9652..2d57e26a6acd8 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.1 2004/07/10 18:40:11 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/amd64/include/legacyvar.h b/sys/amd64/include/legacyvar.h
index a3d28420b0f9f..dbe26f3b0c7cd 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.5 2004/05/16 20:30:46 peter Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h
index b7810fd220831..34d36e84e7de9 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.8 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 2e36bd815d0ee..642c718d6c908 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 b6d31220cb934..50f556a87d8fe 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 32497a46f8700..eba297b078ead 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.1 2003/05/01 03:31:17 peter Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index d56a418a5b5e8..7e53f8e52ee1a 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.221 2003/11/14 22:23:30 peter Exp $
  */
 
 #ifndef __MACHINE_MPTABLE_H__
diff --git a/sys/amd64/include/mutex.h b/sys/amd64/include/mutex.h
index 919a4415ef8a8..d3557ab95489d 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 5216c55a28dce..7690112ba9c93 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.13.2.1 2004/09/10 00:04:16 scottl Exp $
  */
 
 /*
diff --git a/sys/amd64/include/pc/display.h b/sys/amd64/include/pc/display.h
index 36f91deb09797..de5f6123bff33 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.6 2001/12/14 15:27:15 nyan Exp $
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 305b7ff895feb..ea2fc51dbbb6d 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 6d1bde2d5f845..34f530a0a0b16 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 10cdb96ac2ce4..7109e018958f7 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.12 2004/03/13 19:19:13 peter Exp $
  *
  */
 
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index 0694c766fc83f..86613898fe1d5 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.42 2003/11/20 23:49:28 peter Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 3069a66ce5d58..2298c6a22fb78 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.122.2.2 2004/10/10 19:08:00 alc Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 319f5af3a5382..366f20ee34cf8 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.22 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index a4cce2c60315a..1c37fd1d88b7f 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.41 2004/07/29 18:02:28 kan Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 07c21ea6e8e8e..a57c9c0d5b7fe 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 adfc79c9ddd2f..0efc31d7df9d7 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.12 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index 32d0f3bb05f78..316b9f015dc7a 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 1883193233997..b2a15c090b9d0 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 28fcc98ea1beb..0547c4b936b51 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.3 1999/10/14 21:38:30 dfr Exp $ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/amd64/include/runq.h b/sys/amd64/include/runq.h
index 0f2f4ef799c37..99a404b5e7025 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.3 2003/12/06 23:24:18 peter Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 4de820b13412c..1403fea7ffaf4 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 2c17b5d1768da..0d0b7b46d9875 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 aacd6c5652e02..6dfda7f604ce9 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.2 2004/04/18 05:36:37 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/amd64/include/sigframe.h b/sys/amd64/include/sigframe.h
index d104507d52f8c..fdca8cd73b664 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 fe8c57f15d6eb..d813a4b225c29 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.27 2004/04/05 23:55:14 imp Exp $
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index f61e9597f12df..5868b1abd4d6a 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.80 2004/05/16 22:11:50 peter Exp $
  *
  */
 
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index 37f232874a9d9..9325b04d02617 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 60a204ad177ff..9623ef38aa293 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.6 2003/10/24 02:50:39 peter Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index 6918a0a11f5b3..4543e1ee2897a 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.23 2004/04/05 21:25:51 imp Exp $
  */
 
 /*
diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h
index 2a1e12015a03f..226ff4db096cb 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 b6cfb0b890749..d834b001f6d6a 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.16 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/amd64/include/ucontext.h b/sys/amd64/include/ucontext.h
index 5c1380336321d..0d2d3db136e33 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 1a58a47a8daa3..aeb17046fc8a5 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.12 2003/09/01 03:01:45 kan Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 954cebc3d8b3a..c7373b3e8060c 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.44.4.1 2004/10/30 00:11:41 peter Exp $
  */
 
 
diff --git a/sys/amd64/isa/atpic.c b/sys/amd64/isa/atpic.c
index 3719a9b04a3aa..412b4d841003a 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.13 2004/08/16 23:12:30 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 37390a062dbfb..ff4a3a2edaa11 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 3a0555a770397..3f400086e43a2 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.214 2004/08/16 22:52:02 peter Exp $");
 
 /*
  * Routines to handle clock hardware.
diff --git a/sys/amd64/isa/elcr.c b/sys/amd64/isa/elcr.c
index 2cfcfa46d0b02..dfd0ac33e96e2 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.1 2004/05/04 20:07:45 jhb 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 f25fac6b83f9d..f4d1271bbf5cb 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 bf1ae4ebea1fc..fa0df80bc68b2 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.146 2004/03/17 21:45:55 jmg Exp $");
 
 /*
  * Modifications for Intel architecture by Garrett A. Wollman.
diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index 83e6cc93645e5..a7643f38c70f1 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.26 2004/08/16 22:51:44 peter Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
diff --git a/sys/amd64/isa/isa_dma.c b/sys/amd64/isa/isa_dma.c
index 201715826774c..a93ad09d2513a 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.19 2004/08/16 22:51:13 peter Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/amd64/isa/isa_dma.h b/sys/amd64/isa/isa_dma.h
index 6b997a72ed4b8..90372906262a3 100644
--- a/sys/amd64/isa/isa_dma.h
+++ b/sys/amd64/isa/isa_dma.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/isa/isa_dma.h,v 1.6 2004/04/05 21:25:52 imp Exp $
  */
 
 #ifndef _I386_ISA_ISA_DMA_H_
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 887879a319981..1b1dd951ad0ba 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/isa/timerreg.h b/sys/amd64/isa/timerreg.h
index 94557a0e22dbf..a6a44919167c4 100644
--- a/sys/amd64/isa/timerreg.h
+++ b/sys/amd64/isa/timerreg.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/amd64/isa/timerreg.h,v 1.8 2004/04/05 21:25:52 imp Exp $
  */
 
 /*
diff --git a/sys/amd64/linux32/Makefile b/sys/amd64/linux32/Makefile
index ae4f1078a2adf..3b9c9144f2e41 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 7362b228cbfb0..882796fde7aff 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 5322c8e9bee5c..7698ea0e87828 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 de7726d19c886..41fa0580cbac8 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 f8c92c4803ec0..81ebba872eddd 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 6c3d2082e87a2..caca0f1a1b573 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 731754cd04c76..bb2e509bed6ad 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.2.2.2 2004/09/09 09:45:25 julian 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 029b131b8226a..a0b628dfb3659 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.2 2004/08/16 08:07:06 tjr Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.1 2004/08/16 07:55:06 tjr Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index ecbbbf388bce8..1119f34e1338e 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.2 2004/08/16 08:07:06 tjr Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.1 2004/08/16 07:55:06 tjr Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index 561b62afd4025..96ee80bf1718b 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.2 2004/08/16 08:07:06 tjr Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.1 2004/08/16 07:55:06 tjr Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 4f0834b6f3537..b50fc1e181ef8 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.3 2004/08/16 11:15:46 obrien 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 8c57f888ab0d8..109128b40734d 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 07ce1d1bf054c..279bb1b39a978 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.1 2004/08/16 07:55:06 tjr 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 3611b1b17fba5..3176f7dbbbea6 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.109 2004/06/03 05:58:30 phk Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index e92d02c2b499b..67d5a33b251d9 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.106 2004/03/13 19:19:13 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index 2fc9e02d440f6..1bbe7773b6071 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/Makefile,v 1.24 2004/08/16 15:45:24 marius Exp $
 
 .if !defined(NOFORTH)
 # Build the add-in FORTH interpreter.
diff --git a/sys/boot/README b/sys/boot/README
index 7502788324ec0..95a51ef2f9adf 100644
--- a/sys/boot/README
+++ b/sys/boot/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/README,v 1.3 2000/05/01 20:26:17 peter 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 e97c8e8974152..6996e7ff57aae 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 17d17b96ab153..a678b5b7073c2 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.9.2.1 2004/08/23 04:26:55 marcel 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 62241a2aaa9ee..cfad889793afe 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.17 2004/02/11 22:01:17 ru Exp $
 
 PROG=	boot1.sym
 INTERNALPROG=
diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index 94540114b99d1..d8997afc7f201 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 f65d9016c815a..9476498f1be75 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.8 2004/02/11 22:01:17 ru Exp $
 
 BOOT= 		cdboot
 NOMAN=
diff --git a/sys/boot/alpha/cdboot/version b/sys/boot/alpha/cdboot/version
index 028be8b5295c7..5ae71c0d4aa0e 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 bf9a68219d055..133b8f0f59210 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.18.2.1 2004/08/23 04:26:55 marcel Exp $
 #
 # Common Alpha loader build rules
 
diff --git a/sys/boot/alpha/common/conf.c b/sys/boot/alpha/common/conf.c
index 71562b34c158a..7c2f3c54497f6 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/ldscript b/sys/boot/alpha/common/ldscript
index 30f7dbb6fc914..2c1d71971a03c 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.2.1 2004/08/23 04:26:55 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 9b8c0725127f0..198abd0a21690 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.14 2004/01/04 23:21:01 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index caba16cedca7f..32a0a5ef5f879 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.14 2004/02/11 22:01:17 ru Exp $
 
 LIB=		alpha
 INTERNALLIB=	true
diff --git a/sys/boot/alpha/libalpha/OSFpal.c b/sys/boot/alpha/libalpha/OSFpal.c
index 1c61f800b4c77..0e5fce70e13d2 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 6c8c683d7ec9f..fbb8f6d2cdafa 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 804d4849d9316..609211414a226 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 94aa4bbff07f7..6d36001131434 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 106ad4527adf5..631b3a6813196 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 7ae5830996000..525f8e2bbcb7b 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 6e437a7f0ba9f..7b8a61f120a1d 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.3 2004/01/04 23:21:01 obrien 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 9c0d6aa2546c2..894fe661da57d 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.5 2004/01/04 23:21:01 obrien 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 bc5ce6aab8de6..9f94833a62f85 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 18c87702738bd..93e6cb80ef716 100644
--- a/sys/boot/alpha/libalpha/getsecs.c
+++ b/sys/boot/alpha/libalpha/getsecs.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.3 2004/01/04 23:21:01 obrien 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 4790aaf9ab107..b195438fc731e 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.6 2000/08/03 09:49:44 jhb Exp $ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/alpha/libalpha/pal.S b/sys/boot/alpha/libalpha/pal.S
index 79f9306aa5da9..fb17d28ba6d22 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 0ee3b6df1dd35..cd9e4a6c784ab 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 184f1d3c9f00e..05a8730de1f4b 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 be57632ddd9b1..f75f77d96357f 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 f8de5614ad3aa..dbf1900b654e4 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 2ad458afa6668..268f537dc1055 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.13 2004/01/04 23:21:01 obrien Exp $");
 
 /*
  * SRM disk device handling.
diff --git a/sys/boot/alpha/libalpha/srmnet.c b/sys/boot/alpha/libalpha/srmnet.c
index 7a76284900aca..0f443319a3b56 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 f7a46e12760b0..adeb04378a1dd 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 73987c80ee1e3..65ce053019958 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 12eec01b29c24..7caac3548fd31 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 d16c21538a7a9..25fa5683c9b49 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 584895e2f7815..024914c59da25 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.11 2004/02/11 22:01:17 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 d16c21538a7a9..c441f7c4a0129 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 82043c438af86..886a1ad08bbb1 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 e3a86c463a813..737144818b15e 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 e88ff03a1c100..5d80d07164dfc 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.3 2004/03/12 21:45:25 trhodes Exp $
  *
  */
 
diff --git a/sys/boot/arc/include/arctypes.h b/sys/boot/arc/include/arctypes.h
index b823e49babad3..7df853ef2e07c 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 085d6bbc8eedc..cd2800ea2b6bd 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 7944374909d23..a06df61bc984b 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.9 2002/05/13 10:53:24 ru Exp $
 
 LIB=		arc
 INTERNALLIB=	true
diff --git a/sys/boot/arc/lib/abort.c b/sys/boot/arc/lib/abort.c
index 21839ab180870..420b848885b44 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 f1e869ba702aa..fbdc0329007db 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 c5fb83995e436..75ebdb106d6f0 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 2847812fed05e..36f9b113e2add 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 4923461557515..852a2ff2cd09f 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 8e153f7ddd778..dfefc003fdc5c 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 1b4fc598d6ae1..d77f08b2bee70 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 4304b7945e27b..6ac7c83cf8875 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 2236978cab94f..6569ce03b4afc 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 a3db40d0cbc07..cb9e450b16aa0 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 8cebb6897c03c..3191129234167 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 0ad48f60272b7..60cc049548829 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 8246d4a38958f..46bc9923077e5 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 8938a33f568f1..67d19c36eb4ee 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 0598534017917..2773d434a5b03 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 e7b74576c1d47..90be4da372908 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.7 2002/05/10 09:26:30 obrien Exp $
 
 BASE= 		loader
 PROG= 		${BASE}.exe
diff --git a/sys/boot/arc/loader/conf.c b/sys/boot/arc/loader/conf.c
index 3b07b7b690682..8e8b6652f26dc 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 0a0faf53ff13d..8b4739b857ebb 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 bc9aa00ed9ab1..f7c5a73610524 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 4a673769a9225..2ba8f9a37eb6c 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.17.2.1 2004/09/03 19:25:40 iedowse 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 d61fbf030f26d..ba7c653fb4ab1 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.12 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * Simple LRU block cache
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 766a8cf5426b5..b81cc098078e5 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.29 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * Loading modules, booting the system
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index f84c8e3ebafe8..098a5b657e956 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.38.6.1 2004/09/03 19:25:40 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index 38aa0a3deff8e..d6c4e7089eee4 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.19 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index 0fc138cb9388b..9706cc79ea733 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.6 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index b7ccbca72ea71..5f13ef53acaab 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 3b3d10728a3d3..af3329735519c 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 28a2fab262306..4b3b333637101 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 33f48e65e0f56..82888cdfe07a1 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 3cbdd5b105ea5..6847b414aba2b 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 cc66c4d26e49a..b9595163a78f1 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 32b01c8c7aec6..2ae6d45f46f98 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 a8efb28c7e1b3..c98f17654edf9 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 0f9956c4f183c..923acb744c134 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 e00487dee60c1..10aa0e0f6ae5b 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.3 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index a44145b5e520f..66b58473035d4 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.30.2.1 2004/09/03 19:25:40 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 1de5dc1fb6947..c55b9fff643b6 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 fed25efafc9f7..9503e9123f22a 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.2.1 2004/09/03 19:25:40 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/load_elf64.c b/sys/boot/common/load_elf64.c
index c29e8e3596a79..dbf28fbadbf36 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 3c9371ba01303..52b187a99274a 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.2.1 2004/09/03 19:25:40 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 53b1317a02996..8507ee5b9345f 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.2.1 2004/09/03 19:25:40 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 3b48453e7f292..da40e8d919bbc 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.64.2.1 2004/09/26 06:32:03 maxim Exp $
 .\"
 .Dd August 18, 2004
 .Dt LOADER 8
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index 86f83c39a9d84..3f0c4f4c3fe2b 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 02fbc4ac7b2db..eb274ca314a74 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 f1a049194cef7..c444eb9538856 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.8.4.1 2004/09/03 19:25:40 iedowse Exp $");
 
 #include <string.h>
 #include <stand.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index ae93426848a55..4f7c382884344 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 fd7b0b1685c47..e2b05e4aa9fd1 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 181c4c7150704..c9bad95a213ab 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 05cce99f9d2a3..bca39cc652f9a 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 f2e262070d96e..cd15bb87084ea 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 d6ff999443185..f1d9a6d520897 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.2.1 2004/09/03 19:25:40 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 03d9d73bab7ff..2ca031c077eb0 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.2.1 2004/09/03 19:25:40 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/reloc_elf64.c b/sys/boot/common/reloc_elf64.c
index c8dcf2a36b0db..acaada9cf2c52 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.2.1 2004/09/03 19:25:40 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 64
 
diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c
index f5a71b335aed4..00394dcd7ee35 100644
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.13 2004/07/04 16:11:01 stefanf Exp $");
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile
index f7f72f7ffe474..c98ce19c37cd3 100644
--- a/sys/boot/efi/Makefile
+++ b/sys/boot/efi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/Makefile,v 1.1 2001/06/09 16:49:48 dfr Exp $
 
 SUBDIR=		libefi loader
 
diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc
index 2668708befb56..9617bf498cb36 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 151bac9737d0d..1d5bf6e0520bc 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.1 2001/06/09 16:49:49 dfr Exp $ */
 
 Files in this directory and subdirectories are subject to the following
 copyright unless superceded or supplemented by additional specific license
diff --git a/sys/boot/efi/include/efi.h b/sys/boot/efi/include/efi.h
index f476a25daa355..bbcef56cffcd8 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 6a9c05d5a8898..748c352b5f8a7 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 93c6995ec67a0..d92800ec2885c 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 a2885713baad7..906cf82b3e669 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 5214737bb0a34..2ed7a5e9831b4 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 2bd7f9b4eae39..44ce45920f1a8 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 ebd6b3b93c1dc..863e11c24004d 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 a6db90c357242..308c8f298aeca 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 3e039ef6a26d0..5280be5264ee7 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 8ef361549a6f1..102a7c677f89f 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 1e7b269b56c66..4fcbf2b0fd233 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.3 2002/12/10 20:11:19 marcel Exp $
  */
 
 extern EFI_HANDLE		IH;
diff --git a/sys/boot/efi/include/efinet.h b/sys/boot/efi/include/efinet.h
index c137ef8c8ab1c..792b1edba0b2a 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 b504bd9c8bfe7..abb81a82677b1 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 d81d6051e1e66..f271d0149f020 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 7a6df76b2b4ef..0d3ff1ec8b626 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 e2d63bd938b5e..d1b4dfd7f19e7 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 68c2221277248..ee2f4cadd7b97 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 5c194953a3122..22b70708f0e93 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.2 2002/05/19 03:17:22 marcel 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 11204647697d7..ebb5615bff9c1 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 73f346981ec4f..66e429d59a7c0 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.3 2002/05/19 03:17:22 marcel 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 59839d28c8b08..818a7be2897c3 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 9ecd4c7b6a6d4..dc7b16e4b1444 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.14 2004/02/13 04:43:41 marcel Exp $
 
 .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64
index 0f79b670e0279..01168d8aff6af 100644
--- a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64
+++ b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.8 2004/07/20 07:01:02 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start_plabel)
diff --git a/sys/boot/efi/libefi/arch/ia64/start.S b/sys/boot/efi/libefi/arch/ia64/start.S
index 5c2f3e18059c2..2eacf1cccce72 100644
--- a/sys/boot/efi/libefi/arch/ia64/start.S
+++ b/sys/boot/efi/libefi/arch/ia64/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/efi/libefi/arch/ia64/start.S,v 1.7 2004/07/20 07:11:14 marcel Exp $
  */
 
 	.text
diff --git a/sys/boot/efi/libefi/bootinfo.c b/sys/boot/efi/libefi/bootinfo.c
index 729ad701062c7..e3932c15c262a 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.10 2004/01/04 23:28:16 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/efi/libefi/copy.c b/sys/boot/efi/libefi/copy.c
index 7bc4edf7e15c3..54b23ff381983 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.5 2003/04/03 21:36:29 obrien Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/efi/libefi/delay.c b/sys/boot/efi/libefi/delay.c
index 723f681c52864..5674760dd0287 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 d9f5275a41972..57cc7ee78dea1 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 3538994ac104a..4e9da226441b4 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 18af3f4bc087b..6450c79c4d3b8 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.8 2003/08/02 08:22:03 marcel Exp $
  */
 
 /*
diff --git a/sys/boot/efi/libefi/efifpswa.c b/sys/boot/efi/libefi/efifpswa.c
index f7d5147139478..6079869fccdf6 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 cf89a9d448841..e0743f646b35f 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 c6fc5231a01bd..a05f83d182e22 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 5f534b25b763d..d6435e2720902 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.13 2004/04/05 23:41:28 imp Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c
index 563b533ab232c..f06f40ed50277 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 7a3f4b2f17190..be076472235ca 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 3ca456e22b9b0..4306290098cc2 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.4 2003/04/03 21:36:29 obrien Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile
index d08c84be81ded..ef3b3016ecb44 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/sys/boot/efi/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.22 2004/07/20 07:01:02 marcel Exp $
 
 PROG= 		loader.sym
 INTERNALPROG=
diff --git a/sys/boot/efi/loader/conf.c b/sys/boot/efi/loader/conf.c
index 145b16b861150..7b0800a3e4460 100644
--- a/sys/boot/efi/loader/conf.c
+++ b/sys/boot/efi/loader/conf.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.9 2003/04/03 21:36:29 obrien Exp $");
 
 #include <stand.h>
 #include <efi.h>
diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c
index 30b4f257e04c7..89f3275154ae7 100644
--- a/sys/boot/efi/loader/main.c
+++ b/sys/boot/efi/loader/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.21 2004/08/10 02:08:57 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/efi/loader/version b/sys/boot/efi/loader/version
index 71f9400f68b08..e6768f0cf353a 100644
--- a/sys/boot/efi/loader/version
+++ b/sys/boot/efi/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/efi/loader/version,v 1.5 2002/12/10 20:11:20 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/ficl/Makefile b/sys/boot/ficl/Makefile
index c455e7a1bb539..90b648a69dee3 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.37.2.1 2004/08/23 04:26:55 marcel 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 00b0d4acf0e3f..e484c7663192d 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 c8f892ed29090..ef50ea1c842b8 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 b76d92559f8fc..56937c7316ab2 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 d4370eb1a48ac..9f8b3472ae735 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 98d56a58bcceb..02e75ec0b0538 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.20 2002/04/09 17:45:11 dcs Exp $ */
 
 #if !defined (__FICL_H__)
 #define __FICL_H__
diff --git a/sys/boot/ficl/fileaccess.c b/sys/boot/ficl/fileaccess.c
index 686c72153e027..7712c737bad8f 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 3fe858147c8f7..86affa2eaec80 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 2a5346aa7b43a..a7523604eacb1 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 e1900e2a46591..01b959e0935cb 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 00b0d4acf0e3f..b018a0bbc68be 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 08bc0e1f4d0bc..5ce8074db580b 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 e01b38fd4aa2e..e18a2d2845320 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.10 2003/12/10 09:09:38 grehan Exp $
  */
 
 /*******************************************************************
diff --git a/sys/boot/ficl/math64.c b/sys/boot/ficl/math64.c
index 6e50458151bc0..1fd6b757c8cb0 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 a4e56369564f9..febc5bf13635d 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/prefix.c b/sys/boot/ficl/prefix.c
index a34fc6c78240e..2e83d16d6dd32 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 d445cb32d93ad..2f5cf98b80614 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 b56da378e9709..0b3d34446d23c 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 6d75efb0d3c5c..7b8fbf705fefc 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 c916089696c13..4023076228bdf 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 10ec5bd724863..b3ce08e7c87b8 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 1144ef536792f..3068ed39f6cb3 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 96205c0808dd1..6bb7ededfb5b5 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 a8c60626c4f84..aac9ea3467cef 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 b6e84674c9fa3..051f4982d37b5 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 ee3c9bdf2f64a..714324602cb15 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 9e6a04ea24dfc..4b1282d8ee893 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 53a1d540043d5..a338adb8e3065 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 c41996aebeaa2..f258572c6ffec 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 a70ebaa634efb..434c03da9c5e0 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 dabb3900892fe..716fff8c8dd57 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 00b0d4acf0e3f..8f2cebc6fd9dc 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 0a6ca33363dda..152823beba1d6 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 f98a3b61db7de..7a3f5b2bc32d7 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 7167f30a25613..cdd0f454cfded 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 dc321f8cf2e3c..bcca00e890a49 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 4400752f4f486..89809648a8ad7 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 7bcb19a601f9c..6d08de98c46e2 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 341993885baab..ae8f755d5623d 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 8b727a2f347c7..b0febb6cf458b 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.8 2004/01/09 19:20:47 scottl Exp $
 
 marker task-beastie.4th
 
diff --git a/sys/boot/forth/frames.4th b/sys/boot/forth/frames.4th
index 3b1f4046891fe..b10bd2983e4d1 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 8ffb02dd81ff8..dac9ff4c72a47 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 d5cf383814a3d..1bd8cb2723d02 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.14 2002/08/13 15:09:33 ru Exp $
 .\"
 .Dd April 25, 1999
 .Dt LOADER.4TH 8
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index d5516d98e7d82..f7f03052efc38 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.85 2004/08/06 15:06:06 jmg Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 350a082aba401..f9fd639a52887 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.21 2004/05/16 22:51:36 ru Exp $
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
diff --git a/sys/boot/forth/loader.rc b/sys/boot/forth/loader.rc
index 9ba2f271c89f7..4c4ab24f6e79f 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.2 1999/11/24 17:59:37 dcs Exp $
 \
 \ Includes additional commands
 include /boot/loader.4th
diff --git a/sys/boot/forth/pnp.4th b/sys/boot/forth/pnp.4th
index 395164deadfc5..ced199ff918f8 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 3ea79e453d800..f7f3624677ae8 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 9da74b7b5a248..2137accc24f8b 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 aac1821a8857f..c142050e89fa2 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 d7e4d0d68573a..1631300d52b59 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.9 2004/02/09 14:11:55 ru Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 40ebc8fa058a6..a46720d1f2a4c 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.29 2004/04/28 21:31:19 ru Exp $
 
 PROG?=	boot0
 STRIP=
diff --git a/sys/boot/i386/boot0/boot0.S b/sys/boot/i386/boot0/boot0.S
index 3349009ebd594..a0ad7707b4b41 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.10 2004/06/17 12:02:25 phk Exp $
  */
 
 /* A 512-byte boot manager. */
diff --git a/sys/boot/i386/boot0/boot0ext.S b/sys/boot/i386/boot0/boot0ext.S
index a63de2532109e..de1c7e2ce62c7 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 e68e237a0c61e..d45934577943e 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 1321dd330c4d5..cf359af79e2f6 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 3e23061df8169..d91c63191033b 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.56 2004/07/30 04:27:20 kan Exp $
 
 FILES=		boot boot1 boot2
 
diff --git a/sys/boot/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S
index 5b0f6f7ec8e14..9f0d6d6dfc907 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.29 2004/08/05 06:00:05 kan Exp $
  */
 
 /* Memory Locations */
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index e7b9a2b9aff2a..810b82dc875d7 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.70 2004/07/30 00:33:09 kan 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 4bb93cfe9d3ef..44d1f101b23c9 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 3fc2963997e9b..5ed451e8f69af 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 39f78ed639b9c..9a65f19def458 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 265f86d1ed55a..23b27439117de 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 a4e78a752a269..d3ab656a71e42 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.18 2004/04/27 19:45:15 ru Exp $
 
 PROG=	btx
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index 7581519ba5368..e45eb68823338 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.37 2004/05/14 20:29:30 ru Exp $
  */
 
 /*
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index 551c292d70650..0809fffe6183b 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.17 2004/04/27 19:45:16 ru Exp $
 
 PROG=	btxldr
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/sys/boot/i386/btx/btxldr/btxldr.S
index aa531b8894295..3a0349534c354 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 563f001253b2b..0f940b87f881a 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.12 2004/02/09 14:11:57 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 6a006596295f5..5318a9bdd917c 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 9c77b4295e7cf..6bca7400e3abe 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 1152f8b1d9635..1ef0712a3a13b 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 0d7d1116322d2..6d6af1929696a 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 ddca8256de2d7..6624e31f3185a 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.12 2004/04/28 21:31:20 ru Exp $
 
 PROG=	cdboot
 STRIP=
diff --git a/sys/boot/i386/cdboot/cdboot.s b/sys/boot/i386/cdboot/cdboot.s
index ab959f45fe6db..856eaafb73c6c 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 d25e849613a62..a33310e337ea0 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.20 2004/02/12 22:06:33 ru Exp $
 
 PROG=	kgzldr.o
 STRIP=
diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c
index 45ed2ee62e168..6b12e3632c003 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 cfb479fd2d84f..5e2162abc168b 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 5cd5b44b60057..c8ed8cac32d5e 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 538875b510e59..bece56b848a63 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 ff174eb0b71b3..bc9489d29d92e 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 550fa526d946f..5f693582b0f02 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 bfae7ce013a52..f3723aa754c6e 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.36 2004/02/07 23:30:45 ru Exp $
 #
 LIB=			i386
 INTERNALLIB=		true
diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/sys/boot/i386/libi386/amd64_tramp.S
index ff12c661d94d8..2e95bd3dc0ce7 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 f9b2d774b0545..6a725bcaf1d32 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.9 2004/05/25 05:51:35 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 7259ff59ec049..9b6cb23272757 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.7 2004/06/16 18:21:22 phk 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 b97a2685c29da..a5a706235246a 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.44.2.1 2004/09/27 07:16:47 wes Exp $");
 
 /*
  * BIOS disk device handling.
diff --git a/sys/boot/i386/libi386/biosmem.c b/sys/boot/i386/libi386/biosmem.c
index 019cf90a30ae5..28f327b9bde7d 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 5717bdc8a480f..11474b8717383 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.4 2003/08/25 23:28:31 obrien Exp $");
 
 /*
  * PnP enumerator using the PCI BIOS.
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index b6e765ad3745f..fd079054d072b 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 2859a5631dc57..f83f80b51a78f 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.2 2003/08/25 23:28:31 obrien 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 50952810b0304..2235bac2a7ba9 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.35 2003/08/25 23:28:31 obrien 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 ceb254c5c914a..efdeb564e181a 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 58b4e3c6b169c..961500bebb699 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 1b08d9bdd7ac7..9d3ee523ed064 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 7ae45b17a36dd..4ca41e0b99967 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.6 2003/08/25 23:28:31 obrien 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 5d8592797b592..29c08f8e6891e 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.13.4.1 2004/09/03 19:25:40 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 1a5b0b2471516..b5b81ab59c7c4 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.14.4.1 2004/09/03 19:25:40 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 1c5f0f05fe1df..95f1a2b2d9481 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 2dce4f1021b83..1cb57613a9cc0 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 91993df96d768..d5daad73915ad 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 f2696e0a360de..dea2b65d21f90 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.18 2004/06/16 18:21:22 phk Exp $
  */
 
 
diff --git a/sys/boot/i386/libi386/nullconsole.c b/sys/boot/i386/libi386/nullconsole.c
index ebb1e7edd2b63..d99e8d043fabd 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 870e2540150f6..26c077116b947 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 b78508a98dbf3..8c01eadc2d4cd 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.20 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/i386/libi386/pxe.h b/sys/boot/i386/libi386/pxe.h
index f1f22aac712f1..203979b34d8c0 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 dcf1441aeb244..644e061e5bb49 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 1db9a4a60688f..9f72ed8211195 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 bea6b1e9e0f50..27ea4df717f4c 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.19 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 55152bbd522db..aad3b48902f1d 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.76 2004/02/27 14:10:09 ru Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 1d8bd047f9e06..d3b25c5e2592a 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.24.4.1 2004/09/03 19:25:40 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 d650d993952f1..7522125c1c24a 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.2 2003/11/21 19:01:02 dcs 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 829d29a46e767..63dcce87bcd50 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.29 2004/03/14 05:48:04 bde Exp $");
 
 /*
  * MD bootstrap main() and assorted miscellaneous
diff --git a/sys/boot/i386/loader/version b/sys/boot/i386/loader/version
index 7a2acaf1859a6..03a6ab38241dd 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 2eb349c4da4e8..73b08b877fa36 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.13 2004/04/28 21:31:21 ru Exp $
 
 PROG=	mbr
 STRIP=
diff --git a/sys/boot/i386/mbr/mbr.s b/sys/boot/i386/mbr/mbr.s
index 9cd39d295ddf1..44c94fddfdde4 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.6 2000/06/27 20:04:10 jhb 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 cc8902f165e0d..d058075084544 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 f8ea8a94191ef..27fde369d45c4 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 25ab5c001e5b7..dac404c4c5c92 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 b8d7f32d5fb13..ff43377ee3f7e 100644
--- a/sys/boot/ia64/Makefile
+++ b/sys/boot/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/Makefile,v 1.2 2001/09/12 08:34:26 dfr Exp $
 
 SUBDIR=		libski skiload
 
diff --git a/sys/boot/ia64/Makefile.inc b/sys/boot/ia64/Makefile.inc
index 2e9a113df3879..1dbdc9d04f2b0 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/libski/Makefile b/sys/boot/ia64/libski/Makefile
index caba74ed02a05..f2828cec9061b 100644
--- a/sys/boot/ia64/libski/Makefile
+++ b/sys/boot/ia64/libski/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.12 2004/02/13 04:43:41 marcel Exp $
 
 LIB=		ski
 INTERNALLIB=	true
diff --git a/sys/boot/ia64/libski/acpi_stub.c b/sys/boot/ia64/libski/acpi_stub.c
index 3e044e65fc2d9..3fa18442cc864 100644
--- a/sys/boot/ia64/libski/acpi_stub.c
+++ b/sys/boot/ia64/libski/acpi_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.3 2003/12/09 08:35:17 marcel Exp $");
 
 #include <contrib/dev/acpica/acpi.h>
 
diff --git a/sys/boot/ia64/libski/bootinfo.c b/sys/boot/ia64/libski/bootinfo.c
index dbc4673b6a6af..bc671efa85991 100644
--- a/sys/boot/ia64/libski/bootinfo.c
+++ b/sys/boot/ia64/libski/bootinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.9 2003/09/08 09:11:32 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/libski/copy.c b/sys/boot/ia64/libski/copy.c
index d86537a14099d..df2d11ea18942 100644
--- a/sys/boot/ia64/libski/copy.c
+++ b/sys/boot/ia64/libski/copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/copy.c,v 1.3 2003/04/03 21:36:29 obrien Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/libski/delay.c b/sys/boot/ia64/libski/delay.c
index 2389603edb4a5..086d188d15e38 100644
--- a/sys/boot/ia64/libski/delay.c
+++ b/sys/boot/ia64/libski/delay.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/delay.c,v 1.2 2003/04/03 21:36:29 obrien Exp $");
 
 void
 delay(int usecs)
diff --git a/sys/boot/ia64/libski/devicename.c b/sys/boot/ia64/libski/devicename.c
index b01bf18302503..457929469ddfb 100644
--- a/sys/boot/ia64/libski/devicename.c
+++ b/sys/boot/ia64/libski/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/devicename.c,v 1.2 2003/09/08 09:11:32 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/libski/efi_stub.c b/sys/boot/ia64/libski/efi_stub.c
index f2a1dffd30d3b..dd72f4d2f429f 100644
--- a/sys/boot/ia64/libski/efi_stub.c
+++ b/sys/boot/ia64/libski/efi_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/efi_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/bootinfo.h>
diff --git a/sys/boot/ia64/libski/elf_freebsd.c b/sys/boot/ia64/libski/elf_freebsd.c
index 4f5804706e3d5..6dd537c576e07 100644
--- a/sys/boot/ia64/libski/elf_freebsd.c
+++ b/sys/boot/ia64/libski/elf_freebsd.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.10 2004/04/05 23:41:28 imp Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/libski/exit.c b/sys/boot/ia64/libski/exit.c
index aeac67c493410..ec4731473075e 100644
--- a/sys/boot/ia64/libski/exit.c
+++ b/sys/boot/ia64/libski/exit.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/exit.c,v 1.2 2003/04/03 21:36:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/libski/libski.h b/sys/boot/ia64/libski/libski.h
index 043177cd2acfa..154df3af63f63 100644
--- a/sys/boot/ia64/libski/libski.h
+++ b/sys/boot/ia64/libski/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/libski/libski.h,v 1.4 2003/02/01 22:50:08 marcel Exp $
  */
 
 /*
diff --git a/sys/boot/ia64/libski/module.c b/sys/boot/ia64/libski/module.c
index 57f697cbad5af..883fbe0a9feae 100644
--- a/sys/boot/ia64/libski/module.c
+++ b/sys/boot/ia64/libski/module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.3 2003/09/08 09:11:32 obrien Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/libski/pal_stub.S b/sys/boot/ia64/libski/pal_stub.S
index e2476613668a2..0c2071db94781 100644
--- a/sys/boot/ia64/libski/pal_stub.S
+++ b/sys/boot/ia64/libski/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/libski/pal_stub.S,v 1.3 2003/11/09 07:42:16 marcel Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/boot/ia64/libski/sal_stub.c b/sys/boot/ia64/libski/sal_stub.c
index b5661a395b118..e27a9f18e84d4 100644
--- a/sys/boot/ia64/libski/sal_stub.c
+++ b/sys/boot/ia64/libski/sal_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/sal_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/md_var.h>
diff --git a/sys/boot/ia64/libski/skiconsole.c b/sys/boot/ia64/libski/skiconsole.c
index e5cea3dc99367..bd5f346bc6fd6 100644
--- a/sys/boot/ia64/libski/skiconsole.c
+++ b/sys/boot/ia64/libski/skiconsole.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/skiconsole.c,v 1.2 2003/04/03 21:36:29 obrien Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/libski/skifs.c b/sys/boot/ia64/libski/skifs.c
index 5a272c74563a2..7c17913c12ab7 100644
--- a/sys/boot/ia64/libski/skifs.c
+++ b/sys/boot/ia64/libski/skifs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/skifs.c,v 1.2 2003/09/08 09:11:32 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/libski/ssc.c b/sys/boot/ia64/libski/ssc.c
index e1f871c4d5c50..a42849110b985 100644
--- a/sys/boot/ia64/libski/ssc.c
+++ b/sys/boot/ia64/libski/ssc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/ssc.c,v 1.4 2003/09/08 09:11:32 obrien Exp $");
 
 #include <stand.h>
 #include "libski.h"
diff --git a/sys/boot/ia64/libski/time.c b/sys/boot/ia64/libski/time.c
index c66bdee36f8ad..2f1f5ac4a223f 100644
--- a/sys/boot/ia64/libski/time.c
+++ b/sys/boot/ia64/libski/time.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/time.c,v 1.4 2003/09/08 09:11:32 obrien Exp $");
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile
index 2003b96367921..d46a2f5ba9d54 100644
--- a/sys/boot/ia64/skiload/Makefile
+++ b/sys/boot/ia64/skiload/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.14 2004/02/13 04:45:41 marcel Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/sys/boot/ia64/skiload/conf.c b/sys/boot/ia64/skiload/conf.c
index 5066a77f13cb5..bcb50fd863947 100644
--- a/sys/boot/ia64/skiload/conf.c
+++ b/sys/boot/ia64/skiload/conf.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.4 2003/04/04 02:12:56 marcel Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/skiload/ldscript.ia64 b/sys/boot/ia64/skiload/ldscript.ia64
index e4e1dad0bd91e..d8105eaa2de05 100644
--- a/sys/boot/ia64/skiload/ldscript.ia64
+++ b/sys/boot/ia64/skiload/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.2 2003/07/17 01:49:59 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start)
diff --git a/sys/boot/ia64/skiload/main.c b/sys/boot/ia64/skiload/main.c
index f336d17f81a9f..3e004b82d860e 100644
--- a/sys/boot/ia64/skiload/main.c
+++ b/sys/boot/ia64/skiload/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.4 2003/07/17 01:49:59 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/skiload/skiload.cmd b/sys/boot/ia64/skiload/skiload.cmd
index 48b77e1e40bae..21b27dad5a016 100644
--- a/sys/boot/ia64/skiload/skiload.cmd
+++ b/sys/boot/ia64/skiload/skiload.cmd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/skiload/skiload.cmd,v 1.1 2001/09/12 15:08:49 dfr Exp $
 iar
 fr
 pa
diff --git a/sys/boot/ia64/skiload/start.S b/sys/boot/ia64/skiload/start.S
index bb0266fd05173..8a22d6d4fb205 100644
--- a/sys/boot/ia64/skiload/start.S
+++ b/sys/boot/ia64/skiload/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/skiload/start.S,v 1.1 2003/07/17 01:49:59 marcel Exp $
  */
 
 #include <machine/fpu.h>
diff --git a/sys/boot/ia64/skiload/version b/sys/boot/ia64/skiload/version
index 6f4fc3c28a46d..c3d1d187f30c0 100644
--- a/sys/boot/ia64/skiload/version
+++ b/sys/boot/ia64/skiload/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/ia64/skiload/version,v 1.2 2002/03/30 23:52:34 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 3b881b780e87a..5332c2ed4f353 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 5d20372631e67..a1870f185762a 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 2fdd2934d5191..dc2048871a364 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 a153f4fb07f55..b9ef8df68b5c9 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.8 2002/11/10 19:17:36 jake Exp $
 
 LIB=		ofw
 INTERNALLIB=	true
diff --git a/sys/boot/ofw/libofw/devicename.c b/sys/boot/ofw/libofw/devicename.c
index a2c48975417ae..4e2876fb9e0ae 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 4a8855b597dce..c7b7df179c0c8 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.8 2004/07/08 06:04:45 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 f3a2d8c05423a..cc8da11dcb7b6 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.9 2004/08/02 03:05:09 grehan Exp $
  */
 
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index a0c9f023fa8e5..d65a35bc5eb95 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.9 2004/08/16 15:45:25 marius Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/sys/boot/ofw/libofw/ofw_copy.c
index ba8c91f700ccf..44ba443d81ffa 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.14 2004/07/08 06:06:56 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 d241aed19d282..879fdeb924576 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.11 2004/01/04 23:27:31 obrien 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 5239fa2be8eed..40ad7b059deb2 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.5 2004/08/02 03:05:09 grehan 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 d39a34344556e..b37dd40a7e52b 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 cb85eeaa41d96..323b2cb9fe91e 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.8 2004/08/16 15:45:25 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 cb1cf590825f0..4c9d720e783f4 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.2 2004/01/04 23:27:31 obrien 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 581bf22320c97..51ca1e34ebf66 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.4 2004/01/04 23:27:31 obrien Exp $");
 
 #include <stand.h>
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/openfirm.c b/sys/boot/ofw/libofw/openfirm.c
index b1d2b402b4872..9624a2423acee 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.10 2004/08/16 15:45:25 marius Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/boot/ofw/libofw/openfirm.h b/sys/boot/ofw/libofw/openfirm.h
index 40382cdd50227..a8a95f248cdc8 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.9 2004/08/16 15:45:25 marius Exp $
  */
 #ifndef _OPENFIRM_H_
 #define	_OPENFIRM_H_
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index d63cb4c2e0a48..323675702ce2c 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 0c17dd0beb759..d69f05dd4517c 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 c9028ee7d18fe..d48926dff2f73 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.3 2004/02/09 16:01:45 nyan Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
diff --git a/sys/boot/pc98/boot0.5/boot.s b/sys/boot/pc98/boot0.5/boot.s
index 1a3bfc7c87909..c5be97ae9ea49 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 80dbe2abd498e..27cad9c114c8c 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 9d0db21d925ac..4e3adf3a3127c 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 18da4881f6db3..2689ca6d6e957 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 211de141110a6..8efadc9e3bdfb 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 65f5a9a632099..5af88e418a0d9 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 150b835f795d6..11f4dd3e76e07 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 a4decfe05f99b..a21ff5d62c2d5 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.3 2004/02/09 16:01:45 nyan Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
diff --git a/sys/boot/pc98/boot0/boot0.s b/sys/boot/pc98/boot0/boot0.s
index 508e2521157a2..177817b0a079c 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 258b151f65277..9c2a830ef4d42 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.18.2.1 2004/09/19 05:28:13 nyan Exp $
 #
 
 PROG=	boot
diff --git a/sys/boot/pc98/boot2/README.serial.98 b/sys/boot/pc98/boot2/README.serial.98
index 97a4b32f5e6d7..4682e97e38e6c 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 de51618f162e6..dba29892d42da 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 914014dea7b89..fed5ced61ec0d 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 8a884d6342dcb..cedcc6e993b9b 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 d572ed272aa48..917abb7f842fc 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.11 2003/09/08 09:11:20 obrien 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 6fd1e99cb1ae2..4bbb9a1330af2 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.6 2004/07/30 09:42:04 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/pc98/boot2/boot2.S b/sys/boot/pc98/boot2/boot2.S
index 605547532c3b2..716f4d353387a 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.3 2001/05/24 11:18:32 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 2a78f344d40cc..2eb3de34f0344 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 f892c276ce92e..5d57cfda59fb7 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.11 2004/07/30 09:42:04 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 8ac77da6d0993..b13fb0af57b5a 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 9a59f99bc77bc..bb37432b3cf09 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 88dc8ba429f14..9564084ab71eb 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.6 2004/07/30 09:42:04 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 f10329683a8c8..0efda3ed86131 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 324131acf5613..9444f734ebbdc 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 ea7b98aac4e3c..115559d986215 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 114a369c8c98d..149dc2ca97d8b 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 217dbdb176987..21a4208e0a72a 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 2a9bcbb7a1b2a..6b2ef35c4ad76 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 d924624f08804..b6552344c3794 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.6 2004/07/30 09:42:04 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 bcdc17880958c..95057d826793e 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.4 2003/09/08 09:11:20 obrien Exp $");
 
 #include "boot.h"
 
diff --git a/sys/boot/pc98/btx/Makefile b/sys/boot/pc98/btx/Makefile
index 39f78ed639b9c..606b2c09525f0 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 265f86d1ed55a..6572d904a4efc 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 7780e6be8f647..cf35b951363d7 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.10 2004/04/29 08:24:30 nyan Exp $
 
 PROG=	btx
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S
index 9100eb30973cc..e1ac708ba2ab9 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.19 2004/05/20 20:30:59 markm Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index 0cbed4974b76d..b659341b2325d 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.8 2004/04/29 08:24:57 nyan Exp $
 
 PROG=	btxldr
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.S b/sys/boot/pc98/btx/btxldr/btxldr.S
index 9c414a6c63144..f97eb1df8000b 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.11 2004/05/20 20:24:18 markm Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index 563f001253b2b..c2dc8566f5679 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.9 2004/02/09 16:01:45 nyan Exp $
 
 PROG=	crt0.o
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/lib/btxcsu.s b/sys/boot/pc98/btx/lib/btxcsu.s
index f08ae754f8269..eaca1436d82c2 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.2 1999/08/28 00:40:32 peter 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 9c77b4295e7cf..e2d5477b26e84 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 1152f8b1d9635..3452c00356b09 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 0d7d1116322d2..2dac463a19e45 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 1c423d8f0f2a5..8df14bb7008dc 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.14 2004/02/13 15:24:25 nyan Exp $
 
 PROG=	kgzldr.o
 STRIP=
diff --git a/sys/boot/pc98/kgzldr/crt.s b/sys/boot/pc98/kgzldr/crt.s
index 1435435e67926..3b152abc9f13f 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.4 2002/09/24 02:17:13 nyan Exp $
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index c3ebc16db08ba..2e97e5a665bf6 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.20 2004/02/07 14:35:33 ru Exp $
 #
 LIB=			pc98
 INTERNALLIB=		true
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index 706f85421a614..98372ed73cee8 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.30 2004/06/17 11:44:05 phk Exp $");
 
 /*
  * BIOS disk device handling.
diff --git a/sys/boot/pc98/libpc98/biosmem.c b/sys/boot/pc98/libpc98/biosmem.c
index e2e792cc11269..e88877b32f900 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.6 2003/09/08 09:11:20 obrien 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 71c8a5dce95cb..c694fedcd4dec 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.5 2003/09/16 11:24:23 bde Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/libpc98/gatea20.c b/sys/boot/pc98/libpc98/gatea20.c
index 677a11e3ff945..a381104f5fc82 100644
--- a/sys/boot/pc98/libpc98/gatea20.c
+++ b/sys/boot/pc98/libpc98/gatea20.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/gatea20.c,v 1.4 2003/09/08 09:11:20 obrien Exp $");
 
 /* extracted from freebsd:sys/i386/boot/biosboot/io.c */
 
diff --git a/sys/boot/pc98/libpc98/i386_module.c b/sys/boot/pc98/libpc98/i386_module.c
index d988b27f00586..f04fb9c222822 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 406b1807a3008..be8691f6666ed 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.5 2003/09/08 09:11:20 obrien Exp $");
 
 #include <stand.h>
 #include <btxv86.h>
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/sys/boot/pc98/libpc98/vidconsole.c
index ae02d9e7bd95d..92700220ab1cb 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.12 2004/01/18 04:10:45 nyan Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 7192554abf4c5..51d853e9b1429 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.35 2004/03/14 09:41:57 nyan Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
diff --git a/sys/boot/pc98/loader/conf.c b/sys/boot/pc98/loader/conf.c
index 18eb21c29cc50..2b190eb8a9df4 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.2 2003/09/08 09:11:21 obrien Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 522908b36d0d4..c82281639ef6e 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.17 2004/03/14 09:43:15 nyan Exp $");
 
 /*
  * MD bootstrap main() and assorted miscellaneous
diff --git a/sys/boot/sparc64/Makefile b/sys/boot/sparc64/Makefile
index fdc87fde92d5f..71b7999d07cad 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 f2170c83a8a7f..aa3ec51308e4f 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 93d213d3c63aa..2d616e337b3c2 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.10 2004/02/11 21:17:04 ru Exp $
 
 PROG=	boot1.elf
 INTERNALPROG=
diff --git a/sys/boot/sparc64/boot1/_start.s b/sys/boot/sparc64/boot1/_start.s
index 30f8019cc863e..3fa176cf88381 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 4c2786f755a83..863f855af06f0 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.18 2004/08/16 15:45:25 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile
index 31129cd1412e3..b5f394c47bc2e 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.18 2004/08/16 15:45:25 marius Exp $
 
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" sparc64
diff --git a/sys/boot/sparc64/loader/locore.S b/sys/boot/sparc64/loader/locore.S
index c1b3e2bd7eb46..a90b2d1f3c211 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.6 2002/05/29 05:49:58 jake Exp $
  */
 
 #define	LOCORE
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index 9a8a8faa96126..c8846bbf52b98 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.23.2.2 2004/09/09 23:06:55 kensmith 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 6a9506ca2c480..221d762698f81 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.12 2004/04/04 05:24:13 marcel Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/sparc64/loader/version b/sys/boot/sparc64/loader/version
index bef4091e58f67..4f5750d09dbee 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/cam/cam.c b/sys/cam/cam.c
index b84132d2fcfd6..9d1e4fdd4fdfa 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.8 2003/06/14 22:17:38 njl Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 0ca870a8ddd05..179d9431d65d3 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.10 2002/01/09 03:38:58 msmith Exp $
  */
 
 #ifndef _CAM_CAM_H
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 01995b3b8ae29..b69436ce32277 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.27 2004/06/07 19:12:44 scottl Exp $
  */
 
 #ifndef _CAM_CAM_CCB_H
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index b393f76191494..a1b7026a19245 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.7 2001/03/27 05:45:09 ken 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 2b7622b625281..56e22da5bd2d6 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.56 2003/11/08 10:56:57 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index 88a709d08fb56..b7acef42bd610 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.14 2004/07/15 08:25:59 phk Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 0c05ee2686982..66e567dfa043f 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.7 2003/06/10 17:50:20 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index 3d0a29c6bf888..dc0ac5e0ed411 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.8 2000/05/26 02:01:42 jake Exp $
  */
 
 #ifndef _CAM_CAM_QUEUE_H
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index c11e7ea4decc7..ecf998f74923a 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.7 2003/06/10 17:50:20 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index fb6b1a4c71d1b..6a65ce54043da 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.5 2001/01/24 01:46:18 jhb Exp $
  */
 
 #ifndef _CAM_CAM_SIM_H
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 19116a1319077..2ec4c836f6ea7 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.142 2004/07/15 08:25:59 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index f23338104dc60..e79865226d9ba 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.4 2001/03/27 05:45:10 ken Exp $
  */
 
 #ifndef _CAM_CAM_XPT_H
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index 6281a1594fbb0..4ef2abfa5ed6c 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.3 1999/12/29 04:54:28 peter Exp $
  */
 
 #ifndef _CAM_CAM_XPT_PERIPH_H
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 040532060ac89..2b6b9058b8198 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.7 2000/01/14 23:08:46 gibbs Exp $
  */
 
 #ifndef _CAM_CAM_XPT_SIM_H
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 8f3a3de9aa41b..9167be7d6ac68 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.45 2004/08/13 18:45:04 mjacob Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 9470ee8476020..17f4ced2068bd 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.23 2003/04/30 00:35:22 ken Exp $
  */
 
 /*
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index f587b00a703c5..c6dc22e5353ba 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.89.2.1 2004/09/13 06:26:57 phk Exp $");
 
 #include "opt_cd.h"
 
diff --git a/sys/cam/scsi/scsi_cd.h b/sys/cam/scsi/scsi_cd.h
index f502d664391a3..0d36247225c6d 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 1cf3b1fb5c72b..beab6be43669c 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.40 2004/06/16 09:46:31 phk 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 754777918453f..88ca42e8bf5b2 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.4 2003/05/31 16:54:37 phk 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 4570ed23b2fa5..348cb9da9675f 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.171 2004/08/12 23:17:09 sanpei Exp $");
 
 #ifdef _KERNEL
 #include "opt_hw_wdog.h"
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index 994eb03134886..b638583189ed3 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.5 2000/05/21 23:57:52 ken Exp $
  */
 
 #ifndef	_SCSI_SCSI_DA_H
diff --git a/sys/cam/scsi/scsi_dvcfg.h b/sys/cam/scsi/scsi_dvcfg.h
index b963e5d777213..f72f25ffe619b 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.1 2000/10/23 12:55:27 non 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 d5cae8159fedc..89f0d6b000f93 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.2 2003/01/20 18:05:46 gibbs 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 0d9b3b4dc8b6e..582a4f7bc6294 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.21 2003/06/14 22:17:38 njl 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 2724001471482..338ca53e3506c 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.7 2004/07/10 20:54:01 marcel 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 43a8d8475eb13..d8722d2e345d0 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.7 2003/06/10 18:14:05 obrien 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 1e0916ca57a8b..b0a1ed034188b 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.4 2002/03/20 08:55:22 alfred 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 85dc4cb21363f..e866622117f31 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.6 2002/06/05 19:05:01 gibbs 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 ec98f42591ac5..5a6143228c30f 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.41 2004/06/16 09:46:31 phk 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 d39765977ff3a..16a8b56c3a419 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.4 2001/03/27 05:45:11 ken Exp $
  */
 
 #ifndef _SCSI_PASS_H
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 94653b524c962..1881fe82e6de6 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.42 2004/06/16 09:46:31 phk 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 6e2b30d532049..f4f699425a5d8 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.3 2001/01/12 02:49:40 steve Exp $
  */
 
 #ifndef	_SCSI_SCSI_PT_H
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 4836b8ade1167..e9e7bad47a32d 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.101 2004/06/16 09:46:31 phk 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 92a150226dd98..d78bd645b4ef6 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.9 2001/01/12 02:49:40 steve Exp $
  */
 
 #ifndef	_SCSI_SCSI_SA_H
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 25b94892ae16f..7814f620eaf1f 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.29 2004/06/16 09:46:31 phk 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 1849019af2262..4863bcfe09293 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.2 2000/01/15 22:40:04 mjacob 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 9f5fc1bc009e3..560ce0621d9ea 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.20 2003/09/30 08:03:52 simokawa 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 a3e3381d160e9..0e083b5c81f24 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.63 2004/08/15 06:24:40 jmg 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 b6f57dbed8097..3fd43c2be12be 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.11 2002/11/22 22:55:51 njl Exp $
  */
 
 #ifndef _CAM_SCSI_SCSI_TARGETIO_H_
diff --git a/sys/coda/README b/sys/coda/README
index 19de799c0eac7..5cd02cddd3358 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 be7e848bbea67..f1b58d219e87e 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.14 2004/06/16 09:46:32 phk Exp $
  * 
  */
 
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index 5fb352effb824..42a7643891c9e 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.12 2004/06/17 17:16:40 phk Exp $
  * 
  */
 
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index d3feff0b2b91f..7736e7f698666 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.36 2004/07/15 08:25:59 phk Exp $");
 
 #include "vcoda.h"
 
diff --git a/sys/coda/coda_io.h b/sys/coda/coda_io.h
index 4daede1e4c13e..1c9c56d964edf 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.7 2002/05/16 21:25:34 trhodes Exp $
  * 
  */
 
diff --git a/sys/coda/coda_kernel.h b/sys/coda/coda_kernel.h
index cc0fd957f81c0..870c00599de22 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.4 1999/08/28 00:40:53 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c
index 5f8106a9c7ae5..6f20a5ce43b86 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.20 2003/09/07 07:43:09 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_namecache.h b/sys/coda/coda_namecache.h
index 13bb99dad18a0..05a72693443e5 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.9 2003/09/07 07:43:09 tjr Exp $
  * 
  */
 
diff --git a/sys/coda/coda_opstats.h b/sys/coda/coda_opstats.h
index 8661a07ebfa0c..77506fa76b06a 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.5 1999/08/28 00:40:54 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_pioctl.h b/sys/coda/coda_pioctl.h
index a76c653e9f7b9..d140695f4f273 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.7 2002/05/16 21:25:34 trhodes Exp $
  * 
  */
 
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index 03e408da63d60..a5bb798ca0ac2 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.30 2004/06/16 09:46:32 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 f135b34412088..6184a8c4b037c 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.4 2004/06/16 09:46:32 phk Exp $
  * 
  */
 
diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index a59425f2e80bd..89749f0c8e019 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.29 2004/07/04 08:52:33 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_subr.h b/sys/coda/coda_subr.h
index 2b026eb674a3b..aaf70b19fc03d 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.8 2003/09/07 07:43:09 tjr Exp $
  * 
  */
 
diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c
index 7e4d32109045a..cd7704ebb8593 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.21 2004/06/17 17:16:40 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 473b84d30092f..18b29e72dc691 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.6 2004/06/16 09:46:32 phk Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index 189ee92487fc1..d67e3e0356eda 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.51 2004/07/30 22:08:49 phk Exp $");
 
 #include <vcoda.h>
 
diff --git a/sys/coda/coda_vfsops.h b/sys/coda/coda_vfsops.h
index 6d36232c1be27..9baa5d8268f9f 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.8 2003/09/07 07:43:09 tjr Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index 97621a8c4c7b2..adf009055dedd 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.53 2004/07/28 06:05:41 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index 88a398e8cd6c3..74a9a5b0781b7 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.13 2004/06/16 09:46:32 phk Exp $
  * 
   */
 
diff --git a/sys/compat/freebsd32/Makefile b/sys/compat/freebsd32/Makefile
index 0741ec8474aa2..c1e889c3c02a3 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 806b2ffc6d946..99380db054bb2 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 6ff5910c7ebf1..4c09f62ef0515 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.23 2004/06/17 17:16:41 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index 5b153b09a0416..72adefb7d4479 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.28.2.1 2004/10/09 15:25:40 mtm Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index bbdf9be41b416..66a7a9f470d08 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.28.2.1 2004/10/09 15:25:40 mtm Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
index c438f1db2b5f1..de1b473edb261 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.19.2.1 2004/10/09 15:25:40 mtm Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index 0267f47b92d7f..58a9db880178b 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.29.2.1 2004/10/09 15:25:40 mtm Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h
index 1b05e99e89275..12bbcc2a3ad1e 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.9 2003/12/23 02:48:11 peter Exp $
  */
 
 #include <vm/vm.h>
diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf
index 4c65e7d561c30..85b49a76bda6d 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 c2ff8c1d3eb98..ace6defa1b338 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.40.2.1 2004/10/09 15:12:33 mtm 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 54cec2189ef4d..3166df3cc9578 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_signal.h b/sys/compat/ia32/ia32_signal.h
index b618b172603c9..8ad97839470bb 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.6 2004/04/14 23:20:14 peter Exp $
  */
 
 struct ia32_sigaltstack {
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index a2d14354b87ff..52b58cf1a8a57 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.19 2004/08/11 02:35:05 marcel Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/ia32/ia32_util.h b/sys/compat/ia32/ia32_util.h
index a2b88cb4272eb..1bbe495ee6d23 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 040c6491b35a4..f0d9a8c193f7b 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.84 2004/08/16 08:19:18 tjr 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 8102b18c6f415..eb72434ed2d5a 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.87 2004/08/16 07:28:16 tjr 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 1bb137e68e753..508bc48e0100a 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.15 2004/08/16 07:28:16 tjr 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 677d8ffccdbce..040ccb330be7a 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.121 2004/08/16 07:28:16 tjr 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 4d20ab906a539..77c8940ffe918 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.21 2004/07/02 15:31:44 netchild Exp $
  */
 
 #ifndef _LINUX_IOCTL_H_
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 04dc7727ff73e..1c944a4126e48 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.39 2004/08/16 07:28:16 tjr 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 2557f22fedd18..b8ce589166672 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 8ebf68d8642dd..1141be5d192d6 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.22 2004/08/16 07:28:16 tjr 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 b68e57fd32388..d968f706087bc 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 3f080280bdcb1..b4b9dc2b2dafe 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.160 2004/08/16 11:12:57 obrien Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 675352444ff1c..6b40889480213 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.47 2004/08/16 12:15:07 obrien 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 edb7c66b26920..34bb0644bdfb0 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 8233db1744c25..1d13d09b10386 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.51.2.2 2004/09/03 15:30:20 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 b6b9841ad197a..074e8e048b2e0 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 406b5244e5104..f4b921cc78030 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.62 2004/08/16 07:28:16 tjr Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index 72bc1c4437db5..4e9da2e2c7ea0 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.13 2004/08/16 07:28:16 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index 83543eee27e4e..98f0d96fb46ab 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.15 2004/08/16 07:28:16 tjr 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 264e6c109324d..d75003c25044d 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.26 2004/06/23 06:35:43 bde 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 48014537712b9..bdb0f83043089 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.22 2004/08/15 11:52:45 tjr Exp $
  */
 
 /*
diff --git a/sys/compat/ndis/cfg_var.h b/sys/compat/ndis/cfg_var.h
index 11991091613e3..f9505df267ea1 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.2 2003/12/18 03:51:21 wpaul Exp $
  */
 
 #ifndef _CFG_VAR_H_
diff --git a/sys/compat/ndis/hal_var.h b/sys/compat/ndis/hal_var.h
index d0da06d5fb1ae..4b3a21d658ffa 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.4 2004/08/01 20:04:30 wpaul Exp $
  */
 
 #ifndef _HAL_VAR_H_
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index 364f7716ee480..438ef86d341c5 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.60 2004/08/16 18:50:20 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 aa9d0142939fd..96d63f1897e08 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.29 2004/08/16 18:50:20 wpaul Exp $
  */
 
 #ifndef _NDIS_VAR_H_
diff --git a/sys/compat/ndis/ntoskrnl_var.h b/sys/compat/ndis/ntoskrnl_var.h
index 117a177633b88..a21f531ecb07e 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.17 2004/08/04 18:22:50 wpaul Exp $
  */
 
 #ifndef _NTOSKRNL_VAR_H_
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
index b78ebbb93a2ed..1c442959afe53 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.8 2004/08/01 20:04:30 wpaul Exp $
  */
 
 #ifndef _PE_VAR_H_
diff --git a/sys/compat/ndis/resource_var.h b/sys/compat/ndis/resource_var.h
index 9386052ccab8b..5722bd22981b7 100644
--- a/sys/compat/ndis/resource_var.h
+++ b/sys/compat/ndis/resource_var.h
@@ -1,6 +1,6 @@
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/resource_var.h,v 1.2 2004/03/29 02:15:29 wpaul Exp $
  */
 
 typedef int cm_resource_type;
diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c
index 42cea66c06d53..03e74036f2001 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.13 2004/08/01 20:04:30 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 deff521b385d9..fc94dbc0d5655 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.67.2.1 2004/10/13 19:23:33 mlaier 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 d9e83a484f183..bf364ce23346d 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.43.2.1 2004/10/13 19:23:33 mlaier 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 b1480cfaafc94..66d0042e07d0c 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.7 2004/01/13 22:49:45 obrien Exp $");
 
 /*
  * This file contains routines for relocating and dynamically linking
diff --git a/sys/compat/netbsd/dvcfg.h b/sys/compat/netbsd/dvcfg.h
index 585d3c5106265..14e5ab1236c75 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.5 2004/03/13 19:46:26 peter Exp $ */
 /*	$NetBSD$	*/
 /*
  * [NetBSD for NEC PC98 series]
diff --git a/sys/compat/netbsd/physio_proc.h b/sys/compat/netbsd/physio_proc.h
index bffe9f3606ec6..7b0368ec4cb85 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.6 2004/03/13 19:46:26 peter 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 6a91b13870517..8e68461f88733 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.33 2004/06/05 02:18:27 tjr 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 0da3a5604e30c..4c0c7a83f3e6b 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.1 2000/12/20 12:51:03 takawata Exp $	*/
 /*
  * Copyright (c) 2000 Masaru OKI
  */
diff --git a/sys/compat/svr4/Makefile b/sys/compat/svr4/Makefile
index 7da356e4b49fc..c6ef650b92550 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 90d3b384e0a69..d5b10d1dabb25 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.23 2004/06/24 02:21:17 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index 66408640e003f..7b656d84c9aae 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.7 2003/05/12 05:08:38 phk Exp $
  */
 
 #include "opt_svr4.h"
diff --git a/sys/compat/svr4/svr4_acl.h b/sys/compat/svr4/svr4_acl.h
index 6d9454f65ecd3..c42db5c8a36bc 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.3 1999/08/28 00:51:14 peter 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 2440782278889..495a47eceef9a 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.3 1999/08/28 00:51:14 peter Exp $
  */
 
 #ifndef	_SVR4_DIRENT_H_
diff --git a/sys/compat/svr4/svr4_errno.h b/sys/compat/svr4/svr4_errno.h
index cc39929acfd5f..71aab920394b5 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.3 1999/08/28 00:51:14 peter Exp $
  */
 
 #ifndef	_SVR4_ERRNO_H_
diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h
index 672a3602e0e9c..3db9ad5b4ab9a 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.6 2002/05/30 07:28:43 alfred Exp $
  */
 
 #ifndef	_SVR4_EXEC_H_
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index 0c592c30b48ae..e807b6cfba209 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.32.4.1 2004/09/03 15:30:20 jhb Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h
index 3309a4f21cd1d..7aa3181a2ef1d 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.4 2000/08/31 22:54:04 obrien Exp $
  */
 
 #ifndef	_SVR4_FCNTL_H_
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index c15c5b493cb90..edebccaa51ec9 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.31 2004/02/04 21:52:53 jhb 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 37184cb72610b..8b3336fb80d1e 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.3 1999/08/28 00:51:16 peter Exp $
  */
 
 #ifndef	_SVR4_FILIO_H_
diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h
index f828c843c2b48..10d0246526611 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.4 2000/08/31 22:54:04 obrien 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 c160b8eeb6e9f..e26a2e876aeb4 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.3 1999/08/28 00:51:17 peter Exp $
  */
 
 #ifndef	_SVR4_HRT_H_
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 61f9d75b91437..eed7c20159286 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.21 2004/06/21 22:57:10 phk 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 54811b9ee1384..5b00a5fe348c7 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.5 2002/03/20 05:41:37 alfred Exp $
  */
 
 #ifndef	_SVR4_IOCTL_H_
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index ff148b33b9ba2..97e4857b9fd57 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.13 2003/06/10 21:35:15 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_ipc.h b/sys/compat/svr4/svr4_ipc.h
index 6aadb7e050eca..1de03e96a34c3 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.3 1999/08/28 00:51:18 peter Exp $
  */
 
 #ifndef _SVR4_IPC_H_
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 243dc226aa306..f36cfb6670fc2 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.71 2004/03/17 20:00:00 jhb Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/svr4/svr4_mman.h b/sys/compat/svr4/svr4_mman.h
index db7c3dacef5f1..d41b2520a2b82 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.3 1999/08/28 00:51:19 peter Exp $
  */
 
 #ifndef _SVR4_MMAN_H_
diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h
index 7e103cf95eef5..cfb11565cceea 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.15.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 6aed48d413e38..6ba0004d24eb6 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.16 2004/02/04 21:52:53 jhb 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 3512df387674d..19de264704f5a 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.3 1999/08/28 00:51:19 peter Exp $
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_siginfo.h b/sys/compat/svr4/svr4_siginfo.h
index be898374dc2be..83034767e6344 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.3 1999/08/28 00:51:20 peter Exp $
  */
 
 #ifndef	_SVR4_SIGINFO_H_
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index dc6af50f3924c..ad3285ff04a3f 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.29 2003/10/20 10:38:48 tjr 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 5a01a8fb24e1a..87baac7eeada6 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.9 2002/03/20 05:41:38 alfred Exp $
  */
 
 #ifndef	_SVR4_SIGNAL_H_
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index 65126d76cdf6b..46000c9ed1395 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.23 2004/06/17 17:16:41 phk 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 1df1e43d7685b..2fb68f10dad78 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.8 2004/06/17 17:16:41 phk Exp $
  */
 
 #ifndef _SVR4_SOCKET_H_
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 089daff81f2ce..a17558caa6b0c 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.15 2003/06/10 21:35:15 obrien 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 dd4e220c9f488..850e02f346e82 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.3 1999/08/28 00:51:22 peter Exp $
  */
 
 #ifndef	_SVR4_SOCKIO_H_
diff --git a/sys/compat/svr4/svr4_sockmod.h b/sys/compat/svr4/svr4_sockmod.h
index 927ba0d283675..34e3c920c72e7 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.3 1999/08/28 00:51:22 peter Exp $
  */
 
 #ifndef	_SVR4_SOCKMOD_H_
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index a361bd2f1ec0d..5169571899e03 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.18 2003/06/10 21:35:15 obrien 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 e92aea68f367c..4c484453339da 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.4 2000/08/31 22:54:05 obrien Exp $
  */
 
 #ifndef	_SVR4_STAT_H_
diff --git a/sys/compat/svr4/svr4_statvfs.h b/sys/compat/svr4/svr4_statvfs.h
index b3bf473a1b52c..9d79a9a74db05 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.3 1999/08/28 00:51:23 peter Exp $
  */
 
 #ifndef	_SVR4_STATVFS_H_
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 0e708f6ee9914..60a0384960f42 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.49.2.1 2004/09/03 15:30:20 jhb Exp $");
 
 #define COMPAT_43 1
 
diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h
index e5a39e9ab779f..1929f1c7efd93 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.4 2002/03/20 05:41:38 alfred Exp $
  */
 
 #ifndef	_SVR4_STROPTS_H_
diff --git a/sys/compat/svr4/svr4_syscall.h b/sys/compat/svr4/svr4_syscall.h
index c8def22a8f626..fc4604e97756f 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.13.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_syscallnames.c b/sys/compat/svr4/svr4_syscallnames.c
index b49ea225baedd..21e77be68013d 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.13.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_sysconfig.h b/sys/compat/svr4/svr4_sysconfig.h
index 874c5653e634d..fe48a0b46b71c 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.3 1999/08/28 00:51:24 peter Exp $
  */
 
 #ifndef	_SVR4_SYSCONFIG_H_
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index bdd5bd72ac929..33e9e9a75dccb 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.14.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_systeminfo.h b/sys/compat/svr4/svr4_systeminfo.h
index 40bc2b85d7570..7244621a3f128 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.3 1999/08/28 00:51:24 peter Exp $
  */
 
 #ifndef	_SVR4_SYSTEMINFO_H_
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 64639f2e1110b..ebc5126688000 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.37 2004/07/15 08:26:00 phk 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 a6cb59fdae97f..eda2ca95bfc1c 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.11 2003/06/10 21:35:15 obrien 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 8afa4f321bc36..f80ebbcc90668 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.3 1999/08/28 00:51:25 peter Exp $
  */
 
 #ifndef	_SVR4_TERMIOS_H_
diff --git a/sys/compat/svr4/svr4_time.h b/sys/compat/svr4/svr4_time.h
index 3d61771fc9045..8456ba02cabb5 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.3 1999/08/28 00:51:25 peter Exp $
  */
 
 #ifndef	_SVR4_TIME_H_
diff --git a/sys/compat/svr4/svr4_timod.h b/sys/compat/svr4/svr4_timod.h
index f0c508f511b8d..1887c18f5f639 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.3 1999/08/28 00:51:26 peter Exp $
  */
 
 #ifndef	_SVR4_TIMOD_H_
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 3b4b841a789d1..26672f50bf4e3 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.13 2004/06/21 22:57:10 phk Exp $");
 
 #ifndef BURN_BRIDGES
 
diff --git a/sys/compat/svr4/svr4_ttold.h b/sys/compat/svr4/svr4_ttold.h
index c578170a1ef9d..dc6a255b1278b 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.3 1999/08/28 00:51:26 peter Exp $
  */
 
 #ifndef	_SVR4_TTOLD_H_
diff --git a/sys/compat/svr4/svr4_types.h b/sys/compat/svr4/svr4_types.h
index 410746b6adc9c..85f9f9d24c75c 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.5 2004/06/17 17:16:41 phk Exp $
  */
 
 #ifndef	_SVR4_TYPES_H_
diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h
index 04bebe6eb81e6..4c0884540d9e0 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.3 1999/08/28 00:51:27 peter Exp $
  */
 
 #ifndef	_SVR4_UCONTEXT_H_
diff --git a/sys/compat/svr4/svr4_ulimit.h b/sys/compat/svr4/svr4_ulimit.h
index 0735d42f722f0..393211bbd5b04 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.3 1999/08/28 00:51:28 peter Exp $
  */
 
 #ifndef	_SVR4_ULIMIT_H_
diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h
index e9ebffbfdaaeb..5efeceb88d5b5 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.4 2000/08/31 22:54:05 obrien Exp $
  */
 
 #ifndef	_SVR4_USTAT_H_
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index e0cb54ff3cf16..056d67ed72bde 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.7 2003/10/20 10:38:48 tjr Exp $
  */
 
 #ifndef	_SVR4_UTIL_H_
diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h
index 0ff6deadc7d1e..5aaf733b0c4c8 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.4 2000/08/31 22:54:05 obrien Exp $
  */
 
 #ifndef	_SVR4_UTSNAME_H_
diff --git a/sys/compat/svr4/svr4_wait.h b/sys/compat/svr4/svr4_wait.h
index 9a92c0114c1c1..c92bf314433eb 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.3 1999/08/28 00:51:29 peter Exp $
  */
 
 #ifndef	_SVR4_WAIT_H_
diff --git a/sys/compat/svr4/syscalls.conf b/sys/compat/svr4/syscalls.conf
index 24f087ac0f58d..d63085b97599f 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 63435979503c0..69e9c976b97cd 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.15.2.1 2004/09/03 15:30:20 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 d17855daab85f..89b2972b52292 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.130 2004/05/09 22:29:37 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 02687616bb2f1..b57cf5c4b5b0b 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.11 2004/05/09 22:29:37 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 998d296e187e4..bfbc0fbdf28c1 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.1 2004/05/14 11:49:40 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 6259f69321724..b8632a03e4252 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.260 2004/05/09 22:29:37 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 82d79a8d5e4e3..a0c7efba94ba2 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.57 2004/05/09 22:29:37 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index eb8fda091ab9b..cf4484bc6957c 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.161 2004/05/09 22:29:37 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 471ae7f92765a..2350e4eedbd48 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.270 2004/08/13 14:30:26 ru Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index a9e11e51d9de0..c447f1b41f397 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.28 2004/05/09 22:29:38 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 28affc4579154..07c5cd0b66a04 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/NOTES,v 1.1261.2.6 2004/09/22 19:23:36 andre Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
diff --git a/sys/conf/files b/sys/conf/files
index 2cbefaedcb08f..df2485eef3da4 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files,v 1.943.2.4 2004/09/22 19:23:37 andre 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 6b3553b905c90..3e5cd545eeb8a 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.114 2004/08/01 11:40:51 markm 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 f4e72d6438553..579a5b67fc91e 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.47 2004/08/16 12:51:33 obrien 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 a3181871bdcb0..2f6247c76ceb6 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.arm,v 1.3 2004/05/14 23:42:54 cognet 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 fac91dae9c5e9..fc9fd395006f3 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.504.4.1 2004/10/24 18:02:52 scottl 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 413791a3789dc..aff11251d190c 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.72 2004/08/16 18:54:22 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.pc98 b/sys/conf/files.pc98
index 634566ae70e1e..54e2946cbadab 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.pc98,v 1.305 2004/08/16 13:59:01 rwatson 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 ed52bcb20ab22..0cb673febc0d8 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.41 2004/08/16 13:07:39 ssouhlal 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 562d6d3a41407..4a51f247b0331 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.59 2004/08/15 22:59:34 marius 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 4f773ab22f88a..7ab285658a6f8 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.mk,v 1.42 2004/05/14 13:35:46 cognet 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 4fc4964764e5a..970256505d5e0 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.68.2.1 2004/09/20 17:39:02 ru 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 e1a088bb223b4..70b3fe5c95c3e 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.56 2004/08/13 14:30:26 ru 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 7fd40a7a28bab..675c50166d1f4 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.166 2004/08/14 23:53:04 marius Exp $
 #
 # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device
 # drivers (KLD's).
diff --git a/sys/conf/kmod_syms.awk b/sys/conf/kmod_syms.awk
index 677d813507ee5..5a2650079930a 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 46013802b040b..d2825885a3c50 100644
--- a/sys/conf/ldscript.alpha
+++ b/sys/conf/ldscript.alpha
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.alpha,v 1.7 2004/02/13 12:28:53 ru 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 68ab1a2c7e4ed..ccc96f8d6fbac 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 96653f3395602..7fe4c727172de 100644
--- a/sys/conf/ldscript.arm
+++ b/sys/conf/ldscript.arm
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.arm,v 1.1 2004/05/14 11:49:40 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 a94f32fdd4c2f..2008a851a07b9 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 cc78ee1397add..e012730bdf9be 100644
--- a/sys/conf/ldscript.ia64
+++ b/sys/conf/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.11 2004/06/20 22:32:19 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 fac182df76331..74d94c31a4a20 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 6f9c021ae1b30..7a3b01d3ee7f0 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/majors b/sys/conf/majors
index 9741407092c48..19da98b1f047a 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/majors,v 1.201 2004/05/05 13:09:11 rik Exp $
 #
 # This list is semi-obsoleted by DEVFS, but for now it still contains
 # the current allocation of device major numbers.
diff --git a/sys/conf/majors.awk b/sys/conf/majors.awk
index d9d006de6d781..52c1b231f6751 100644
--- a/sys/conf/majors.awk
+++ b/sys/conf/majors.awk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/majors.awk,v 1.1 2003/02/27 08:52:11 phk Exp $
 /^#/	{ next }
 NF == 1 { next }
 $2 == "??" { next }
diff --git a/sys/conf/makeLINT.mk b/sys/conf/makeLINT.mk
index 08947a91db059..bff4279a5ecb0 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 83445cfcb7058..6f68d4a05b462 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 dbcb44857c3b4..0d25ee8ae8b4f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -28,12 +28,12 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.62.2.15.2.5 2004/11/04 18:51:30 scottl Exp $
 
 TYPE="FreeBSD"
 REVISION="5.3"
 BRANCH="RELEASE"
-RELEASE="${REVISION}-${BRANCH}"
+RELEASE=5.3-RELEASE
 VERSION="${TYPE} ${RELEASE}"
 
 if [ "X${PARAMFILE}" != "X" ]; then
diff --git a/sys/conf/options b/sys/conf/options
index b83657a37977a..0f49bca1cbfa8 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options,v 1.475.2.4 2004/09/22 19:23:37 andre Exp $
 #
 #        On the handling of kernel options
 #
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index d1aaf8d3fe26b..f0ee9965294d8 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 a6dce410cf692..dc0567e8c43cc 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.amd64,v 1.16 2004/08/16 11:09:59 obrien 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 f2e9d8c911a37..4cf9fb4f62b90 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/conf/options.arm,v 1.1 2004/05/14 11:49:40 cognet Exp $
 ARMFPE		opt_global.h
 CPU_SA1100	opt_global.h
 CPU_SA1110	opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 69a3656b590e1..2ea03369492c8 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.i386,v 1.214 2004/08/16 12:25:47 obrien 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 8f4b2ac0432a9..345250fbafee6 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 e5354a905a192..a1e6c5a0a952d 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.pc98,v 1.177 2004/08/16 13:59:01 rwatson 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 a6dc6da171360..851ed3bff7360 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 307ce702c3626..182c8f67eaf2b 100644
--- a/sys/conf/options.sparc64
+++ b/sys/conf/options.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.11 2004/06/24 02:57:10 obrien Exp $
 
 SUN4U			opt_global.h
 
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index b8d4864b0322b..249055c726e0a 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 c740ed359ad16..51f812de997ae 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 00808958818d9..78ff693dbcee4 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 2004/06/12 00:57:20 mlaier 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 d0a1313f4fb99..537416d5aa36b 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 7eea5c7e54e4b..f62a9b0c34530 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 e4e84e6e524b3..2df4747391fb5 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 ff6d83260c7e8..d1578edd9ca17 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 6bc4a95a15baf..7604f6b542c66 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.2 2004/06/12 00:57:20 mlaier 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 63194ee131693..665fac572df0b 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 31fe1330ab3db..08234b4c2440f 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.5 2004/06/15 23:59:37 mlaier Exp $	*/
 /*	$KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/if_altq.h b/sys/contrib/altq/altq/if_altq.h
index 0676e401f0b26..2b4537eadd976 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 bb1605cbfb6bd..407100d8ecf4a 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/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index 1452c056f5343..0cf990a58db8a 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.35 2004/08/14 00:19:07 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/contrib/dev/oltr/trlld.h b/sys/contrib/dev/oltr/trlld.h
index 988cf356df108..9e48f6afab2f7 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 944606da5a312..77c1aa5828f4f 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 cdcb250c5a62e..22f88cb49d39c 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 63cfd3e3cf3bf..c0fbe847c6eb0 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 1ee473da33f10..30fa68a7c0079 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 b62377679670a..4142b56db6211 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 495163b31f242..f8fcbabeacb36 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -100,7 +100,7 @@
 
 #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.39 2004/06/29 03:39:06 darrenr Exp $";
 #endif
 
 #ifndef	_KERNEL
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c
index a32c74b93c3f4..967bfdca7cb05 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.c
+++ b/sys/contrib/ipfilter/netinet/ip_auth.c
@@ -105,7 +105,7 @@ extern struct ifqueue   ipintrq;		/* ip packet input queue */
 
 #if !defined(lint)
 /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.36 2004/06/22 05:20:30 darrenr Exp $";
 #endif
 
 
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.h b/sys/contrib/ipfilter/netinet/ip_auth.h
index 64fc2d7f10bfd..7527e3b9cb267 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.h
+++ b/sys/contrib/ipfilter/netinet/ip_auth.h
@@ -3,7 +3,7 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.h,v 1.13 2003/02/15 06:23:45 darrenr Exp $
  *
  */
 #ifndef	__IP_AUTH_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index 34ce384ab9230..28bbd0815b93e 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -5,7 +5,7 @@
  *
  * @(#)ip_compat.h	1.8 1/14/96
  * $Id: ip_compat.h,v 2.26.2.9 2001/01/14 14:58:01 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.23 2004/06/21 22:46:35 darrenr Exp $
  */
 
 #ifndef	__IP_COMPAT_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c
index 16afbca26c559..ed34ae6bd75cf 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil.c
@@ -132,7 +132,7 @@ extern	int	ip6_getpmtu(struct route_in6 *, struct route_in6 *,
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
 /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.47.2.3 2004/10/03 17:04:38 mlaier Exp $";
 #endif
 
 extern	struct	protosw	inetsw[];
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h
index 5bbec282f34c9..842a016e10bed 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/sys/contrib/ipfilter/netinet/ip_fil.h
@@ -5,7 +5,7 @@
  *
  * @(#)ip_fil.h	1.35 6/5/96
  * $Id: ip_fil.h,v 2.29.2.4 2000/11/12 11:54:53 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.h,v 1.26.2.2 2004/09/22 19:51:03 andre Exp $
  */
 
 #ifndef	__IP_FIL_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index 0d19f539a46ad..182fe50be1308 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -90,7 +90,7 @@ extern struct timeout ipfr_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.25 2004/06/21 22:46:35 darrenr Exp $";
 #endif
 
 
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.h b/sys/contrib/ipfilter/netinet/ip_frag.h
index 4055cb18874d2..e6b7c3cfb9d3d 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.h
+++ b/sys/contrib/ipfilter/netinet/ip_frag.h
@@ -5,7 +5,7 @@
  *
  * @(#)ip_frag.h	1.5 3/24/96
  * $Id: ip_frag.h,v 2.4.2.2 2000/11/10 13:10:54 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.h,v 1.16 2004/06/21 22:46:35 darrenr Exp $
  */
 
 #ifndef	__IP_FRAG_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
index e8bf21682854a..453023b1ccda9 100644
--- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
@@ -2,7 +2,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.24 2004/06/21 22:46:35 darrenr Exp $
  */
 #if SOLARIS && defined(_KERNEL)
 extern	kmutex_t	ipf_rw;
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c
index 06c14721494fb..50054f6f2de20 100644
--- a/sys/contrib/ipfilter/netinet/ip_log.c
+++ b/sys/contrib/ipfilter/netinet/ip_log.c
@@ -4,7 +4,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.27 2004/06/21 22:46:35 darrenr Exp $
  */
 #include <sys/param.h>
 #if defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c
index 49de89bf748d1..09a1722af2bb7 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat.c
@@ -111,7 +111,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[] = "@(#)$Id: ip_nat.c,v 2.37.2.44 2001/07/21 07:17:22 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.34 2004/06/21 22:46:35 darrenr Exp $";
 #endif
 
 nat_t	**nat_table[2] = { NULL, NULL },
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/contrib/ipfilter/netinet/ip_nat.h
index 3d9732c4c8882..9cc94a6d9f08a 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.h
+++ b/sys/contrib/ipfilter/netinet/ip_nat.h
@@ -5,7 +5,7 @@
  *
  * @(#)ip_nat.h	1.5 2/4/96
  * $Id: ip_nat.h,v 2.17.2.14 2000/11/18 03:58:04 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.h,v 1.21 2004/06/21 22:46:36 darrenr Exp $
  */
 
 #ifndef	__IP_NAT_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index da90a9d607d96..107461ff9fea3 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -77,7 +77,7 @@
 
 #if !defined(lint)
 /* static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.9.2.6 2001/07/15 22:06:15 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.22 2003/02/15 06:23:45 darrenr Exp $";
 #endif
 
 #if defined(_KERNEL) && (SOLARIS || defined(__sgi))
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/sys/contrib/ipfilter/netinet/ip_proxy.h
index 8488188936ff8..331cffa1986bf 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.h
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.h
@@ -4,7 +4,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * $Id: ip_proxy.h,v 2.8.2.4 2000/12/02 00:15:03 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.h,v 1.13 2003/02/15 06:23:45 darrenr Exp $
  */
 
 #ifndef	__IP_PROXY_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
index 933e7ea6ae5e3..22dc246eae54f 100644
--- a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c,v 1.10 2004/06/21 22:46:36 darrenr Exp $
  */
 #if SOLARIS && defined(_KERNEL)
 extern	kmutex_t	ipf_rw;
diff --git a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
index 8f450ea0cb9bd..05cc5a7acdff9 100644
--- a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
@@ -4,7 +4,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.11 2004/06/21 22:46:36 darrenr Exp $
  */
 #if SOLARIS && defined(_KERNEL)
 extern	kmutex_t	ipf_rw;
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index ef19b5ecd0c3f..f21b0ac7788ef 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -95,7 +95,7 @@
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_state.c	1.8 6/5/96 (C) 1993-2000 Darren Reed";
 /* static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.30.2.38 2001/07/23 13:49:46 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.33 2004/06/21 22:46:36 darrenr Exp $";
 #endif
 
 #ifndef	MIN
diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/sys/contrib/ipfilter/netinet/ip_state.h
index cc91282b5000e..630b8e6646f50 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.h
+++ b/sys/contrib/ipfilter/netinet/ip_state.h
@@ -5,7 +5,7 @@
  *
  * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
  * $Id: ip_state.h,v 2.13.2.1 2000/07/08 02:15:35 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.h,v 1.15 2004/06/21 22:46:36 darrenr Exp $
  */
 #ifndef	__IP_STATE_H__
 #define	__IP_STATE_H__
diff --git a/sys/contrib/ipfilter/netinet/ipl.h b/sys/contrib/ipfilter/netinet/ipl.h
index 31dfa15a51a6d..e4bdc98b8a82a 100644
--- a/sys/contrib/ipfilter/netinet/ipl.h
+++ b/sys/contrib/ipfilter/netinet/ipl.h
@@ -4,7 +4,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.22 2004/06/21 22:46:36 darrenr Exp $
  */
 
 #ifndef	__IPL_H__
diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
index c06b7199a20cb..f60b42a90ad0f 100644
--- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.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/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.13 2004/06/16 09:46:34 phk Exp $
  */
 
 
diff --git a/sys/contrib/ngatm/FREEBSD-Xlist b/sys/contrib/ngatm/FREEBSD-Xlist
index 0ead0cc6a5ce2..b506cfdecd883 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 cb167acca87de..915030fb1b5e2 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/api/ccpriv.h b/sys/contrib/ngatm/netnatm/api/ccpriv.h
index 85bf9b769e378..19470942eb40c 100644
--- a/sys/contrib/ngatm/netnatm/api/ccpriv.h
+++ b/sys/contrib/ngatm/netnatm/api/ccpriv.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/contrib/ngatm/netnatm/api/ccpriv.h,v 1.1.1.1 2004/07/08 16:39:02 harti Exp $
  *
  * ATM API as defined per af-saa-0108
  *
diff --git a/sys/contrib/ngatm/netnatm/api/unisap.h b/sys/contrib/ngatm/netnatm/api/unisap.h
index 004feb77eb930..1f81c7372d57a 100644
--- a/sys/contrib/ngatm/netnatm/api/unisap.h
+++ b/sys/contrib/ngatm/netnatm/api/unisap.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $Begemot: libunimsg/netnatm/api/unisap.h,v 1.5 2004/07/08 08:22:01 brandt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/api/unisap.h,v 1.1.1.1 2004/07/08 16:39:03 harti Exp $
  */
 #ifndef _NETNATM_API_UNISAP_H_
 #define _NETNATM_API_UNISAP_H_
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ie.h b/sys/contrib/ngatm/netnatm/msg/uni_ie.h
index f24c560fb8de0..924592ee2e180 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 62cba33cd91d2..23511d87336f2 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 f9991858b418d..03b89842a7d85 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 ddb095b612c5b..fbb20447734e8 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 be61925c977a9..a3415524e543a 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 f9b44f2b168d7..5dc5d5e1c1bbe 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 1653ba7438ec6..5456912839085 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 70e4e2eeb8b49..1512c320a5cf5 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 8dc6b83e97a26..b8fca57df175c 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.9.2.1 2004/09/20 15:25:57 mlaier Exp $	*/
 /*	$OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/contrib/pf/net/if_pflog.h b/sys/contrib/pf/net/if_pflog.h
index 305001742ae94..9dd5c1b6d2c66 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.4 2004/06/16 23:24:00 mlaier Exp $	*/
 /* $OpenBSD: if_pflog.h,v 1.10 2004/03/19 04:52:04 frantzen Exp $ */
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c
index a03b86acf0fe1..5e79bcef50609 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.11.2.1 2004/09/20 15:25:57 mlaier Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/if_pfsync.h b/sys/contrib/pf/net/if_pfsync.h
index b276b4a5314da..db88c70266499 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.4 2004/06/16 23:24:00 mlaier Exp $	*/
 /*	$OpenBSD: if_pfsync.h,v 1.13 2004/03/22 04:54:17 mcbride Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c
index 2a5b62792dea7..c8d845d652f32 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.18.2.2 2004/10/03 17:04:39 mlaier Exp $	*/
 /*	$OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */
 /* add	$OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */
 
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c
index 7f8ddb9832ed2..e275f9ea6a3f0 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.5 2004/08/16 17:58:12 mlaier Exp $ */
 /*	$OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */
 /* add	$OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */
 
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index 4767deef00ea4..aec1e1185b2f2 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.12.2.4 2004/10/03 17:04:39 mlaier Exp $	*/
 /*	$OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */
 /* add	$OpenBSD: pf_ioctl.c,v 1.118 2004/05/03 07:51:59 kjc Exp $ */
 
diff --git a/sys/contrib/pf/net/pf_norm.c b/sys/contrib/pf/net/pf_norm.c
index fcaeaa4be6323..79f173783037a 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.10 2004/08/14 15:32:40 dwmalone Exp $	*/
 /*	$OpenBSD: pf_norm.c,v 1.80.2.1 2004/04/30 21:46:33 brad Exp $ */
 /* add	$OpenBSD: pf_norm.c,v 1.87 2004/05/11 07:34:11 dhartmei Exp $ */
 
diff --git a/sys/contrib/pf/net/pf_osfp.c b/sys/contrib/pf/net/pf_osfp.c
index af05330a154e4..6449b643ddbce 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.4 2004/06/16 23:24:00 mlaier Exp $	*/
 /*	$OpenBSD: pf_osfp.c,v 1.9 2004/01/04 20:08:42 pvalchev Exp $ */
 
 /*
diff --git a/sys/contrib/pf/net/pf_subr.c b/sys/contrib/pf/net/pf_subr.c
index 3de2924260543..60ac1a74a12c0 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.1 2004/06/16 23:24:00 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 e192004ac77aa..c8c8949e1f391 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.5 2004/07/28 06:14:44 kan Exp $	*/
 /*	$OpenBSD: pf_table.c,v 1.47 2004/03/09 21:44:41 mcbride Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/pfvar.h b/sys/contrib/pf/net/pfvar.h
index ab21c597dcab4..c8ed7c106f65c 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.8.2.2 2004/10/03 17:04:39 mlaier Exp $	*/
 /*	$OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */
 /* add	$OpenBSD: pfvar.h,v 1.194 2004/05/11 07:34:11 dhartmei Exp $ */
 
diff --git a/sys/contrib/pf/netinet/in4_cksum.c b/sys/contrib/pf/netinet/in4_cksum.c
index 24a04d0145621..d30757e0e0fdf 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 a261e5517b7d5..43ccf4335f4da 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.1 2002/03/05 09:19:02 ume 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 680b2e5812e2a..b348079f1285c 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 e480e65790e54..41298e3f7eef4 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 a40c06e0c60ff..5670d83ccd094 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 5f26d408960a7..d520be615a48a 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 9314ff3c1459a..f65e3145a811b 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 fdd5a27e914e8..a2be6034d2fe4 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 df8d1cf3d779a..9abd6c12caa54 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 ecc140754bf9d..7964c391a5aea 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/cast128/cast128.c b/sys/crypto/cast128/cast128.c
index 6260087a47a7d..255d5c9ca2a60 100644
--- a/sys/crypto/cast128/cast128.c
+++ b/sys/crypto/cast128/cast128.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/cast128/cast128.c,v 1.7 2003/10/10 15:06:16 ume Exp $");
 
 #include <sys/types.h>
 #include <crypto/cast128/cast128.h>
diff --git a/sys/crypto/cast128/cast128.h b/sys/crypto/cast128/cast128.h
index 2ca39bae3418e..186532b7f8f5e 100644
--- a/sys/crypto/cast128/cast128.h
+++ b/sys/crypto/cast128/cast128.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/cast128/cast128.h,v 1.7 2003/10/10 15:06:16 ume Exp $	*/
 /*	$NetBSD: cast128.h,v 1.6 2003/08/26 20:03:57 thorpej Exp $ */
 /*      $OpenBSD: cast.h,v 1.2 2002/03/14 01:26:51 millert Exp $       */
 
diff --git a/sys/crypto/cast128/cast128sb.h b/sys/crypto/cast128/cast128sb.h
index 6d546b9128004..a7b827b01bf10 100644
--- a/sys/crypto/cast128/cast128sb.h
+++ b/sys/crypto/cast128/cast128sb.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: cast128sb.h,v 1.1 2003/08/26 16:37:37 thorpej Exp $	*/
 /*      $OpenBSD: castsb.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $       */
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/cast128/cast128sb.h,v 1.1 2003/10/10 15:06:16 ume Exp $	*/
 
 /*
  *	CAST-128 in C
diff --git a/sys/crypto/des/arch/i386/des_enc.S b/sys/crypto/des/arch/i386/des_enc.S
index 7fc29e678a4cd..1c297d1beb8cf 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 81c7bfbeef5e6..b5a94fa41f257 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 87a004af4b4d6..39b7128acba9f 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 c8d484a0d48cb..5692c0b42305c 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 2c3cacc1b4996..035697f10ca3f 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 7d1fb506a22d4..d0dbb4ffdd3f8 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 0528b9cecafc0..8d77aac4f702a 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 d4aa375024d7a..209dca61448b0 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 129b8277be3fa..4fd00b6179b02 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/md5.c b/sys/crypto/md5.c
index 94bce1d324028..4c1441b988d5e 100644
--- a/sys/crypto/md5.c
+++ b/sys/crypto/md5.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/md5.c,v 1.9 2004/01/27 19:49:19 des Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/sys/crypto/md5.h b/sys/crypto/md5.h
index 621b5abdd1ef2..690f5bfc11f36 100644
--- a/sys/crypto/md5.h
+++ b/sys/crypto/md5.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/md5.h,v 1.4 2002/03/20 05:13:50 alfred Exp $	*/
 /*	$KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $	*/
 
 /*
diff --git a/sys/crypto/rc4/rc4.c b/sys/crypto/rc4/rc4.c
index f94a554b98d49..89cb86fde895c 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 670b1a005ba17..39cdcc8d92b0f 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 2d76c7d831774..6b2ad1bda91e8 100644
--- a/sys/crypto/rijndael/Makefile
+++ b/sys/crypto/rijndael/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/crypto/rijndael/Makefile,v 1.1 2003/10/19 22:12:23 phk Exp $
 
 PROG=test00
 NOMAN=1
diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c
index 522b8e128c89f..93d80ecfada05 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.7 2003/11/10 10:33:39 ume Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
diff --git a/sys/crypto/rijndael/rijndael-alg-fst.h b/sys/crypto/rijndael/rijndael-alg-fst.h
index 0c27b469d66ff..085988cadac87 100644
--- a/sys/crypto/rijndael/rijndael-alg-fst.h
+++ b/sys/crypto/rijndael/rijndael-alg-fst.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/rijndael/rijndael-alg-fst.h,v 1.5 2003/11/10 10:33:39 ume Exp $	*/
 /*	$KAME: rijndael-alg-fst.h,v 1.5 2003/07/15 10:47:16 itojun Exp $	*/
 /**
  * rijndael-alg-fst.h
diff --git a/sys/crypto/rijndael/rijndael-api-fst.c b/sys/crypto/rijndael/rijndael-api-fst.c
index 28b7f7ca186ef..82271f1af5984 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.11 2003/11/10 10:33:39 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 155a2129069ca..e7ca9319f9137 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.6 2003/11/10 10:33:39 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 9a7fda30af604..35ddbd96e2584 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 41ecf48cddf14..5ac7fdb93addc 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.2 2003/11/11 18:58:53 ume Exp $	*/
 
 /**
  * rijndael-alg-fst.h
diff --git a/sys/crypto/rijndael/rijndael_local.h b/sys/crypto/rijndael/rijndael_local.h
index 7c765a2b11f8d..7cdeecebef2eb 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 f7a534a0cfa28..534b2c1199599 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 208789ab13392..a553d5fb988eb 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 3686d7ddde519..0bd6cb1ebdaea 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 98e497e3116b9..0ca8c9fd34f8f 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 12da95c92bdad..eb367e30e197b 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/ddb/db_access.c b/sys/ddb/db_access.c
index d8224ada5a521..9c3f7a8a9666b 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.18 2004/07/10 23:47:18 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 9709c3141f677..bdab006df39ba 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.10 2002/03/20 05:14:27 alfred Exp $
  */
 
 #ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 78f4f4f3039e9..319b9d5961ea4 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.24 2004/07/10 23:47:18 marcel Exp $");
 
 #include "opt_comconsole.h"
 
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index d6ed76e6a821d..98d8bb03a3edb 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.16 2002/12/31 18:30:53 jake Exp $
  */
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index b1ad9e50640a2..6e93be3812aa8 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.57 2004/07/21 05:55:51 marcel 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 bc5fe6cbe42af..fbbc41b89109a 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.12 2002/03/20 05:14:28 alfred Exp $
  */
 
 #ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index aa89022cfb435..7f33c3cff19f1 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.31 2003/06/10 22:09:23 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 3495a58117c0b..b44f9499e9a48 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.16 2003/06/10 22:09:23 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index fa66c0f7bae0f..0265509e1f109 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.35 2003/06/10 22:09:23 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index b8b2e3b223158..5f84613ae4e8d 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.21 2003/06/10 22:09:23 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 538a86675035a..0eb77237a55a2 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.13 2002/03/20 05:14:28 alfred Exp $
  */
 
 #ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_main.c b/sys/ddb/db_main.c
index 8344deed47a37..2ff2ab8fdb7f2 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.3 2004/07/28 08:59:08 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index ff2734caad8c3..c6a9e145d0e60 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.31 2004/07/10 23:47:18 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index cca5a89753793..0fbc4e8eaa8b4 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.12 2002/03/20 05:14:28 alfred Exp $
  */
 
 #ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index b173c8ca95e39..6c95597b786d6 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.28 2004/07/10 23:47:18 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 58200598b5071..6ad7ff35784f2 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.52.2.1 2004/09/09 10:03:18 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index ab589d3870056..e7bc422101797 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.24 2004/07/10 23:47:19 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 5714950aecc7c..d306cfa22c3e4 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.35 2004/02/24 22:51:42 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 8fb5866bac68e..25217e905d347 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.22 2002/08/14 17:56:47 jmallett Exp $
  */
 
 #ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_thread.c b/sys/ddb/db_thread.c
index b58f0b09a7d30..61206c4257132 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.1 2004/07/10 23:47:19 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index cf8e2e73423c3..f6481a8b78f72 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.21 2004/07/10 23:47:19 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 7f7a463bdcfea..8ec43274fdbf4 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.13 2004/07/10 23:47:19 marcel Exp $
  */
 
 /*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index af3e7d51d16b1..3416f0c13c921 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.25 2003/06/10 22:09:23 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 18943f43942dc..715ae95e59b8d 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.11 1999/08/28 00:41:12 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 69353c13183ee..7145a519af231 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.14 2003/06/10 22:09:23 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 97d332e5bf39e..879fe26a98d5a 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.36 2004/07/21 05:07:09 marcel Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 335359c8c10b4..bcc9d3747cd62 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.101 2004/08/13 01:44:09 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 06149a942e0fb..7f821debd2435 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.17 2004/08/12 05:05:06 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 ef61c0a365031..8897786c6e174 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 0c6ae902c4ca9..c4fe2e4c630ac 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.19 2004/06/13 17:57:15 obrien Exp $");
 
 /*
  * Debugging support.
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 405b742c3f333..f5350e1c662ca 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.41 2004/08/12 05:05:06 scottl Exp $");
 
 #include "opt_aac.h"
 
diff --git a/sys/dev/aac/aac_ioctl.h b/sys/dev/aac/aac_ioctl.h
index f01cf70e506e2..0bc0d73d21f76 100644
--- a/sys/dev/aac/aac_ioctl.h
+++ b/sys/dev/aac/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/dev/aac/aac_ioctl.h,v 1.10 2004/02/07 17:40:38 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
index 21c944b057321..177cbbc8c6955 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 04de403a30728..8493cfe192027 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.48.4.1 2004/10/23 19:22:22 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 47ebd0360764d..1155f4dfbe16f 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.4 2001/12/04 02:39:06 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index 426601bac1f82..4dc6822fbf0de 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.18 2004/08/13 01:44:09 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index 87e3c9c8ad75a..726511b772e4a 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 2004/08/13 01:44:09 scottl Exp $
  */
 
 #include <sys/bio.h>
diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c
index df818cd6f644e..a8f330213f094 100644
--- a/sys/dev/acpica/Osd/OsdDebug.c
+++ b/sys/dev/acpica/Osd/OsdDebug.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/acpica/Osd/OsdDebug.c,v 1.8.2.1 2004/09/10 22:14:08 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c
index e8f933d5af23f..be811df9319da 100644
--- a/sys/dev/acpica/Osd/OsdHardware.c
+++ b/sys/dev/acpica/Osd/OsdHardware.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/acpica/Osd/OsdHardware.c,v 1.14 2004/06/18 17:56:45 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c
index da57695516a39..00d17f31c7118 100644
--- a/sys/dev/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpica/Osd/OsdInterrupt.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/acpica/Osd/OsdInterrupt.c,v 1.18 2004/08/13 06:22:24 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c
index e32dc59aeb361..9fcb82c7ffe44 100644
--- a/sys/dev/acpica/Osd/OsdMemory.c
+++ b/sys/dev/acpica/Osd/OsdMemory.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/acpica/Osd/OsdMemory.c,v 1.11 2004/04/14 03:39:08 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index 2bb19b05a7ed3..a1b168033b6b9 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.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/acpica/Osd/OsdSchedule.c,v 1.29 2004/08/13 06:22:26 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdStream.c b/sys/dev/acpica/Osd/OsdStream.c
index b4150cff6c7e8..1542c7ddb84a8 100644
--- a/sys/dev/acpica/Osd/OsdStream.c
+++ b/sys/dev/acpica/Osd/OsdStream.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/acpica/Osd/OsdStream.c,v 1.4 2004/04/14 03:39:08 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c
index 571afa4565020..11efde1ca2efa 100644
--- a/sys/dev/acpica/Osd/OsdSynch.c
+++ b/sys/dev/acpica/Osd/OsdSynch.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/acpica/Osd/OsdSynch.c,v 1.22 2004/06/18 17:58:11 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c
index 0ce25d2da560b..aa9c0a9dbae7f 100644
--- a/sys/dev/acpica/Osd/OsdTable.c
+++ b/sys/dev/acpica/Osd/OsdTable.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/acpica/Osd/OsdTable.c,v 1.7.2.1 2004/10/08 18:09:36 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index b5ed18d6b46a6..5986ba6ef97f2 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.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/acpica/acpi.c,v 1.186.2.5 2004/10/15 16:02:43 njl Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c
index 8ff6dd01e974f..ffdb479a39354 100644
--- a/sys/dev/acpica/acpi_acad.c
+++ b/sys/dev/acpica/acpi_acad.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/acpica/acpi_acad.c,v 1.31 2004/08/13 17:47:40 njl Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c
index c0bf2869ecef5..680334ef23b47 100644
--- a/sys/dev/acpica/acpi_battery.c
+++ b/sys/dev/acpica/acpi_battery.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/acpica/acpi_battery.c,v 1.10 2004/08/13 06:21:41 njl Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index 9031f3f2354e5..c660c4b4e281c 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.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/acpica/acpi_button.c,v 1.29 2004/06/30 16:08:03 njl Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index 90f46a4128470..15dd7d013cbbb 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.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/acpica/acpi_cmbat.c,v 1.36 2004/08/17 18:36:07 njl Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index 7d172f26eb551..92e5b393e0281 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.42 2004/08/13 06:21:47 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 1f168ca559526..72d043452a6a5 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -135,7 +135,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.59 2004/08/13 06:21:53 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 7365d9ce3c802..294f972599ed4 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.2 2004/07/15 16:29:08 njl Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c
index d61d6e7ad3bec..23b5ea16dfe9e 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 50421c64b95b9..fd1fe3ccc0e65 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.26.2.1 2004/08/29 23:24:33 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 41f7581e58aa9..274941f977a05 100644
--- a/sys/dev/acpica/acpi_package.c
+++ b/sys/dev/acpica/acpi_package.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/acpica/acpi_package.c,v 1.3 2004/04/09 06:40:03 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index dcc87b45e1eaa..f83d82b45211f 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.23 2004/08/13 06:21:58 njl 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 731a9878159e7..6604949eaff55 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.24.2.5 2004/09/20 05:52:19 njl 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 f8b8e9db5e245..3b8b9593d8505 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.50 2004/08/13 06:22:07 njl 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 90371733b31f2..e632b473aba82 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_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/sys/dev/acpica/acpi_pcib_acpi.c,v 1.39.2.2 2004/10/14 23:52:21 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 8686cf7c253c3..233c6b95186e6 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.10 2004/08/11 14:52:50 njl Exp $");
 
 #include "opt_acpi.h"
 
diff --git a/sys/dev/acpica/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h
index 2c59fae66d0b1..f751e62c4680e 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.3 2004/08/11 14:52:50 njl Exp $
  */
 
 #ifndef	_ACPI_PCIBVAR_H_
diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index 624fc546c8a37..28a53e8e5bd99 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.26.2.1 2004/09/17 04:20:31 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 f50bee398be82..151aa620b4369 100644
--- a/sys/dev/acpica/acpi_quirk.c
+++ b/sys/dev/acpica/acpi_quirk.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/acpica/acpi_quirk.c,v 1.1 2004/06/30 04:45:32 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_quirks b/sys/dev/acpica/acpi_quirks
index 0c4d8a3e5fbba..ce1ef6ddb8b34 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.3.2.1 2004/10/10 03:15:45 njl 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 c5be7bbd9f72e..d0d86e0d66219 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.28.2.1 2004/08/31 05:26:37 njl 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 7673bc221cfd9..6b6a5184e5d30 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.48.2.2 2004/09/26 06:39:35 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 1a3a45a9b91c1..f05c3218b2f4a 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.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/acpica/acpi_timer.c,v 1.35.2.1 2004/10/10 03:15:45 njl 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 ace48181ae22f..37faa78a2fa06 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: acpi_vid.c,v 1.4 2003/10/13 10:07:36 taku Exp $
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.8 2004/08/13 06:22:20 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpiio.h b/sys/dev/acpica/acpiio.h
index 4f059e79109c4..62ef01f3ff913 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.10.2.1 2004/08/19 19:08:57 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 88d041caac206..b97af458c2bb9 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.79.2.3 2004/10/10 03:15:45 njl Exp $
  */
 
 #include "acpi_if.h"
diff --git a/sys/dev/adlink/adlink.c b/sys/dev/adlink/adlink.c
index b32ef3daa5023..d8bc35de1cca5 100644
--- a/sys/dev/adlink/adlink.c
+++ b/sys/dev/adlink/adlink.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.11 2004/06/16 09:46:36 phk Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index d71893861d572..e0b0925a36719 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.16 2004/03/17 17:50:24 njl 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 96bdc7c77ea7d..72a8498f558b3 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.26 2004/05/30 20:08:24 phk 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 9ac61f394fa93..01b0ef755892a 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.24 2004/05/30 20:08:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 1c2d645a3fb0f..7c00307c506dc 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.27 2003/08/24 17:48:01 obrien Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index ab4e550a9afe4..8c9b67a1828e3 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.3 2000/04/07 11:32:36 nyan Exp $
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 7b9b149d1fc5a..66b96d0ade03e 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.21 2003/08/24 17:48:02 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index ba9703db1b6dc..fcb49e9460906 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.11 2000/05/26 02:02:03 jake Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index 730f161f31f93..1ac9771b5a348 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.8 2003/08/24 17:48:02 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index 128efc4c9715c..f76c57356a0b0 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.7 2004/03/10 20:52:47 phk Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index e6050b885d7c2..d7ea320203555 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.20 2004/03/17 17:50:24 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index f4e7f4cfe91ff..1ad94fe96c17f 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.18 2003/08/24 17:48:02 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index d36ca351b9777..b40c591eda680 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.9 2003/08/24 17:48:02 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index 53834474e4641..b7aa7c743a026 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.7 2000/10/29 16:57:32 phk Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index 2b643291453fb..a80ceae3078bc 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.4 2003/08/24 17:48:02 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index 2218454898676..8ced8403dc91e 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.3 2000/02/03 16:34:57 gibbs Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index f4244f98a484c..9443d54fd4527 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.4 2000/06/10 11:06:16 peter Exp $
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 919b1ecd6764e..2d95528ec0e16 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha.c,v 1.55 2003/11/13 04:14:53 imp 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 7215cb069cbd8..6ed9cb7599d93 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.29 2004/03/17 17:50:24 njl 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 730e57e794297..163d803665c6c 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.11 2004/03/17 17:50:24 njl Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index c64d8ea06a733..eec1f2835ae32 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.17 2003/11/13 04:14:53 imp Exp $
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 34b16afd37911..be8d238d8fd16 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.32 2004/03/17 17:50:25 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index c72f068aa3b9d..8dae418106db8 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.4 2000/05/26 02:02:12 jake Exp $
  */
 
 /* Resource Constatns */
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 31f4283cb2bc5..b5dea35c782fd 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.22 2003/08/24 17:48:02 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index d08a66514228f..90bc32563ffd2 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.3 2002/03/15 21:30:41 luoqi Exp $
  */
 
 #define SCSISEQ		0x00	/* SCSI sequence control */
diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c
index d95f648ce3648..0d286ed773039 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.10 2004/03/17 17:50:25 njl 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 0fd2125d07a62..ef8dbeb4d8996 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.11 2004/03/17 17:50:25 njl 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 55831508a9664..70eb4dccf9d7e 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.14 2004/05/27 03:49:39 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 d834fb64dda44..f10815a475ace 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 b3fa8e3782a42..5b4979fbe041e 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.34 2004/08/17 00:14:30 gibbs Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c
index 1515a68d60b96..61619ff4b268e 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.1.2.2.2.1 2004/10/24 17:10:57 gibbs Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index ba6ab22aa8eeb..0cf68ee2fd862 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.62 2004/08/17 00:14:30 gibbs Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index 18ac5f3225e94..1574a44773412 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.16 2004/03/17 17:50:25 njl Exp $");
 
 #include <dev/aic7xxx/aic79xx_osm.h>
 
diff --git a/sys/dev/aic7xxx/aic7770.c b/sys/dev/aic7xxx/aic7770.c
index d6b35a04f7313..8895447766657 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.17 2004/07/13 16:06:19 stefanf 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 ca8e2a951e755..714a0d73eff92 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.31.2.1 2004/09/02 15:33:15 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 3e17ba9315afb..d2c2a2e44234f 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.21.2.1 2004/09/02 15:32:05 gibbs Exp $
  */
 
 #ifndef _AIC79XX_H_
diff --git a/sys/dev/aic7xxx/aic79xx.reg b/sys/dev/aic7xxx/aic79xx.reg
index e3cc7c5deff27..54bef935a42e9 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.18 2004/08/04 17:55:34 gibbs Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $"
 
diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq
index 56ac75505a097..520e9b76bec9f 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.17 2004/08/04 17:55:34 gibbs 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 0498ab3129408..4bdee39f35b8d 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.16 2004/08/04 17:55:34 gibbs Exp $
  */
 
 #ifndef _AIC79XX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index 458f634727d3f..7f7bb700c0d0a 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.19 2004/08/17 00:14:30 gibbs 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 924ef1bb46899..35e73fa6f6db2 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.14 2004/05/30 20:08:24 phk Exp $
  */
 
 #ifndef _AIC79XX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index 6f917b90da243..1b5e174bff300 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.20.2.1 2004/09/02 15:31:21 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 4bf646610bd03..2175d400c68e7 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.102 2004/08/17 00:14:30 gibbs 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 fc72f03df431a..2516208ad48c4 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.51.2.1 2004/08/18 22:16:38 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index e196d83b93c7a..b2f6310f6d2a6 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.46 2003/12/17 00:02:09 gibbs Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $"
 
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 810d766beeaf0..8e777c14e5530 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.127 2004/08/13 21:41:23 gibbs 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 6d08d2563848d..c126ed16a0974 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.19 2003/12/17 00:02:10 gibbs 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 859c43ccdd465..b11792f0c1137 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.11 2002/08/31 06:45:28 gibbs 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 e25e1049df2ac..d0f81c578b168 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.23 2003/12/17 00:02:10 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index ba1eca22cd97f..bd2f1b727ee76 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.41 2004/08/17 00:14:31 gibbs 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 55d9697b65885..19fe030460947 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.27 2004/08/17 00:14:31 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_pci.c b/sys/dev/aic7xxx/aic7xxx_pci.c
index fcb90b92174fd..34a673c2be45c 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.32.2.1 2004/09/02 15:29:39 gibbs 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 525fdcc2c00da..0f6789c4d3614 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.3 2004/08/17 00:14:31 gibbs 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 f00d80b6887b9..8bef65fdd34f3 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.3 2004/08/17 00:14:31 gibbs Exp $
  */
 
 /******************************** OS Includes *********************************/
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index fa35af3e17447..d00e8993d6313 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.18 2004/03/12 21:36:12 trhodes Exp $
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index 0c780f9065bee..9c9348a177610 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.37 2004/03/12 21:45:25 trhodes 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 51678dd46ff74..1173b97dd0970 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.16 2002/08/31 06:39:40 gibbs Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index 67e046d966254..bb1d09f81d2cd 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.23 2003/01/20 18:02:11 gibbs Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
index 3e80f07df49c5..30b6f8f22b1e9 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.8 2002/11/27 07:06:43 scottl 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 439f760b34b54..f8017b3f1b325 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.2 2002/08/31 06:39:40 gibbs 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 f06e7035cb357..9ee23f3ad9b8f 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.5 2003/12/16 23:54:07 gibbs Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index 45c0b233d0bc2..d4cf23bf0bb94 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.22 2003/12/16 23:54:07 gibbs Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index f1f448dff569f..9753470dd25b5 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.23 2003/01/20 18:01:37 gibbs Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index afc22e8b4903c..b638b30132775 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.16 2002/08/31 06:39:41 gibbs Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index b885bf44464e7..868fc2e5ddbcf 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.27 2004/05/30 20:08:25 phk Exp $
  */
 
 /*
diff --git a/sys/dev/amd/amd.h b/sys/dev/amd/amd.h
index 6171bcfe322a2..b2277f521a2b3 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.5 2002/12/14 19:20:57 scottl Exp $
  */
 
 #ifndef AMD_H
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index a4e0fce475ba4..3d8ae58cc91dc 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.54 2004/08/16 17:23:09 ambrisko 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 a8c0252233777..bc471e23f5192 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.9 2003/08/24 17:48:03 obrien 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 33a09f0eebbe4..b5ecd8c189baf 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 8c520adc5a471..0401538d07740 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.33 2004/05/30 20:08:25 phk Exp $");
 
 /*
  * Disk driver for AMI MegaRaid controllers
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index aa4094b5a7bfd..895a185dc06c9 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.23 2004/08/14 02:48:13 ambrisko 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 b1a4e441af426..914438ee9daf9 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 e14ade467cd0b..fca855ff13bcd 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 07850382f0a61..5a9514f18f959 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.7 2002/10/30 22:00:11 emoore Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 224ae44c7a215..7f13f9a17ccca 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.22 2004/07/01 06:56:10 ps Exp $
  */
 
 #if __FreeBSD_version >= 500005
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index a838424f5a818..f91b220337205 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.14 2003/12/30 01:07:12 ambrisko Exp $
  */
 
 #ifndef _IF_AIRONET_IEEE_H
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index c3487386e14f7..94e856e2cccd7 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.63 2004/08/01 23:58:03 mlaier 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 92b9d1c379eb8..4fd09707054ee 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.14 2003/12/30 01:07:12 ambrisko Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 7b22eace94ad3..1b5db8dca14a3 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.26 2004/05/27 03:49:39 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 67d27a3288627..a519025092ead 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.26 2003/12/30 01:07:12 ambrisko 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 47db1be4e98fa..652144f660c9d 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.21 2003/12/30 01:07:12 ambrisko Exp $
  */
 
 #define AN_TIMEOUT	65536
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 7777e89348b70..edf5f1a82f785 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.65 2004/08/13 22:52:11 rwatson Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/ar/if_ar.h b/sys/dev/ar/if_ar.h
index 875e42a6745cb..6b07206d58540 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.3 2000/11/20 13:43:40 julian 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 fe07afb8d5b7e..a930d98bd0081 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.53 2003/08/24 17:48:04 obrien 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 0815d5e8f7d95..651cc8487d7fd 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.11 2004/05/30 20:08:26 phk 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 f735435227600..e2267006db107 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.9 2003/04/23 15:40:11 jhay Exp $
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/dev/arl/if_arl.c b/sys/dev/arl/if_arl.c
index 2d199e46286b3..2bc918d708b34 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.9 2004/08/13 22:54:19 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 62ad3bd0d67c3..2da446f75eea3 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.4 2004/07/31 20:47:57 fjoe Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/arl/if_arlreg.h b/sys/dev/arl/if_arlreg.h
index 137232f29de03..40b0be3bf9b7d 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.5 2004/07/31 20:47:57 fjoe Exp $
  */
 
 #ifndef _IF_ARLREG_H
diff --git a/sys/dev/asr/MAINTAINER b/sys/dev/asr/MAINTAINER
index 337f8fb3d5f08..2dc16cf0f2a04 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 e8badb67487a5..fdb161b11ebed 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -156,7 +156,7 @@
 
 #include	"dev/asr/sys_info.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.64 2004/08/02 23:32:23 marius Exp $");
 
 #define	ASR_VERSION	1
 #define	ASR_REVISION	'1'
diff --git a/sys/dev/asr/dptalign.h b/sys/dev/asr/dptalign.h
index bb72c5b67fb40..90365e176cf15 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.5 2002/05/14 21:59:10 obrien Exp $
  */
 #if (!defined(__DPTALIGN_H))
 #define	      __DPTALIGN_H
diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h
index 94c0810ae3a11..29fa36ecfe7d5 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.7 2002/05/14 21:59:10 obrien Exp $
  */
 
 #ifndef __DPTSIG_H_
diff --git a/sys/dev/asr/i2oadptr.h b/sys/dev/asr/i2oadptr.h
index d880e4793a30c..6c2a63d6627c9 100644
--- a/sys/dev/asr/i2oadptr.h
+++ b/sys/dev/asr/i2oadptr.h
@@ -76,7 +76,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.5 2002/05/14 21:59:10 obrien Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2obscsi.h b/sys/dev/asr/i2obscsi.h
index 06ee30ce662c7..442ca8e6c2d93 100644
--- a/sys/dev/asr/i2obscsi.h
+++ b/sys/dev/asr/i2obscsi.h
@@ -76,7 +76,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.5 2002/05/14 21:59:10 obrien Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h
index 6b2fe5c5ee60f..dfacba89b42ec 100644
--- a/sys/dev/asr/i2odep.h
+++ b/sys/dev/asr/i2odep.h
@@ -45,7 +45,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.7 2002/05/15 12:25:11 brian Exp $
  *
  **************************************************************************/
 
diff --git a/sys/dev/asr/i2odpt.h b/sys/dev/asr/i2odpt.h
index 9435b7cf19a56..4ab6d27e9258b 100644
--- a/sys/dev/asr/i2odpt.h
+++ b/sys/dev/asr/i2odpt.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2000 Adaptec Corporation.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2odpt.h,v 1.5 2002/05/14 21:59:10 obrien Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2oexec.h b/sys/dev/asr/i2oexec.h
index e800305765689..85d254873b6f1 100644
--- a/sys/dev/asr/i2oexec.h
+++ b/sys/dev/asr/i2oexec.h
@@ -76,7 +76,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.5 2002/05/14 21:59:10 obrien Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index 23f2791aa3a30..4968cdb0b6237 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -76,7 +76,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.6 2002/05/14 21:59:10 obrien Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2otypes.h b/sys/dev/asr/i2otypes.h
index eaa97c71342f4..8ac9588427ac8 100644
--- a/sys/dev/asr/i2otypes.h
+++ b/sys/dev/asr/i2otypes.h
@@ -76,7 +76,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.5 2002/05/14 21:59:10 obrien Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2outil.h b/sys/dev/asr/i2outil.h
index 3262dcda5244e..a720f701a9c4e 100644
--- a/sys/dev/asr/i2outil.h
+++ b/sys/dev/asr/i2outil.h
@@ -76,7 +76,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.5 2002/05/14 21:59:10 obrien Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h
index 871d8f92c1cab..27572f12beeb0 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.6 2002/05/14 21:54:56 obrien Exp $
  */
 
 #ifndef		_OSD_DEFS_H
diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index e1309e4f0ddc7..f4dc4427aca0c 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.8 2002/05/14 21:59:10 obrien Exp $
  */
 
 #ifndef		__OSD_UNIX_H
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index a243c04d1edb4..3298e1ec917d1 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.9 2003/01/01 18:48:49 schweikh Exp $
  */
 
 #ifndef		__OSD_UTIL_H
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index 80da928e7cbb1..4f3af609f945d 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.8 2002/05/14 21:59:10 obrien Exp $
  */
 
 #ifndef		__SYS_INFO_H
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index f2fccd7105a8b..1f3c72b96ffce 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.222.2.4.2.1 2004/10/24 09:31:25 scottl 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 e12b5793d4ce8..d05d320235bb8 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.81.2.3 2004/10/10 15:01:47 sos Exp $
  */
 
 /* ATA register defines */
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index 4c63faeb85fac..7c61aa572e0ed 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.25.2.1.2.1 2004/10/23 19:05:17 le 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 925b30f04fbcc..02149296e6033 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.13.2.1 2004/10/10 15:01:47 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 83c38a54039e7..0d0a2c243b9fe 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.81.2.3 2004/10/10 15:01:47 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-commands.h b/sys/dev/ata/ata-commands.h
index ea27d683325f2..dd6171372c344 100644
--- a/sys/dev/ata/ata-commands.h
+++ b/sys/dev/ata/ata-commands.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-commands.h,v 1.2 2004/04/30 16:21:34 sos Exp $
  */
 
 /* ATA commands */
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 847736dfeca10..1adfca2f7b042 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.175.2.2 2004/09/30 21:29:19 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 c24c4ae4fca8b..ad06b20eef0e7 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.49 2004/04/30 16:21:34 sos Exp $
  */
 
 /* structure describing an ATA disk */
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index 051d8c2addab8..b21f6ac4cef0d 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.129.2.2 2004/09/30 21:29:19 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 4fadd2dc5349b..10189e12e0f61 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.22.2.1 2004/10/10 15:01:47 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 5b38772f11162..5f172f50c680d 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.44.2.2 2004/09/30 21:29:19 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 b5d7388188d5f..65708456f567a 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.87.2.3 2004/10/10 15:01:47 sos 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 a8c5608e16d43..702c987a96ee4 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.32.2.2 2004/10/10 15:01:47 sos Exp $
  */
 
 /* structure holding chipset config info */
diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c
index d0544d07ea27e..90d9cc27fe314 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.32.2.4.2.1 2004/10/24 09:31:25 scottl 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 4edaa7960af7c..891f7c5edde11 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.81 2004/08/09 14:22:58 sos 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 7a3e7a998d588..47d6634050942 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.27 2004/06/25 21:21:59 sos Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index a0cd71cfca7f8..87d4e6dc777cd 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.35 2004/06/17 07:29:56 green 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 6c36f99a6fec1..43419eafaefae 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.170.2.1 2004/09/06 19:36:26 sos 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 1618df513fbcb..d539ddef670ae 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.43 2004/04/30 16:21:34 sos Exp $
  */
 
 /* CDROM Table Of Contents */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 9fda1406aa563..b1b43b8562adc 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.97 2004/08/05 21:11:33 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 4f37b0dea5d1a..de9f7607e454e 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.23 2004/04/30 16:21:34 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 654925fb3d889..1ccf6cefff78c 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.93 2004/08/05 21:11:33 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 f34328d255fad..6a34083b04f6d 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.22 2004/06/16 09:46:37 phk Exp $
  */
 
 /* ATAPI tape drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index dde23cde82d9f..1b359c1bb2599 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.57 2004/08/08 17:10:54 sam 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 194d1671747ca..83e90cd57638b 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.8 2004/04/02 23:57:10 sam 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 f0015ee92c474..cb8f48daf92a4 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.7 2004/04/02 23:57:10 sam Exp $
  */
 
 /*
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index 0d3598981881e..8b5fe6f1940c1 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.14 2004/04/03 03:33:02 sam Exp $
  */
 
 /*
diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c
index 90f85c0b1acf6..c5f4c672f6bc2 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.6 2004/01/15 10:04:20 onoe Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/awi/am79c930reg.h b/sys/dev/awi/am79c930reg.h
index 74d38bf38b37d..c31b4c75e127e 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 3836521f1e290..64e6964bfb9bb 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 105b7a75d1628..de54fe2cc64f2 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.34 2004/08/13 22:55:25 rwatson Exp $");
 #endif
 
 #include "opt_inet.h"
diff --git a/sys/dev/awi/awireg.h b/sys/dev/awi/awireg.h
index 555e058b3d146..133505be439af 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 b9f24e40773ea..8bba436cf6276 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.10 2004/01/15 10:04:20 onoe 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 683790a5cb801..65763dbe5df27 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.19 2004/05/27 03:49:40 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 805cd2669e191..8f229c473145c 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -28,7 +28,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.15.2.2 2004/10/09 15:20:18 mlaier 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 10b26db817711..14975c3ac8802 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -21,7 +21,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.3.2.1 2004/09/04 19:23:54 des Exp $ */
 
 #ifndef _BFE_H
 #define _BFE_H
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 34341caf79f07..6351fb840e904 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.72.2.2 2004/09/29 14:31:49 ps 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 e75a3bff114fd..8f2a19fb89a41 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.28.2.1 2004/09/29 14:31:49 ps Exp $
  */
 
 /*
diff --git a/sys/dev/bktr/CHANGELOG.TXT b/sys/dev/bktr/CHANGELOG.TXT
index 230ceb9f50fba..e81e3d8d3aef8 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.19 2002/05/16 22:43:18 eric Exp $ */
 /*
  * MAINTAINER = Roger Hardiman <roger@freebsd.org>
  */
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 68bf40b48c65c..e30c81f3d0746 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.13 2003/12/08 07:59:18 obrien 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 9b7500703b249..ef98d51db6d6e 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.3 2003/08/12 09:45:34 alex 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 18c01a5b0af2d..357bf45b95a6b 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.24 2004/08/08 01:23:39 sanpei 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 d805690cbf83b..37bf8f5ecc1b2 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.7 2004/08/08 01:23:39 sanpei 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 d8b381fdf86bb..6f19f45d47fb5 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.135 2004/06/16 09:46:38 phk 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 315566f31a40e..d7fd14c8da4e3 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.6 2004/06/16 09:46:38 phk 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 19410981a28e7..d717337ab5c60 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.25 2003/12/08 07:59:18 obrien Exp $");
 
 /*
  * I2C support for the bti2c chipset.
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index a8333519ae91d..01243d1f1608e 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 3adacce803a94..28ebc18da61ca 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.11 2004/07/15 08:26:00 phk 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 4c6d7a508ac7e..0596d3aed7fd2 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.1 2000/09/10 14:34:08 roger 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 87d4ed97d73ea..d46b2374ae3b5 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.47 2004/06/16 09:46:38 phk 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 d2826022a94df..068075931c9c0 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.7 2003/12/01 19:03:50 truckman 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 c8fc4d4bc7eac..98e8490fdbbcc 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.47 2004/06/16 09:46:38 phk 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 7804773eb74f7..4dfcb5ccae030 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.13 2004/06/27 09:59:02 schweikh 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 d7a67c0f834fb..2de70373943f4 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.1 1999/09/26 22:06:20 roger 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 3731e7d2b34bd..fca5decc36038 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 5f70a4b87ecd2..13d330577bf5e 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.15 2003/12/20 17:12:25 obrien Exp $
  */
 /*
  *	ioctl constants for Matrox Meteor Capture card.
diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c
index 74abc3ac5981d..786f449a3142f 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.3 2003/12/12 21:18:04 rwatson Exp $
  */
 
 /*
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 4920cdb351dc9..50a6369679d76 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.43 2003/08/25 09:28:54 obrien 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 3157503513a33..6aaa0a2b9838a 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.19 2004/03/17 17:50:29 njl 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 3241abdb00c0b..4d2c617af9be6 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.23 2004/03/17 17:50:29 njl 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 1bdfbe8a6f826..c27d7a62c3168 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.9 2004/03/17 17:50:29 njl 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 fe9d3f02ba1de..38c4a6cf8f774 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.19 2004/05/30 20:08:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index 4a796f2a58138..928de98f9dee5 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.15 2001/08/26 21:51:35 peter Exp $
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 29557d20fb132..3a0053bc1cd0f 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.44 2004/06/27 13:07:02 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 e17b935aed2dd..98ce5717a9daa 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.46 2004/04/11 19:22:25 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 a56d13b9df974..f1b46a7e0abc1 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.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/cardbus/cardbus_cis.h,v 1.10 2003/10/07 03:33:54 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index c356323d21255..a906aed0a6434 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.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/cardbus/cardbusreg.h,v 1.6 2002/10/07 22:58:24 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index b8276894912d5..058a70b0240e3 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.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/cardbus/cardbusvar.h,v 1.8 2003/01/27 05:47:01 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 3b277f4da52f8..bb807b982d764 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.56 2004/08/16 23:13:16 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
index baf9b88f2ea58..a5dc3b8fb70b7 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.4 2004/07/29 08:06:22 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index b621ce4c95824..1182481af2501 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.14 2004/07/29 08:06:22 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
index 5657ea0ba4b65..242f99df4948e 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.9 2004/06/21 20:18:40 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c
index 8f7732fd80e1b..170b54afdb1de 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.5 2003/10/31 18:31:58 brooks 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 4bfed9791d6f5..c91a4fb1918e0 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.14 2004/08/13 22:57:44 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 35e7afd998b2e..f9dde5373c55c 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 1703145d40930..e0f7d2f8fb0a2 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.3 2003/10/31 18:31:58 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 9e2fdd4bea0d6..54b211b8d49fe 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.16 2004/05/23 16:11:46 mux 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 04e8c3b237272..d2e660e36311d 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.1 2001/03/16 07:25:42 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 8b62d203d22c4..297f82d186587 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 b7d684438ee5e..d72aa86c57fe1 100644
--- a/sys/dev/cp/cpddk.c
+++ b/sys/dev/cp/cpddk.c
@@ -18,7 +18,7 @@
  * $Cronyx: cpddk.c,v 1.13.4.35 2004/08/16 16:29:06 rik Exp $
  */									
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cp/cpddk.c,v 1.3 2004/08/16 17:28:04 rik Exp $");
 
 #include <dev/cx/machdep.h>
 
diff --git a/sys/dev/cp/cpddk.h b/sys/dev/cp/cpddk.h
index f16feffc6b5c7..fcd3be303cc6d 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.19 2004/08/10 13:37:20 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cp/cpddk.h,v 1.2 2004/08/16 12:00:07 rik 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 85d18360eff45..7c3c31d568fe9 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.12 2004/08/13 23:02:17 rwatson Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/cp/ng_cp.h b/sys/dev/cp/ng_cp.h
index 0dd65618cce30..d875abc5d7543 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.1 2004/05/05 16:11:45 rik Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 939c2080c815a..d7c3b1b91e6e6 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.33 2004/08/13 23:03:11 rwatson Exp $");
 
 /*
  *
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index dcbd02f06869e..363368ce41919 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.5 2003/10/31 18:31:58 brooks 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 721a49a9de91a..e4b3aaf7d100f 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.11 2004/05/27 03:49:40 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 5a93643591d53..545733f7f6c76 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.5 2003/11/04 02:59:57 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 0f62c62d934d6..c3891c34a819d 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.2 2003/10/31 18:31:58 brooks Exp $
  */
 
 #ifndef _IF_CSVAR_H
diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c
index 5528f439f1ce1..4348c9cd73a08 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.6 2004/03/13 19:46:27 peter Exp $");
 /*	$NetBSD$	*/
 
 /*
diff --git a/sys/dev/ct/bshwvar.h b/sys/dev/ct/bshwvar.h
index 9e2259c94c768..0f3ae02dbc4ce 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.3 2002/03/20 02:04:09 alfred 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 eb87dbfb7e55b..17ddeb24576b7 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.9 2004/07/10 20:57:43 marcel Exp $");
 /*	$NetBSD$	*/
 
 #define	CT_DEBUG
diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c
index 15173e23a5500..f4fa5844d7253 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.11 2004/03/17 17:50:30 njl Exp $");
 /*	$NetBSD$	*/
 
 /*
diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h
index 18a9ec86673cf..7b8b877e282f8 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.5 2002/06/01 08:29:12 ru 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 4e7ba1569edcc..0de0877f91213 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.3 2002/03/20 02:04:09 alfred 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 0ab2d4eaeb452..f1e46e9e62aa0 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.1 2004/02/23 20:19:00 rik Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctau.c b/sys/dev/ctau/ctau.c
index 37cbd4698caa8..0bf0bf07e9895 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.2 2004/03/04 14:16:12 bms 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 6d43f97258584..fcd1e819593dc 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 cb3311cd1d668..7058e2b91013f 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 354f2bac974d3..3212a4c3f683e 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 523008932a0f4..8c487da76a72a 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 9097a5522a1e8..55e3f4d92dfce 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.1 2004/02/23 20:19:00 rik Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctddk.c b/sys/dev/ctau/ctddk.c
index 92f98056697f9..8ca03c7d0db09 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.1 2004/02/23 20:19:00 rik 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 d48e1092319a8..dae2082207609 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.1 2004/02/23 20:19:00 rik 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 bb0241464a556..053555c6c88c0 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.1 2004/02/23 20:19:00 rik Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/hdc64570.h b/sys/dev/ctau/hdc64570.h
index 978ff6ab20c50..39f4ad62dc054 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.1 2004/02/23 20:19:00 rik Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index 767972f32a237..cffd6f315d516 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.14.2.1 2004/09/08 12:38:23 rik Exp $");
 
 #include <sys/param.h>
  
diff --git a/sys/dev/ctau/lxt318.h b/sys/dev/ctau/lxt318.h
index f194b7bda03b8..d6d0396d249e6 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.1 2004/02/23 20:19:00 rik Exp $
  */
 
 #define LX_WRITE	0x00
diff --git a/sys/dev/ctau/ng_ct.h b/sys/dev/ctau/ng_ct.h
index 5fba87812cda8..2771e3c605ba1 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.1 2004/02/23 20:19:00 rik Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cx/cronyxfw.h b/sys/dev/cx/cronyxfw.h
index 70264136ec147..dfc235905a9b9 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.1 2003/12/03 07:29:38 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 db2c1380c2643..1942a6a8980bc 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.1 2003/12/03 07:29:38 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 a5e4e05d75424..b43af9605fed8 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 e4328b59b127b..fe6b38a7ae1d8 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.1 2003/12/03 07:29:38 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 75b40c04884d3..9233b1c4c85ed 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.1 2003/12/03 07:29:38 imp Exp $
  */
 
 #ifndef port_t
diff --git a/sys/dev/cx/cxreg.h b/sys/dev/cx/cxreg.h
index 0cfc6b0f101a5..ee5399e56bbe4 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.1 2003/12/03 07:29:38 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 4ab00631367ed..8dea0bd8d895c 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.30.2.1 2004/09/08 12:38:23 rik Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/cx/machdep.h b/sys/dev/cx/machdep.h
index 23469259bd15b..8694a94cdf608 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.2 2004/03/12 21:45:26 trhodes Exp $
  */
 
 /*
diff --git a/sys/dev/cx/ng_cx.h b/sys/dev/cx/ng_cx.h
index a878e9872dfa3..f2e731f7174b1 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.2 2004/02/14 21:08:11 rik Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 04df7e109ec12..3e9c57c4fa65b 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.159 2004/07/15 20:47:37 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 8d6df24127a0b..128daf3c371f0 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 98c21973b3a2e..3966c56113679 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.35 2004/05/30 20:08:29 phk Exp $");
 
 #include "opt_cy_pci_fastintr.h"
 
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index 88a36eb4a65e2..6d643ff9c9bd9 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 15ee98ca3f89e..17ed741db2309 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 bc33dbe489e22..3090a04e633e9 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.16 2004/07/15 20:47:37 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index 6c25ee13a6250..c18b4f32e5e70 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.2 2004/02/16 07:25:46 simokawa Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index f2518fd52c11b..6b3d570c54169 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.4 2004/05/30 20:08:30 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dec/mc146818reg.h b/sys/dev/dec/mc146818reg.h
index e60d043f13dd0..5e54045cb44dd 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.3 2000/05/01 19:54:23 peter 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 5c1472cb19753..a20ffdd7b50bd 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.8 2003/08/24 17:46:03 obrien 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 a67caca2604ee..50ebca9e1710a 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.4 2000/04/08 14:16:58 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/dec/mcclockvar.h b/sys/dev/dec/mcclockvar.h
index 196209be3bce3..1d5ca97b29d05 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.4 2000/05/01 19:54:24 peter 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 2c6e4cdf78d55..5813eaa4967b1 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.1 2001/05/02 01:08:01 brian Exp $
  */
 
 const u_char CX_bios[] = {
diff --git a/sys/dev/digi/CX.c b/sys/dev/digi/CX.c
index 3a9aa31297cea..0f231d43a45da 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 77ce089d73556..cf6f24166f93f 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char CX_fepos[] = {
diff --git a/sys/dev/digi/CX_PCI.bios.h b/sys/dev/digi/CX_PCI.bios.h
index 9a285409150d8..403e13fd7fe15 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char CX_PCI_bios[] = {
diff --git a/sys/dev/digi/CX_PCI.c b/sys/dev/digi/CX_PCI.c
index 2a941f7ef5a5d..3c74188fcaf88 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 a42e76fdb154d..dbfe734740bfd 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char CX_PCI_fepos[] = {
diff --git a/sys/dev/digi/EPCX.bios.h b/sys/dev/digi/EPCX.bios.h
index d45651a195f18..33981d9d5c07a 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_bios[] = {
diff --git a/sys/dev/digi/EPCX.c b/sys/dev/digi/EPCX.c
index a920eb66a2e70..ad3cea30aa35d 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 590ce0fc81320..b42e6390ec6aa 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_fepos[] = {
diff --git a/sys/dev/digi/EPCX_PCI.bios.h b/sys/dev/digi/EPCX_PCI.bios.h
index 51fac5aa6f0a6..1693038b4c4a4 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_PCI_bios[] = {
diff --git a/sys/dev/digi/EPCX_PCI.c b/sys/dev/digi/EPCX_PCI.c
index a9ef049ea6be1..36d23785040f5 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 7d4380c7b4138..10c1c3484193a 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_PCI_fepos[] = {
diff --git a/sys/dev/digi/Xe.bios.h b/sys/dev/digi/Xe.bios.h
index 73d2baa0f9e87..5638a7a0eb1db 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char Xe_bios[] = {
diff --git a/sys/dev/digi/Xe.c b/sys/dev/digi/Xe.c
index b1bb5e53f07ad..3b79aec2983fc 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 fa729b720f565..ef09e77486594 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char Xe_fepos[] = {
diff --git a/sys/dev/digi/Xem.bios.h b/sys/dev/digi/Xem.bios.h
index 1ed1a535946cb..c041323f0fbae 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.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char Xem_bios[] = {
diff --git a/sys/dev/digi/Xem.c b/sys/dev/digi/Xem.c
index fb903b6245462..8f3fb4a561ea5 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 54b1463658eec..9acebfc09b065 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.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char Xem_fepos[] = {
diff --git a/sys/dev/digi/Xr.bios.h b/sys/dev/digi/Xr.bios.h
index a0805ae9eb3b1..8f616160b6e89 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 4d68c87d211ba..9d4cc59f5c615 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 66fbd10e1d2fb..e91f93e754366 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 b0c9db315986b..b7871fe29ee61 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 8bfb77a81a038..c6b6f40e770f9 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 329c2f1f63f78..b005ac62d419b 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 89f2d0ae2901c..97647d27d4d7b 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 ff5157e3f3d48..968ccd828d240 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.55 2004/07/28 21:06:13 phk Exp $
  */
 
 /*-
diff --git a/sys/dev/digi/digi.h b/sys/dev/digi/digi.h
index a2fcb4fddc680..51f3a9f8a9194 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.17 2004/07/11 15:18:37 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 f1f4a5f9ab456..c977563fa6140 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 f1e8ced703744..50e00b1d7abfc 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 fafa5a1fbf089..acdca75bc2aaa 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.11 2004/05/30 20:08:30 phk Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/digi/digi_pci.h b/sys/dev/digi/digi_pci.h
index 2273d0048dede..22163341655b8 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 4a1641f92d7e7..ab7bb05c26c7d 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 d04c95a3b8bb7..32ed226a6cd0c 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.15 2004/02/21 19:42:50 phk Exp $"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index ef3c019721158..bc03c85f41268 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.18 2003/08/24 17:46:04 obrien 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 c0ede88cf9d54..4acef1b3e9794 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.8 2004/03/17 17:50:30 njl 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 7385215ae263f..5b3580c65f67f 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.30 2004/03/17 17:50:30 njl 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 59256872916f7..8cd68c3fbfaf3 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.48 2004/03/17 17:50:30 njl Exp $"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.48 2004/03/17 17:50:30 njl Exp $");
 
 /*
  * dpt_scsi.c: SCSI dependant code for the DPT driver
diff --git a/sys/dev/drm/ati_pcigart.h b/sys/dev/drm/ati_pcigart.h
index dd1141f5303a2..bd22131c0f369 100644
--- a/sys/dev/drm/ati_pcigart.h
+++ b/sys/dev/drm/ati_pcigart.h
@@ -26,7 +26,7 @@
  * Authors:
  *   Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.3 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h
index 36e86b364e1a0..b25447492a59e 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.7 2004/06/11 03:26:59 anholt Exp $
  */
 
 
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index e45bad4fda9a2..6f434ba5c45c9 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.11 2004/06/16 09:46:42 phk Exp $
  */
 
 #ifndef _DRM_P_H_
diff --git a/sys/dev/drm/drm_agpsupport.h b/sys/dev/drm/drm_agpsupport.h
index fc2f4d1e56632..0cef1c0ea08a8 100644
--- a/sys/dev/drm/drm_agpsupport.h
+++ b/sys/dev/drm/drm_agpsupport.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_agpsupport.h,v 1.3 2003/08/19 02:57:31 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_auth.h b/sys/dev/drm/drm_auth.h
index 9141d5778b061..8d87b07196053 100644
--- a/sys/dev/drm/drm_auth.h
+++ b/sys/dev/drm/drm_auth.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_auth.h,v 1.5 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_bufs.h b/sys/dev/drm/drm_bufs.h
index 8b40f98474307..a69c8dd2178fc 100644
--- a/sys/dev/drm/drm_bufs.h
+++ b/sys/dev/drm/drm_bufs.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.10 2004/01/06 04:34:52 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_context.h b/sys/dev/drm/drm_context.h
index 9d832641fb7df..2c0e94507905c 100644
--- a/sys/dev/drm/drm_context.h
+++ b/sys/dev/drm/drm_context.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_context.h,v 1.7 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_dma.h b/sys/dev/drm/drm_dma.h
index 7cf3d174653dd..fab4c29c111cf 100644
--- a/sys/dev/drm/drm_dma.h
+++ b/sys/dev/drm/drm_dma.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.8 2003/12/23 14:38:42 se Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_drawable.h b/sys/dev/drm/drm_drawable.h
index 7f3938d620905..04a84198fe203 100644
--- a/sys/dev/drm/drm_drawable.h
+++ b/sys/dev/drm/drm_drawable.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_drawable.h,v 1.3 2003/08/19 02:57:31 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h
index 1227296eb6ac1..eef3b8de5e917 100644
--- a/sys/dev/drm/drm_drv.h
+++ b/sys/dev/drm/drm_drv.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.26 2004/08/05 07:20:24 mux Exp $
  */
 
 /*
diff --git a/sys/dev/drm/drm_fops.h b/sys/dev/drm/drm_fops.h
index 4c79fe1172372..c45b5fea5e739 100644
--- a/sys/dev/drm/drm_fops.h
+++ b/sys/dev/drm/drm_fops.h
@@ -29,7 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.11 2004/06/16 09:46:42 phk Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_ioctl.h b/sys/dev/drm/drm_ioctl.h
index d34851937721b..4656a75082555 100644
--- a/sys/dev/drm/drm_ioctl.h
+++ b/sys/dev/drm/drm_ioctl.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.7 2003/11/12 20:56:30 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_irq.h b/sys/dev/drm/drm_irq.h
index 8f7d747f47998..93400b4506db6 100644
--- a/sys/dev/drm/drm_irq.h
+++ b/sys/dev/drm/drm_irq.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_irq.h,v 1.3 2004/03/17 17:50:31 njl Exp $
  */
 
 int DRM(irq_by_busid)( DRM_IOCTL_ARGS )
diff --git a/sys/dev/drm/drm_linux_list.h b/sys/dev/drm/drm_linux_list.h
index 4fef61c528b61..a55739e7d6ccd 100644
--- a/sys/dev/drm/drm_linux_list.h
+++ b/sys/dev/drm/drm_linux_list.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_linux_list.h,v 1.1 2004/06/11 03:26:59 anholt Exp $
  */
 
 struct list_head {
diff --git a/sys/dev/drm/drm_lock.h b/sys/dev/drm/drm_lock.h
index f0937076e5528..9c8e72b520eb8 100644
--- a/sys/dev/drm/drm_lock.h
+++ b/sys/dev/drm/drm_lock.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_lock.h,v 1.4 2003/08/19 02:57:31 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h
index 917cb1e15e7a9..fd2ff5f2c57ce 100644
--- a/sys/dev/drm/drm_memory.h
+++ b/sys/dev/drm/drm_memory.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.11 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_memory_debug.h b/sys/dev/drm/drm_memory_debug.h
index a627fb4281dee..4f9b8ebee9e5e 100644
--- a/sys/dev/drm/drm_memory_debug.h
+++ b/sys/dev/drm/drm_memory_debug.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_memory_debug.h,v 1.2 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h
index 750e6ec3f93c2..d1e516e14c78f 100644
--- a/sys/dev/drm/drm_os_freebsd.h
+++ b/sys/dev/drm/drm_os_freebsd.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_os_freebsd.h,v 1.20 2004/06/16 09:46:42 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/drm/drm_pci.h b/sys/dev/drm/drm_pci.h
index 2a0569d06d0c7..0a47250723021 100644
--- a/sys/dev/drm/drm_pci.h
+++ b/sys/dev/drm/drm_pci.h
@@ -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.h,v 1.2 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_pciids.h b/sys/dev/drm/drm_pciids.h
index 0a8abc5cb4b34..c597156465296 100644
--- a/sys/dev/drm/drm_pciids.h
+++ b/sys/dev/drm/drm_pciids.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/drm/drm_pciids.h,v 1.1 2004/06/11 03:26:59 anholt Exp $ */
 /*
    This file is auto-generated from the drm_pciids.txt in the DRM CVS
    Please contact dri-devel@lists.sf.net to add new cards to this list
diff --git a/sys/dev/drm/drm_sarea.h b/sys/dev/drm/drm_sarea.h
index 45bef824e7ccb..986348bbc25db 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.3 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef _DRM_SAREA_H_
diff --git a/sys/dev/drm/drm_scatter.h b/sys/dev/drm/drm_scatter.h
index 4da0a1b6f1caa..d22fe156b09a8 100644
--- a/sys/dev/drm/drm_scatter.h
+++ b/sys/dev/drm/drm_scatter.h
@@ -27,7 +27,7 @@
  *   Gareth Hughes <gareth@valinux.com>
  *   Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.5 2003/08/19 02:57:31 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_sysctl.h b/sys/dev/drm/drm_sysctl.h
index a1ab8635125fe..dc911cd6804fc 100644
--- a/sys/dev/drm/drm_sysctl.h
+++ b/sys/dev/drm/drm_sysctl.h
@@ -21,7 +21,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_sysctl.h,v 1.7 2004/01/06 04:34:52 anholt Exp $
  */
 
 #ifdef __FreeBSD__
diff --git a/sys/dev/drm/drm_vm.h b/sys/dev/drm/drm_vm.h
index 2637a83998ed5..04a345622eb3c 100644
--- a/sys/dev/drm/drm_vm.h
+++ b/sys/dev/drm/drm_vm.h
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.11 2004/06/16 09:46:42 phk Exp $
  */
 
 #if defined(__FreeBSD__) && __FreeBSD_version >= 500102
diff --git a/sys/dev/drm/mga.h b/sys/dev/drm/mga.h
index 74a98ac40ef42..af6bd748aaff6 100644
--- a/sys/dev/drm/mga.h
+++ b/sys/dev/drm/mga.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga.h,v 1.5 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __MGA_H__
diff --git a/sys/dev/drm/mga_dma.c b/sys/dev/drm/mga_dma.c
index 3f75d7663f2ab..2b91182a564ce 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.10 2004/01/06 04:34:53 anholt Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/mga_drm.h b/sys/dev/drm/mga_drm.h
index 57ecc16c5719e..1253c0f0101e1 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.4 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __MGA_DRM_H__
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index cbec2999beb54..7779e523127b9 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.7 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga_drv.h
index c84c9ea5b9636..c37c40c71e5d3 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.7 2004/01/06 04:34:53 anholt Exp $
  */
 
 #ifndef __MGA_DRV_H__
diff --git a/sys/dev/drm/mga_irq.c b/sys/dev/drm/mga_irq.c
index 1c9a93f5940a9..4b8874607c880 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.3 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/mga_state.c b/sys/dev/drm/mga_state.c
index b4a7d6f07d9fd..70564ac418aa8 100644
--- a/sys/dev/drm/mga_state.c
+++ b/sys/dev/drm/mga_state.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_state.c,v 1.8 2003/08/24 22:04:12 anholt Exp $");
 
 #include "dev/drm/mga.h"
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_ucode.h b/sys/dev/drm/mga_ucode.h
index 3dd85e3bea2f0..3830261f2083d 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.1 2002/04/27 20:47:57 anholt Exp $
  */
 
 /*
diff --git a/sys/dev/drm/mga_warp.c b/sys/dev/drm/mga_warp.c
index 035d04589add0..298d7ceaa11a7 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.5 2003/08/19 02:57:31 anholt Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/r128.h b/sys/dev/drm/r128.h
index 3a22671f37244..8b089046d9320 100644
--- a/sys/dev/drm/r128.h
+++ b/sys/dev/drm/r128.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128.h,v 1.6 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __R128_H__
diff --git a/sys/dev/drm/r128_cce.c b/sys/dev/drm/r128_cce.c
index e7160bd9a5da2..566f170a774ee 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.10 2004/01/06 04:34:53 anholt Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/r128_drm.h b/sys/dev/drm/r128_drm.h
index 30b8b3eaf548e..a3380ac486c68 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.5 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __R128_DRM_H__
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index b9df5ecf97087..905edaeacb922 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.7 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128_drv.h
index 0695684c1db2e..85ae0d337dbfa 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änzer <daenzerm@student.ethz.ch>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drv.h,v 1.8 2004/01/06 04:34:53 anholt Exp $
  */
 
 #ifndef __R128_DRV_H__
diff --git a/sys/dev/drm/r128_irq.c b/sys/dev/drm/r128_irq.c
index 2da58d61b4bf6..95c0f8dd45dab 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.3 2003/10/24 01:48:16 anholt Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128_state.c
index 703d5508e42e2..ab03bcbfae1e7 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.10 2004/06/11 03:26:59 anholt Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/radeon.h b/sys/dev/drm/radeon.h
index 517d9d27cccf6..ae1ac39c6ba9c 100644
--- a/sys/dev/drm/radeon.h
+++ b/sys/dev/drm/radeon.h
@@ -27,7 +27,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Keith Whitwell <keith@tungstengraphics.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon.h,v 1.9 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __RADEON_H__
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c
index 59cd9ff58b010..e94dbb872e7fd 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.11 2004/01/06 04:34:53 anholt Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/radeon_drm.h b/sys/dev/drm/radeon_drm.h
index 51bbacfbf4249..b1595bdbed6fd 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.8 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __RADEON_DRM_H__
diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c
index 354167560863b..6111dd9b184c1 100644
--- a/sys/dev/drm/radeon_drv.c
+++ b/sys/dev/drm/radeon_drv.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.9 2003/10/24 01:48:17 anholt Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/radeon_drv.h b/sys/dev/drm/radeon_drv.h
index d14d34204afd6..8f8f9235bfe32 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.10 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __RADEON_DRV_H__
diff --git a/sys/dev/drm/radeon_irq.c b/sys/dev/drm/radeon_irq.c
index 636653c2ae1e3..6eb56c7393675 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änzer <michel@daenzer.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.4 2003/10/24 01:48:17 anholt Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/radeon_mem.c b/sys/dev/drm/radeon_mem.c
index 3238c2717a276..98c954c1f5338 100644
--- a/sys/dev/drm/radeon_mem.c
+++ b/sys/dev/drm/radeon_mem.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_mem.c,v 1.5 2004/06/11 03:26:59 anholt Exp $");
 
 #include "dev/drm/radeon.h"
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/radeon_state.c b/sys/dev/drm/radeon_state.c
index 950a8eec2df20..b0d9ffa75c88a 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.11 2004/06/11 03:26:59 anholt Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/sis.h b/sys/dev/drm/sis.h
index 03498183f2e76..8b938e479a2b6 100644
--- a/sys/dev/drm/sis.h
+++ b/sys/dev/drm/sis.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.h,v 1.3 2004/06/11 03:26:59 anholt Exp $
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis.h,v 1.3 2002/10/30 12:52:38 alanh Exp $ */
 
diff --git a/sys/dev/drm/sis_drm.h b/sys/dev/drm/sis_drm.h
index 18711a5d17759..a7f34918491bf 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.4 2003/09/09 00:24:31 anholt Exp $
  */
 
 #ifndef __SIS_DRM_H__
diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis_drv.c
index ae6615b912aa6..432310e8a5961 100644
--- a/sys/dev/drm/sis_drv.c
+++ b/sys/dev/drm/sis_drv.c
@@ -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.c,v 1.3 2004/06/11 03:26:59 anholt Exp $
  */
 
 #include "dev/drm/sis.h"
diff --git a/sys/dev/drm/sis_drv.h b/sys/dev/drm/sis_drv.h
index 3f80901bb1710..8eb793f11dac4 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.1 2003/09/09 00:24:31 anholt Exp $
  */
 
 #ifndef _SIS_DRV_H_
diff --git a/sys/dev/drm/sis_ds.c b/sys/dev/drm/sis_ds.c
index 74b111e33750a..2dda6e003e35f 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.1 2003/09/09 00:24:31 anholt Exp $
  */
 
 #include "dev/drm/sis.h"
diff --git a/sys/dev/drm/sis_ds.h b/sys/dev/drm/sis_ds.h
index d5cdbc27800af..101622c7a2f40 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.2 2004/03/03 08:24:31 obrien Exp $
  */
 
 #ifndef __SIS_DS_H__
diff --git a/sys/dev/drm/sis_mm.c b/sys/dev/drm/sis_mm.c
index 6f29974ee0827..0f29911b91ab1 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.4 2004/06/11 03:26:59 anholt Exp $
  */
 
 #include "dev/drm/sis.h"
diff --git a/sys/dev/drm/tdfx.h b/sys/dev/drm/tdfx.h
index cc2b72035c8ba..1800c27f85468 100644
--- a/sys/dev/drm/tdfx.h
+++ b/sys/dev/drm/tdfx.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/tdfx.h,v 1.4 2004/06/11 03:26:59 anholt Exp $
  */
 
 #ifndef __TDFX_H__
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c
index 93083fdeea23e..30e42f136fc18 100644
--- a/sys/dev/drm/tdfx_drv.c
+++ b/sys/dev/drm/tdfx_drv.c
@@ -29,7 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.6 2003/10/24 01:48:17 anholt Exp $
  */
 
 #include "dev/drm/tdfx.h"
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index d0df87579b788..7a358d8a1b536 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.233.2.1 2004/09/17 10:14:49 glebius 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 22bbf78be0e67..f9feb528f7142 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.1 2000/08/17 12:15:43 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 40f114bface4a..7c487b791dc14 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.12 2003/10/31 18:31:58 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index 69da715f26462..80c83dd1d0463 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.15 2003/10/31 18:31:58 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index a30a13791e8a9..67b581a4deba4 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.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_pccard.c,v 1.59 2004/07/21 20:38:12 imp Exp $
  */
 
 #include "opt_ed.h"
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 245faff0d4f82..809b1611b8cfb 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.36 2004/06/18 01:28:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 4b0857894ce99..9a93a721aac1b 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.32 2003/10/15 17:22:15 shiba Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index fd3bcf1cf169f..5330b4a40687f 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.18 2004/03/03 07:33:43 obrien Exp $
  */
 
 #ifndef SYS_DEV_ED_IF_EDVAR_H
diff --git a/sys/dev/eisa/eisa_if.m b/sys/dev/eisa/eisa_if.m
index 9bf7e56bb542e..1c6d01adab40a 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.1 2004/06/09 16:56:22 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 2ef026561aebb..41514eb8b6277 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.69 2004/08/16 22:05:53 gibbs Exp $");
 
 #include "opt_eisa.h"
 
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index ebdee5a6cdd6a..2f9c338a7dc38 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.23 2004/06/09 16:08:20 imp Exp $
  */
 
 #ifndef _DEV_EISA_EISACONF_H_
diff --git a/sys/dev/em/LICENSE b/sys/dev/em/LICENSE
index de8145e47a903..ed12592db2ab0 100644
--- a/sys/dev/em/LICENSE
+++ b/sys/dev/em/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/LICENSE,v 1.2 2003/03/21 21:47:30 pdeuskar Exp $
 Copyright (c) 2001-2003, Intel Corporation 
 All rights reserved.
 
diff --git a/sys/dev/em/README b/sys/dev/em/README
index 5f4f715ae3d46..33b31651b9b6f 100644
--- a/sys/dev/em/README
+++ b/sys/dev/em/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/README,v 1.8 2003/08/27 21:52:36 pdeuskar 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 2964c623e58ad..1a5fb55cbcc30 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.44.2.2 2004/10/15 22:12:59 tackerman Exp $*/
 
 #include <dev/em/if_em.h>
 
diff --git a/sys/dev/em/if_em.h b/sys/dev/em/if_em.h
index 662c1af8b1395..544e526ae4b04 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.25.2.1 2004/10/15 22:12:59 tackerman 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 ee3be59c34b26..91ca47077f8fe 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.13.2.1 2004/10/15 22:12:59 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 f3574bd4de5e3..5b7ee18eec82d 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.13.2.1 2004/10/15 22:12:59 tackerman 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 5c010ec25ec9d..08186908a8169 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.13 2003/08/22 05:54:51 imp 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 1ca6e35a2ed0e..b6d48dbcbe4f0 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.33 2004/05/30 20:08:31 phk Exp $");
 
 /*
  * i f _ e n _ p c i . c  
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.33 2004/05/30 20:08:31 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 33108381ec810..5373f1202e3cc 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -33,7 +33,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.63 2004/08/02 00:18:34 green Exp $");
 
 /*
  *
diff --git a/sys/dev/en/midwayreg.h b/sys/dev/en/midwayreg.h
index 5c2fe1b8fdbd7..8f214da442201 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 27da2f57aed23..06154425dbe6e 100644
--- a/sys/dev/en/midwayvar.h
+++ b/sys/dev/en/midwayvar.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/en/midwayvar.h,v 1.13 2003/08/07 15:04:25 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 60197577cafe4..e76ace29705af 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.133 2004/05/23 16:11:47 mux 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 9d1e6030d3f79..c39d7a0efc490 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.31 2004/07/22 07:11:15 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 5bc38bc5d1f3b..3512f8d44bdf0 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.24 2004/07/22 07:11:15 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 3bd1af80bb2cb..e8c760a4abbed 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.10 2004/07/22 07:11:15 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 021b504e1761d..b3681022c60d4 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.38 2004/05/27 03:49:41 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 acc8f79f0fd04..06bc9655f86f5 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.36 2003/11/02 20:08:58 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
index 242ccd46569df..0af747e99e39a 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.13 2003/10/25 21:28:40 imp Exp $
  */
 
 struct ep_board {
diff --git a/sys/dev/esp/esp_sbus.c b/sys/dev/esp/esp_sbus.c
index ba8f38209ad48..583ed52741c8e 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.6.2.1 2004/09/16 03:48:43 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/lsi64854.c b/sys/dev/esp/lsi64854.c
index 6216560716e49..74fd24b3f44f1 100644
--- a/sys/dev/esp/lsi64854.c
+++ b/sys/dev/esp/lsi64854.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/lsi64854.c,v 1.2 2004/08/02 22:55:23 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/lsi64854reg.h b/sys/dev/esp/lsi64854reg.h
index 763d312feefd9..3fe1ec6c2989a 100644
--- a/sys/dev/esp/lsi64854reg.h
+++ b/sys/dev/esp/lsi64854reg.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/esp/lsi64854reg.h,v 1.1 2004/06/10 05:11:39 scottl Exp $ */
 
 /*
  * LSI 64854 DMA engine. Contains three independent channels
diff --git a/sys/dev/esp/lsi64854var.h b/sys/dev/esp/lsi64854var.h
index 03e1d7d748921..9c61cbbecf627 100644
--- a/sys/dev/esp/lsi64854var.h
+++ b/sys/dev/esp/lsi64854var.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/esp/lsi64854var.h,v 1.2 2004/08/02 22:55:23 trhodes Exp $ */
 
 struct lsi64854_softc {
 	device_t		sc_dev;
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index 48686110f30cc..b03728aeeaebd 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.6 2004/08/02 22:55:23 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/ncr53c9xreg.h b/sys/dev/esp/ncr53c9xreg.h
index b4ba1e81f5e32..9bd0b4d8a29b4 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.2 2004/08/02 22:55:23 trhodes Exp $ */
 
 /*
  * Register addresses, relative to some base address
diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h
index 7bf6b2d737dea..8b0f684e79d42 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.4 2004/08/02 22:55:23 trhodes 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 0ddd2c1fe4076..6fcc0bb1e4c87 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.53 2004/08/13 23:06:55 rwatson 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 310f554ae22d0..1d604e0c577a2 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.10 2004/06/28 16:38:53 imp 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 1d1c383760f2a..cda11ed9be915 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.10 2004/06/27 13:10:20 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 a924c2822efa6..23a2d0544152f 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.5 2003/03/29 15:33:04 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ex/if_exvar.h b/sys/dev/ex/if_exvar.h
index 6427f1fcd4942..b98a7ccbb2c1d 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.5 2004/06/27 13:10:20 imp Exp $
  */
 
 struct ex_softc {
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 5c0e8a4b82d1b..5a2194796d73a 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.17 2004/08/16 01:57:06 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 e2f092aac4ddb..5076900036bba 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.4 2003/06/06 06:00:48 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 147cf15622299..fc7aeac314be0 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.6 2004/08/15 23:17:54 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 6e9caf28deb61..af768cad1d36d 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.1 2003/06/23 14:46:12 harti Exp $
  */
 
 static uint32_t firmware[] = {
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index 8335e929ff7a6..1f5d2499b60cc 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.14 2004/03/17 17:50:32 njl 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 45b885a4f1bf4..c6a16a49e9242 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.1 2003/06/23 14:46:12 harti Exp $
  */
 { 0x00000000, 353053 },
 { 0x00fe0001, 351668 },
diff --git a/sys/dev/fatm/if_fatmreg.h b/sys/dev/fatm/if_fatmreg.h
index 0b4a403d39f96..134bd526a45a0 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.1 2003/06/23 14:46:12 harti Exp $
  *
  * Fore PCA200E hardware definitions.
  */
diff --git a/sys/dev/fatm/if_fatmvar.h b/sys/dev/fatm/if_fatmvar.h
index 8919d24b07125..e3f98e5160125 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.4 2003/08/07 15:04:25 jhb Exp $
  *
  * Fore PCA200E driver definitions.
  */
diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c
index 9b924e763e788..2e674e16081f8 100644
--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/boot_font.c,v 1.3 2003/08/24 17:46:06 obrien Exp $");
 
 /*
  * This font lives in the public domain. It it a PC font, IBM encoding,
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/boot_font.c,v 1.3 2003/08/24 17:46:06 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c
index 00cf4149b7fac..bd4dbb7f584ed 100644
--- a/sys/dev/fb/creator.c
+++ b/sys/dev/fb/creator.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/fb/creator.c,v 1.5 2004/07/09 23:12:22 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 0878feb299d0a..e8ace87e8b2a6 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 7db63152accf1..82e5d7a9d8a06 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 2004/01/21 05:08:51 grehan Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/gallant12x22.h b/sys/dev/fb/gallant12x22.h
index b26ad34f873cc..4155cd8d00bd6 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.2 2004/04/07 20:45:57 imp Exp $
  */
 
 static u_char gallant12x22_data[] = {
diff --git a/sys/dev/fb/gfb.c b/sys/dev/fb/gfb.c
index 63a317d8bb52a..8e51d99adb688 100644
--- a/sys/dev/fb/gfb.c
+++ b/sys/dev/fb/gfb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.5 2003/08/24 17:46:06 obrien Exp $");
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.5 2003/08/24 17:46:06 obrien Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h
index 470dfc268864c..10c14d604c607 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.2 2004/06/16 09:46:43 phk Exp $
  */
 
 #ifndef _FB_GFB_H_
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 6096bdf932f0d..71e856dbc897d 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.7 2004/03/17 17:50:32 njl 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 ec25d1cf03a40..8b8938e86989d 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 ca4885c63ebb6..6cabbce771bc7 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 e67bb244e4a16..5890844321073 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 36ba9a708d895..ff3822e99c6b0 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 08ca193a23095..8a60efb122518 100644
--- a/sys/dev/fb/tga.c
+++ b/sys/dev/fb/tga.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.5 2004/06/03 06:09:58 phk Exp $");
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.5 2004/06/03 06:09:58 phk Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/fb/tga.h b/sys/dev/fb/tga.h
index 28302485ac542..f3f74d2b7d363 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.1 2001/11/01 08:26:29 obrien Exp $
  */
 
 #ifndef _FB_TGA_H_
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 3af5fda458dcc..b7c99122468a9 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.31 2004/06/16 09:46:43 phk Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index e26c214e21c5b..397fd72ebdc63 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.7 2004/06/16 09:46:43 phk Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 43d23482a29e5..cb4eacf735f33 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.283.2.3 2004/10/10 23:49:38 peadar Exp $");
 
 #include "opt_fdc.h"
 
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c
index 6a3cacd5e722b..53464675d0574 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.2.2.3 2004/09/30 20:04:56 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 6700e751f38d6..2da5451cde51d 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.9.2.3.2.1 2004/10/28 19:40:40 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 1f143c75b0cca..66c26e7e3cc12 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_pccard.c,v 1.8.2.1 2004/09/18 04:57:55 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 5ecf9125c3ee9..526380901381f 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/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/dev/fdc/fdcvar.h,v 1.3.2.1 2004/09/18 04:57:55 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 ddf3fc50e2dee..dd1a69f12e363 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.86 2004/08/13 23:08:08 rwatson Exp $");
 
 /*
  *
diff --git a/sys/dev/fe/if_fe_cbus.c b/sys/dev/fe/if_fe_cbus.c
index 6df70ae92eac1..b443406c005b4 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.9 2003/08/24 17:46:06 obrien 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 1856951b48747..914e387d381c8 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.5 2003/08/24 17:46:06 obrien 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 49266deeacea9..91c51cdd32fd3 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.12 2004/05/27 03:49:42 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 21da37ab0d26b..6bc7b7e551e18 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.8 2000/09/14 12:02:07 nyan 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 c8fd35579625c..b308d8e449d9f 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.2 2003/10/31 18:32:00 brooks Exp $
  */
 
 /* How many registers does an fe-supported adapter have at maximum?  */
diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README
index d879f31a6b15d..59e3c5fa99fe2 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 2002/09/13 12:31:56 ikob 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 f2b7164eaf118..0e8d0c5e05474 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.78 2004/07/28 06:20:01 kan Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index 04c62873730ef..f30e18b6e10a7 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.19 2004/05/22 16:14:17 dfr Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire_phy.h b/sys/dev/firewire/firewire_phy.h
index 02cda696ea3f4..eff01ac9e05c1 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.2 2003/04/17 03:38:02 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 3c44a553adebc..6189cb83f5570 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.36 2004/06/16 09:46:44 phk Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c
index 4c09075a936fe..cd9e472024d67 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.11 2004/05/22 16:14:17 dfr Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index cffb6369b7476..d6ce7aab56e0b 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.44 2004/06/17 17:16:44 phk Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index afb1a09b11554..8c736deb0b686 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.6 2004/03/26 23:17:10 simokawa Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index 6bf66c702d6f3..cabe74c474ae9 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.2 2003/05/27 16:34:52 scottl Exp $
  */
 
 struct fwdma_alloc {
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index a2e81e3c448fa..91274910ce6ee 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.29 2004/06/16 09:46:44 phk Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index f8188d10aa25f..3a88daa112a83 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.7 2004/05/22 16:14:17 dfr 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 ad20edcce3598..de36fdbdcba43 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.79 2004/07/20 04:49:44 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index c3660a6e83055..05b60f79a6a80 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.48 2004/08/04 12:18:39 simokawa Exp $
  */
 
 #define BOUNCE_BUFFER_TEST	0
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 9abcb417bc413..9091216498f7c 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.20 2004/08/04 12:18:39 simokawa Exp $
  *
  */
 #define		PCI_CBMEM		PCIR_BAR(0)
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 014335a1d9924..8ac8c08deae08 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.13 2004/05/22 16:14:17 dfr Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index f2e77768adf7b..980949f0d5e55 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.2 2004/05/22 16:14:17 dfr Exp $
  */
 
 struct phyreg_base {
diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index 744172563e094..9e0763dbc11dc 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.12 2004/05/22 16:14:17 dfr Exp $
  *
  */
 
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 58a8cfe7d9eb7..6e279b4ea61d8 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.8 2004/05/22 16:14:17 dfr Exp $
  *
  */
 
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 96d903c78a968..65b2c0976f4a5 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.34 2004/08/12 03:02:16 rwatson Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index 97422168621b3..b25d988f8adfd 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.3 2003/04/17 03:38:02 simokawa Exp $
  */
 
 #ifndef _NET_IF_FWEVAR_H_
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 2c11a253ecbec..f130264aaebf9 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.5 2004/08/13 23:09:41 rwatson Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index fe202180a2747..23fd1411061d4 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.2 2004/06/13 13:58:00 dfr Exp $
  */
 
 #ifndef _NET_IF_FWIPVAR_H_
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 89b9631d828ce..795e388912fd1 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.79 2004/07/20 04:49:44 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index 49ec97e0caeba..6f8446d30bb56 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.4 2004/05/22 16:14:17 dfr Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index c6fea6bcbe501..2329730f714a6 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.7 2004/05/22 16:14:17 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 81e44c14f913f..b92e8f3b27311 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.217.2.1 2004/09/25 22:21:09 mux 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 1e8d660e4c6e4..33b5afabd996b 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.35 2003/05/14 20:33:41 mux Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 8168bd308f53e..1a2cc71292018 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.32 2004/06/02 22:59:57 mux Exp $
  */
 
 /*
diff --git a/sys/dev/fxp/rcvbundl.h b/sys/dev/fxp/rcvbundl.h
index e97e9aaf5b38d..0d009c357fc8e 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.1 2001/10/25 05:23:31 jlemon Exp $
  */
 /*
 rcvbundl.h
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index 6ec46bb6afb9b..08bfb3209f6e5 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.27 2004/08/13 23:11:24 rwatson 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 19c0de2628ecc..6f7a1ac085e46 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.16 2004/06/03 06:09:59 phk 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 700c732d0ebcd..1f8febff8c16a 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.2 2002/07/10 10:24:23 benno Exp $
  */
 
 #ifndef	_IF_GEMREG_H
diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h
index d93728e225f98..a11b340da4c9a 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.8 2003/05/15 16:57:55 tmm Exp $
  */
 
 #ifndef	_IF_GEMVAR_H
diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c
index ba57878d8d040..e7232b7532003 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.13 2004/07/10 22:29:41 marcel Exp $");
 
 #include "opt_fb.h"
 
diff --git a/sys/dev/gfb/gfb_pci.h b/sys/dev/gfb/gfb_pci.h
index e0f517e7331a8..70b21490e8573 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.1 2001/11/01 08:26:30 obrien Exp $
  */
 
 #ifndef _PCI_GFB_H_
diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c
index 7972272255611..08d7fccd31a1f 100644
--- a/sys/dev/gx/if_gx.c
+++ b/sys/dev/gx/if_gx.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.19 2004/05/30 20:08:32 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/gx/if_gxreg.h b/sys/dev/gx/if_gxreg.h
index 4a14a9102b123..efec910c5c20e 100644
--- a/sys/dev/gx/if_gxreg.h
+++ b/sys/dev/gx/if_gxreg.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/gx/if_gxreg.h,v 1.1 2001/10/19 02:17:32 jlemon Exp $
  */
 
 /*
diff --git a/sys/dev/gx/if_gxvar.h b/sys/dev/gx/if_gxvar.h
index 8570a506afa86..a805a20d1c209 100644
--- a/sys/dev/gx/if_gxvar.h
+++ b/sys/dev/gx/if_gxvar.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/gx/if_gxvar.h,v 1.4 2002/11/14 23:54:52 sam Exp $
  */
 
 #if __FreeBSD_version < 500000
diff --git a/sys/dev/harp/if_harp.c b/sys/dev/harp/if_harp.c
index 435b64e293e89..f9e7e4155cf77 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.5 2004/07/15 08:26:01 phk Exp $");
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/harp/if_harp.c,v 1.5 2004/07/15 08:26:01 phk 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 823801781bd25..e0f56275476fb 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.20 2004/03/17 17:50:34 njl 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 2dbfc693e0382..3fbfb77d04ff0 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.16 2003/12/24 18:22:04 alfred Exp $");
 
 /*
  * ForeHE driver.
diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c
index 410be9db47337..2ed8cb8d5973c 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.9 2003/08/22 06:00:26 imp 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 fb80f81bb673d..5b60fac7a340d 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.7 2003/10/29 14:33:41 harti 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 a7c2452431fff..ffb724fba7540 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.9 2003/11/05 11:43:06 harti 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 9d2d794c13393..c624177213f50 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.1 2003/06/17 16:12:50 harti Exp $
  *
  * Default configuration
  */
diff --git a/sys/dev/hatm/if_hatmreg.h b/sys/dev/hatm/if_hatmreg.h
index 7e88a5c61e5a9..d32ae87451397 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.1 2003/06/17 16:12:50 harti Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hatm/if_hatmvar.h b/sys/dev/hatm/if_hatmvar.h
index 2ca6f9473031e..ccd9fdc9700ca 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.15 2003/11/05 11:47:31 harti Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 5b64c31864ae5..59b647c0f4f82 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.5 2001/06/20 17:09:14 pirzyk Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index 3e00a941072f6..ce8c935ee733b 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.4 2003/07/31 14:20:07 harti Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 491733af197f8..ab94442e395f7 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 84b36808445ef..3777c84ea7c17 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.18 2004/02/22 16:27:28 mux 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.18 2004/02/22 16:27:28 mux Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index 1f68f7d3e44c3..b076e29e4e7f8 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 f4f796ffa435d..0ed3e42180194 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.12 2003/08/22 06:00:26 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.12 2003/08/22 06:00:26 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index c23e0cb294f0d..1aa43c125e4e5 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.6 2002/06/14 16:59:37 arr Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index 6124bdaaefd36..9cc17c4dc45e0 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.16 2004/02/21 19:08:23 harti 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.16 2004/02/21 19:08:23 harti Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 9c0f29dabba70..3633f0dd13668 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.11 2003/08/22 06:00:26 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.11 2003/08/22 06:00:26 imp Exp $");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index a37e2ecb0cba2..4058dfa6db3e6 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.18 2004/02/22 16:27:28 mux 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.18 2004/02/22 16:27:28 mux Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index c07eee5e9600e..690269d0b8f59 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.22.2.1 2004/09/15 15:14:17 andre 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.22.2.1 2004/09/15 15:14:17 andre Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 83960d977e4b0..80c971491659b 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.3 2002/04/16 01:34:00 arr Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index 17f165724387d..650dfa193f97c 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.13 2004/02/22 16:27:28 mux 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.13 2004/02/22 16:27:28 mux Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 53b568f69ebd0..c720efdcdd3b7 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.2 1999/08/28 00:41:52 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 51745ac9336f6..b8fed778f2917 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 84c9adf5c4916..e7b68e54bbe76 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.13 2004/02/22 16:27:28 mux 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.13 2004/02/22 16:27:28 mux Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index d0f05b8de114b..676e75b6b2f8f 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.10 2004/02/21 19:08:23 harti Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index cd0dd3c495dfb..ff4133f3333a9 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.10 2003/08/22 06:00:26 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.10 2003/08/22 06:00:26 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/hfa_eisa.c b/sys/dev/hfa/hfa_eisa.c
index 6c42fb8634e34..d305c5e20e636 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 34db172bb4cdb..1593deca92bf2 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.9 2004/07/15 08:26:01 phk Exp $
  */
 
 /*
diff --git a/sys/dev/hfa/hfa_freebsd.h b/sys/dev/hfa/hfa_freebsd.h
index 75400162eda9a..79e97ee64cdcd 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 b6cc311ebd65a..f4e3a3d45cc98 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.4 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  *
diff --git a/sys/dev/hfa/hfa_sbus.c b/sys/dev/hfa/hfa_sbus.c
index 990803cb19d70..93f69cbb43b23 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 c2b5fc979ac9f..829c011eccffb 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.28 2004/07/04 16:11:01 stefanf Exp $");
 
 /*
  * Driver for various Hifn encryption processors.
diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h
index 5f7099aa06687..d22a4b09ded74 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.4 2004/03/10 10:10:46 phk 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 b40b819a2f4e5..abd45f3ceccb0 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.4 2003/10/08 20:25:47 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 2720e58d49c96..467425bdad2c8 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.31 2004/08/13 23:14:50 rwatson Exp $");
 
 /*
  * HME Ethernet module driver.
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index fc203a9ee860c..1f4c0456a0272 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.15 2004/08/14 22:38:20 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 769ceb524a630..157065c560147 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.14 2004/08/12 20:37:02 marius 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 c3d205be0a6f4..9579eddb286a6 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 4482fd4ba91bc..6b937cbb146aa 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.6 2004/08/12 20:37:02 marius Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 9cc3a2ba0c75c..321e66b9f62eb 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.2 2004/10/24 09:23:07 scottl Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index 3b8d99c5dfbb9..d953391ed0ebf 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.1 2004/10/24 05:37:23 scottl Exp $
  */
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
diff --git a/sys/dev/hptmv/hptintf.h b/sys/dev/hptmv/hptintf.h
index 5b54475593e72..b4285d92cffef 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.1 2004/10/24 05:37:23 scottl Exp $
  */
 
 #ifndef HPT_INTF_H
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index b135bfa2215c4..57624ff1b95b6 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.1 2004/10/24 05:37:23 scottl Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hptmv/mvOs.h b/sys/dev/hptmv/mvOs.h
index 3325d14c7cc13..17d96953b24d8 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.2 2004/10/24 08:38:29 scottl Exp $
  */
 #ifndef __INCmvOsBsdh
 #define __INCmvOsBsdh
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index f9a41fcb73a41..e935ced487192 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.2 2004/10/24 08:38:29 scottl Exp $
  */
 #ifndef _OSBSD_H_
 #define _OSBSD_H_
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index 90672c4ee7e6a..6e3693a02e9cd 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 a9a5a83348e0f..fa4ecb942c6af 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.4 2002/10/23 15:53:09 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index b8f903782395b..7b256b5432e9b 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 b676e25a9cd5c..9800eedadef30 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.6 1999/08/28 00:45:13 peter Exp $
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index 2bc8a08317c66..8f82516350401 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.8 2001/06/30 05:29:11 imp Exp $
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/i8251.h b/sys/dev/ic/i8251.h
index fab1ea4378696..1f4f844d32e7e 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/i82586.h b/sys/dev/ic/i82586.h
index d594730a0dd5b..ac6e2af5509cb 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 91270a0715cc6..53c5194720a2c 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 1e0561a5ee66e..9137792b010db 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 cbac72c1e0d4f..22fece01c6410 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.15 2004/04/07 20:45:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/rsa.h b/sys/dev/ic/rsa.h
index 6f9376af2f233..b6535d05f1bbe 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/wd33c93reg.h b/sys/dev/ic/wd33c93reg.h
index c286c65a16ebc..3ca404135c5b3 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.1 2001/06/14 11:05:47 nyan Exp $ */
 /*	$NecBSD: wd33c93reg.h,v 1.21.24.1 2001/06/13 05:52:05 honda Exp $	*/
 /*	$NetBSD$	*/
 /*
diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index 0d8dd59b07a3f..a1da47f475ebc 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.9 2004/03/12 21:45:26 trhodes 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 4432a6db3d3b0..9e61a542adb6d 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.13 2004/06/24 18:21:28 ambrisko 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 ca0577c7d178d..d8512aaeaf6a5 100644
--- a/sys/dev/ichsmb/ichsmb_reg.h
+++ b/sys/dev/ichsmb/ichsmb_reg.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_reg.h,v 1.1 2000/10/06 00:09:45 archie Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_REG_H_
diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h
index 99abbe55afbe2..90e8608f8e183 100644
--- a/sys/dev/ichsmb/ichsmb_var.h
+++ b/sys/dev/ichsmb/ichsmb_var.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_var.h,v 1.2 2000/12/07 02:09:39 archie Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_VAR_H
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 73f871990c2f7..7464d17a789cd 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.4 2004/06/13 05:00:19 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index ab0e117fbdf82..12da6cb707623 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.1 2004/05/11 18:21:38 des Exp $
  */
 
 #ifndef _ICHWD_H_
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index c9682ef674b59..3ee24b3e5958a 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.36 2004/06/16 09:46:45 phk 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 794cb90b90c3f..8ae7d043a585e 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.45 2004/05/30 20:08:34 phk Exp $
  */
 
 /*
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index be247864ab965..1dfb75110edec 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.16 2004/05/30 20:08:34 phk 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 692211d0eb657..d8ad40a49d4b2 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.29 2004/05/30 20:08:34 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ida/idaio.h b/sys/dev/ida/idaio.h
index b30f2eae1ac7a..652833db1df6e 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 2317a3de8813b..360b33beb5e56 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.8 2004/01/15 04:05:47 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 118e680427f7e..a15261ae03417 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.15 2004/06/16 09:46:45 phk Exp $
  */
 
 /*
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index 0edceeb9bb102..ccbac0d8b6c84 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.9 2004/01/14 06:14:35 alc 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 61cbdf9d1a7c9..fc9a3993c3bf1 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.5.2.2 2004/09/15 18:38:32 andre 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 1112d31d48ae1..9cf1002c790fd 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.4 2004/03/17 17:50:35 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idtreg.h b/sys/dev/idt/idtreg.h
index 43ede7e292da3..3b1637abbb87d 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.1 2002/09/30 05:12:34 mdodd Exp $
  */
 
 #define	IDT_VERSION	"IDT 1.101"
diff --git a/sys/dev/idt/idtvar.h b/sys/dev/idt/idtvar.h
index 6761a00ee4df3..2ca248efa2ba7 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.2 2003/01/01 18:48:50 schweikh Exp $
  */
 
 /*******************************************************************************
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index f30d7752f11f1..1f3f60e8d2251 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.100 2004/08/13 23:15:44 rwatson Exp $");
 
 /*
  * Intel 82586 Ethernet chip
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 7bcc500aa61d2..5eeff15d30471 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 b8448c86bcfd8..2b3172d99693f 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.2 2003/08/24 17:49:13 obrien 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 dcd8bae8155a3..19187465ecaff 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.3 2003/03/28 06:27:08 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index d3b0f228f9574..2808fe2bf6f01 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 a57b2d0dde20e..d63afe56acd12 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.2 2003/08/06 17:28:33 bde Exp $
  */
 
 enum ie_hardware {
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 1dd892a9623eb..f253ba3129774 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.1.2.1 2004/10/23 18:58:53 le Exp $");
 
 #include "opt_bdg.h"
 
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 8f26eaca8552d..f90f897c0876e 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.6 2004/07/11 00:19:30 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 00f4086ab1575..b64629d5961c8 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.8 2004/08/16 18:50:20 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 0e60744263222..bf1276949a32f 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.15 2004/07/11 00:19:30 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 1979cf1ed6055..066098c3dbd56 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.21 2004/08/13 23:16:44 rwatson Exp $");
 
 /*
  * I2C bus IP driver
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 3a879d8d0d37d..e7f9f0e877353 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 5d362c1a2dd42..8026fcb138dda 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 53ecdceb947f1..c2ad09afe6fd5 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 5642741669684..80f6419761389 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.5 2002/03/23 15:47:17 nsouch Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index aae8a76ce51c1..d377e1c70698f 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 59bbaef4d3fe2..a97af7f6275fa 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 eddc022b97d7a..713e32c405619 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.5 2000/04/08 14:17:01 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 6753db9bc49b2..ca85b0d53d12b 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 3a9e7e34807f7..971510eec89f4 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 966063f2a13b2..548c90d97d586 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 b1c9992827c58..ba60f2d01d89a 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.10.2.1 2004/09/08 19:54:36 scottl Exp $");
 
 #define _IIR_C_
 
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index 688cf634d153e..99dbd3e0e1c4f 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.10 2004/06/16 09:46:46 phk 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 4d976b3e9e814..87a68d1cae977 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.15 2004/06/16 09:46:46 phk 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 d0ff7bb4646d0..38b092487f984 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.13 2004/03/17 17:50:35 njl 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 33f6c1d099b9c..92bfed947b8d3 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 b1a8297389012..39912038b9e40 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.13 2004/06/16 09:46:46 phk 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 9c26a7af746da..813e285dea31f 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.11 2004/06/16 09:46:46 phk Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_commands.c b/sys/dev/ips/ips_commands.c
index e2495aba0ec3f..851ad995cabb6 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.11 2004/06/14 18:19:04 jdp Exp $");
 
 #include <dev/ips/ips.h>
 
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 87b848e60dea6..a6a821e797e83 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.6 2004/02/28 19:14:41 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 0b0fe65d4030a..316533959ccaa 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.3 2004/02/18 21:36:52 phk Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_ioctl.c b/sys/dev/ips/ips_ioctl.c
index fa4ff3666c4a9..18a21317a2985 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.5 2004/05/30 04:01:29 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 ef0691e92846c..84be407dbe235 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 5431c96c626c7..3c945dd488837 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.10 2004/03/19 17:36:47 scottl Exp $");
 
 #include <dev/ips/ips.h>
 
diff --git a/sys/dev/isp/DriverManual.txt b/sys/dev/isp/DriverManual.txt
index ea1968f9f8830..fc35af47d07ac 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 75f01bf7dd36a..00593d82aa385 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 a12c3d4472b9d..79ea38993837c 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.111 2004/05/24 07:02:24 njl 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 986fc8d6cb9fc..b159ba8535e35 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.102.2.1 2004/08/27 15:46:56 mjacob 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 3f60a948a3b6f..dee65edcc4975 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.75.2.1 2004/10/11 23:59:03 mjacob 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 6bc54fbf08e75..2dcee5ffa9251 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.30 2004/05/24 07:02:25 njl Exp $ */
 /*
  * Qlogic Host Adapter Inline Functions
  *
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index 93ccc53f9ceb5..af00e53677dc3 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.11 2004/02/07 03:43:27 mjacob Exp $ */
 /*
  * Copyright (c) 2001 by Matthew Jacob
  *
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 8fe9ba3626166..b48576894f5aa 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.98.2.1 2004/10/11 23:59:03 mjacob 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 5f87f3dbb08e7..4a9f37d676335 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 d26d1e35d427d..e91f4d272ec3e 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.30 2004/05/24 07:02:25 njl 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 c0bbc89fb11eb..6e815dd181a17 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.21 2003/09/13 01:58:26 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 358e956036d96..4cc77604cf3c5 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.9 2003/09/13 01:58:51 mjacob 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 77aeb00c5ec9e..13e63a5890b0d 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.46 2004/01/23 23:22:35 mjacob 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 2f51790819e27..126476226d5ce 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.22 2002/02/17 06:38:22 mjacob 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 1e99dc9b5c4bf..4c753199f5f24 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.66 2004/05/24 07:02:25 njl 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 965d0b084d7c5..d09f77b396a9b 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.1 2002/07/11 01:55:15 mjacob 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 dbb3992e67e84..18a7225bbf5de 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.3 2001/02/11 03:35:44 mjacob 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 de896a08b5dfb..32f20231c86b5 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.2 2001/02/11 03:35:44 mjacob 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 7279007f29b14..f942822ea760f 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.5 2004/01/14 18:38:02 mjacob 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 f593ec3f45cf7..ee9c2b161c391 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.5 2002/09/01 02:28:35 mjacob 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 8bd389f236c8c..5ab7b80d54128 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.6 2004/01/14 18:38:02 mjacob 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 152b057006390..90149b962ef90 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.6 2004/01/14 18:38:03 mjacob Exp $ */
 /*
  * Copyright (C) 2001 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c
index 633fdf76b8e60..58dcc87a354ea 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.13 2004/07/15 08:26:01 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ixgb/LICENSE b/sys/dev/ixgb/LICENSE
index 35e396476bb95..b8ed5b9126b94 100644
--- a/sys/dev/ixgb/LICENSE
+++ b/sys/dev/ixgb/LICENSE
@@ -1,4 +1,4 @@
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/LICENSE,v 1.1 2004/05/28 00:22:58 tackerman Exp $*/
 Copyright (c) 2001-2004, Intel Corporation
 All rights reserved.
 
diff --git a/sys/dev/ixgb/README b/sys/dev/ixgb/README
index 33f85a7c9bd81..f1772771ca562 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 2004/05/28 00:22:58 tackerman 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 cc4739199f9f8..6c4806374ef25 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.3 2004/08/14 00:17:04 rwatson Exp $*/
 
 #include <dev/ixgb/if_ixgb.h>
 
diff --git a/sys/dev/ixgb/if_ixgb.h b/sys/dev/ixgb/if_ixgb.h
index a8a7a580664b7..8d415fd0dce72 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.2 2004/06/03 06:10:00 phk 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 999863cc59a7f..4e813557651d8 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.1 2004/05/28 00:22:59 tackerman 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 861a99a139972..c7ec7b729fb22 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 6a1163aab61bf..d30667aa72e8d 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 23b0b2846e593..131c9d685f79a 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 2194544e04ee4..88c13bbe55e7f 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 a224f6300fa20..d33ba85719be9 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 0568febed341f..dfdae7ae8495b 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 efb1e29280dc0..80c54645e40d1 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 d94819a8c4c2a..cee216eb7209a 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 966fe78abb60e..3a566e0205b84 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/atkbd.c b/sys/dev/kbd/atkbd.c
index 5d6822ef28f78..13c2ea9b14a4a 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/atkbd.c,v 1.43 2004/06/10 20:30:56 jhb Exp $");
 
 #include "opt_kbd.h"
 #include "opt_atkbd.h"
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index 7fc2325c0dd40..5d570fd1553c3 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.15 2003/08/24 17:49:15 obrien Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
index 7711c660863cb..2dba1aa85921a 100644
--- a/sys/dev/kbd/atkbdcreg.h
+++ b/sys/dev/kbd/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/kbd/atkbdcreg.h,v 1.10 2003/07/12 18:36:04 mikeh Exp $
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/kbd/atkbdreg.h
index 4ae93e3b96ff9..f452d4179b315 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/kbd/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/kbd/atkbdreg.h,v 1.6 2000/03/19 03:25:12 yokota Exp $
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index b7694c50d0a4f..f2a9e1b9e7728 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.42 2004/06/16 09:46:48 phk Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 78a5af4208814..63f166a2ec96e 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 2004/06/16 09:46:48 phk Exp $
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 2cde0044614e7..abe9228965afd 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.49 2001/03/12 00:00:22 ache Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/led/led.c b/sys/dev/led/led.c
index 07c1c9e236f71..5fde0cd2920af 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.13 2004/07/10 15:38:27 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 866311b9809a4..0276b5e919426 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 f26d4526fdfd3..3648e9995c3f9 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.34 2004/08/13 23:18:01 rwatson 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 28a6aec85f41a..9903f3b160c46 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.3 2002/11/14 23:54:52 sam Exp $
  */
 
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 111192dda81bf..8435ddde36b5b 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.110 2004/08/13 23:20:50 rwatson Exp $");
 
 /*
 #define DIAGNOSTIC
diff --git a/sys/dev/lnc/if_lnc_cbus.c b/sys/dev/lnc/if_lnc_cbus.c
index c03afc6b4ddb9..03d06ea27823d 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.7 2004/06/03 06:10:00 phk 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 5f6ed66abb366..a24bba09cbf95 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.18 2004/05/30 20:08:35 phk 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 688385ab020b6..49da820c4d6cd 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.34.2.1 2004/08/25 17:30:36 mux 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 86e1d8b021a90..e23d1ec5665a5 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 8c76738500f1c..71f93077d5a06 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.27 2004/03/03 08:33:34 obrien Exp $
  */
 
 /*
diff --git a/sys/dev/matcd/creativeif.h b/sys/dev/matcd/creativeif.h
index 739550b27c840..702623d50d21b 100644
--- a/sys/dev/matcd/creativeif.h
+++ b/sys/dev/matcd/creativeif.h
@@ -37,7 +37,7 @@ SUCH DAMAGE.
 See matcd.c for Edit History
 */
 
-/* $FreeBSD$
+/* $FreeBSD: src/sys/dev/matcd/creativeif.h,v 1.1 2003/06/17 01:20:03 uhclem Exp $
 */
 
 /*----------------------------------------------------------------------------
diff --git a/sys/dev/matcd/matcd.c b/sys/dev/matcd/matcd.c
index aead16c72ef52..e0ce4a77a8bdc 100644
--- a/sys/dev/matcd/matcd.c
+++ b/sys/dev/matcd/matcd.c
@@ -531,7 +531,7 @@ static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995,2002,2
 /*	Flags in the if_state array */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/matcd/matcd.c,v 1.5 2004/06/16 09:46:49 phk Exp $");
 
 #define	BUSBUSY	0x01			/*<18>Bus is already busy*/
 
diff --git a/sys/dev/matcd/matcd_data.h b/sys/dev/matcd/matcd_data.h
index 1923cec4cbcc5..c3df7afbd1e7d 100644
--- a/sys/dev/matcd/matcd_data.h
+++ b/sys/dev/matcd/matcd_data.h
@@ -37,7 +37,7 @@ SUCH DAMAGE.
 See matcd.c for Edit History
 */
 
-/* $FreeBSD$
+/* $FreeBSD: src/sys/dev/matcd/matcd_data.h,v 1.2 2004/06/16 09:46:49 phk Exp $
 */
 
 /*----------------------------------------------------------------------------
diff --git a/sys/dev/matcd/matcd_isa.c b/sys/dev/matcd/matcd_isa.c
index 48d01dd237883..3941c50eece9b 100644
--- a/sys/dev/matcd/matcd_isa.c
+++ b/sys/dev/matcd/matcd_isa.c
@@ -35,7 +35,7 @@ SUCH DAMAGE.
 -----------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/matcd/matcd_isa.c,v 1.3 2004/03/17 17:50:36 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/matcd/matcddrv.h b/sys/dev/matcd/matcddrv.h
index b2f069e0bec16..a3c47ebc89c33 100644
--- a/sys/dev/matcd/matcddrv.h
+++ b/sys/dev/matcd/matcddrv.h
@@ -37,7 +37,7 @@ SUCH DAMAGE.
 See matcd.c for Edit History information.
 */
 
-/* $FreeBSD$
+/* $FreeBSD: src/sys/dev/matcd/matcddrv.h,v 1.1 2003/06/17 01:20:03 uhclem Exp $
 */
 
 /*----------------------------------------------------------------------------
diff --git a/sys/dev/matcd/options.h b/sys/dev/matcd/options.h
index fe0c8f2adc035..f27e553b1b761 100644
--- a/sys/dev/matcd/options.h
+++ b/sys/dev/matcd/options.h
@@ -37,7 +37,7 @@ SUCH DAMAGE.
 See matcd.c for Edit History
 */
 
-/* $FreeBSD$
+/* $FreeBSD: src/sys/dev/matcd/options.h,v 1.1 2003/06/17 01:20:03 uhclem Exp $
 */
 
 /*----------------------------------------------------------------------------
diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c
index efa70d29b8a6d..f6e4f89f99dda 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 e818b68b80239..6b9324ec4191b 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 db11d67699f60..6555c47f42988 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 4f09744c5287e..64e516aeda198 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.142 2004/06/16 09:46:49 phk 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 f63167246f4d7..279c1614c6599 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.8 2004/03/17 17:50:36 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index cc8a3ab7163af..c56d27342af6b 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.16 2004/03/12 21:45:27 trhodes Exp $
  */
 
 #ifndef MCD_H
diff --git a/sys/dev/mcd/mcdvar.h b/sys/dev/mcd/mcdvar.h
index adfd4a4f41911..162906369e968 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 607c492dbc7a1..648447ee91467 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.127.2.3 2004/09/02 20:08:41 cperciva Exp $
  *
  */
 
diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c
index 9fb33d2c4d48b..6e8ba71d00de6 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 f514f50bedb69..61030b3ef8f4d 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 78aa5561b7f69..4643b90383479 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.15 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Driver for Altima AC101 10/100 PHY
diff --git a/sys/dev/mii/acphyreg.h b/sys/dev/mii/acphyreg.h
index 827aba68f157b..0712a62ffd823 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 ca13a844892d7..be3637b53ce63 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.16 2004/05/30 17:57:40 phk Exp $");
 
 /*
  * driver for AMD AM79c873 PHYs
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index ffc362a8c7b1e..8b87a39557acd 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.1 1999/09/06 05:27:55 wpaul Exp $
  */
 
 #ifndef _DEV_MII_AMTPHYREG_H_
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index c180b5ef59287..5703aa45cfada 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.8 2004/05/30 17:57:40 phk 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 7f2956ad0b750..dd931ecdf37dd 100644
--- a/sys/dev/mii/bmtphyreg.h
+++ b/sys/dev/mii/bmtphyreg.h
@@ -36,7 +36,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.1 2002/07/05 11:07:24 benno Exp $
  */
 
 #ifndef _DEV_MII_BMTPHYREG_H_
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 6680b53073e9a..1046eb0a96558 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.31 2004/05/30 17:57:40 phk 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 786f49dae8d56..c6351d3e7f5bb 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.5 2003/06/17 15:02:28 ps Exp $
  */
 
 #ifndef _DEV_MII_BRGPHYREG_H_
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 03a71d5283490..9b9344d5fd58f 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.1.2.1 2004/09/14 21:22:33 wpaul Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.1.2.1 2004/09/14 21:22:33 wpaul 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 2822ac18704cd..06b4ba86c3b7d 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.1.2.1 2004/09/14 21:22:33 wpaul Exp $
  */
 
 #ifndef _DEV_MII_CIPHYREG_H_
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 28affb81063c2..3ad66b507b1cc 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.26 2004/05/29 18:13:44 marius 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 2dc1448988a0b..8e2fb8cec9311 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.13 2004/05/30 17:57:40 phk 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 bdfc665f89013..d58c6b938342f 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.2 2003/09/20 10:53:08 wilko Exp $ */
 /*
  * Principal Author: Parag Patel
  * Copyright (c) 2001
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 914577289fd95..67b88f40b0a72 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.18 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * driver for 3Com internal PHYs
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index b2a3d81686142..29d8341570c89 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 4b7d1f113051a..c7a9888ced804 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 db5c1002d7577..5d7072a234621 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.13 2004/05/29 18:09:10 marius 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 662bd34b280e1..efcb0dbf74ccc 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 e3d782b06ff98..fc70c3c072c87 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.20 2004/08/15 06:24:40 jmg 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 963c226177226..4d423e5da1013 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.4 2002/04/29 11:57:28 phk Exp $
  */
 
 #ifndef _DEV_MII_MII_H_
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 538e5fe547f81..417f9831df008 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.21 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Subroutines common to all PHYs.
diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m
index 017812f4dfb0a..0931059fba7e7 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 6415c92a6db7e..ed64254fd8403 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.27.4.1 2004/09/14 21:22:33 wpaul 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 f6c759c40e930..da1d6a5869756 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 ecb84f7769797..cdb1b291312a9 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.19 2004/05/03 13:01:34 andre Exp $");
 
 /*
  * driver for Micro Linear 6692 PHYs
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 8c74a39bb4e7d..c0f4b8caf4b7a 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.18 2004/05/30 17:57:40 phk Exp $");
 
 /*
  * Driver for the National Semiconductor DP83891 and DP83861
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index c7680f1e8a3c9..a7bef88de9c5c 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.3 2002/04/29 11:57:28 phk Exp $
  */
 
 #ifndef _DEV_MII_NSGPHYREG_H_
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 70676ddc1e4f5..0c3fc47bf3c29 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.22 2004/05/29 18:23:26 marius 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 5ff0490b1dfe5..5e8d3478e854a 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 50986dc52f5ca..918903fc67ecc 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.14 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * driver for homePNA PHYs
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 63891f58e5e0c..75d60509a2cbe 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.17 2004/05/29 18:09:10 marius 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 2f09eeb3d09b1..2eed3e471f0f0 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.13 2004/05/29 18:09:10 marius 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 a69786596a292..29a32b045a338 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 98609db14d26a..f8f4a11c0c305 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.5 2004/05/30 17:57:40 phk 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 1adecf4611cb1..9dbc540c9d7c4 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.1 2003/09/11 03:53:46 wpaul Exp $
  */
 
 #ifndef _DEV_MII_RGEPHYREG_H_
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 2e93373d84bf7..6650a58b6c068 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.20 2004/05/30 17:57:40 phk Exp $");
 
 /*
  * driver for RealTek 8139 internal PHYs
diff --git a/sys/dev/mii/ruephy.c b/sys/dev/mii/ruephy.c
index 282dcdd344b17..bb593677252bc 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 5f3911bebd5db..4690df15c244d 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 c5efb691683bf..372a5413a86ef 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.15 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Driver for the TDK 78Q2120 MII
diff --git a/sys/dev/mii/tdkphyreg.h b/sys/dev/mii/tdkphyreg.h
index 1f106251b607a..2611f2200ba14 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.1 2000/10/19 08:34:32 jon Exp $
  */
 
 /*
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index ff00a4708312b..22749f07444ef 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.17 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Driver for Texas Instruments's ThunderLAN PHYs
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index 77e4a45700bd7..0ae83e34d7e8d 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.2 1999/08/28 02:16:30 peter Exp $
  */
 
 #ifndef _DEV_MII_TLPHYREG_H_
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index c75bd6cfa8206..122ef562d9383 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.16 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * driver for generic unknown PHYs
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 123d529131790..7f812399e4b92 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 1270c42c154ac..3ccbc267d14c6 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.16 2004/05/30 17:57:40 phk 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 e06b1970831ea..6e3f26f109e46 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.3 2002/01/10 18:06:41 archie Exp $
  */
 
 #ifndef _DEV_MII_XMPHYREG_H_
diff --git a/sys/dev/mk48txx/mk48txx.c b/sys/dev/mk48txx/mk48txx.c
index 1cbb5263f6d60..e88fbb9ad4ad6 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.3.4.1 2004/09/25 20:53:44 marius Exp $");
 
 /*
  * Mostek MK48T02, MK48T08, MK48T59 time-of-day chip subroutines.
diff --git a/sys/dev/mk48txx/mk48txxreg.h b/sys/dev/mk48txx/mk48txxreg.h
index e2b48868e4a6a..ab6de171b3c72 100644
--- a/sys/dev/mk48txx/mk48txxreg.h
+++ b/sys/dev/mk48txx/mk48txxreg.h
@@ -35,7 +35,7 @@
  *
  *	$NetBSD: mk48txxreg.h,v 1.4 2000/11/11 11:59:42 pk Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mk48txx/mk48txxreg.h,v 1.1.8.1 2004/09/25 20:53:44 marius Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index f026175f91ed0..954497c8bc5ce 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.48 2004/06/16 09:46:50 phk Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx_compat.h b/sys/dev/mlx/mlx_compat.h
index 7160c3d1639bc..176c6439ead91 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 8b19fa86b154c..fccfd963be07e 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.33 2004/05/30 20:08:36 phk 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 f3309277fb630..38a28acbddbce 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.19 2004/05/30 20:08:36 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mlx/mlxio.h b/sys/dev/mlx/mlxio.h
index f091befad2d0d..43c51cb669666 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 fef77dfbe6f84..d04ae2e9140db 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.8 2002/09/23 18:54:30 alfred Exp $
  */
 
 #define MLX_BLKSIZE	512		/* fixed feature */
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index 345cf9933c22c..dc9c7e368ae96 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 2e368164b6045..06f06ee50a29b 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.36 2004/06/16 09:46:51 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/mly/mly_tables.h b/sys/dev/mly/mly_tables.h
index 433a1cb1036e0..2f04c87c1f5b3 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 504b5040b5327..554544d347fd6 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 a4106a57b0039..944998eb9ec81 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 e1c7a50e91679..58f1a8d016c8b 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 2b02a9ac95b3a..beaa0f7ebf2a9 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.3 2002/08/30 03:36:50 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi.h b/sys/dev/mpt/mpilib/mpi.h
index a3fab3c2aeb9c..6aebf2c926ca0 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.4 2003/06/03 17:47:48 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_cnfg.h b/sys/dev/mpt/mpilib/mpi_cnfg.h
index 6008f42277716..11c7959c881ba 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.4 2003/06/03 17:47:48 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_fc.h b/sys/dev/mpt/mpilib/mpi_fc.h
index 60487e139d693..a3245c3e27492 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.3 2002/08/30 03:36:50 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_init.h b/sys/dev/mpt/mpilib/mpi_init.h
index 78545889f8198..6faa490966d90 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.4 2003/06/03 17:47:48 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_ioc.h b/sys/dev/mpt/mpilib/mpi_ioc.h
index e2e8f43fe81eb..aaaaf8b5c839c 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.4 2003/06/03 17:47:48 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_lan.h b/sys/dev/mpt/mpilib/mpi_lan.h
index 0c2a137b35175..a83873a492128 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.3 2002/08/30 03:36:50 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_raid.h b/sys/dev/mpt/mpilib/mpi_raid.h
index c78a600b64a54..4106833e85174 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.4 2003/06/03 17:47:48 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_targ.h b/sys/dev/mpt/mpilib/mpi_targ.h
index f212c62d13dc2..c2b4d20efea82 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.3 2002/08/30 03:36:50 mjacob Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h
index becf1a0747c43..21ac622c80e7b 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.4 2004/03/12 21:45:28 trhodes Exp $ */
 /*
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c
index 8c99e1ca319ac..b4a32c3d2884e 100644
--- a/sys/dev/mpt/mpt.c
+++ b/sys/dev/mpt/mpt.c
@@ -1,7 +1,7 @@
 /*
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.9 2003/08/24 17:54:11 obrien Exp $");
  * Generic routines for LSI '909 FC  adapters.
  * FreeBSD Version.
  *
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index 82e8cf5187520..2e8472e12eb55 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.4 2003/06/03 17:47:47 mjacob Exp $ */
 /*
  * Generic defines for LSI '909 FC  adapters.
  * FreeBSD Version.
diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c
index 96e35e103b3b2..abd8cb8681ed9 100644
--- a/sys/dev/mpt/mpt_debug.c
+++ b/sys/dev/mpt/mpt_debug.c
@@ -1,7 +1,7 @@
 /*
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.5 2004/07/13 16:06:19 stefanf Exp $");
  * Debug routines for LSI '909 FC  adapters.
  * FreeBSD Version.
  *
diff --git a/sys/dev/mpt/mpt_freebsd.c b/sys/dev/mpt/mpt_freebsd.c
index 24803db677cd6..ee55d58072838 100644
--- a/sys/dev/mpt/mpt_freebsd.c
+++ b/sys/dev/mpt/mpt_freebsd.c
@@ -1,7 +1,7 @@
 /*
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_freebsd.c,v 1.15.4.1 2004/08/29 04:56:38 dwhite Exp $");
  * FreeBSD/CAM specific routines for LSI '909 FC  adapters.
  * FreeBSD Version.
  *
diff --git a/sys/dev/mpt/mpt_freebsd.h b/sys/dev/mpt/mpt_freebsd.h
index 991e56e5e6bd2..8afd054da2161 100644
--- a/sys/dev/mpt/mpt_freebsd.h
+++ b/sys/dev/mpt/mpt_freebsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.h,v 1.9 2003/06/03 17:47:47 mjacob Exp $ */
 /*
  * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index 874ee3eace2ff..1564548350e6a 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.16 2004/03/17 17:50:37 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c
index 62615e57f9417..e92422b21281b 100644
--- a/sys/dev/musycc/musycc.c
+++ b/sys/dev/musycc/musycc.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/musycc/musycc.c,v 1.33.2.1 2004/10/15 21:45:13 jmg Exp $");
 
 /*
  * Card state machine:
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 0c8fa1d5719e6..08effe9a3fb32 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.26 2004/06/09 14:34:01 naddy 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 ccc7338a9eb79..b358947a7c51e 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.1 2002/04/04 05:22:13 julian Exp $
  *
  * Myson MTD80x register definitions.
  *
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index dbb8ea9df3a7b..b5ee7d0bef945 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.10 2004/07/10 21:05:14 marcel 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 1e97372aa263a..437693780aeda 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.22 2004/05/27 03:49:42 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 cf12288555157..510d73ef87da2 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.3 2004/03/13 19:46:27 peter 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 7e16b9e72fbdf..76265541e9e06 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.2 2001/07/14 00:38:50 non 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 0296c5eae004b..f1cbcffd86501 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.2 2001/07/14 00:38:50 non 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 6d5edce9cae7b..fcc82f4664cb8 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.8 2002/05/31 23:39:04 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 151321cc1c2fd..5f09a8a56e7df 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.65.2.1 2004/10/08 23:56:36 scottl 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 e27359fc86459..6c7ef2f146a77 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.9.8.1 2004/10/08 23:56:36 scottl Exp $
  */
 
 #define NGE_CSR			0x00
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 41a8704305d46..0ce4ca7d294be 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.30 2004/07/15 20:47:37 phk Exp $");
 
 /*
  * Pseudo-nulmodem driver
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index 954d1bb98898a..a4abfb5db5b9b 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.12 2004/07/10 21:06:08 marcel 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 4c61b07d122d0..9d3a1be9396aa 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.20 2004/05/27 03:49:43 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 3bfcd9696bcf5..a276bd8bc9d93 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.2 2001/07/14 00:38:51 non 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 57614084834f2..2b6293f1905a5 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.7 2002/05/31 23:39:04 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 3fc3ac0b88dc4..87c6df2af26d4 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.30 2004/08/02 19:59:41 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/ofw_bus.h b/sys/dev/ofw/ofw_bus.h
index 3f4fbae9754d2..443eccd88d6bd 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 87e4fcc41e28a..d33d4480f8961 100644
--- a/sys/dev/ofw/ofw_bus_if.m
+++ b/sys/dev/ofw/ofw_bus_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/dev/ofw/ofw_bus_if.m,v 1.1 2004/08/12 17:41:29 marius 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 5b3b2854434ee..451fa165e3836 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.28 2004/08/04 00:21:19 gad 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 fa6ef22ca5378..f5c82bfc27285 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.14 2004/08/16 15:45:26 marius 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 f810be93e4aa3..0df66f20305bc 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.3 2001/02/16 14:16:30 mrg Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/ofw_pci.h,v 1.1 2001/11/18 20:38:43 tmm Exp $
  */
 
 #ifndef _DEV_OFW_OFW_PCI_H_
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index db87a4a2da5c6..1494d0d769452 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.13 2004/08/16 15:45:26 marius Exp $");
 /*
  * Copyright (C) 2000 Benno Rice.
  * All rights reserved.
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index acbaad741564a..78243a80f751d 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.10 2004/08/16 15:45:26 marius Exp $
  */
 
 #ifndef _OPENFIRM_H_
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index b67a1f8fb0159..06ef361a0ebcb 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.12 2004/08/16 15:45:26 marius Exp $");
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index c4f21d2897a41..4ac88cf67404b 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.4 2004/05/22 16:43:42 marius Exp $
  */
 
 #ifndef _DEV_OFW_OPENFIRMIO_H_
diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c
index 07a0791515526..d0c0d225a6ed9 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.6 2004/08/16 15:45:26 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 5233d29eb870b..35e6a50d63727 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 0e67c58a20f6d..02900369e7ec1 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 c8a1aa8693dd2..16d7334453b99 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.7 2004/05/23 16:11:50 mux 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 1720820a453db..259b987bd82d1 100644
--- a/sys/dev/owi/if_owi_pccard.c
+++ b/sys/dev/owi/if_owi_pccard.c
@@ -70,7 +70,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/owi/if_owi_pccard.c,v 1.2 2004/05/26 00:52:57 imp 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 04de3b3538cec..7a53cbf8c5b76 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.1 2003/08/24 05:42:49 imp Exp $
  */
 
 #define WI_DELAY	5
diff --git a/sys/dev/owi/if_wivar.h b/sys/dev/owi/if_wivar.h
index 98f197069fd1c..226c9d327191f 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.2 2003/11/14 19:00:30 sam Exp $
  */
 
 #define WICACHE			/* turn on signal strength cache code */  
diff --git a/sys/dev/patm/genrtab/Makefile b/sys/dev/patm/genrtab/Makefile
index 9c067004a5a74..281ae0ed3e583 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.4 2004/02/25 13:12:51 johan 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 eef0749fc8c42..13f10d390d760 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.1 2003/07/15 11:57:24 harti 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.1 2003/07/15 11:57:24 harti 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 c970568f6ac33..a9d7c76723b07 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.1 2003/07/15 11:57:23 harti Exp $
  *
  * Register definitions for the IDT77252 chip.
  */
diff --git a/sys/dev/patm/if_patm.c b/sys/dev/patm/if_patm.c
index 900d1fa7161a1..03b41efe97955 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.6 2004/03/10 17:03:27 bms 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 dd4a52d0e3356..850a5a0db016b 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.7 2004/03/17 17:50:38 njl 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 a8f1c3b0a8a72..615edeb102277 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.3 2004/03/10 17:03:27 bms 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 359d447cec485..5f7e635edafa8 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.7 2004/03/10 17:03:27 bms 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 f945276690b4b..410b25ac9fba2 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 a008b3563a59e..19285c96e9d41 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.5 2004/03/10 17:03:27 bms 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 112251627f569..9bc7ed7cc1291 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.6 2004/03/10 17:03:27 bms 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 f26cf17132e54..d3c171287544a 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.3 2003/08/07 14:30:58 harti Exp $
  *
  * Driver for IDT77252 (ABR) based cards like ProSum's.
  */
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index 40c429eac1488..4cfb2c888a71c 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.24 2004/05/28 02:23:10 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 3509a8c0690c4..836fc476d3814 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.93 2004/08/16 15:57:18 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 99ec427805034..fffa43b3fc30c 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.28 2004/04/12 20:56:34 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 9c8221cacbe14..b8703a45686d8 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.1 2003/10/07 03:35:48 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 7e7bf519fa35a..4878742a55231 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.13 2004/05/27 15:21:51 imp Exp $");
 
 #define	PCCARDDEBUG
 
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 93214e260a26d..4cae5f5b2999a 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.85.2.1 2004/09/13 16:47:00 emax 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 f6f67f8dba806..b73b53387fc47 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.2 2003/10/07 03:33:53 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 e6aa22f6b3838..6f1373679d673 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.47 2004/05/28 02:24:07 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/power_if.m b/sys/dev/pccard/power_if.m
index d661d5c5ccd93..3c89cfeea1a49 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.3 2000/04/16 06:04:13 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 418696e2bc2af..eae1e1ffda5f5 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.117 2004/08/12 06:50:29 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 9d5818e258657..d952b2d09e963 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_isa.c,v 1.2 2004/08/16 06:33:58 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 b3c1363c90de7..0e066b21ac34c 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.2 2004/08/16 06:33:58 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 73df7aa50e881..dc58c1e3fb007 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.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/pccbb/pccbbdevid.h,v 1.16 2004/07/22 20:19:57 imp Exp $
  */
 
 /* Vendor/Device IDs */
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index fddf46739cf6a..3b8a47eec362f 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.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/pccbb/pccbbreg.h,v 1.14 2003/08/09 20:49:22 imp Exp $
  */
 
 /*
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 75458af7398b3..58796b0b2217b 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.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/pccbb/pccbbvar.h,v 1.21 2004/08/12 06:50:29 imp Exp $
  */
 
 /*
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c
index 7b5f0649a6d83..27d74ac459a63 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.4 2004/08/12 17:41:30 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 032095855f59c..862185850c699 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 b23c8dd5b5b8f..dfd907d48f60c 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.3 2004/08/12 17:41:30 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 a4a2a5099f530..1d48651fe31c1 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 ed4d9d8cb9a9a..c000ec10aeee1 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 61027a1cbc678..092438551210b 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 56e6df59e68f3..b896d388f4802 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 1ae9d34545c11..0445c6490da30 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 335f1a5a9f234..8a40aba083bb3 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 2004/05/30 17:57:42 phk Exp $");
 
 /*
  * PCI:ISA bridge support
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index d9a5e626a11bc..8f1b635859dce 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.264 2004/07/02 13:42:36 imp Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/dev/pci/pci_if.m b/sys/dev/pci/pci_if.m
index 635005dc1bcb9..487d34b898d30 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.6 2003/07/01 14:08:32 tmm Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 43114d7741991..534dd2f8e702a 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.33 2004/07/01 07:46:28 jhb Exp $");
 
 /*
  * PCI:PCI bridge support.
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index 041e8e306d140..7ea5f8de187ca 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.12 2004/04/09 15:44:34 imp Exp $
  *
  */
 
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index b14abe13b3fb2..0efb8abddab90 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.17 2004/06/16 09:46:53 phk Exp $");
 
 #include "opt_bus.h"	/* XXX trim includes */
 
diff --git a/sys/dev/pci/pcib_if.m b/sys/dev/pci/pcib_if.m
index 1ea253800563e..6fc78a1679efc 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.4 2000/12/09 09:15:38 msmith Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h
index a4acaabe13a98..344f8d143eb3f 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 9f0f612848ec8..9f22ad8082708 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.39 2003/09/14 19:30:00 scottl Exp $
  *
  */
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 38eaa1d8c2cc7..b908b85e1ae84 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.64 2004/04/07 20:45:58 imp Exp $
  *
  */
 
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index ea01423945c0d..c0cd826b31733 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.27 2004/03/17 17:50:39 njl Exp $
  */
 
 /*
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index e8082f51e0561..342d93efa4e13 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.22 2004/03/17 17:50:39 njl 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 5a658854a4ca0..70fab265ada30 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.9 2003/08/24 17:54:16 obrien 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 ba2a993faf9ea..935453e888c79 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.8 2004/06/13 17:29:07 mlaier Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 311b26d600ed8..a359ef70ef043 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.23 2003/08/24 17:54:16 obrien 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 95781957e1a04..c52f7e50ed426 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 282d79e460b15..be11ad66f4573 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.11 2004/01/13 20:36:03 alc Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 5b05812ed551f..9a213da91ed28 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.35.2.1 2004/09/15 15:14:18 andre 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 7bb9ad4639293..2efdead5dcb1f 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 a9b3667c41291..21e80e6ca6b3d 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 3b978d7a9873d..b4362202a1dbe 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.34 2004/07/09 16:56:46 cognet Exp $");
 
 /*
  * Device Driver for AT parallel printer port
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 9075b4ec6e5ad..da1a527ee5b85 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 8458bc6bd357c..738f2064d1bde 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.8 2000/05/20 05:45:04 obrien Exp $
  */
 
 #ifndef	_DEV_PPBUS_LPT_H_
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 58bbf2c36e0ae..58a3517678086 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.19 2004/07/09 16:56:46 cognet Exp $");
 
 #include "opt_pcfclock.h"
 
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 566350301cbee..96121cc88def8 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 5c4010f88bf52..39657494dd7c6 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 f54dae1e44ec8..117ad8615ff74 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 533ab5f4603a5..553babad0c24f 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 1ee55e56d4bfa..59dc74a6a922f 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 1ad27f8febd31..37eda7fd2e535 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 eb1f64ec68aef..07f11b39b5a4b 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 2794eddc1dea3..b288fc892ed57 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 f21dd837568be..0543b1f81c263 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.2 2000/04/08 14:17:03 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 77a8f8f4c2ac8..cb68a017dc3f3 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 8ff2fb48c4ad6..e5b9994cdbce7 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 033d1fef0a561..529d49a7d5657 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.43 2004/07/09 13:42:05 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index f01c0d12791b3..0ea267dbd2ab2 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 128fdc7e56f01..33159ab20d189 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 fe66fa5299be7..64d2ccbe76376 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 05952263588a8..51672a2590fb5 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.44 2004/05/30 20:08:37 phk Exp $");
 
 #include "opt_ppc.h"
 
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index 2b41bfebca1d2..1f97c4ea0c248 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 ea12ead9c417a..96a29cac5ee84 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 ad3f74cd316f5..e61d06946f57a 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.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/ppc/ppcvar.h,v 1.1 2003/08/01 05:02:55 ambrisko Exp $
  *
  */
 
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index a9c47e830ac2e..c60e9dde25e59 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.6 2003/08/24 17:54:17 obrien 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 57f050411bc33..090b9a0c88951 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.4.6.1 2004/10/02 14:14:27 scottl Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index 9d97280ee62d3..564c0cd96c0dd 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.6.2.1 2004/10/02 14:14:27 scottl 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 f14be91904d21..7b0bf8e7520e3 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.13.2.1 2004/10/02 14:14:27 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index e3f192c4dbc42..ff71c07f84c0d 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.33 2004/07/01 17:23:49 imp 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 c7ddeb40153e5..789f1a6793b47 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.3 2004/08/12 17:41:30 marius Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c
index c01db42e6537e..e9bb3d05b213a 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 b4c0cf4ecc699..3854c34859a18 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.10 2004/05/30 20:08:38 phk Exp $");
 
 /*
  * Copyright (c) 1996, 1998, 1999
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.10 2004/05/30 20:08:38 phk Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_sbus.c b/sys/dev/puc/puc_sbus.c
index 47a2fb41303a9..a828144541b0f 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.4 2004/08/12 17:41:30 marius Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index ad8277144cf72..a1f13cb55d88a 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.45 2004/05/17 12:57:30 rik 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 f0dbe585f813b..ce0cc25c16c8b 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.13 2004/04/18 14:37:27 bde Exp $ */
 
 /*-
  * Copyright (c) 2002 JF Hay.  All rights reserved.
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c
index 0ffa83eff0341..e5bf483a4517d 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.24 2004/04/16 17:07:11 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/kthread.h>
diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 95fc8e9436892..cd49870d2969a 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.12 2004/04/09 15:47:09 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/hash.h b/sys/dev/random/hash.h
index 8580d145d6832..9c31976bc8f8b 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 c0dba9e5da837..4c849c7163d60 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.2 2004/04/17 19:26:53 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/dev/random/nehemiah.h b/sys/dev/random/nehemiah.h
index b35fb3fb2262f..90af99b159d01 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 5cd1bddccf0f1..d7eb72af18ccf 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.2 2004/04/11 09:13:42 nyan Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 79dbe5fe86a4d..c3f2b6b9fb229 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.58 2004/08/02 20:42:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/randomdev.h b/sys/dev/random/randomdev.h
index bf13e1b8568bf..e0ed94a31ff05 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 ae22046925b03..f657769f95144 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.44 2004/04/09 15:47:09 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/random/yarrow.h b/sys/dev/random/yarrow.h
index 558354d27f737..098065fdc5992 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 36e4c2a71054b..652fe634f3bdb 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ray/if_ray.c,v 1.72 2004/08/13 23:39:07 rwatson Exp $");
 
 /*	$NetBSD: if_ray.c,v 1.12 2000/02/07 09:36:27 augustss Exp $	*/
 /* 
diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h
index 2ab5310c91d95..8fb099aba787c 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.12 2001/12/10 08:09:42 obrien Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_raymib.h b/sys/dev/ray/if_raymib.h
index c8ce2551f240b..711b7bbef03fa 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.12 2002/09/23 06:25:07 alfred Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayreg.h b/sys/dev/ray/if_rayreg.h
index cff653f6d0fb2..1fa5cbe6d5542 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.10 2000/11/14 05:32:01 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
index 09430e3526b31..be1fe84b63a35 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.17 2001/12/10 08:09:42 obrien Exp $
  *
  */
 
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index ddb0d4273cbc9..77f4dee611af2 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.97 2004/07/15 20:47:38 phk Exp $
  */
 
 /*
diff --git a/sys/dev/rc/rcreg.h b/sys/dev/rc/rcreg.h
index 321222ed26dee..5871722cd3311 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.5 2002/10/23 15:53:09 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 888f8d6c19692..58097ed5d8cbe 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.28.2.5 2004/10/12 21:51:20 jmg Exp $");
 
 /*
  * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 1912f92262d41..4f1fcee07c85d 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.4 2003/08/24 17:54:22 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rndtest/rndtest.h b/sys/dev/rndtest/rndtest.h
index 93b7eb8f1291b..e15da994341d9 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.1 2003/03/11 22:54:44 sam Exp $	*/
 /*	$OpenBSD$	*/
 
 /*
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index da32de86ae086..dfb60eed9f601 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.64 2004/07/15 20:47:38 phk Exp $");
 
 /* 
  * rp.c - for RocketPort FreeBSD
diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c
index 9cb567786afbd..59dfddd83c540 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.6 2004/05/30 20:08:39 phk 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 70aaa5b9d3ff0..2d0fceadbbb11 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.9 2004/06/21 13:02:25 gallatin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rp/rpreg.h b/sys/dev/rp/rpreg.h
index 1122ace5fb9a5..1a570cef8fa70 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.6 2004/06/21 13:02:25 gallatin Exp $
  */
 
 /*
diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h
index 89b4a2f551278..f2c97af42f9fa 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.6 2004/07/11 15:18:37 phk Exp $
  */
 
 /*
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index 0b39f0dc3583e..4f3bea35104ca 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.35 2004/08/12 17:41:30 marius Exp $");
 
 /*
  * SAB82532 Dual UART driver
diff --git a/sys/dev/sab/sab82532reg.h b/sys/dev/sab/sab82532reg.h
index 8b53371972deb..9f1fe3ab8d932 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.1 2002/08/04 18:36:36 jake Exp $
  */
 
 /*
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 828d67d78a4d1..64f99dd33f67b 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.7 2004/05/30 20:08:40 phk Exp $");
 
 /*
  * SafeNet SafeXcel-1141 hardware crypto accelerator
diff --git a/sys/dev/safe/safereg.h b/sys/dev/safe/safereg.h
index 6d07999eb10e3..c38c3d203acdc 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 fd1ee389a2a78..d9f1202399754 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 27ebcae4ca27f..5477cf2207d95 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.18 2004/08/13 23:41:00 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 0cd88ba696beb..56c9bc3a6c352 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.12 2004/03/17 17:50:41 njl Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c
index 92e864e9c4a7f..afda60d0d692a 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 70fca443051bd..1f8598b674266 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.1 2001/11/21 22:29:34 fjoe Exp $
  */
 
 /*
diff --git a/sys/dev/sbni/if_sbnivar.h b/sys/dev/sbni/if_sbnivar.h
index 8668a6050870b..797128aef898c 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.3 2002/08/05 18:14:16 fjoe Exp $
  */
 
 /*
diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c
index 19292b1d3013d..4674b6cbfb8b3 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.10 2004/05/30 20:08:40 phk 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 44404712a9525..8bdc75da02ac8 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.1 2003/04/13 06:27:13 fjoe Exp $
  */
 
 /* SBNI16 controller chip definitions */
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index e474a8a07e283..86ee51a1d3913 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.82 2004/07/28 06:20:57 kan Exp $");
 
 
 #undef	SCD_DEBUG
diff --git a/sys/dev/scd/scd_isa.c b/sys/dev/scd/scd_isa.c
index da2fe6a0d5eb9..17b48f0f61922 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.4 2004/03/17 17:50:41 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index 38e2293bc7d8a..844d5b4d6b2cd 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.7 2004/03/12 21:45:28 trhodes Exp $
  *
  */
 
diff --git a/sys/dev/scd/scdvar.h b/sys/dev/scd/scdvar.h
index 773a78be1fb65..e94e20cba6238 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 ad81ab0632b62..a5d2491496c90 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.132 2004/07/28 06:21:53 kan 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 b9576b2554e34..5fafc9a91ae71 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.18 2004/07/11 15:18:38 phk Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/si/si2_z280.c b/sys/dev/si/si2_z280.c
index 84179dd8d1ab9..d02abe22abaf3 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.5 2003/08/24 18:03:43 obrien 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 16a928902a98a..be1685103b1e6 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.7 2003/08/24 18:03:43 obrien 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 6be3c87af6be1..1b5f76459cde5 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.5 2004/05/30 20:08:40 phk 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 91cc6e869a9ca..a0f08f640ac09 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.6 2004/05/30 20:08:40 phk Exp $");
 
 #include "opt_debug_si.h"
 
diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c
index f6e2486b9f720..24c3b0d44a4ed 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.6 2004/05/30 20:08:40 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 0d59ea9fff627..6c2b2606f800a 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.9 2000/01/23 22:51:49 peter Exp $
  */
 
 /*
diff --git a/sys/dev/si/sivar.h b/sys/dev/si/sivar.h
index 4232e76c80195..1d1d463b515dc 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.1 2000/01/24 07:24:02 peter Exp $
  */
 
 int	siattach(device_t dev);
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index fae045fc0545a..202cc6f7ec848 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.450 2004/07/22 23:16:12 imp 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 137f47ecde5f6..1088624db48ac 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.14 2003/12/27 19:47:10 imp 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 cafb143eddd7a..b32259ec75883 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.13 2004/05/27 03:49:43 imp 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 efd32baabd1df..815613bf00b8d 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.16 2004/06/07 16:33:47 wpaul 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 877a03966d07a..7eeeeaa7e1305 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.8 2003/12/27 19:47:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index 7b00452c88ce9..51e09ed2b6d9c 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 22a6019d8e62e..094bdd14fe21c 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 4c1c5b199f91c..7bdb7ce6599fe 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 387515f62a55f..23d1378ccff32 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 8a8500924a268..324d2c85e2411 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 64b0a3354c36c..7c96366ba15a3 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 ed9c468e66e35..6cbc00a2e409e 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 9f96b9dfe1729..dadb052f38edb 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 781a15961292b..33f558e25dc81 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.6 2000/04/08 14:17:04 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index ed8fcbb8dc8b5..b72fbcb876548 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.41 2004/06/09 14:34:02 naddy 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 f88f3385d28b5..20c60e06b4736 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.12 2003/11/10 16:04:11 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 48978a04dac3b..10d6cd0bb6ee8 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.25 2004/05/30 20:08:41 phk 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 55dba1def7723..d8c190b8dde33 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.4 2003/10/25 19:56:19 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sn/if_snvar.h b/sys/dev/sn/if_snvar.h
index 284b43f85dbf6..c03d0f7f103a6 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.5 2003/10/26 22:35:44 imp Exp $
  */
 
 #ifndef _IF_SNVAR_H
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 582b77094db0b..239003f522186 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.15 2004/08/13 23:47:01 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 b72fe86afc6b6..adb07e8d6544b 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.1 2000/10/02 14:27:18 nyan 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 7e4b1d75df549..0ff91d5d35be2 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.6 2003/08/24 18:03:45 obrien 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 78fa636cc8904..ab21b1d813179 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.2 2002/03/20 02:07:42 alfred 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 fcc6a22452846..5300b5ed28eaf 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.3 2003/02/10 13:31:49 nyan 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 69a6ca60315e4..673945f4a1a9b 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.6 2004/03/17 17:50:42 njl 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 19a0505ded4f8..9ca1553b19226 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.5 2003/08/24 18:03:45 obrien 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 1478d26bd307e..c70bc6a00aa49 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.5 2004/05/08 06:04:06 imp Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_sncreg.h b/sys/dev/snc/if_sncreg.h
index 30b0bb7559928..6f501a5646d7b 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.1 2000/10/02 14:27:18 nyan 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 33e39f32a3bf0..acdbb42a72af5 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.2 2002/03/20 02:07:42 alfred Exp $
  */
 
 /*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 6103a5d651f3a..3d9212fb8ea2f 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.93 2004/07/15 20:47:39 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h
index 012910c978d30..5acbb18f12df0 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 f9952665b71b7..e599ef55a3613 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.12 2004/07/15 08:26:03 phk Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index 10ea296c0844d..a5cc722f72f3b 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.33.2.1 2004/10/15 05:14:10 njl Exp $");
 
 struct ad1816_info;
 
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index 078523f1d12ea..f10d7cdc539f3 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.1 1999/09/28 20:00:06 cg Exp $
  */
 
 /* AD1816 register macros */
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index 22e1bb068629f..debcacab0aba9 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.11 2004/07/16 03:59:54 tanimura Exp $");
 
 #ifdef __alpha__
 static int
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index ba371e13b08ca..28be6dd6399b8 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.31.2.1 2004/10/15 05:14:10 njl 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 bd88322f484db..b40c5b15eeccf 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.14.2.1 2004/10/15 05:14:10 njl 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 c8c91e7c39341..6d381a61ab4c5 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.90.2.1 2004/10/15 05:14:10 njl 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 d97c70a14cf2f..8c5344e84be8e 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -303,7 +303,7 @@ MIX_NONE(SOUND_MIXER_LINE3),
  * 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.11 2001/03/25 21:43:24 cg Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h
index ddcb863f5de67..d9459c7282a41 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 aa1d4160e346a..08817eaf503da 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.87.2.1 2004/09/16 19:02:50 truckman 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 1319328f19000..a1f5679002d17 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.77 2004/07/16 03:59:54 tanimura Exp $");
 
 #define SB_DEFAULT_BUFSZ	4096
 
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 7783c084db9c9..81a24682b5562 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.42.2.1 2004/10/15 05:14:10 njl 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 2b980807245e8..023d946a37b51 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.2 2003/09/07 16:28:02 cg 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 edfb55b97c1ce..ebceaf0b3add6 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.16 2004/07/16 03:59:27 tanimura Exp $");
 
 /* Debugging macro's */
 #undef DEB
diff --git a/sys/dev/sound/pci/als4000.h b/sys/dev/sound/pci/als4000.h
index a6a67df786bce..6dac5f168b6cf 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.2 2001/10/10 17:56:35 orion Exp $
  */
 
 #define ALS_PCI_ID0 		0x40004005
diff --git a/sys/dev/sound/pci/au88x0.c b/sys/dev/sound/pci/au88x0.c
index 5bd5c6c9d8e3e..5b80bb144beb1 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.8 2004/07/16 03:59:27 tanimura Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/au88x0.h b/sys/dev/sound/pci/au88x0.h
index 15f7b767a0c77..bae2c032bb03e 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 dc34322ba1a56..90a74ad423f4d 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.29 2004/07/16 03:59:27 tanimura 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 d710b2e0ba853..879af949af7e0 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.3 2003/09/07 16:28:02 cg Exp $
  */
 
 #ifndef _AU8820_REG_H
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 857592af000d2..578219f2935a5 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.29 2004/07/16 03:59:27 tanimura 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 9e838a6faad37..ac5a32da1da37 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.2 2001/03/29 15:36:31 orion Exp $
  */
 
 /* C-Media CMI8x38 Audio Chip Support */
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index ea9e0fcd33bad..a89b233bb02f2 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.20 2004/07/16 03:59:27 tanimura Exp $");
 
 #define CS4281_DEFAULT_BUFSZ 16384
 
diff --git a/sys/dev/sound/pci/cs4281.h b/sys/dev/sound/pci/cs4281.h
index 68a71e7b7f0ad..b7f6ae30b420f 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.3 2001/04/19 13:23:50 orion Exp $
  */
 
 #ifndef _CS4281_H_
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 5cc205abfcb91..1f01929d761a8 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.30 2004/07/16 03:59:27 tanimura 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 b914df589e9d7..a9b8d2132225f 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.31 2004/07/16 03:59:27 tanimura 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 8ed292a3298ae..4c9f7f21bd03f 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.3 2001/05/30 22:38:31 cg Exp $
  */
 
 #ifndef _CSA_REG_H
diff --git a/sys/dev/sound/pci/csavar.h b/sys/dev/sound/pci/csavar.h
index f46a6257e2597..fcd3b93ac795f 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.4 2001/06/23 18:00:06 cg Exp $
  */
 
 #ifndef _CSA_VAR_H
diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h
index 72a052a2b9bcd..9bbf656c6c659 100644
--- a/sys/dev/sound/pci/ds1-fw.h
+++ b/sys/dev/sound/pci/ds1-fw.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/sound/pci/ds1-fw.h,v 1.3 2001/05/30 22:46:40 cg Exp $
  */
 #ifndef _HWMCODE_
 #define _HWMCODE_
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 6f74e78fe1f61..3cfe0bf5a3f52 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.40 2004/07/16 03:59:27 tanimura Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ds1.h b/sys/dev/sound/pci/ds1.h
index ad4e829cbfee1..8cccf33d1808f 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 99aef33536463..809fd2c6f5aaa 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.52 2004/07/24 15:30:23 obrien Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 99d738eb0eb82..1008762a2b565 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.51 2004/07/16 03:59:27 tanimura 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 076fe3c01a1bf..af4953272b127 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.4 2000/04/05 00:38:00 cg Exp $
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 42e772a056fc8..1750ba1a0b958 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.23 2004/07/16 03:59:27 tanimura 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 f52bf8775d605..970d9d862a82e 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.42.2.2 2004/10/07 18:38:55 ps Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h
index 8f6cf68bcb48e..f58c4c934a66a 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.3 2003/08/10 14:57:47 orion Exp $
  */
 
 #define PCIR_NAMBAR 0x10
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index 79c1277eb2c8f..c81dddd5536c7 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -51,7 +51,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.23.2.1 2004/08/29 20:50:32 green Exp $");
 
 #define inline __inline
 
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 13f56511dd1d9..d71f9c998b331 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.25 2004/07/16 03:59:27 tanimura Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h
index 41ce3510295f2..521d7af2b4ef7 100644
--- a/sys/dev/sound/pci/maestro_reg.h
+++ b/sys/dev/sound/pci/maestro_reg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: maestro_reg.h,v 1.10 2000/08/29 17:27:29 taku Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/maestro_reg.h,v 1.2 2001/01/03 01:32:57 jhb 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 f6cdecfd2f02e..b268834a3422b 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.3 2004/01/17 10:37:10 phk Exp $
  */
 
 #define NM_TOTAL_COEFF_COUNT 0x3158
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 5c4619b8c8620..45f1d6bc7a534 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.33 2004/07/16 03:59:27 tanimura Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index be5e7e2964982..966edd5c8d29d 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.3 2003/09/07 16:28:03 cg Exp $
  */
 
 #ifndef _NM256_H_
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index dfc9cc504da6e..d3cfb024246f2 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.32 2004/07/16 03:59:27 tanimura 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 bbfb6d7434002..d8ca600ff2cf2 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.44 2004/07/16 03:59:27 tanimura Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index 67e3e49935013..1f93c00aeeb08 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.6 2003/09/07 16:28:03 cg Exp $
  */
 
 #ifndef _T4DWAVE_REG_H
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index cf145515f61dd..d9140eeb0fbb8 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.17 2004/07/16 03:59:27 tanimura Exp $");
 
 #define VIA8233_PCI_ID 0x30591106
 
diff --git a/sys/dev/sound/pci/via8233.h b/sys/dev/sound/pci/via8233.h
index bc6f57aa62086..410c5493c613b 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.3 2003/04/17 15:04:11 orion Exp $
  */
 
 #ifndef _SYS_SOUND_PCI_VIA8233_H_
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index f27476160832a..4f9d79eb6eff8 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.31 2004/07/16 03:59:27 tanimura 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 ac6750e71b08a..a4a9a086fd441 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 6fd1f8fa1462a..8d4b6c42617ea 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.17 2004/07/16 03:59:27 tanimura Exp $");
 
 /* ------------------------------------------------------------------------- */
 /* Constants */
diff --git a/sys/dev/sound/pci/vibes.h b/sys/dev/sound/pci/vibes.h
index 36cbadd667817..f9a266b997e35 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.1 2001/03/19 00:26:40 orion Exp $
  */
 
 /* ------------------------------------------------------------------------- */
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index a6303f93c2fd6..c60ccd9989323 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.51 2004/05/08 03:41:40 sanpei 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 933281cb8a9e6..b115b3c6ae279 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.15 2003/09/07 16:28:03 cg Exp $
  */
 
 #define AC97_MUTE	0x8080
diff --git a/sys/dev/sound/pcm/ac97_if.m b/sys/dev/sound/pcm/ac97_if.m
index 36c5c19091a60..0ade5e242c95a 100644
--- a/sys/dev/sound/pcm/ac97_if.m
+++ b/sys/dev/sound/pcm/ac97_if.m
@@ -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/ac97_if.m,v 1.3 2002/05/01 03:07:40 obrien 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 e5e728f8b3148..1ac5856d6b8b2 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.2 2003/08/21 15:44:55 orion 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 740031d2ed3a4..ae3f8d07cf9a5 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.2 2003/08/21 15:44:55 orion 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 773bc35977f80..dd7927067ab86 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.23 2004/04/29 02:51:59 green 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 48981b5c40781..0131057d5517a 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.9 2004/01/28 08:02:15 truckman 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 cf970c7132a73..e4534f54f440d 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -29,7 +29,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.97 2004/02/28 19:47:02 truckman 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 f2fb5957ae1d0..6ef0537d1d427 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.30 2004/02/28 19:47:02 truckman Exp $
  */
 
 struct pcmchan_children {
diff --git a/sys/dev/sound/pcm/channel_if.m b/sys/dev/sound/pcm/channel_if.m
index 9d8e289509c2b..51e11eb97e29d 100644
--- a/sys/dev/sound/pcm/channel_if.m
+++ b/sys/dev/sound/pcm/channel_if.m
@@ -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/channel_if.m,v 1.4 2001/05/27 17:22:00 cg Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 64088f95117c0..043ac9806b63d 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.77 2004/07/02 15:31:44 netchild Exp $");
 
 #define OLDPCM_IOCTL
 
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index 0a42e74ef1c16..a7e8d9b0c4c42 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.8 2004/01/20 03:58:57 matk Exp $
  */
 
 extern struct cdevsw dsp_cdevsw;
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index 1fd0900bff9fb..0f4714176b794 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.13 2003/09/07 16:28:03 cg 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 0ec36df6f80a2..5306cad66ed52 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.32 2003/09/07 16:28:03 cg 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 61d42255d966c..3c3429abcfa93 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.11 2003/09/07 16:28:03 cg Exp $
  */
 
 struct pcm_feederdesc {
diff --git a/sys/dev/sound/pcm/feeder_fmt.c b/sys/dev/sound/pcm/feeder_fmt.c
index 59d7edc485f58..59eb7dae15ba0 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.13 2003/09/07 16:28:03 cg 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 a100a6dbf0ea5..f256cf53a8ce0 100644
--- a/sys/dev/sound/pcm/feeder_if.m
+++ b/sys/dev/sound/pcm/feeder_if.m
@@ -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/feeder_if.m,v 1.5 2002/05/01 03:07:40 obrien 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 c3752a0ad7b1f..99fea86ce3ce1 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.10 2003/04/20 17:08:56 orion Exp $");
 
 #endif /* _KERNEL */
 
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index f40b4301abd53..dd763099768d0 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.40 2004/06/25 16:34:33 josef Exp $");
 
 MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 22bd22aa6c3f3..43af826695832 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.13 2004/06/16 09:46:57 phk 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 38d99fbd05dfb..f9ffac6dd4297 100644
--- a/sys/dev/sound/pcm/mixer_if.m
+++ b/sys/dev/sound/pcm/mixer_if.m
@@ -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/mixer_if.m,v 1.5 2002/05/01 03:52:40 obrien Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index c8e63877394cd..ab956b6721347 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.17.2.1 2004/09/14 06:43:46 truckman 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 4446b3241e9e5..fcdc462ff6d9a 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.92 2004/07/16 03:59:09 tanimura Exp $");
 
 devclass_t pcm_devclass;
 
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index f1fd6df23d3ed..5cca37a794c2f 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.61 2004/07/16 03:59:09 tanimura Exp $
  */
 
 /*
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index ce67fb1559c40..9255103ac7e7f 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.16 2004/01/28 08:02:15 truckman 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 99b0d41399a5c..17db3e592496f 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.3 2003/09/07 16:28:03 cg Exp $
  */
 
 int vchan_create(struct pcm_channel *parent);
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 28f4ac54e01ce..512f0c26a2962 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $	*/
-/*	$FreeBSD$: */
+/*	$FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.7 2002/08/25 01:32:22 bde 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 8433c818303fb..b3c3984f93304 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.1 2002/07/21 17:28:50 nsayer 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 cd6366cfd94a5..2a8e5a07f2629 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.5 2004/07/16 03:58:57 tanimura 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 20c87cbe333ee..a505050053cb5 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudioreg.h,v 1.7 2000/12/28 00:29:58 augustss Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.2 2002/11/06 21:37:21 joe 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 88668a7cb370b..9402e84514f08 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.63 2004/08/13 23:49:48 rwatson Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/sr/if_sr.h b/sys/dev/sr/if_sr.h
index a55a6d3f6b569..f71726aa6b7cf 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.3 2000/11/20 13:43:40 julian 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 e9a00764f5ee8..356a1aaa7ae12 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.49 2003/08/24 18:17:23 obrien 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 dd41d74bcf58c..8e72038823ace 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.20 2004/05/30 20:08:41 phk 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 3d80b22ea1844..55f50a45d32e0 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.8 2003/04/23 20:22:32 jhay Exp $
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index 223ed53d6051b..1b8aefc4d6d2d 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.12 2004/07/10 21:14:20 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30.h b/sys/dev/stg/tmc18c30.h
index 8a1848c6b5bf3..0033a822bb2c8 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 b674c2eefc078..7623268408a2b 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.10 2003/08/24 18:17:23 obrien 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 0ea2df0f91b1b..814f3fe58838d 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.21 2004/05/27 03:49:44 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 8f8b24e4d0ab3..da7f9f0e54d9b 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.4 2003/09/02 17:30:38 jhb 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 7ffd4d39d349a..94f1bea6301d1 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.3 2004/03/17 17:50:45 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30reg.h b/sys/dev/stg/tmc18c30reg.h
index 9c84d89bc3a3f..9cf206dd4f727 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.2 2001/07/14 00:38:51 non 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 d6bc4ac4cc497..983fc381fbfa2 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.7 2002/05/31 23:39:04 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 1df09523ddee2..61689f49ab54c 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.47 2004/07/15 08:26:03 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sx/cd1865.h b/sys/dev/sx/cd1865.h
index 5056deaeecab7..75d04e5c892cf 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.1 2004/04/11 19:32:20 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sx.c b/sys/dev/sx/sx.c
index 4995292695119..5f8f0e9fbfa1f 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.12 2004/07/15 20:47:39 phk Exp $
  */
 
 
diff --git a/sys/dev/sx/sx.h b/sys/dev/sx/sx.h
index 109b212f334fe..b3e764d35940a 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.3 2004/07/11 15:18:38 phk Exp $
  */
 
 
diff --git a/sys/dev/sx/sx_pci.c b/sys/dev/sx/sx_pci.c
index 3187caf682caa..31ca31dd8dedc 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.4 2004/05/30 20:08:42 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sx/sx_util.c b/sys/dev/sx/sx_util.c
index d9409254d3229..521f9930899a7 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.1 2004/04/11 19:32:20 imp Exp $
  */
 
 #include "opt_debug_sx.h"
diff --git a/sys/dev/sx/sx_util.h b/sys/dev/sx/sx_util.h
index 582e73be1bb1b..979cac1845a7d 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.1 2004/04/11 19:32:20 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sxvar.h b/sys/dev/sx/sxvar.h
index 7eea73337abe2..aa017c4bc3208 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.1 2004/04/11 19:32:20 imp Exp $
  */
 
 
diff --git a/sys/dev/sym/README.sym b/sys/dev/sym/README.sym
index b4612237e7bf9..a4620798b41f5 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.5 2001/11/11 18:02:11 groudier Exp $
  */
 
 README.sym
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index 4154b6c33bf71..55fb2bafd8fa0 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.8 2001/11/11 18:02:11 groudier 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 61caabddc0ae4..0214ec72f3973 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.10 2002/11/09 12:55:05 alfred 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 65b2838bb3d64..6c06dd023f9f5 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.4 2003/08/05 07:22:12 dds 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 96ae523ddc1da..a9e4b21234b94 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.6 2002/12/30 21:18:08 schweikh Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 77f8df32d7ec3..c66c3b69ba2b3 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.7 2002/12/30 21:18:08 schweikh Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index ced33f34c1666..53ec63cae200e 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.48.2.1 2004/09/19 01:07:23 mjacob 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 1ef6bded320b2..f1de420ffc284 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.9 2003/03/27 07:37:02 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 960acca5a5122..03c6df0780d8d 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 3cd58305cde5d..7178e43e2328f 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.22 2003/02/19 05:47:14 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/dragon/dragon_saver.c b/sys/dev/syscons/dragon/dragon_saver.c
index f8fa51b5e08bd..f847f3f7eabc9 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 d7793b6dd96f2..3b057c8ae7dac 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 0bc031cad7cb1..3ec42cb5cd662 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 d6cfe80da6897..f37d377eac732 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 ea3f46e5c3a7e..f9d3b419c88cb 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 0a75886388baf..9ad2c6f1f9a1d 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 80e2212ee3c7a..0987e2e22e753 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 cba157e0aca71..407db639ddc47 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.19 2004/01/21 05:08:51 grehan Exp $");
 
 #include "opt_syscons.h"
 #include "opt_gfb.h"
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index c83048e13f044..880bbcfb16e92 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 a2b7a211f392d..bc544c2be44dd 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.36 2003/08/24 18:17:23 obrien Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c
index 4e93a6af1b0d2..360a0278eba17 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 96059d4829486..ef6a3a14941d0 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 0b9135a4a0076..f167ad32a3356 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 b1c01af1f800f..5d24deef6e062 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 dbc0dfc3fe888..173f716349f19 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.20 2004/06/16 09:46:58 phk Exp $");
 
 #include "opt_vga.h"
 
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index b26aa3d1aabc6..21da00cac2ea9 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.15 2004/05/30 20:08:42 phk Exp $");
 
 #include "opt_syscons.h"
 #include "opt_vga.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 8fbb3c78c7551..dcd86917cc9ae 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.32 2004/07/13 16:06:19 stefanf Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 898d7f7019767..5010ce8cc458e 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.12 2003/08/24 18:17:24 obrien Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index ea5651fee2f6a..fc7fc4bfd1649 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.30 2003/02/19 05:47:14 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index a1f24b89fcc15..11126304d21c1 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.25 2001/02/21 11:28:02 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index d5f76e527c106..f82672f8cf246 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.427.2.1 2004/09/30 17:49:15 nectar Exp $");
 
 #include "opt_syscons.h"
 #include "opt_splash.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 99bf8a4aeec8f..41f975f53c1ab 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.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/syscons/syscons.h,v 1.80 2004/07/28 06:29:02 kan Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index ce8fe12079029..3064fd9b7ba94 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.24 2004/07/15 20:47:39 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 050790d8a391b..049fd49569154 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 8742fd7341cde..46952170f1ab2 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.3 2001/03/20 19:34:22 cokane 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 fa4351de226f3..ac35fc1d073a7 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.5 2001/03/20 19:34:22 cokane Exp $
  */
 
 
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index 351411aee2d65..3ae37ffd6211d 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.35 2004/06/16 09:46:59 phk 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 1ecc554e8edc1..590f697752cfb 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.3 2001/03/20 19:34:22 cokane 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 95a9bbf9c1657..ad71bfa0dcb1d 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.9 2004/06/16 09:46:59 phk 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 1477a7c4210a6..df44b918241dc 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.8.2.1 2004/09/02 06:14:42 marcel 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 2699131044933..a2e6ee27a2f3d 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.1 2001/11/01 08:26:30 obrien Exp $
  */
 
 #ifndef _PCI_TGA_H_
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 2319828b8d0c5..26ffaaa0e00b3 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.23 2004/05/30 20:08:43 phk Exp $");
 
 /*
  *	HISTORY:					
diff --git a/sys/dev/trm/trm.h b/sys/dev/trm/trm.h
index e9eadbea8181b..1469e606bf6be 100644
--- a/sys/dev/trm/trm.h
+++ b/sys/dev/trm/trm.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/dev/trm/trm.h,v 1.4 2004/03/07 17:23:39 cognet Exp $
  */
 
 #ifndef trm_H
diff --git a/sys/dev/twa/twa.c b/sys/dev/twa/twa.c
index fd540a70f1af6..f2ae9ae9d8d80 100644
--- a/sys/dev/twa/twa.c
+++ b/sys/dev/twa/twa.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/twa/twa.c,v 1.2 2004/04/02 15:09:57 des Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa.h b/sys/dev/twa/twa.h
index 812f326d991b1..54ba39b54676d 100644
--- a/sys/dev/twa/twa.h
+++ b/sys/dev/twa/twa.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/twa/twa.h,v 1.4 2004/06/16 09:47:00 phk Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_cam.c b/sys/dev/twa/twa_cam.c
index b8505e988e4b3..5165a94ec6acd 100644
--- a/sys/dev/twa/twa_cam.c
+++ b/sys/dev/twa/twa_cam.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/twa/twa_cam.c,v 1.3 2004/05/17 17:16:58 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_externs.h b/sys/dev/twa/twa_externs.h
index 0c62bf1c22c25..364159d7af6af 100644
--- a/sys/dev/twa/twa_externs.h
+++ b/sys/dev/twa/twa_externs.h
@@ -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/twa/twa_externs.h,v 1.1 2004/03/30 03:45:59 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_freebsd.c b/sys/dev/twa/twa_freebsd.c
index 828aae18e0caf..2e665d10c838c 100644
--- a/sys/dev/twa/twa_freebsd.c
+++ b/sys/dev/twa/twa_freebsd.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/twa/twa_freebsd.c,v 1.7.2.1 2004/08/25 17:15:26 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_fwimg.c b/sys/dev/twa/twa_fwimg.c
index 7b8a0dff1dd74..5e12a005561b0 100644
--- a/sys/dev/twa/twa_fwimg.c
+++ b/sys/dev/twa/twa_fwimg.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/twa/twa_fwimg.c,v 1.1 2004/03/30 03:45:59 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_globals.c b/sys/dev/twa/twa_globals.c
index bcfee06e59234..dd3090f1a2ae6 100644
--- a/sys/dev/twa/twa_globals.c
+++ b/sys/dev/twa/twa_globals.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/twa/twa_globals.c,v 1.1 2004/03/30 03:45:59 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_includes.h b/sys/dev/twa/twa_includes.h
index 22cae2e8a46f5..d3687380980da 100644
--- a/sys/dev/twa/twa_includes.h
+++ b/sys/dev/twa/twa_includes.h
@@ -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/twa/twa_includes.h,v 1.3 2004/05/30 20:08:43 phk Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_ioctl.h b/sys/dev/twa/twa_ioctl.h
index 80373fe889ec6..8b9d04175181a 100644
--- a/sys/dev/twa/twa_ioctl.h
+++ b/sys/dev/twa/twa_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/dev/twa/twa_ioctl.h,v 1.1 2004/03/30 03:45:59 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_reg.h b/sys/dev/twa/twa_reg.h
index f8800f89cbcc5..3c6714f3416e7 100644
--- a/sys/dev/twa/twa_reg.h
+++ b/sys/dev/twa/twa_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/dev/twa/twa_reg.h,v 1.1.4.1 2004/08/25 17:15:26 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 340dab931e64e..476afc19393ff 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.22 2004/06/11 18:42:44 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index 3729100411315..ffb9e3c9c4561 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.13 2004/06/16 09:47:00 phk Exp $
  */
 /*
  * Portability and compatibility interfaces.
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index a29b3ddb76a3a..74a3624143d31 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.39 2004/06/16 09:47:00 phk Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_tables.h b/sys/dev/twe/twe_tables.h
index 3ba83c972c4b7..c8871a280213f 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 1b78472495ab3..430157fba7076 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.3 2003/12/02 07:57:20 ps Exp $
  */
 
 
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index f6e7db6e1a03b..2f77bc85cce76 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 90391ad95dfca..3245e10fbc057 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 435103760d1b4..adc795026622e 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.86 2004/08/13 23:52:33 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 63891cda2457c..291f06e354d6f 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 1277244d98f4d..5d718c48024a6 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.18 2003/04/20 18:08:00 mux Exp $
  */
 
 /*
diff --git a/sys/dev/txp/3c990img.h b/sys/dev/txp/3c990img.h
index a14441d3ed3ce..a14355a7b4fd4 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.1 2001/07/23 21:01:36 wpaul Exp $ */
 
 /*
  * Copyright (C) 1999-2001 3Com, Inc.
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 2a7221de4f9f9..f95c1d2d4b8b6 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.27 2004/08/13 23:53:36 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.27 2004/08/13 23:53:36 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.27 2004/08/13 23:53:36 rwatson Exp $";
 #endif
 
 /*
diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index 634c29f07f7e6..a17c8325fd80c 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.2 2001/07/23 20:54:31 wpaul Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index 5de4d420ac5ca..fd02b1f0d85ba 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.3 2003/09/26 05:14:56 marcel Exp $
  */
 
 #ifndef _DEV_UART_H_
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
index a82dd06e7b19e..7488fc25b13cf 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.6 2004/06/24 10:07:28 phk 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 a26357132d043..6786f4fd22bdb 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.2 2003/09/26 05:14:56 marcel 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 15e8bcb9899c3..543f6f2feb89e 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.5 2004/08/12 17:41:30 marius 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 82dd59a45496c..7ef262661e7cf 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.3.2.1 2004/09/24 22:50:57 marius 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 5f0e02b26babe..6bdca02d7d3e5 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.8 2004/05/27 03:49:44 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 2e4573d4e26bc..91c044b79fbfd 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.4 2003/11/28 05:28:29 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 7277df99fc41f..db158a448170c 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 9740cffc28ea0..fd15550b45faf 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.10 2004/07/10 21:16:01 marcel 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 78626339fa149..ecc6c40c3932b 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.6 2004/08/14 23:54:27 marius 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 67b49b4f0c50d..838904d439b38 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.8 2004/08/14 23:54:27 marius 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 8a32574f0c32e..04392d7c5f462 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.8 2004/08/14 23:54:27 marius 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 7cf2fd09c089d..d28acd2065d0a 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.8 2004/08/14 23:54:27 marius 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 70464567036a9..c14699cce15a5 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.8 2004/08/14 23:54:27 marius 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 3fc263017afb1..53e6e8454ea66 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.12 2004/08/14 23:54:27 marius 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 1496faa8e2a12..6cebe7e62ac02 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.12 2004/08/15 02:17:20 marius Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/dev/uart/uart_dbg.c b/sys/dev/uart/uart_dbg.c
index 71938b9618275..9b9f218d71368 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.1 2004/07/10 18:08:38 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_i8251.c b/sys/dev/uart/uart_dev_i8251.c
index 4da2fa0d795ca..21e6803f9fe18 100644
--- a/sys/dev/uart/uart_dev_i8251.c
+++ b/sys/dev/uart/uart_dev_i8251.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.4 2004/06/24 10:07:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_i8251.h b/sys/dev/uart/uart_dev_i8251.h
index bdb47f3c02cb5..b2f60ea61c48c 100644
--- a/sys/dev/uart/uart_dev_i8251.h
+++ b/sys/dev/uart/uart_dev_i8251.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_dev_i8251.h,v 1.1 2003/09/07 04:59:15 imp Exp $
  */
 
 #ifndef _DEV_UART_DEV_I8251_H_
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index adac35fe86e08..54714252596aa 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.10 2004/08/06 15:51:31 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_ns8250.h b/sys/dev/uart/uart_dev_ns8250.h
index 85c47229124a4..54426d843b77d 100644
--- a/sys/dev/uart/uart_dev_ns8250.h
+++ b/sys/dev/uart/uart_dev_ns8250.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_dev_ns8250.h,v 1.1 2003/09/06 23:13:47 marcel Exp $
  */
 
 #ifndef _DEV_UART_DEV_NS8250_H_
diff --git a/sys/dev/uart/uart_dev_sab82532.c b/sys/dev/uart/uart_dev_sab82532.c
index 5d22b4f0b2c70..5b376769fe119 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.7 2004/06/24 10:07:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_sab82532.h b/sys/dev/uart/uart_dev_sab82532.h
index 8b53371972deb..257b5c5c772df 100644
--- a/sys/dev/uart/uart_dev_sab82532.h
+++ b/sys/dev/uart/uart_dev_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/uart/uart_dev_sab82532.h,v 1.1 2003/09/06 23:13:47 marcel Exp $
  */
 
 /*
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index b804bec68dba4..87e3502bc9319 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.8 2004/06/24 10:07:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_z8530.h b/sys/dev/uart/uart_dev_z8530.h
index 458aff7944c85..844e781ce3c5e 100644
--- a/sys/dev/uart/uart_dev_z8530.h
+++ b/sys/dev/uart/uart_dev_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/uart/uart_dev_z8530.h,v 1.1 2003/09/06 23:13:47 marcel Exp $
  */
 
 #ifndef _DEV_UART_DEV_Z8530_H_
diff --git a/sys/dev/uart/uart_if.m b/sys/dev/uart/uart_if.m
index 762c16eaa1430..9454d49b35cc9 100644
--- a/sys/dev/uart/uart_if.m
+++ b/sys/dev/uart/uart_if.m
@@ -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/uart/uart_if.m,v 1.2 2003/09/17 01:41:21 marcel 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 05254182c30cf..b8ac78a9aa6b3 100644
--- a/sys/dev/uart/uart_kbd_sun.c
+++ b/sys/dev/uart/uart_kbd_sun.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/uart/uart_kbd_sun.c,v 1.2 2004/04/02 05:59:06 marcel Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/dev/uart/uart_kbd_sun.h b/sys/dev/uart/uart_kbd_sun.h
index 574e966b70402..d200e1e14cea1 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.1 2003/11/11 07:33:24 jake 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 e7dc612051043..5a3a0e3d82caa 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 4c40a3613ba51..05fb4e429b555 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.2 2004/03/20 08:38:33 marcel 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 c4d0220195bc2..8edba35a81ccc 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.16 2004/07/15 20:47:39 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index db3e96c0b2c25..a664ff671e82b 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.29 2004/05/30 20:08:45 phk Exp $");
 
 /*
  * uBsec 5[56]01, 58xx hardware crypto accelerator
diff --git a/sys/dev/ubsec/ubsecreg.h b/sys/dev/ubsec/ubsecreg.h
index 4be530a022965..ae855a4bf91da 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.5 2003/04/27 04:26:22 sam 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 965a0d90181d0..e0025dc60b9e8 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.7 2003/06/02 23:32:03 sam 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 09db78cd85225..47c48326130cf 100644
--- a/sys/dev/usb/FILES
+++ b/sys/dev/usb/FILES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/FILES,v 1.6 2003/04/14 14:04:07 ticso Exp $
 
 A small roadmap of the USB files:
 
diff --git a/sys/dev/usb/dsbr100io.h b/sys/dev/usb/dsbr100io.h
index aa53eadd46128..38304949f69de 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.1 2002/03/04 03:51:19 alfred 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 460efed5ac77b..712c2a353a3d0 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.14 2004/08/02 15:37:34 iedowse Exp $");
 
 /*
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c
index 5b1b1f19f72c8..43ce322192994 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.14 2004/08/02 15:37:34 iedowse 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 634fc9e693d91..399d355399511 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.5 2004/08/02 12:56:00 iedowse Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h
index 5cd3f58998943..2f466ce65fefb 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.4 2004/08/02 15:37:34 iedowse Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index f083a17cf6818..df871e627daed 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.23 2003/08/24 17:55:54 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 590e7cb585c60..74f88c0637b08 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.12 2003/07/04 01:50:38 jmg 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 9588bf8079276..ad4501586b8f8 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.86 2004/08/11 03:38:55 rwatson 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 478ceced0c222..14568b13b30d9 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.18 2004/05/23 12:35:24 iedowse Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 5dad4d631b421..2004611acafe6 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.22 2004/08/15 10:51:21 iedowse 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 a9938f4a229ca..5c25b5eaa0e3f 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.3 2004/05/23 12:35:24 iedowse Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index b7e715a255399..9883c73d07a4e 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.52 2004/08/11 03:38:55 rwatson 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 beaf1d5a39d1d..1b80033490654 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.13 2004/05/23 12:35:24 iedowse Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 1e21d9cc66bf8..f3e61ae6ec6de 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.58 2004/08/11 03:38:55 rwatson 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 4fa829516fb98..15feb906171d0 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.14 2004/05/23 12:35:24 iedowse Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index e4ffd81a686a5..6d091ee9c4b30 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.16 2004/08/11 03:38:55 rwatson 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 f3818283ac0c2..8564d508d4ac3 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.3 2004/05/23 12:35:24 iedowse Exp $
  */
 
 #ifndef _IF_RUEREG_H_
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 6eab7bc49cd3c..5d8a299c3337f 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.8 2004/08/11 03:38:55 rwatson 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.8 2004/08/11 03:38:55 rwatson 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 7680422a65e32..04c1e85e32e22 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.2 2004/05/23 12:35:25 iedowse Exp $	*/
 /*
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
diff --git a/sys/dev/usb/kue_fw.h b/sys/dev/usb/kue_fw.h
index 8d8c1e1f2f0c7..1e303b7f942b1 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.2 2000/04/03 20:58:23 n_hibma Exp $
  */
 
 /*
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 9de8479bb3f65..cc25904ea441f 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.144 2004/08/02 15:37:34 iedowse 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 6700323dc5cb8..52c92b39be4f1 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.40 2004/08/02 15:37:35 iedowse Exp $");
 
 /*
  * USB Open Host Controller driver.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index 4c0a6c2607039..7476b873219a6 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.21 2004/05/06 09:21:05 silby Exp $	*/
 
 
 /*
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 19ec182009c29..7bab7acb394ee 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.37 2004/08/02 15:37:35 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 c2da72e91b116..b4be151b65b0c 100644
--- a/sys/dev/usb/rio500_usb.h
+++ b/sys/dev/usb/rio500_usb.h
@@ -19,7 +19,7 @@
 
     ---------------------------------------------------------------------- */
 
-/*  $FreeBSD$ */
+/*  $FreeBSD: src/sys/dev/usb/rio500_usb.h,v 1.1 2000/04/08 17:02:13 n_hibma 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 6fe6dc878a341..620d550334542 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.14.2.1 2004/10/16 03:38:41 kan 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 eab35bed9f55a..064bfee89d6a9 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.12 2004/08/15 23:39:18 imp Exp $");
 
 /*
  * BWCT serial adapter driver
diff --git a/sys/dev/usb/ubser.h b/sys/dev/usb/ubser.h
index d1cc2c6b5969e..1c6567feb2c08 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.1 2004/03/01 02:34:48 ticso Exp $
  */
 
 #ifndef UBSER_H
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 9f84df7efc467..b8129b040aa3b 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.51 2004/07/15 20:47:40 phk Exp $");
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index 818c3245a8390..c74733e54f561 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.4 2004/06/26 09:20:06 phk Exp $	*/
 
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 2bedbbe092d8e..f6df275606f7c 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.28 2004/08/15 23:39:18 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 0b7b4eeae7e05..ff5f069d72ec9 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.3 2003/07/04 01:50:38 jmg Exp $
  */
 
 #ifndef _NETGRAPH_UDBP_H_
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 66b7376c43f3e..0c45a18426958 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.22 2004/08/15 23:39:18 imp Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index e015f844ef96f..e624532202930 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.18 2004/07/01 17:16:20 brooks Exp $");
 
 /*
  * FTDI FT8U100AX serial adapter driver
diff --git a/sys/dev/usb/uftdireg.h b/sys/dev/usb/uftdireg.h
index a7c6edcb6005d..11bab9c987749 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 4ff006f9311af..87c1e6f7e1b5a 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.88 2004/08/15 23:39:18 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 9dd6988ab9075..f327de15d59c9 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.1 2002/04/07 17:04:01 joe 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 695859da622d9..64116ef21e43d 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.154 2004/08/02 20:53:31 iedowse Exp $");
 
 
 /*
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index a5ba3415a2641..eed6a0f05515c 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.54 2004/08/02 15:37:35 iedowse Exp $");
 
 /* Universal Host Controller Interface
  *
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index b640e9f9e8aa4..8f482318f79bf 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.21 2003/07/04 01:50:38 jmg Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 56709803c788c..b41e4a40ab93c 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.37 2004/08/02 15:37:35 iedowse Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 4c287af11879b..c9c4c251eca0b 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.73.2.1 2004/10/13 00:51:01 takawata Exp $");
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 54affde4750c7..9f09306649d05 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.62.2.1 2004/09/13 03:00:06 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 d1eea00016afb..3c9bde4fa4301 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.49 2004/08/15 23:39:18 imp 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 4be53b3dae8de..feced1c63dd3b 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.65 2004/08/15 23:39:18 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 eeb0973aad332..9c6e8a6f2420c 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.112.2.1 2004/09/20 05:28:08 sanpei 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 2d42e76b458b5..f26a29d2d3da0 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.8 2004/08/07 23:45:04 sanpei 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 baede276c4113..01e0848732d67 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.53 2004/06/27 12:41:44 imp 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 ff9ab5a538ae7..5e9ac64e1ae32 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.70 2004/08/15 23:39:18 imp 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 8ae8a7d6e9f8e..dc5c6b9744fd6 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.20.2.1 2004/09/20 04:46:41 sanpei Exp $");
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index f2df650e711be..1a5fa5928d681 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.33 2004/08/15 23:39:18 imp Exp $");
 
 
 /*
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 07be320209ca6..2e0f94109e426 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.100 2004/08/02 15:37:35 iedowse Exp $");
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index e5278596f3cee..579fede31a8c3 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.38 2002/11/06 21:37:21 joe 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 325f3db48eea8..75e06767fdb38 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.17 2003/11/14 11:09:45 johan 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 c8a40108ef5c6..4ad52636bfc3d 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.6 2003/03/04 23:19:55 jlemon Exp $
  */
 
 #ifndef _USB_ETHERSUBR_H_
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index c1b27c8a4becd..25c14ed1b687d 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.9 2000/04/08 14:17:05 dfr Exp $
 #
 
 # USB interface description
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index 82b678e82b5c8..917c67f79b184 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.6 2004/08/02 13:59:02 iedowse 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.6 2004/08/02 13:59:02 iedowse 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 bba88d582082d..e65ecefc348f8 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.20 2003/09/01 01:07:24 jmg 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 972c4e917408b..69cdfced0b6c9 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.67.2.1 2004/09/26 05:54: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 0c05d54b55a79..6dacf11819b03 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.38.2.1 2004/09/20 05:18:04 sanpei 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 2a36a0649babe..0ce83f8655677 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.16 2001/07/05 10:12:59 n_hibma 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 adeb43697f915..c455694fd5f66 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.69.2.1 2004/09/13 03:01:56 imp Exp $");
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index 45266e44302c7..06abf44710cb4 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbcdc.h,v 1.6 2000/04/27 15:26:50 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.10 2003/01/09 04:24:28 imp Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index f84be49646b62..ffcd039f6b781 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.195.2.4 2004/09/20 05:28:08 sanpei Exp $
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index b313d8f7c8f8d..42ee1122f6fb4 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: usbdi.c,v 1.104 2004/07/17 20:16:13 mycroft Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.86.2.1 2004/09/03 20:01:32 iedowse Exp $");
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 0fd24fea867c0..b48bac4f24466 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.50 2004/08/15 23:39:18 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 8fdd1cc8f7a98..44ef1675f03fd 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.32 2004/05/30 20:08:45 phk 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 a6a3646b13a46..dd2b8c394fb50 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.29 2004/06/23 02:30:52 mycroft Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.17 2004/06/26 10:35:10 le Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index dafdc01b5e0f5..aea236e47d7e4 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.41 2004/06/30 02:56:24 imp Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index fbc17047e6a0f..65dc5a607e05d 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.13 2002/01/02 20:16:53 joe Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index eed75e4cddea6..ba3ea29a0c781 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.57.2.1 2004/09/20 05:03:28 sanpei Exp $");
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 68214e775d46d..20e888834a274 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.22 2004/06/27 12:41:44 imp 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 1e6da57a5942d..860eafae39b94 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.23 2004/06/27 12:41:44 imp Exp $");
 
 /*
  * uvscom: SUNTAC Slipper U VS-10U driver.
diff --git a/sys/dev/utopia/idtphy.h b/sys/dev/utopia/idtphy.h
index dacb2afedef31..b478f4ea1cead 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.2 2003/07/14 12:12:50 harti Exp $
  *
  * Register definitions for the following chips:
  *	IDT 77105
diff --git a/sys/dev/utopia/suni.h b/sys/dev/utopia/suni.h
index ac8e9978fc9c7..d94ba9361708f 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.1 2003/06/12 14:28:32 harti 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 263f4b9f20e45..e4a1ac340eb05 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.7 2004/07/15 08:26:03 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/utopia.h b/sys/dev/utopia/utopia.h
index ae044f98f08da..642d87c5441f9 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.3 2003/07/14 15:06:53 harti Exp $
  */
 #ifndef _DEV_UTOPIA_UTOPIA_H
 #define	_DEV_UTOPIA_UTOPIA_H
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 39e44500c7ec9..8730d8aeb46ae 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.3.2.1 2004/09/14 21:22:33 wpaul 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 9b7e5869e107f..77566007ffba8 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.1.2.1 2004/09/14 21:22:33 wpaul Exp $
  */
 
 /*
diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h
index ad298c49d850b..140c8a3e5729c 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.1.2.1 2004/09/14 21:22:33 wpaul Exp $
  */
 
 #if !defined(__i386__)
diff --git a/sys/dev/vinum/COPYRIGHT b/sys/dev/vinum/COPYRIGHT
index f0295e6a6d0e2..aafb761a30c0a 100644
--- a/sys/dev/vinum/COPYRIGHT
+++ b/sys/dev/vinum/COPYRIGHT
@@ -33,5 +33,5 @@
  * otherwise) 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/vinum/COPYRIGHT,v 1.4 1999/08/28 00:42:36 peter Exp $
  */
diff --git a/sys/dev/vinum/makestatetext b/sys/dev/vinum/makestatetext
index c5a7da2ba2118..fc736be4df7c8 100755
--- a/sys/dev/vinum/makestatetext
+++ b/sys/dev/vinum/makestatetext
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Make statetexts.h from vinumstate.h
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/vinum/makestatetext,v 1.6 2000/02/29 06:07:01 grog Exp $
 # $Id: makestatetext,v 1.7 1999/12/29 07:24:54 grog Exp grog $
 infile=vinumstate.h
 ofile=statetexts.h
diff --git a/sys/dev/vinum/request.h b/sys/dev/vinum/request.h
index 600130f4e2933..3d985cd0fe5f4 100644
--- a/sys/dev/vinum/request.h
+++ b/sys/dev/vinum/request.h
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: request.h,v 1.22 2003/04/24 04:37:08 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/request.h,v 1.21 2003/05/01 13:06:00 grog Exp $
  */
 
 /* Information needed to set up a transfer */
diff --git a/sys/dev/vinum/statetexts.h b/sys/dev/vinum/statetexts.h
index 88cfc17d0309d..921c743632231 100644
--- a/sys/dev/vinum/statetexts.h
+++ b/sys/dev/vinum/statetexts.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/dev/vinum/statetexts.h,v 1.9 2000/02/29 06:07:01 grog Exp $
  */
 
 /* Drive state texts */
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 5fb990d8a207c..b6e27b2df9273 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinum.c,v 1.66 2004/07/15 08:26:04 phk Exp $");
 
 #define STATIC static					    /* nothing while we're testing */
 
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 989af88889241..91274ed6f5b50 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.67 2004/06/17 17:16:46 phk Exp $");
 
 #define STATIC static
 
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 121357de6654e..1103ee404953e 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -1,7 +1,7 @@
 /* daemon.c: kernel part of Vinum daemon */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumdaemon.c,v 1.26 2003/08/24 17:55:56 obrien Exp $");
 /*-
  * Copyright (c) 1997, 1998
  *	Nan Yang Computer Services Limited.  All rights reserved.
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index ed2e6a51c0cfb..7d5aa37e5232c 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumext.h,v 1.33 2003/05/23 00:57:48 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.42.2.1 2004/09/24 22:40:01 marius Exp $
  */
 
 /* vinumext.h: external definitions */
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 41178212420ea..8f25bf1a29606 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -37,7 +37,7 @@
 /* Header files used by all modules */
 /*
  * $Id: vinumhdr.h,v 1.19 2001/05/22 04:07:22 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.31 2004/07/10 21:17:04 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index d031ef938fb44..0c3778db2d5c3 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -1,7 +1,7 @@
 /* vinuminterrupt.c: bottom half of the driver */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.44 2004/07/10 21:17:04 marcel Exp $");
 
 /*-
  * Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index d7d554d442003..5ef33a3573b6d 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.100 2004/06/22 06:38:01 le Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h
index bf5134a64f909..6e530c9005883 100644
--- a/sys/dev/vinum/vinumio.h
+++ b/sys/dev/vinum/vinumio.h
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumio.h,v 1.23 2003/05/04 05:25:46 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.h,v 1.23 2003/06/12 05:32:31 grog Exp $
  */
 
 #define L 'F'						    /* ID letter of our ioctls */
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 235b125d7e6ff..70b919fb03b0f 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.51 2004/07/10 21:17:04 marcel Exp $");
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Nan Yang Computer Services Limited.  All rights reserved.
diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h
index d7bc7a5b4bf8a..d4501e412f8a3 100644
--- a/sys/dev/vinum/vinumkw.h
+++ b/sys/dev/vinum/vinumkw.h
@@ -30,7 +30,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumkw.h,v 1.20 2003/05/07 03:32:09 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumkw.h,v 1.23 2003/06/12 05:45:19 grog Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index f1a2ea3103e20..2a01694ef4981 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.27 2003/08/24 17:55:56 obrien Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 43e19379f4b58..dd11103a6ffd1 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.35.2.1 2004/09/24 22:40:01 marius Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 
diff --git a/sys/dev/vinum/vinumobj.h b/sys/dev/vinum/vinumobj.h
index d6a4d873d2252..9f0530389cd2c 100644
--- a/sys/dev/vinum/vinumobj.h
+++ b/sys/dev/vinum/vinumobj.h
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumobj.h,v 1.7 2003/05/23 01:08:58 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumobj.h,v 1.11 2004/06/16 09:47:02 phk Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 49da34b4dec34..18e8bdeeb5ab8 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumparser.c,v 1.33 2003/08/24 17:55:56 obrien Exp $");
 
 /*
  * This file contains the parser for the configuration routines.  It's used
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index 4bdd64f4c7f87..f21db91e701f2 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumraid5.c,v 1.14 2003/08/24 17:55:56 obrien Exp $");
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <sys/resourcevar.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 0915f8cb46930..0fbb944fd6fc1 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.73 2004/03/19 10:28:34 le Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 59a91a9bc01a6..f29b54bbc3b86 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.45 2003/12/15 00:45:53 grog Exp $");
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index 94b45c1507def..47d3c602fb93b 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumstate.c,v 1.34 2003/08/24 17:55:57 obrien Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumstate.h b/sys/dev/vinum/vinumstate.h
index 572f317d03dca..beef6aae3b0ba 100644
--- a/sys/dev/vinum/vinumstate.h
+++ b/sys/dev/vinum/vinumstate.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/dev/vinum/vinumstate.h,v 1.9 1999/08/28 00:42:43 peter Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index f63bbd7f308f1..1b3eccba19fbc 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumutil.c,v 1.19 2004/06/16 09:47:02 phk Exp $");
 
 /* This file contains utility routines used both in kernel and user context */
 
diff --git a/sys/dev/vinum/vinumutil.h b/sys/dev/vinum/vinumutil.h
index 2efa42c225590..d723fb7cd076f 100644
--- a/sys/dev/vinum/vinumutil.h
+++ b/sys/dev/vinum/vinumutil.h
@@ -36,7 +36,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumutil.h,v 1.1 2001/05/22 04:07:22 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumutil.h,v 1.1 2001/05/22 22:29:35 grog Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 8e7edd8306684..cbf62b9982c90 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumvar.h,v 1.33 2003/05/23 01:09:23 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.49 2004/03/19 10:28:34 le Exp $
  */
 
 #include <sys/time.h>
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 584196e89bc4c..58c4330dca7d0 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.51 2004/08/14 00:12:42 rwatson 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 f51c05551036c..09a8479157cb9 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.22 2004/08/11 20:35:55 gibbs 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 7e22bd496ea83..0986b5cb9ab6c 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.30 2004/05/30 20:08:46 phk 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 6ee87bd3796b1..a2e854ef59344 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.11 2003/10/25 04:05:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/vx/if_vxvar.h b/sys/dev/vx/if_vxvar.h
index e8a7a323eca98..60f5137f43795 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.2 2003/10/31 18:32:06 brooks Exp $
  *
  October 2, 1994
 
diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c
index 782388588089c..2a49a7ff75d2b 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 cf0ad21bf3fcc..1a7add1ff13e8 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.8 2003/08/24 17:55:57 obrien 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 d48ba6e6b8645..72c27fd2089c6 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.18 2003/06/27 00:49:04 sam Exp $
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 486df5234321b..6b3dd2d6d665d 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.168 2004/08/01 23:58:04 mlaier 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 549825b72be3e..b553c0d92ba3d 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.47 2004/06/09 06:31:40 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 89c9d97826e62..9c9b82d213a46 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.22 2004/03/17 17:50:48 njl Exp $
  */
 
 /*
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 03c6e22de150a..c63c97fe32f1c 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.43 2003/12/28 06:58:52 sam Exp $
  */
 
 #define WI_DELAY	5
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index 0a8388e77b7bf..55a97e2192e6c 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.22 2004/04/01 00:38:45 sam Exp $
  */
 
 #if 0
diff --git a/sys/dev/wi/spectrum24t_cf.h b/sys/dev/wi/spectrum24t_cf.h
index 7f1d2b0232720..b636a3d8f0ad0 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.1 2002/08/03 00:19:58 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 25296b5968c11..f7b192b281861 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.63 2004/05/30 20:08:46 phk Exp $");
 
 
 /*
diff --git a/sys/dev/wl/if_wl.h b/sys/dev/wl/if_wl.h
index 7f9c2270ed0e4..a219b73b175ca 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.6 2003/04/16 17:29:00 jhay Exp $
  */
 /* Definitions for WaveLAN driver */
 
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index c60fa0a60399c..18ca8f75f6f5d 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.52 2004/08/14 00:15:26 rwatson 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 af014b94027fd..17e030bc04914 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.21 2004/06/27 13:25:28 imp Exp $");
 
 /* xe pccard interface driver */
 
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index 9b3c39a611a05..80c07fc4bcb5d 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 041588167e4c3..0aff611d30dfd 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.5 2004/04/09 17:27:36 rsm 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 9b191d28ba906..241d949784472 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.3 2004/04/07 20:45:58 imp Exp $
  */
 
 /*
diff --git a/sys/dev/zs/z8530var.h b/sys/dev/zs/z8530var.h
index 1e5fef7d32828..9da92d6b6c6a0 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 ab13d09e2252a..8050634e14a73 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.26 2004/07/15 20:47:40 phk 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 3879a9edf5d13..b483dd8cc5c63 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/dev/zs/zs_sbus.c b/sys/dev/zs/zs_sbus.c
index 40b7ea4fd0748..a342258361f7e 100644
--- a/sys/dev/zs/zs_sbus.c
+++ b/sys/dev/zs/zs_sbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs_sbus.c,v 1.8 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 146afc32ba0f4..ec8512cff496e 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 ec665a7b02569..4edd34e977edc 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 ff30d2fab3f75..10d39eee0a290 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.40 2004/04/07 20:45:59 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h
index ba8bbf02a4be6..d0ac6c86c2a57 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.20 2004/06/16 09:47:03 phk Exp $
  */
 
 #ifndef _FS_DEVFS_DEVFS_H_
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 6edb02bdb865f..880372b4e74ae 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.31 2004/06/18 08:08:47 phk Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index b73ac7729e5b0..7068378b9024e 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.12 2004/06/16 09:47:03 phk Exp $
  */
 
 /*
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 27a759f00f6bc..f4f6be9cb6d60 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.33 2004/07/30 22:08:49 phk Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 08a7abe713c29..c73db19f7251d 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.73 2004/07/26 07:24:02 cperciva Exp $
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index dfe4c6bd1e531..dd564e31c4cf3 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.18 2004/07/12 08:14:05 alfred Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 01e895660c034..44b10410c8d28 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.46 2004/07/30 22:08:49 phk Exp $
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index e6c0075bb99b8..eab20f0f74517 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.93 2004/04/07 20:45:59 imp Exp $
  */
 
 /*
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index 1148c9a40aa60..8e317b6b703a1 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.18 2004/04/07 20:45:59 imp Exp $
  */
 
 extern vop_t **fifo_vnodeop_p;
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index f21f2b608d7b3..c5b7a0f0f13a2 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.101 2004/08/15 06:24:40 jmg Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs.h b/sys/fs/hpfs/hpfs.h
index c02862b094bd5..3f9571e886bd2 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.14 2004/06/16 09:47:03 phk Exp $
  */
 
 /*#define HPFS_DEBUG 10*/
diff --git a/sys/fs/hpfs/hpfs_alsubr.c b/sys/fs/hpfs/hpfs_alsubr.c
index 226865fd1e2de..48b0c06641e79 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_hash.c b/sys/fs/hpfs/hpfs_hash.c
index e1cd079ee281a..1211e1aebeeca 100644
--- a/sys/fs/hpfs/hpfs_hash.c
+++ b/sys/fs/hpfs/hpfs_hash.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_hash.c,v 1.16 2004/06/16 09:47:03 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_ioctl.h b/sys/fs/hpfs/hpfs_ioctl.h
index 7f60729b1ba3a..fb6a65b5b5a00 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 88542cb2160be..cde396abf8308 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 a54702788e622..dbc3aab4d864c 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.6 2003/03/04 00:04:42 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_subr.h b/sys/fs/hpfs/hpfs_subr.h
index 9409152a27ff5..93399800f0e48 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.2 2001/11/27 00:08:04 jhb 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 e002feb60b647..bcbdf59864107 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.39 2004/07/30 22:08:49 phk Exp $
  */
 
 
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 6f913586c31ad..4a7a0ce9c9f5d 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.49 2004/08/08 13:20:43 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfsmount.h b/sys/fs/hpfs/hpfsmount.h
index 3566776b96ade..7ccc96c9e3b36 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 4fbd9aea940d4..16c1ecbe03533 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.11 2003/12/26 17:24:37 trhodes 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 2f1f711f04077..5922cc0893f43 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.10 2003/12/26 17:24:37 trhodes 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 0da43784baa6e..22dd2c1c39f1c 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.27.2.1 2004/09/11 03:19:31 tjr 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 2680af0414be2..2e0fb50eb7be6 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.20 2004/02/19 09:56:58 tjr 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 3b0599e2fd36d..df3a0971a67f2 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.13 2003/12/26 17:24:37 trhodes 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 6ad440e241666..f79c919c61475 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.37 2004/02/19 09:56:58 tjr 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 6fa69bd01e3a7..15f5b694145c5 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.73 2004/06/16 09:47:03 phk 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 8c114237e8feb..21803e66bb15f 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.35.2.1 2004/10/13 16:27:27 delphij 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 ad6d4a7f8c6c5..5181cee06e860 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 26ef1a4a0002e..baf5d00a4c4d1 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 446f0b214275c..c385b82ed7ff1 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.40.2.1 2004/10/13 16:28:40 delphij 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 4893798fc9588..c1f26729e047c 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.126.2.1 2004/09/05 03:23:36 tjr 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 9e329890399c9..be693686e53d6 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.149 2004/07/26 07:24:02 cperciva 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 46f9cc5df94d6..630816360ede3 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.33 2004/07/03 13:22:38 tjr 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 1940ee9deea07..ea348f1bba1ec 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.16 2004/06/16 09:47:04 phk Exp $
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index 6816220c0e5c1..e25ec1f65addd 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 e51bc09f2fdad..3ede7027aa955 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 347306e885360..cffe5cc88a2fb 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 dd9ec2d4f386c..233712ad74dcd 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.20 2004/06/16 09:47:04 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index 7df7495c770ac..f39053de6a9a2 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 c11cfa1f6317e..62c4ca075b4f3 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 0b2b53e8b7958..7d42b230bd814 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.34 2004/07/28 06:30:43 kan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index c0ecc75e5dc49..c4dd67a3a69d8 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 3bd803c347bbf..fe7e262a38744 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.61 2004/07/30 22:08:50 phk Exp $
  */
 
 
diff --git a/sys/fs/ntfs/ntfs_vfsops.h b/sys/fs/ntfs/ntfs_vfsops.h
index b82877acc39bf..f3b19e9e122c5 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.7 2001/09/12 08:37:18 julian 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 1ee98a5f566be..6518b4ebe75f4 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.42 2004/04/07 20:46:01 imp Exp $
  *
  */
 
diff --git a/sys/fs/ntfs/ntfsmount.h b/sys/fs/ntfs/ntfsmount.h
index 5497ad9f2176f..bf62f0f86f6ef 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 b57e7430687db..e423afb4a9f7a 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.20 2004/04/07 20:46:01 imp Exp $
  */
 
 struct null_mount {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 7a2d7524471e0..08f520b182f23 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.43 2004/07/10 21:20:11 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index ea49163bfcd0a..37ba1fa9765c1 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.63 2004/07/30 22:08:50 phk Exp $
  */
 
 /*
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index a755bbe767d5b..13d846c29122f 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.66 2004/04/07 20:46:01 imp Exp $
  */
 
 /*
diff --git a/sys/fs/nwfs/nwfs.h b/sys/fs/nwfs/nwfs.h
index 3d2a262d7a13e..a4d5372911df2 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.5 2001/09/12 08:37:19 julian Exp $
  */
 
 #ifndef _NWFS_H_
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 22f0e61ab79c2..2d7cdfb12a8e8 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.34 2004/05/06 05:03:20 alc Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/fs/nwfs/nwfs_ioctl.c b/sys/fs/nwfs/nwfs_ioctl.c
index 32692b467d314..7200ab4483956 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.7 2002/09/26 14:07:00 phk 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 dd445d9112268..999d57646f50b 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.7 2002/05/16 21:25:42 trhodes 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 b86f7d1d4fd0b..6057b15520447 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.30 2003/10/05 02:43:30 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 fa5de92f137f1..358824aec13de 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.9 2001/09/12 08:37:19 julian 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 10d9647ce2c4f..4d1a0d6f82ff2 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.11 2003/02/03 19:49:33 phk 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 4fece8a2627e8..c8391586f68a2 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.4 2001/09/12 08:37:19 julian 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 290004812aeb1..20a6cd1e27986 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.34 2004/07/30 22:08: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 4215e633d4d91..0082740087338 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.30 2003/10/18 11:06:14 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index 02e42c72c5d0c..4e502fa2dcd62 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.8 2004/04/07 20:46:01 imp Exp $
  */
 
 struct portal_args {
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index dea2d397ad24e..72103f5dbc7d3 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.51 2004/07/30 22:08:50 phk Exp $
  */
 
 /*
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index dce916592b4e8..3c53c05f2a611 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.65 2004/06/24 00:47:23 rwatson Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/README b/sys/fs/procfs/README
index f816b321b432c..e7a941f288cde 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 309f0f2bb6281..b96b6823debd2 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.11 2004/01/07 17:58:51 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index b8ee3aa3680b4..eaab5a08eb9b2 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.46 2004/04/07 20:46:02 imp Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 55c803333fd40..b786b87ee67c3 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.52 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index 0e129bbafd397..c7fcba869ff7c 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.24.2.1 2004/10/09 17:11:08 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 93356ce6e7b4f..e1a6065639a0c 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.30.2.1 2004/10/09 17:11:08 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_ioctl.c b/sys/fs/procfs/procfs_ioctl.c
index 8b90da6b7b1de..62f8673da50c4 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.10 2003/12/07 17:40:00 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 06112fc14397f..4a025c46dd29f 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.36 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index c85f6e61d2c65..aa4a8f4c2dd17 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.59 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index 16c917e787959..2ad11287b0a9c 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 7da0f8c81590c..49923dafdf77e 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.29.2.1 2004/10/09 17:11:08 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index a9bb64de00ac3..ae7d57e27f7b6 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.9 2004/02/04 21:52:54 jhb Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 87d3c0b51fda9..0b3430f37ecaf 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.52 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index e7bffc78f61c3..2b5c04d6ff1f9 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.11 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index 140a993c15da3..39906f6553b4a 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.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/pseudofs/pseudofs.c,v 1.22 2004/07/30 22:08:50 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h
index c2bb9b334e369..aee45afe53796 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.28 2004/07/30 22:08:50 phk Exp $
  */
 
 #ifndef _PSEUDOFS_H_INCLUDED
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index 24848b3382879..8d9c359e92e9c 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.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/pseudofs/pseudofs_fileno.c,v 1.10 2003/04/29 13:36:01 kan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/pseudofs/pseudofs_internal.h b/sys/fs/pseudofs/pseudofs_internal.h
index e730f8cd3e14c..fb081ac08f22b 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.3 2001/10/01 04:26:33 des Exp $
  */
 
 #ifndef _PSEUDOFS_INTERNAL_H_INCLUDED
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index d237cd237aec8..8ae0b5792d57a 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.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/pseudofs/pseudofs_vncache.c,v 1.26 2004/08/15 21:58:02 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index d8fa427b3e990..fd91fe27e8d45 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.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/pseudofs/pseudofs_vnops.c,v 1.45.2.1 2004/09/06 19:38:01 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/smbfs/smbfs.h b/sys/fs/smbfs/smbfs.h
index 50487916826fc..598765f7db712 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.8 2003/02/08 05:48:04 tjr 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 6a1ea45b36429..7946641a7949e 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.27 2004/05/06 05:03:21 alc Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index c76d73e8c05b1..eed13b44e2826 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.20 2004/07/10 21:21:13 marcel 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 7a8d545d1ef41..8fc0d839b30e2 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.6 2004/02/10 05:53:02 tjr 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 97f5921f7d1a8..02f43dbf8cd03 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.12 2004/01/12 14:43:49 tjr 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 27cd62ea76d64..0462344e4d5c8 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.4 2003/06/14 15:24:54 tjr 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 bc1279fae1649..29f29fa916a42 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.3 2002/09/18 09:27:04 bp 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 d8d90e407f7b8..b81f72aceed58 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.26 2004/07/30 22:08:51 phk Exp $
  */
 #include "opt_netsmb.h"
 #ifndef NETSMB
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index c051b695296ef..904c5200571cd 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.46 2004/07/26 07:24:02 cperciva Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 85f4c4882dbb9..538f6a3be63f3 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.226 2004/08/08 13:23:05 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/udf/ecma167-udf.h b/sys/fs/udf/ecma167-udf.h
index 43915082249d0..63d9a46680d17 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.4 2002/09/23 18:54:30 alfred Exp $
  */
 
 /* ecma167-udf.h */
diff --git a/sys/fs/udf/osta.c b/sys/fs/udf/osta.c
index c85c4f9502ac9..9bce0d5996f6d 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.3 2003/11/05 06:55:23 scottl Exp $
  */
 
 #include <fs/udf/osta.h>
diff --git a/sys/fs/udf/osta.h b/sys/fs/udf/osta.h
index a5e3b8625a143..26c6cf095b4d0 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 c45f60e4aca69..349e813839fd5 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.8 2004/06/23 19:36:09 scottl Exp $
  */
 
 #define UDF_HASHTBLSIZE 100
diff --git a/sys/fs/udf/udf_iconv.c b/sys/fs/udf/udf_iconv.c
index 934516986c853..812baef2a6f9e 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 1c34694c3d4c4..a04888144a689 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 89f38ba6aa8e8..a00d5c3eb484f 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.20 2004/07/30 22:08:51 phk Exp $
  */
 
 /* udf_vfsops.c */
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index d26fddcb03eb8..74bfe49a46bcf 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.37 2004/06/23 21:49:03 scottl Exp $
  */
 
 /* udf_vnops.c */
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 10af870a2f859..be6c0a89a407c 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.17 2004/04/07 20:46:02 imp Exp $
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index a008c999693bd..392a41b794c6b 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.33 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index c9da7f7d21086..afb09f3787177 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.58 2004/07/30 22:08:51 phk Exp $
  */
 
 /*
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 077411fa51ac7..326d2e4bcbeec 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.40 2004/04/07 20:46:02 imp Exp $
  */
 
 /*
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index f5326d447f3e2..806a2497c6aba 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.28 2004/04/07 20:46:03 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 99b86ead9ed2b..d66a74f04bef1 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.79 2004/07/15 08:26:04 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 1b5293e143143..2a39b03cb6aca 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.67 2004/07/30 22:08:51 phk Exp $
  */
 
 /*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index c8240e9973a53..ab1f6eb430569 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.108 2004/07/12 08:14:07 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gdb/gdb.h b/sys/gdb/gdb.h
index a7a54294d38e9..0b72f73a82370 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.1 2004/07/10 17:47:22 marcel Exp $
  */
 
 #ifndef _GDB_GDB_H_
diff --git a/sys/gdb/gdb_int.h b/sys/gdb/gdb_int.h
index 1a043bdca6325..5f8a957793e8e 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.1 2004/07/10 17:47:22 marcel Exp $
  */
 
 #ifndef _GDB_GDB_INT_H_
diff --git a/sys/gdb/gdb_main.c b/sys/gdb/gdb_main.c
index 0eed036aa9ce6..33283b7592701 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.2 2004/08/10 19:32:33 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/gdb/gdb_packet.c b/sys/gdb/gdb_packet.c
index 703d2e0b52db7..a2c54430f46e3 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.1 2004/07/10 17:47:22 marcel 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 bb9cbf07f7df4..9e93ba429e4f4 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.28 2004/08/08 07:57:51 phk Exp $
  *
  */
 
diff --git a/sys/geom/bde/g_bde.h b/sys/geom/bde/g_bde.h
index 9332c6b270615..efd3d9fce658f 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 165dad69a40fe..a0a216f952ed8 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.19.2.1 2004/09/14 05:59:12 phk 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 d429984e1a008..b3516ed88becb 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.12.4.1 2004/09/14 05:59:12 phk 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 f2baef58fa9ab..d6ee0c09853cc 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.24 2004/03/05 22:42:17 jhb Exp $
  *
  * This source file contains the state-engine which makes things happen in the
  * right order.
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index a1e1765485e93..9d25cc247696b 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.18.2.2 2004/09/28 18:22:15 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 5cf8757bb169e..349fcf1293b37 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.10 2004/08/09 11:29:42 pjd Exp $
  */
 
 #ifndef	_G_CONCAT_H_
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index bf756595904f5..10f9e85838ca5 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.11 2004/08/08 07:57:52 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/geom/gate/g_gate.h b/sys/geom/gate/g_gate.h
index 929826abd10cb..b29fb5c4deddd 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.3 2004/05/03 21:02:02 pjd Exp $
  */
 
 #ifndef _G_GATE_H_
diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index 55a6f0c7df502..2e33dcfee6440 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.84.2.1 2004/08/31 06:14:03 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_H_
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index db073d4f13fa2..e6d20050d208f 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_aes.c,v 1.26 2004/08/08 07:57:51 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c
index 04f5cac1af80e..c7a6d0774085d 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 0f880a37c5f16..baf2c541c3351 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd.c,v 1.70 2004/08/08 07:57:51 phk 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 dfdeb8555fea7..3445a356eca07 100644
--- a/sys/geom/geom_bsd_enc.c
+++ b/sys/geom/geom_bsd_enc.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd_enc.c,v 1.5 2003/06/11 06:49:15 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index c638a3b8d3b85..ef925a822fe01 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.152 2004/08/08 07:57:51 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index ce000f3168daa..e7cfbe97d35fe 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.32 2004/06/16 09:47:05 phk Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_ctl.h b/sys/geom/geom_ctl.h
index fd68bdaa428a3..32221cddbf0e8 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 1ca5cdba5152a..21c8f823e7f08 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.79.2.1 2004/10/15 06:12:29 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index bf101e68fb746..ce8a1952e0b8f 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.91 2004/08/08 07:57:51 phk Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h
index a94df8916d8f4..fb2f1bff1a1bc 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.3 2004/02/18 21:36:53 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_DISK_H_
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c
index fd7001f657871..283ba5f23974b 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 d26bac08cfa98..d7cc27681bdf7 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.50 2004/07/08 16:17:14 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 76255e2879cb8..fc015dc39dfd8 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.8 2004/08/08 07:57:51 phk Exp $
  *
  * This is a GEOM module for handling path selection for multi-path
  * storage devices.  It is named "fox" because it, like they, prefer
diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c
index 3f545906297d4..d4ce910cf8174 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.30 2004/08/08 07:57:51 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 39b3f1033ea93..9b99ed7527f01 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.28 2004/07/08 16:17:14 phk Exp $
  */
 
 LIST_HEAD(class_list_head, g_class);
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index eeade09800bf2..0a4d0b4ebad92 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.57.2.2.2.1 2004/10/21 17:49:45 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c
index 762a1fd69869f..48ae2958065c1 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.34.2.1 2004/09/28 18:16:51 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c
index 941458fae861d..3de190697a9e7 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.60 2004/08/08 07:57:51 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 da5f99779012e..6e8ecd9086e32 100644
--- a/sys/geom/geom_mbr_enc.c
+++ b/sys/geom/geom_mbr_enc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_mbr_enc.c,v 1.2 2003/06/11 06:49:15 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/diskmbr.h>
diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c
index afbc59fcb126c..144f25bbfb2ad 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.47 2004/08/08 07:57:51 phk 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 04de220436776..e691e19a05dbb 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.2 2003/06/11 06:49:15 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/diskpc98.h>
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index 45b552b3a5d31..448889b8c3fae 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.55.2.1 2004/08/19 06:56:50 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_slice.h b/sys/geom/geom_slice.h
index 4003c8fa0ad8d..6aa628f62a9ea 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 3085c4bf0be61..26cc6f811162f 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.81.2.1 2004/09/13 06:26:57 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 ece8e1eba7716..0ed8f221c6062 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.43 2004/08/08 07:57:51 phk 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 70899b1bbea7f..daa429ee98d63 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.4 2004/06/01 20:18:24 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c
index 94175f74e2367..ee5f89c481f1c 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.13 2004/08/09 06:04:00 phk 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 a2f6dbdbb1728..d242f8de4f81f 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.7.2.3 2004/10/15 06:08: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 a0848318c9589..4d91b402f8ed3 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.3 2004/07/13 12:01:29 pjd Exp $
  */
 
 #ifndef	_G_LABEL_H_
diff --git a/sys/geom/label/g_label_iso9660.c b/sys/geom/label/g_label_iso9660.c
index 34d9252bdfdb9..8cdf07f37ded8 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 2004/07/02 19:40:34 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 ff0d7c3b7e14f..50bc49c5016a9 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_ufs.c b/sys/geom/label/g_label_ufs.c
index dc188f7a69394..a02d36a1499e2 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.1 2004/07/02 19:40:34 pjd 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 3f79e163b80e2..f386fd724008a 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.19.2.4 2004/10/15 06:10:12 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 59490054a80f1..246a852e92f3d 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.8.2.2 2004/10/15 06:10:12 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 0ec5401bb6836..544ecad5bab5a 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.4 2004/08/10 19:52:12 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 1a2cb3b058bab..c34bfd1d2ceaa 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.9.2.2 2004/09/19 10:38:57 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 378c3eff490f9..3020d3bc430da 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 4fcacaefbc405..ced66dfcf1e36 100644
--- a/sys/geom/notes
+++ b/sys/geom/notes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/geom/notes,v 1.4.6.1 2004/09/13 06:26:57 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 36c0dd5533de3..7580f6fe2ba1a 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.4.2.3 2004/10/15 06:11:28 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 948d599930a18..905a1473180c8 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.1.2.2 2004/10/15 06:11:28 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 94ec67ec4ee8d..7c1beddfcd0bd 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.1.2.1 2004/09/14 15:47:03 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index 647316ba2817d..ded38e15e6a13 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.16.2.2 2004/09/28 18:19:30 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 5a7825b0e8184..165df975f989d 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.5 2004/08/09 11:29:42 pjd Exp $
  */
 
 #ifndef	_G_STRIPE_H_
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index 747ca5625fafe..b12c1731a6612 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.1.2.2 2004/09/20 06:07:19 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 a25e5cafd632c..460c3a3c8ad3b 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.9.2.2 2004/10/07 17:51:06 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 ddbf5cf38d4cf..bc0bcad4d4e84 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.2.2.1 2004/09/24 16:23:17 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 244e16966bed2..d985f9b3ba9d2 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.9.2.1 2004/09/24 16:23:17 le 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 46d9d51b9699a..74ff38721a491 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.2.2.2 2004/10/07 17:51:06 le 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 ca95ba74e7d27..58398f07ea49a 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.1.2.1 2004/10/07 17:51:06 le 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 7ce5b08a7a5ef..d116dd44963be 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.8.2.2 2004/10/07 17:51:06 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 9ba02e85f896f..ab44c4335fa2c 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.5.2.2 2004/10/07 17:51:06 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 212f6c65f8313..9c234eafc9bd0 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.2.2.2 2004/10/07 17:51:06 le 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 d328c502c5791..544cbb48fa308 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.1.2.1 2004/09/24 16:23:17 le 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 2b572c3879770..9de826324f5a4 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.2.2.1 2004/10/07 17:51:06 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 177e97156abca..efad724384131 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.1 2004/06/12 21:16:10 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 4e1710815dfe1..6252b766948fe 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.2.2.1 2004/09/24 16:23:17 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 1821cfd8b6a72..d5130bfa1c41e 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.6.2.2 2004/10/07 17:51:06 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 196f7f8d50f04..3aa401a441968 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.1.2.2 2004/10/07 17:51:06 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 4ace9d2cbd40f..5244d35e8740a 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.4.2.1 2004/09/24 16:23:17 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/gnu/dev/sound/pci/csaimg.h b/sys/gnu/dev/sound/pci/csaimg.h
index 51fdde1d66c48..8ceb5d87e5c3e 100755
--- a/sys/gnu/dev/sound/pci/csaimg.h
+++ b/sys/gnu/dev/sound/pci/csaimg.h
@@ -18,7 +18,7 @@
  *     Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
  *     USA.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/dev/sound/pci/csaimg.h,v 1.1 2001/05/30 22:28:30 cg Exp $
  *
  ***************************************************************************/
 
diff --git a/sys/gnu/dev/sound/pci/emu10k1-ac97.h b/sys/gnu/dev/sound/pci/emu10k1-ac97.h
index 4f4b072ed2b79..3e72827e9a34b 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.h b/sys/gnu/dev/sound/pci/emu10k1.h
index f3250f5fd1770..7660e9425d87e 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.7 2004/01/09 06:38:11 obrien Exp $
  */
 
 
diff --git a/sys/gnu/dev/sound/pci/maestro3_dsp.h b/sys/gnu/dev/sound/pci/maestro3_dsp.h
index 9c14f336dc9d7..14554befc1500 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.4 2001/05/27 21:07:39 scottl 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 f74ed309c5baa..96f9a63a885d3 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.4 2001/05/27 21:07:39 scottl Exp $ */
 /*
  *      ESS Technology allegro audio driver.
  *
diff --git a/sys/gnu/ext2fs/COPYRIGHT.INFO b/sys/gnu/ext2fs/COPYRIGHT.INFO
index 699f519c02a84..6dfc3d404361d 100644
--- a/sys/gnu/ext2fs/COPYRIGHT.INFO
+++ b/sys/gnu/ext2fs/COPYRIGHT.INFO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/gnu/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/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index beaf9214dc671..8e387f17bbd83 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.38 2004/04/07 20:46:03 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_balloc.c b/sys/gnu/ext2fs/ext2_balloc.c
index 5ddbe359922e4..2d4214b668c2a 100644
--- a/sys/gnu/ext2fs/ext2_balloc.c
+++ b/sys/gnu/ext2fs/ext2_balloc.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_balloc.c,v 1.19 2004/04/07 20:46:03 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_bitops.h b/sys/gnu/ext2fs/ext2_bitops.h
index cccc23cfd6ce3..ea2fccd898700 100644
--- a/sys/gnu/ext2fs/ext2_bitops.h
+++ b/sys/gnu/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/ext2fs/ext2_bitops.h,v 1.1 2003/08/25 01:39:47 marcel Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_BITOPS_H_
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 94db5818e145e..b0a31c288ac10 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_bmap.c,v 1.57 2004/04/07 20:46:03 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h
index 45ba6b32c76cf..48784f753258f 100644
--- a/sys/gnu/ext2fs/ext2_extern.h
+++ b/sys/gnu/ext2fs/ext2_extern.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_extern.h,v 1.31 2004/06/16 09:47:06 phk Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_EXTERN_H_
diff --git a/sys/gnu/ext2fs/ext2_fs.h b/sys/gnu/ext2fs/ext2_fs.h
index 4c9466db64b3a..4bfef4784eb68 100644
--- a/sys/gnu/ext2fs/ext2_fs.h
+++ b/sys/gnu/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/ext2fs/ext2_fs.h,v 1.13 2004/02/18 14:08:25 tjr Exp $
  */
 /*
  *  linux/include/linux/ext2_fs.h
diff --git a/sys/gnu/ext2fs/ext2_fs_sb.h b/sys/gnu/ext2fs/ext2_fs_sb.h
index 811f5895470cc..6b9a92d8fb19a 100644
--- a/sys/gnu/ext2fs/ext2_fs_sb.h
+++ b/sys/gnu/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/ext2fs/ext2_fs_sb.h,v 1.4 2004/02/19 09:06:06 tjr Exp $
  */
 /*
  *  linux/include/linux/ext2_fs_sb.h
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index fca9a0d848309..1e4b3e75d54f1 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_ihash.c,v 1.38 2004/06/16 09:47:06 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index 0fbf51f92d9d6..06ecf903e4942 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.5 (Berkeley) 12/30/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode.c,v 1.47 2004/04/07 20:46:03 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_inode_cnv.c b/sys/gnu/ext2fs/ext2_inode_cnv.c
index 12b5f4a66cbe5..ed338fae24d65 100644
--- a/sys/gnu/ext2fs/ext2_inode_cnv.c
+++ b/sys/gnu/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/ext2fs/ext2_inode_cnv.c,v 1.13 2004/02/18 14:08:25 tjr Exp $
  */
 
 /*
diff --git a/sys/gnu/ext2fs/ext2_linux_balloc.c b/sys/gnu/ext2fs/ext2_linux_balloc.c
index 6ab4c4824e703..94fc17ca98acc 100644
--- a/sys/gnu/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/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/ext2fs/ext2_linux_balloc.c,v 1.21 2003/10/29 07:35:53 marcel Exp $
  */
 /*
  *  linux/fs/ext2/balloc.c
diff --git a/sys/gnu/ext2fs/ext2_linux_ialloc.c b/sys/gnu/ext2fs/ext2_linux_ialloc.c
index 893302abf9a5b..b210712e73a9a 100644
--- a/sys/gnu/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/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/ext2fs/ext2_linux_ialloc.c,v 1.21 2003/10/29 07:35:53 marcel Exp $
  */
 /*
  *  linux/fs/ext2/ialloc.c
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index 30bdee0f0db66..2201f92f87178 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_lookup.c,v 1.44 2004/04/07 20:46:03 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 1a2893db76543..6d123010f18f7 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.28 2004/06/20 03:34:21 bde Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
diff --git a/sys/gnu/ext2fs/ext2_readwrite.c b/sys/gnu/ext2fs/ext2_readwrite.c
index 50fae6b841199..51627473bff8d 100644
--- a/sys/gnu/ext2fs/ext2_readwrite.c
+++ b/sys/gnu/ext2fs/ext2_readwrite.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.7 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_readwrite.c,v 1.29 2004/04/07 20:46:03 imp Exp $
  */
 
 #define	BLKSIZE(a, b, c)	blksize(a, b, c)
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index 94db9346b7c08..90e0f2348d93e 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.2 (Berkeley) 9/21/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_subr.c,v 1.27 2004/07/10 21:21:55 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index a1e5365bdcae1..819d559ee8d98 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.126 2004/07/30 22:08:51 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index cf04778ad9f8e..5a7d8b25ca59e 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/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/ext2fs/ext2_vnops.c,v 1.85 2004/08/15 06:24:40 jmg Exp $
  */
 
 #include "opt_suiddir.h"
diff --git a/sys/gnu/ext2fs/fs.h b/sys/gnu/ext2fs/fs.h
index 854be65c9a9e5..d55bea8fccf37 100644
--- a/sys/gnu/ext2fs/fs.h
+++ b/sys/gnu/ext2fs/fs.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/fs.h,v 1.16 2004/04/07 20:46:03 imp Exp $
  */
 
 /*
diff --git a/sys/gnu/ext2fs/i386-bitops.h b/sys/gnu/ext2fs/i386-bitops.h
index 595e870526b3c..ea929ee575ba6 100644
--- a/sys/gnu/ext2fs/i386-bitops.h
+++ b/sys/gnu/ext2fs/i386-bitops.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/ext2fs/i386-bitops.h,v 1.5 1999/11/15 23:16:06 obrien Exp $ */
 /*
  * this is mixture of i386/bitops.h and asm/string.h
  * taken from the Linux source tree 
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 3daf45e985ca2..58d29426f3eeb 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.41 2004/06/20 03:36:31 bde Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_INODE_H_
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index b7d021a7d3d1e..f33c7a5af6f9e 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 17269d8819c54..b094c26bf7a65 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 6cb3e9eea0950..73e7dfd882604 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_asus.c b/sys/i386/acpica/acpi_asus.c
index 49623e13668ee..44ad487dc99fb 100644
--- a/sys/i386/acpica/acpi_asus.c
+++ b/sys/i386/acpica/acpi_asus.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_asus.c,v 1.11 2004/08/13 06:22:29 njl Exp $");
 
 /*
  * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 6cb108c40a0d5..f25f82b0fa64d 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.25 2004/07/24 22:41:30 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/acpica/acpi_panasonic.c b/sys/i386/acpica/acpi_panasonic.c
index 723682c8c6fad..1515eb1002fa5 100644
--- a/sys/i386/acpica/acpi_panasonic.c
+++ b/sys/i386/acpica/acpi_panasonic.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_panasonic.c,v 1.3.2.1 2004/08/27 00:54:30 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/i386/acpica/acpi_toshiba.c b/sys/i386/acpica/acpi_toshiba.c
index 9bb91375f717b..732358ca9a2b2 100644
--- a/sys/i386/acpica/acpi_toshiba.c
+++ b/sys/i386/acpica/acpi_toshiba.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_toshiba.c,v 1.13 2004/08/13 06:22:35 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S
index 9a22fb108722e..e5e39ee16cdde 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.9 2004/01/01 22:57:22 njl Exp $
  */
 
 #define LOCORE
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index 400d9f15388ae..e453f0f543c7d 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.37.2.1 2004/08/23 05:14:18 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/acpica/genwakecode.sh b/sys/i386/acpica/genwakecode.sh
index e61f62cef4b60..28c2be81da688 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.2 2004/07/27 01:33:27 tjr Exp $
 #
 file2c 'static char wakecode[] = {' '};' <acpi_wakecode.bin
 
diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c
index 43a0a885402ab..2d16ca8207a06 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.17 2004/06/10 20:03:46 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 4aeedd13d6548..2df8498ba401b 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.142 2004/06/16 20:27:50 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/apm.h b/sys/i386/bios/apm.h
index 660b42c98138c..bd5b53bea1d31 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.4 2004/06/16 20:27:50 imp Exp $
  */
 
 #define APM_NEVENTS 16
diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c
index 0938d11b5e1b3..d0f9351a4985c 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.8 2004/06/10 20:30:57 jhb 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 c639b5b740445..b1d48581b8586 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 9879c90334de2..f455277b2346a 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 3a280055902b0..60c3f84c7eb89 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 f9ceae20925fa..fbcbe72ee1532 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 2004/06/10 20:30:57 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/vpd.c b/sys/i386/bios/vpd.c
index 0e22abee24a54..d61783e9d1fa7 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.4 2004/06/10 20:30:57 jhb Exp $");
 
 /*
  * VPD decoder for IBM systems (Thinkpads)
diff --git a/sys/i386/compile/.cvsignore b/sys/i386/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/i386/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 62e5385aaed04..10e7011185383 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.413.2.6.2.2 2004/10/24 18:02:52 scottl Exp $
 
 machine		i386
 cpu		I486_CPU
diff --git a/sys/i386/conf/GENERIC.hints b/sys/i386/conf/GENERIC.hints
index 56c8f0e03d687..46a3340e9ccb3 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.13 2004/04/01 21:48:31 alfred 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 2c006e9c2c80d..0284f84e82b54 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 de60a3da8bb1f..aea2601080f86 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.1168.2.1.2.1 2004/10/24 18:02:52 scottl Exp $
 #
 
 #
diff --git a/sys/i386/conf/OLDCARD b/sys/i386/conf/OLDCARD
index af17bb65e16c5..24a97ee2bcc9c 100644
--- a/sys/i386/conf/OLDCARD
+++ b/sys/i386/conf/OLDCARD
@@ -2,7 +2,7 @@
 # OLDCARD -- Generic kernel configuration file for FreeBSD/i386
 #            using the OLDCARD pccard system.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/OLDCARD,v 1.19 2004/07/13 16:11:34 imp Exp $
 
 include GENERIC
 
diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE
index 60980192dc19a..94d3eee4eba1e 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.9.2.1 2004/10/11 23:59:03 mjacob Exp $
 
 include GENERIC
 
diff --git a/sys/i386/conf/SMP b/sys/i386/conf/SMP
index 135946c01a2de..ab6ccf47a98a8 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.4.1 2004/10/23 20:04:00 kensmith Exp $
 
 include GENERIC
 
diff --git a/sys/i386/conf/gethints.awk b/sys/i386/conf/gethints.awk
index a2de29e278215..e8cc6b67de398 100644
--- a/sys/i386/conf/gethints.awk
+++ b/sys/i386/conf/gethints.awk
@@ -6,7 +6,7 @@
 # 'hints' directive.  See how GENERIC and GENERIC.hints fit together for
 # a static example.  You should use loader(8) if at all possible.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/gethints.awk,v 1.2 2002/07/26 03:52:30 peter Exp $
 
 # skip commented lines, empty lines and not "device" lines
 /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; }
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s
index da5b2ebdbf7a5..268914a090aad 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.101 2004/05/26 07:43:41 bde Exp $
  */
 
 /*
diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c
index 1b4ff7eaa6937..983578a484b83 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 c4eca30d918e0..ec87dc81c97c9 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.178 2004/07/28 21:54:56 phk 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 3bee94fdd5dff..12ba4dab8b4f6 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.70 2004/06/23 17:59:01 jhb 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 3af198adb5e91..34393c840e1cb 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 c10bad3ea092a..edd910d9b71c7 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.59.2.1 2004/09/09 23:05:00 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/critical.c b/sys/i386/i386/critical.c
index 77965d4139870..57bbbbd99adc1 100644
--- a/sys/i386/i386/critical.c
+++ b/sys/i386/i386/critical.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/critical.c,v 1.13 2004/03/05 14:23:13 bde 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 e4c227d663ed7..cdbdde011bc51 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.28 2003/08/25 09:48:46 obrien Exp $");
 
 /*
  * Instruction disassembler.
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 02cf974f55841..ef42a62782f3b 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.82 2004/07/10 23:47:19 marcel Exp $");
 
 /*
  * Interface to new debugger.
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index ca3435eaf3480..051095c1fca78 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.61.2.1 2004/09/16 17:21:46 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 83155b00dbdad..ba2f2a963dda0 100644
--- a/sys/i386/i386/dump_machdep.c
+++ b/sys/i386/i386/dump_machdep.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.9 2003/08/25 09:48:46 obrien 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 ade7e594937dd..6dcab16fb1806 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.30 2004/07/07 20:02:30 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 d8756cc51fbf9..e0b419d196862 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 02168d9c62eb1..8f526a2d56034 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.111 2004/05/26 07:43:41 bde Exp $
  */
 
 #include "opt_apic.h"
diff --git a/sys/i386/i386/gdb_machdep.c b/sys/i386/i386/gdb_machdep.c
index 836b13e73b89b..0f25ec01f8671 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.1.2.1 2004/10/09 05:20:18 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 65b1dc01bc8ea..fefe6fe267891 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.148 2004/05/23 16:50:55 bde Exp $");
 
 #include "opt_apic.h"
 #include "opt_compat.h"
diff --git a/sys/i386/i386/geode.c b/sys/i386/i386/geode.c
index 2702f21eb25a6..5d770a1ed834a 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 2004/06/16 09:47:07 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 453932969e062..84a3243d900ef 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 284b7e25566b3..9be87cb812ac2 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.139 2004/06/03 21:14:53 phk Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index a236245a42db2..74656a7d399f5 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.27 2004/04/07 20:46:04 imp Exp $");
 
 /*
  * MPsafe: alfred
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index 91c4370108620..717dc87749f3b 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.49 2003/11/10 15:48:30 jhb Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/intr_machdep.c b/sys/i386/i386/intr_machdep.c
index c544251289d45..280f4d3df3597 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.9 2004/08/02 15:31:10 scottl Exp $
  */
 
 /*
diff --git a/sys/i386/i386/io.c b/sys/i386/i386/io.c
index 1c0866d30fde9..1b43f0441d5ce 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 aca7d78b47134..9892a998b2d21 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.14 2004/08/02 15:31:10 scottl Exp $");
 
 #include "opt_isa.h"
 #include "opt_no_mixed_mode.h"
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index ac7a55a6a924b..e8ab3fbe3b915 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 f7e69ec661dc5..e0a8db4bfece0 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.56 2004/08/16 21:55:29 gibbs 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 9c3d97be60d34..8fb7f9f12efed 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.9 2004/07/14 18:12:15 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 72ef2bf5747c1..fe5fcbcd30791 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.184 2004/07/08 22:35:34 brian Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/i386/longrun.c b/sys/i386/i386/longrun.c
index eacc38eddbc59..91e784c436587 100644
--- a/sys/i386/i386/longrun.c
+++ b/sys/i386/i386/longrun.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/longrun.c,v 1.2 2004/01/31 20:14:44 shiba Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index ae4dc22d0ab6e..17a82603590db 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.597.2.1 2004/09/09 10:03:18 julian Exp $");
 
 #include "opt_apic.h"
 #include "opt_atalk.h"
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index d093e2d476818..da64b5e03aeed 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 2c3dbbbe055a8..af07002ebb521 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 09cf68a221fd1..d479f19aa46f6 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.235.2.3 2004/09/24 15:02:33 rik 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 b3b5d9e97d18f..8974732eb15d6 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.2 2004/08/15 20:32:40 rwatson Exp $
  */
 
 #include "opt_mp_watchdog.h"
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index 8f42f6b575b61..195c6b6496cc0 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.23 2003/11/03 22:32:03 jhb Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index fe8bf4538a24a..58bce2462da3a 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.235.2.1 2004/09/28 16:24:09 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 660ced6988e10..6ee2be4e9c192 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 2004/05/03 14:49:10 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index 10caf3d33b93d..758e232f02704 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.58.2.1 2004/08/31 05:26:36 njl Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
diff --git a/sys/i386/i386/p4tcc.c b/sys/i386/i386/p4tcc.c
index cec2f58ea52bf..f002e24648c8e 100644
--- a/sys/i386/i386/p4tcc.c
+++ b/sys/i386/i386/p4tcc.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/p4tcc.c,v 1.3 2004/02/29 18:30:35 maxim Exp $");
 
 #include "opt_cpu.h"
 #include <sys/param.h>
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index d085261547c2d..5c95f84acbe35 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 8a0d75d0357f4..4972c5554e35c 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.494.2.6 2004/10/10 19:08:00 alc Exp $");
 
 /*
  *	Manages physical address maps.
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 0af77e05c121c..7ec888ffe7d04 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.105 2004/05/23 15:37:21 bde Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 96e2b25a51ff2..2fab70fd1211d 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.147 2004/07/15 16:37:48 jhb Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index c15f5049cbd0f..0bb8b4d619d05 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 57bb98217d62f..81d7c183437b4 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.92 2004/04/07 20:46:04 imp 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 f1de1ad30e00c..60c86d3f68a5d 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.267.2.2 2004/09/03 06:40:25 julian Exp $");
 
 /*
  * 386 Trap and System call handling
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 01c8d729e6d4a..cfb1b50c85b02 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 14cd38ca7c9c8..6881f803c8051 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.5.2.1 2004/08/25 18:49:56 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 1d002f13ef396..a93d7f916ed32 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.56 2003/08/25 09:48:47 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s
index 68b8b915eb273..0d28d9cdd4b9d 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.30 2003/03/30 05:24:52 jake Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 4452acf2f5792..3f7f8652a28f6 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.241 2004/07/20 01:38:59 davidxu Exp $");
 
 #include "opt_isa.h"
 #include "opt_npx.h"
diff --git a/sys/i386/ibcs2/Makefile b/sys/i386/ibcs2/Makefile
index a46885f66423e..f75b69065c52c 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 a0eecd97ba955..a9f89c26e7ad5 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_errno.c b/sys/i386/ibcs2/ibcs2_errno.c
index cd9a03c11c70c..2f6b5949c831a 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.5 2003/06/02 06:48:51 obrien Exp $");
 
 #include <sys/errno.h>
 #include <i386/ibcs2/ibcs2_errno.h>
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 7f217e0fcd42f..fb44feabe9bc2 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.25.4.1 2004/09/03 15:30:20 jhb Exp $");
 
 #include "opt_spx_hack.h"
 
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 434da5062fe8a..4c6ce13c136cb 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.30 2004/06/21 22:57:14 phk 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 5027498b09e6f..f46535cd9b094 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.21 2003/06/02 06:48:51 obrien 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 bef0a09245aaf..7de2bffbce462 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.7 2003/08/15 14:55:50 jhb Exp $
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index a6004e3fd00dd..2a09d5b72d495 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.17 2003/06/02 06:48:51 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_isc_syscall.h b/sys/i386/ibcs2/ibcs2_isc_syscall.h
index 7591b22576ccb..eaff502633189 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.8 2004/02/04 22:00:42 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.7 2004/02/04 21:57:00 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index 46774c80868ee..28ee19cde902a 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.11 2004/02/04 22:00:42 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.7 2004/02/04 21:57:00 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 4f5cdab6fa7b3..1eebc26aa5fe0 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.55 2004/06/16 00:26:29 julian Exp $");
 
 /*
  * IBCS2 compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index 9e81870e2d897..dc00b2f8ef66c 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.9 2003/06/02 06:48:51 obrien Exp $");
 
 /*
  * IBCS2 message compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index ff3726bccec31..ebde55dd07f36 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.15 2003/06/02 06:48:51 obrien Exp $");
 
 /*
  * IBCS2 compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_poll.h b/sys/i386/ibcs2/ibcs2_poll.h
index 6bd86ced28fd1..a7cba93cbb822 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.4 1999/08/28 00:43:59 peter Exp $
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index 87e99eec8e179..f45e06e1203c4 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.19.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.18.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 6a4b9e47a9abe..5bbe00d205c0a 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.32 2003/10/12 04:25:26 tjr 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 eda9adff58a48..fc92c91f74374 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.7 2002/03/20 05:45:58 alfred Exp $
  */
 
 #ifndef	_IBCS2_SIGNAL_H
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index 21d29b092c3e7..b8eab623bc7c8 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.19 2003/10/12 04:25:26 tjr 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 9a22a7b91bbe4..67f04dd619638 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.8 2002/03/20 05:45:58 alfred Exp $
  */
 
 #ifndef	_I386_IBCS2_IBCS2_SOCKSYS_H_
diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c
index 33bf8c25cce26..4963c38c5a8ed 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.24 2003/08/10 23:26:16 nectar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_syscall.h b/sys/i386/ibcs2/ibcs2_syscall.h
index 5c399bc415ec8..f4aa890ef4d3f 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.16.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.18.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index 001466bd9cd97..13d5eb81ed1f9 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.21.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.18.2.1 2004/09/03 15:30:20 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index 2cbc29d73007d..35a05cb76c36f 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.20 2003/06/02 06:48:51 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index fc639734ccbc5..4d1d4ce1bd45b 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.28 2004/07/15 08:26:04 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index d0eaa37287fb4..c5fc9fe6f9e88 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.17 2003/10/12 04:25:26 tjr 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 e95e50f8cc465..5ea2c9d423ac7 100644
--- a/sys/i386/ibcs2/ibcs2_util.h
+++ b/sys/i386/ibcs2/ibcs2_util.h
@@ -30,7 +30,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.17 2003/10/12 04:25:26 tjr Exp $
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 59684430054cf..e3aa768d05f96 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.33 2003/06/02 06:48:51 obrien 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 8be1acb33fee4..4620a31553c4f 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.14 2004/02/04 22:00:42 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.8 2004/02/04 21:57:00 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_xenix_syscall.h b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
index 0312fb76f121a..d6d4e3df29dd8 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.10 2004/02/04 22:00:42 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.8 2004/02/04 21:57:00 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_xenix_sysent.c b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
index 667ec5a072159..0adddf180454c 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.12 2004/02/04 22:00:42 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.8 2004/02/04 21:57:00 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 6470813236d6d..80d7d0fce569a 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.62 2003/11/18 14:21:34 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index 1dce299f1f0bf..7f5f2c8231630 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 22ab06a100ca7..d0815bde9155a 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.7 2004/02/04 21:57:00 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 61f25954a2274..e60c0dfa09af5 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 1046bf89967a2..e135846b78e4a 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.18.2.1 2004/09/03 15:30:20 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 393d65d4b3bf9..283f2800f560d 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.8 2004/02/04 21:57:00 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 54fdd7bfa3fe2..b3372936c9ec2 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/_inttypes.h b/sys/i386/include/_inttypes.h
index 7da589d8a7710..ccc41f2f6e5e4 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 c7cc41eeb8ccf..fcc75163c2400 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.26 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/i386/include/_stdint.h b/sys/i386/include/_stdint.h
index 0d8aedfff5d68..7b94f833e9164 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 aa240d05e10ca..03ffa0c5fcb2c 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.9 2004/03/20 20:41:40 marcel Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/i386/include/acpica_machdep.h b/sys/i386/include/acpica_machdep.h
index 4eff57d08f774..2d70c0a6e9613 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.6 2004/05/05 20:04:14 njl Exp $
  */
 
 /******************************************************************************
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index 7b584a075e05f..4b7d0be5ababe 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.26 2003/12/10 21:33:07 jhb Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_
diff --git a/sys/i386/include/apicvar.h b/sys/i386/include/apicvar.h
index cc46fdac365da..c82f76fa46c94 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.8 2004/06/23 15:29:20 jhb Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 208d80b0369dc..9fb0240f13889 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.30 2002/03/20 05:48:58 alfred Exp $
  */
 
 #ifndef	_MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index 9111b5cb0f095..35b14a544bd5e 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.8 1999/08/28 00:44:05 peter Exp $
  */
 
 #ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index 64117d0dc65b6..f007c8a81b159 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 9b77bd0c4ed64..f5493e8367467 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 feba60695a4eb..6c0401f31cfb6 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.32 2004/03/12 21:45:29 trhodes Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define _MACHINE_ATOMIC_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index 475a09e08883a..9a8e8947cdd9d 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 a33569f5b22db..200af7fc661ab 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.10 2002/02/27 17:15:45 tmm Exp $
  */
 
 #ifndef _I386_BUS_H_
diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h
index 38c71bac3968c..157d39686aee6 100644
--- a/sys/i386/include/bus_at386.h
+++ b/sys/i386/include/bus_at386.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/i386/include/bus_at386.h,v 1.24 2004/03/12 21:45:29 trhodes Exp $ */
 
 #ifndef _I386_BUS_AT386_H_
 #define _I386_BUS_AT386_H_
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index a278f62f78b74..4875f6b81eae7 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/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/i386/include/bus_dma.h,v 1.25 2003/11/07 23:29:41 scottl Exp $ */
 
 #ifndef _I386_BUS_DMA_H_
 #define _I386_BUS_DMA_H_
diff --git a/sys/i386/include/bus_memio.h b/sys/i386/include/bus_memio.h
index 3533a671fe8d2..a4e6b2f3dc159 100644
--- a/sys/i386/include/bus_memio.h
+++ b/sys/i386/include/bus_memio.h
@@ -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/bus_memio.h,v 1.2 1999/08/28 00:44:08 peter Exp $
  */
 
 #ifndef _I386_BUS_MEMIO_H_
diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h
index 9b2976e8dcaa1..2b77abfe8ced3 100644
--- a/sys/i386/include/bus_pc98.h
+++ b/sys/i386/include/bus_pc98.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/bus_pc98.h,v 1.27 2004/05/04 06:38:13 nyan Exp $ */
 /*	$NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $	*/
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
 
diff --git a/sys/i386/include/bus_pio.h b/sys/i386/include/bus_pio.h
index 8742dd195e0be..a3c877580443f 100644
--- a/sys/i386/include/bus_pio.h
+++ b/sys/i386/include/bus_pio.h
@@ -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/bus_pio.h,v 1.2 1999/08/28 00:44:08 peter Exp $
  */
 
 #ifndef _I386_BUS_PIO_H_
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 1ee85620e6214..a60681c41f538 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.49 2003/11/12 18:13:57 jhb Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/i386/include/comstats.h b/sys/i386/include/comstats.h
index 0b8fc4e0de3f1..95b06dfb6ba4c 100644
--- a/sys/i386/include/comstats.h
+++ b/sys/i386/include/comstats.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/i386/include/comstats.h,v 1.5 1999/08/28 00:44:09 peter Exp $
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index fb1017f3d1ae2..1bda63ac96d29 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.73 2004/08/03 18:44:26 mux Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 01f5c56c7fa09..67e733d9c1268 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.142 2004/04/07 20:46:05 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index d7d4711c81eff..9d84410db3474 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.18 2004/06/03 21:14:52 phk Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/critical.h b/sys/i386/include/critical.h
index 9826988322d3f..5c83aa9c6aab7 100644
--- a/sys/i386/include/critical.h
+++ b/sys/i386/include/critical.h
@@ -33,7 +33,7 @@
  *	related support functions residing
  *	in <arch>/<arch>/critical.c	- prototyped
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/critical.h,v 1.8 2004/07/27 16:41:01 rwatson Exp $
  */
 
 #ifndef _MACHINE_CRITICAL_H_
diff --git a/sys/i386/include/cserial.h b/sys/i386/include/cserial.h
index 3f82f7bff23db..f72ae98ac8158 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.1 2003/12/03 07:29:38 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index 567f3ce07fbec..89ac2d7122809 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.18.2.1 2004/10/09 05:20:18 julian Exp $
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/elan_mmcr.h b/sys/i386/include/elan_mmcr.h
index 27f00bab9c2bf..7ac97e2e2559e 100644
--- a/sys/i386/include/elan_mmcr.h
+++ b/sys/i386/include/elan_mmcr.h
@@ -12,7 +12,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.1 2004/01/05 12:00:59 phk Exp $
  */
 
 #ifndef _MACHINE_ELAN_MMCR_H_
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
index c8506ff5c4067..1ac3922a8478b 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 6cc225c575263..42f7ea861a031 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.39 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 4a89552deea77..2bf246523eb5f 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.9 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index ea2df3cc57c28..bc17576666d37 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.14 2004/07/19 08:17:25 das Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index fd328a9d739b7..65cb4a3ee15af 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.13 2003/01/19 06:01:33 marcel Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 391b8749c7606..97fd02d9c9bfc 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 c67412a292ff3..f33fab6902a2c 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.1 2004/07/10 17:47:21 marcel Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/i386/include/i4b_cause.h b/sys/i386/include/i4b_cause.h
index c98683a9ff390..ff3226c3a7938 100644
--- a/sys/i386/include/i4b_cause.h
+++ b/sys/i386/include/i4b_cause.h
@@ -27,7 +27,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_cause.h,v 1.8 2002/03/17 09:33:12 hm 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 ac8f6a84d2958..745eab2897c45 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -27,7 +27,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_debug.h,v 1.11 2002/03/17 09:33:12 hm 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 9df6adb76ece3..11375a1cabee6 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_ioctl.h,v 1.21 2002/08/12 07:51:57 hm 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 dbaceedc8e324..51bab0525205b 100644
--- a/sys/i386/include/i4b_rbch_ioctl.h
+++ b/sys/i386/include/i4b_rbch_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_rbch_ioctl.h,v 1.5 2002/03/17 09:33:13 hm 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 2f0bb2bdacda8..6b0894914ec37 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_tel_ioctl.h,v 1.9 2002/03/17 09:33:13 hm 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 ee05bfd7deaae..2f431d288f835 100644
--- a/sys/i386/include/i4b_trace.h
+++ b/sys/i386/include/i4b_trace.h
@@ -27,7 +27,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_trace.h,v 1.8 2002/03/17 09:33:13 hm 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 48011f71aea17..a21ae6739e4b4 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.9 2004/03/12 21:45:30 trhodes Exp $
  */
 
 /*
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index ff0d486db305a..9a7957167f675 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.6 2002/06/02 20:05:49 schweikh 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 d954f5ef2b3a8..4830963e23a44 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.15 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/intr_machdep.h b/sys/i386/include/intr_machdep.h
index af9e6725287e9..12484bc2697e9 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.5 2004/08/02 15:31:10 scottl Exp $
  */
 
 #ifndef __MACHINE_INTR_MACHDEP_H__
diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h
index c87c4b9320a4f..d69d8deeeb2da 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.30 2004/03/12 21:45:30 trhodes Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_BT848_H_
diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h
index c9595ded5bb1e..d8bceecc628cf 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.15 2004/03/12 21:45:30 trhodes Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_METEOR_H_
diff --git a/sys/i386/include/iodev.h b/sys/i386/include/iodev.h
index 2273620ccba43..3927fba07e37f 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 28b537af9cd78..1be1862e2d19f 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.1 2004/07/10 18:40:11 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/i386/include/legacyvar.h b/sys/i386/include/legacyvar.h
index a3d28420b0f9f..4992da4354563 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.5 2004/05/03 14:49:43 jhb Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index b7810fd220831..169f134697e19 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.25 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index b8b38bb0f5610..c54e7cb202c90 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.69 2004/06/10 20:30:58 jhb Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/memdev.h b/sys/i386/include/memdev.h
index 4443e3605cbe9..402e595c82222 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 32497a46f8700..ccad5f3202737 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.1 2003/05/01 03:31:17 peter Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/i386/include/mp_watchdog.h b/sys/i386/include/mp_watchdog.h
index bcec051a942fd..cfc0cd22a7811 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 d56a418a5b5e8..389ea23d856e0 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.221 2003/11/14 22:23:30 peter Exp $
  */
 
 #ifndef __MACHINE_MPTABLE_H__
diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h
index 679de2eed30d5..e6b2572107b14 100644
--- a/sys/i386/include/mtpr.h
+++ b/sys/i386/include/mtpr.h
@@ -1,4 +1,4 @@
 /*
  *	Unused in 386BSD port
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mtpr.h,v 1.5 1999/08/28 00:44:19 peter Exp $
  */
diff --git a/sys/i386/include/mutex.h b/sys/i386/include/mutex.h
index 87d47e511ffc9..49ae886798a66 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 27e5dd71097b2..aad0bd04ba7e2 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.27 2004/04/07 20:46:05 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index a4064e3d9d4c2..bcad096f20d93 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.72.2.1 2004/09/10 00:04:17 scottl Exp $
  */
 
 /*
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index c7362a9640804..811e09bcf37aa 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 2004/06/10 20:43:04 jhb Exp $
  */
 
 #ifndef _MACHINE_PC_BIOS_H_
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index 36f91deb09797..64bf5f225ccdf 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.6 2001/12/14 15:27:15 nyan Exp $
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h
index 08c41b07e4b3c..6367f7a7570f6 100644
--- a/sys/i386/include/pc/msdos.h
+++ b/sys/i386/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/msdos.h,v 1.6 2002/10/02 03:29:00 bde Exp $
  */
 
 #define MSECTOR_SIZE	512		/* MSDOS sector size in bytes */
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index 0e991cd3be43f..31a8b8e5cde9d 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 969f910f7f81a..0b4e57bfc1e5a 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 3f3234081961e..c9537572c70cb 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.52 2004/07/10 19:55:59 marcel Exp $
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index cf5a9119416c5..b5a160e3d0a85 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 2002/03/20 05:48:58 alfred Exp $
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/i386/include/pci_cfgreg.h b/sys/i386/include/pci_cfgreg.h
index 4bbfe72cb0f86..22ee8fec0cd77 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.12 2004/05/04 21:17:52 jhb Exp $
  *
  */
 
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 6552ea9fa4496..49c971d82edeb 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.42 2004/03/12 21:45:30 trhodes Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
diff --git a/sys/i386/include/pcvt_ioctl.h b/sys/i386/include/pcvt_ioctl.h
index a1dcbf4345100..6eb4b54086d37 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.16 2003/12/10 02:49:16 obrien Exp $
  * 
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/include/pecoff_machdep.h b/sys/i386/include/pecoff_machdep.h
index b20cb711dc695..d1056a5637a2f 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 f012ee545d51b..014de4be2dabc 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.8 2002/03/20 05:48:58 alfred Exp $
  */
 
 /*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 7c54006f86a45..12f50663575b0 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.112.2.2 2004/10/10 19:08:00 alc Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/privatespace.h b/sys/i386/include/privatespace.h
index d5f2bcf3d5fc3..26b8d0da5977a 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 5b2c286c4e4ef..acfc4345891ae 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.23 2004/06/28 05:37:22 imp Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index 1c5ecf20261dc..72bbf1e92e69f 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.37 2004/05/20 16:12:19 bde Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 12d05c5cfdbcd..427102b88f2e5 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 adfc79c9ddd2f..5ba508ea707cc 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.12 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index 5060bb698f259..590554c167b98 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.30 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index 1883193233997..942c956e24605 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 28fcc98ea1beb..dbe076661e2db 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.3 1999/10/14 21:38:30 dfr Exp $ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/i386/include/runq.h b/sys/i386/include/runq.h
index 2a21bfa4ca29f..adb162ff164f9 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.2 2002/06/20 06:21:20 peter Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index 569c5c860c5d4..34a1836fe1dd4 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.37 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/setjmp.h b/sys/i386/include/setjmp.h
index e6e0371d5d1b8..c6d2f2c765da6 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 7d438f0286445..47e5686ebd325 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.3 2003/12/07 22:49:25 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h
index 98be731d8f102..5f658dcac3f42 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 cd3cf4be948c4..3d3c6eab9608f 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.21 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/smapi.h b/sys/i386/include/smapi.h
index 63b9927016b21..1d30c1683b78b 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 fe87fdfd0740d..640b595782bf3 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.78 2003/12/11 03:48:31 jeff Exp $
  *
  */
 
diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h
index c1ca6ff9ccf16..cff5dcdc2498e 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.46 2003/11/16 00:55:53 bde Exp $
  */
 
 #ifndef _MACHINE_SMPTESTS_H_
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 6b1f0211e5167..f14117d8c3212 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 4b91cf9332941..482b38b5ae976 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 ce59c7f4813ac..08252982f4829 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.19 2004/03/12 21:45:31 trhodes Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index 01c52a9e1e31d..f7818d26af671 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.20 2004/04/07 20:46:05 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index 2a1e12015a03f..9f982d6d8c22f 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 29907d4204981..8dc2910ff8012 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 ec3e0eefaea22..2e43dfff00660 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 4d05f875b8fae..abfad236f1227 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.13 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 041504abab18c..2b1d233031e62 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 a94408a5ec27f..8b3660ab17dfd 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 8f456ac44f6ac..a949a4805ae65 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.18 2004/08/02 15:31:10 scottl 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 52aaded17fa04..8e9ea69a76225 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 60ab86db507bb..1fa4dfa93d965 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.9 2002/03/20 07:39:47 alfred Exp $
  */
 /*
  * Common command control queue funcs.
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 1c82ffa903090..9eb49020eacd6 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.213 2004/07/11 17:50:59 marcel Exp $");
 
 /*
  * Routines to handle clock hardware.
diff --git a/sys/i386/isa/elcr.c b/sys/i386/isa/elcr.c
index 2cfcfa46d0b02..606e53324d89e 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.1 2004/05/04 20:07:45 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 50e3068eb09af..266c5b2add7d4 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.12 2003/06/02 16:32:54 obrien Exp $");
 
 /*
  * Common code for dealing with 3COM ethernet cards.
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 52eb10579ebbd..b034ed24451a2 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.8 2003/03/29 13:18:20 mdodd Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/ic/if_wl_i82586.h b/sys/i386/isa/ic/if_wl_i82586.h
index 663e5918d2eac..99ad62ac31c38 100644
--- a/sys/i386/isa/ic/if_wl_i82586.h
+++ b/sys/i386/isa/ic/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/i386/isa/ic/if_wl_i82586.h,v 1.2 2000/05/01 19:58:08 peter Exp $
  */
 /*
   Copyright 1988, 1989 by Olivetti Advanced Technology Center, Inc.,
diff --git a/sys/i386/isa/ic/mb86960.h b/sys/i386/isa/ic/mb86960.h
index 971ab6692660d..7a4afa916f110 100644
--- a/sys/i386/isa/ic/mb86960.h
+++ b/sys/i386/isa/ic/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/i386/isa/ic/mb86960.h,v 1.3 2000/05/01 19:58:08 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index b8820221dc1b5..a1be0f01102b5 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 677dd16172e97..088f53dfd76ac 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/if_el.c,v 1.64 2004/05/30 20:34:57 phk 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 535a130c90139..1097504c6f686 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -4,7 +4,7 @@
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_elreg.h,v 1.8 2000/12/15 20:09:10 wpaul Exp $
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index f09428f9458d7..6de5c69e60ac7 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.146 2004/07/03 20:11:49 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 a9d7abb7bc0ea..cac612a73787d 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.26 2004/07/05 18:39:30 imp Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/isa_dma.c b/sys/i386/isa/isa_dma.c
index 23dc07de09786..a19b0679dc1d5 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.16 2004/07/05 20:37:42 phk Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/i386/isa/isa_dma.h b/sys/i386/isa/isa_dma.h
index 6b997a72ed4b8..115e206014dcb 100644
--- a/sys/i386/isa/isa_dma.h
+++ b/sys/i386/isa/isa_dma.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/isa_dma.h,v 1.6 2004/04/07 20:46:06 imp Exp $
  */
 
 #ifndef _I386_ISA_ISA_DMA_H_
diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
index 70906f0073ec0..0f31eeae81d34 100644
--- a/sys/i386/isa/lptreg.h
+++ b/sys/i386/isa/lptreg.h
@@ -6,7 +6,7 @@
  * William Jolitz.
  *
  *      form: @(#)lptreg.h	1.1 (Berkeley) 12/19/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/lptreg.h,v 1.7 1999/08/28 00:44:57 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 31c85f89f1087..01224fd2b9bab 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -13,7 +13,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/mse.c,v 1.68 2004/06/16 09:47:08 phk Exp $");
 
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index db5550c63423a..1b56e767ffa3b 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 3d625baef4db1..70a91473c9b5f 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.152 2004/06/19 22:24:16 bde Exp $");
 
 #include "opt_cpu.h"
 #include "opt_debug_npx.h"
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 64c059e514162..02d2d32550363 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.22 2004/03/14 23:03:57 imp 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 9cdd5559ff032..41a308f7810d2 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.11 2000/03/31 08:28:18 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 16aa04ccf92ca..20f4a86441898 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.89 2004/07/15 20:47:40 phk Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_ext.c b/sys/i386/isa/pcvt/pcvt_ext.c
index 035c2af37a15e..26e96a45ca43b 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.34 2004/06/16 09:47:09 phk Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 079d7ddb724f2..249bea1f12cd0 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.53 2004/07/10 21:24:36 marcel Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index 51f0dd017581d..7989f9778e752 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.43 2004/07/10 21:24:36 marcel Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.h b/sys/i386/isa/pcvt/pcvt_kbd.h
index 932f85a337125..5e66515fecfa4 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.11 2000/03/26 09:17:12 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index 8c7793385add1..90e9eb4603adf 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.26 2003/02/19 05:47:23 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index 16d5f603c28cd..6251edf13d088 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.26 2004/06/16 09:47:09 phk Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_tbl.h b/sys/i386/isa/pcvt/pcvt_tbl.h
index 54c92352c5fa3..d952f578e8a26 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.8 2000/03/26 09:17:13 hm Exp $
  *
  *---------------------------------------------------------------------------*
  *
diff --git a/sys/i386/isa/pcvt/pcvt_vtf.c b/sys/i386/isa/pcvt/pcvt_vtf.c
index 2fd0ea180014d..bb16b10b04029 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.14 2004/06/04 20:04:51 phk Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pmtimer.c b/sys/i386/isa/pmtimer.c
index 1eeac6ddf46b2..3563bb68ab15b 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 57d234262b78f..14d7cb14062f2 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.20 2004/05/26 09:43:38 bde Exp $");
 
 #ifdef GUPROF
 #include "opt_i586_guprof.h"
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index 1ded09c429be1..3798905def91b 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/spic.c,v 1.15 2004/06/16 09:47:08 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/spicreg.h b/sys/i386/isa/spicreg.h
index 7657f3ea7729a..d9bba0a230d4a 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.3 2004/02/21 19:42:55 phk Exp $
  *
  */
 
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 2dc74e37682bf..06a096407b7cd 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.66 2004/06/16 09:47:08 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h
index 21eba904db61a..158e5aa5bb649 100644
--- a/sys/i386/isa/timerreg.h
+++ b/sys/i386/isa/timerreg.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/i386/isa/timerreg.h,v 1.7 2004/04/07 20:46:06 imp Exp $
  */
 
 /*
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index d51f68fce30c5..530ef8825632c 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.47 2004/07/15 08:26:05 phk Exp $");
 
 #include "opt_vga.h"
 #include "opt_vesa.h"
diff --git a/sys/i386/linux/Makefile b/sys/i386/linux/Makefile
index bd6b32a7d4a84..0b123724fc75b 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 093abfb840a6a..00b884f2b54b5 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.52 2004/06/24 02:24:39 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index fa0ab75610549..1f8f109d51229 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.63 2004/08/16 07:02:53 tjr Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 0ff2460d71f12..8ae754869bb7f 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 3a36432174b10..dd714850d7159 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 04ff5f45f91b7..ea27e72daaeb8 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 1c23b3a370e89..61b9dad2ed455 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 0e2786c7593ab..0c09e99bb6496 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.41.2.2 2004/09/09 09:45:26 julian 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 82dbc33c05527..1a7f921d2f085 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.59.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.56.2.1 2004/09/03 15:30:21 jhb Exp 
  */
 
diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c
index 6d61ce4428f2d..8886ec2d8f5b6 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.13.2.1 2004/10/09 17:10:48 das Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index b4c9c50026709..0342b9115339f 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.53.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.56.2.1 2004/09/03 15:30:21 jhb Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 5e02a333f062e..c16e0f3215a7f 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.60.2.1 2004/09/03 15:33:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.56.2.1 2004/09/03 15:30:21 jhb Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index bb7e3381396e9..c29a46050071d 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.132 2004/07/15 08:26:05 phk 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 74b687eb12012..752607432cc8e 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 dd5e5869afd00..bed9a3a3659dc 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.56.2.1 2004/09/03 15:30:21 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 378075a77507f..52ebd88bb8f14 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.112.2.2 2004/10/14 23:47:00 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index e22874c5c7d97..acbbcf540a3ee 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.111 2004/07/04 16:11:02 stefanf 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 9577c955a30a7..7314c533b40c7 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.114 2004/07/01 07:46:28 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 76e1cc7eb3a95..a96ee6337dc78 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 6274ad2012b34..1baa65d9f71e1 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 91ad9d3466732..ca02ce44051f0 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.34 2004/01/05 00:29:00 obrien 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 b3d1744263e99..86b0fcda6f2de 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.9 2002/03/20 07:47:59 alfred Exp $
  */
 
 #ifndef	_I386_SVR4_MACHDEP_H_
diff --git a/sys/i4b/capi/README b/sys/i4b/capi/README
index 91685258e1611..0ecebabccfcfd 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 185d2f7a5f8ef..4da0147355eaf 100644
--- a/sys/i4b/capi/capi.h
+++ b/sys/i4b/capi/capi.h
@@ -24,7 +24,7 @@
  *
  * capi/capi.h		The CAPI device interface.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/capi.h,v 1.1 2001/05/25 08:39:31 hm Exp $
  */
 
 #ifndef _I4B_CAPI_H_
diff --git a/sys/i4b/capi/capi_l4if.c b/sys/i4b/capi/capi_l4if.c
index ae7a64bb0c7af..e8bbfa40b8df8 100644
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.6 2003/06/10 23:09:37 obrien 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 ef761bb1acd6b..f35b82a1bac69 100644
--- a/sys/i4b/capi/capi_llif.c
+++ b/sys/i4b/capi/capi_llif.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.3 2003/06/10 23:09:37 obrien 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 8ffd8fbbeeeb0..c996483f4c52a 100644
--- a/sys/i4b/capi/capi_msgs.c
+++ b/sys/i4b/capi/capi_msgs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.4 2003/06/10 23:09:37 obrien 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 3cdce35991d62..2b71171c73d38 100644
--- a/sys/i4b/capi/capi_msgs.h
+++ b/sys/i4b/capi/capi_msgs.h
@@ -24,7 +24,7 @@
  *
  * capi/capi_msgs.h	The CAPI i4b message and handler declarations.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/capi_msgs.h,v 1.1 2001/05/25 08:39:31 hm Exp $
  */
 
 #ifndef _I4B_CAPI_MSGS_H_
diff --git a/sys/i4b/capi/iavc/iavc.h b/sys/i4b/capi/iavc/iavc.h
index 3292768b39705..c71b7f703c273 100644
--- a/sys/i4b/capi/iavc/iavc.h
+++ b/sys/i4b/capi/iavc/iavc.h
@@ -24,7 +24,7 @@
  *
  * capi/iavc/iavc.h	The AVM ISDN controllers' common declarations.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/iavc/iavc.h,v 1.2 2003/07/23 17:58:41 phk Exp $
  */
 
 #ifndef _CAPI_IAVC_H_
diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c
index cbc3d0a54dea4..0c4034cb40b23 100644
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.4 2003/06/10 23:10:44 obrien 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 3dbb8aaa8ab31..73d1a802410fe 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.8 2004/03/17 17:50:49 njl 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 030b6f0fdafa5..2c492cff1fb94 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.7 2003/07/23 17:58:41 phk 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 0183ea19de963..09feeee5fd61c 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.9 2004/03/17 17:50:49 njl 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 4ba3e0582eacd..7ec5efb737322 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.25 2004/06/16 09:47:10 phk 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 e1024e1847891..ab6bda6b241e8 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.22 2004/07/06 06:43:45 ru Exp $");
 
 #include "i4bing.h"
 
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index dcc107fbe697a..b1b4409f25baa 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -54,7 +54,7 @@
  *---------------------------------------------------------------------------*/ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.27.2.2 2004/10/14 11:48:05 rwatson Exp $");
 
 #include "i4bipr.h"
 
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 6caef7f4c884b..e3e539d92a65e 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.25.4.1 2004/10/14 11:48:05 rwatson Exp $");
 
 #include "i4bisppp.h"
 
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index f44dcaf7f03d2..d52fe2eb90db6 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.33 2004/06/16 09:47:10 phk Exp $");
 
 #include "i4brbch.h"
 
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index c4fc0e35b3cd1..aad670fbb16e8 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.34 2004/06/16 09:47:10 phk Exp $");
 
 #include "i4btel.h"
 
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index e165d960f452e..a53e0be13584b 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.30 2004/06/16 09:47:10 phk Exp $");
 
 #include "i4btrc.h"
 
diff --git a/sys/i4b/include/i4b_global.h b/sys/i4b/include/i4b_global.h
index bb77527f60790..6580898249523 100644
--- a/sys/i4b/include/i4b_global.h
+++ b/sys/i4b/include/i4b_global.h
@@ -27,7 +27,7 @@
  *	i4b_global.h - i4b global include file
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_global.h,v 1.12 2004/07/15 08:26:05 phk 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 94f1291195f03..8c50344764e4e 100644
--- a/sys/i4b/include/i4b_isdnq931.h
+++ b/sys/i4b/include/i4b_isdnq931.h
@@ -27,7 +27,7 @@
  *	i4b_isdnq931.h - DSS1 layer 3 message types
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_isdnq931.h,v 1.8 2002/03/17 09:33:14 hm 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 be45c0788160b..0e1ebf294a681 100644
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@@ -27,7 +27,7 @@
  *	i4b_l1l2.h - i4b layer 1 / layer 2 interactions
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l1l2.h,v 1.8 2002/03/17 09:33:14 hm 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 19a6990f3777a..6b8d451a5d55c 100644
--- a/sys/i4b/include/i4b_l2l3.h
+++ b/sys/i4b/include/i4b_l2l3.h
@@ -27,7 +27,7 @@
  *	i4b_l2l3.h - i4b layer 2 / layer 3 interactions
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l2l3.h,v 1.8 2002/03/17 09:33:14 hm 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 82ac0477f07e2..aa0f46e602659 100644
--- a/sys/i4b/include/i4b_l3l4.h
+++ b/sys/i4b/include/i4b_l3l4.h
@@ -27,7 +27,7 @@
  *	i4b_l3l4.h - layer 3 / layer 4 interface
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l3l4.h,v 1.13 2002/08/12 07:53:17 hm 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 0b74044e4aed8..a5dddf1703a00 100644
--- a/sys/i4b/include/i4b_mbuf.h
+++ b/sys/i4b/include/i4b_mbuf.h
@@ -27,7 +27,7 @@
  *	i4b - mbuf handling support routines
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_mbuf.h,v 1.8 2002/03/17 09:33:14 hm 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 1c968b18ca82f..7fd6616f80ca2 100644
--- a/sys/i4b/layer1/i4b_hdlc.c
+++ b/sys/i4b/layer1/i4b_hdlc.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_hdlc.c,v 1.2 2003/06/10 23:18:32 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/i4b/layer1/i4b_hdlc.h b/sys/i4b/layer1/i4b_hdlc.h
index 8365ddb005bd2..ad75de5948b14 100644
--- a/sys/i4b/layer1/i4b_hdlc.h
+++ b/sys/i4b/layer1/i4b_hdlc.h
@@ -29,7 +29,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.5 2002/09/11 12:44:58 phk 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 ab428949308bb..77308ca505aa5 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -27,7 +27,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_l1.h,v 1.13 2001/12/22 09:21:54 gj 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 b130593b580f8..7e772bbcef4f8 100644
--- a/sys/i4b/layer1/i4b_l1dmux.c
+++ b/sys/i4b/layer1/i4b_l1dmux.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.7 2003/06/10 23:18:32 obrien 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 52a7d7e083f3d..5432f107c2b91 100644
--- a/sys/i4b/layer1/i4b_l1lib.c
+++ b/sys/i4b/layer1/i4b_l1lib.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.4 2003/06/10 23:18:32 obrien 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 c2d4cdf6e79af..67ce0ecbf9a21 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
@@ -29,7 +29,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.1 2000/10/09 13:28:54 hm 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 33aef814ddfee..f81226bef1072 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.7 2003/06/10 23:21:00 obrien 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 f8cff9e6709cc..a8c2dfb774d9d 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.7 2003/06/10 23:21:00 obrien 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 42ebff6b6880c..6f89802661eef 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.7 2003/06/10 23:21:00 obrien 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 202707db0b1f1..d01382bafd1fa 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.16 2004/03/17 17:50:49 njl 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 86569242fd821..1ac796aa98c62 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
@@ -29,7 +29,7 @@
  *
  *	$Id$
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h,v 1.1 2001/12/22 09:22:02 gj Exp $
  *
  *
  *---------------------------------------------------------------------------*/
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
index 6006cb9a8e65d..04e5f836ac61e 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.4 2003/06/10 23:23:33 obrien 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 3747674d81e50..0ee6f228f2984 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h,v 1.1 2001/12/22 09:22:02 gj Exp $
  *
  *
  *---------------------------------------------------------------------------*/
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
index eda4d5eb8ebd4..18f219a7baa24 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c,v 1.5 2003/06/10 23:23:33 obrien 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 102a36b0cd561..cc9f8f2d00ca2 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c,v 1.4 2003/06/10 23:23:33 obrien 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 89a7c1413a69f..e9d4f8a50e4a7 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -37,7 +37,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.16 2004/07/18 20:13:31 gj 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 e267957ff6fb1..fce6bf5ba5cb0 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -37,7 +37,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.11 2004/03/17 17:50:50 njl 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 3b51860ce9c97..632f2eeb9ece2 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
@@ -30,7 +30,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.1 2000/10/09 13:28:54 hm 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 a7ff73e826fd3..fff4df5a498f9 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.6 2003/06/10 23:37:09 obrien 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 8213c8602c6fd..03c807a5ab4ff 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c,v 1.6 2003/06/10 23:37:09 obrien 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 2584595823143..083d15d0df1d1 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c,v 1.6 2003/06/10 23:37:09 obrien 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 1036636629f9f..19038f10339b1 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc.h
@@ -31,7 +31,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.1 2000/10/09 13:28:55 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 53de9632abb35..6b4023e26d14b 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.15 2003/06/10 23:39:45 obrien 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 d0456ad565e80..470c8cdfbc3fb 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
@@ -31,7 +31,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.1 2000/10/09 13:28:55 hm 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 0d1ee449a678d..c93412ceb08a3 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
@@ -31,7 +31,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.1 2000/10/09 13:28:55 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index d23eebc5d8f3d..6fb746aec14dc 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -37,7 +37,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.12 2003/06/10 23:39:45 obrien 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 db6a6d8b42f91..3270e605d4c4a 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
@@ -35,7 +35,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.9 2004/03/17 17:50:50 njl 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 0dff30d637b4d..3956b7a2ec49f 100644
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@@ -45,7 +45,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.7 2003/06/10 23:45:23 obrien 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 d786c1c6b252a..25be7f90a2e86 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_avm_a1.c,v 1.8 2004/03/17 17:50:50 njl Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index 62319142afb26..a6d99a6f24a7b 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_bchan.c,v 1.12 2003/06/10 23:45:23 obrien 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 b256d78476f46..3a5c65b18c377 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.10 2004/03/17 17:50:50 njl Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_diva.c b/sys/i4b/layer1/isic/i4b_diva.c
index f2b34c86bb01e..e510761199a64 100644
--- a/sys/i4b/layer1/isic/i4b_diva.c
+++ b/sys/i4b/layer1/isic/i4b_diva.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_diva.c,v 1.3 2003/06/10 23:45:23 obrien 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 51a017002dc5c..387b1f3947aa4 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_drn_ngo.c,v 1.8 2004/03/17 17:50:50 njl Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c
index 572af573cbb98..74c793a779999 100644
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@@ -37,7 +37,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_dynalink.c,v 1.7 2003/06/10 23:45:23 obrien Exp $");
 
 /*	NOTES:
 	
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index 81b09bfc1a344..28b41c7071405 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.9 2004/03/17 17:50:50 njl 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 fffcd801651b3..a11786a3688ac 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.7 2003/06/10 23:45:23 obrien 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 25b63c485454e..43773d8cd1e84 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.13 2004/05/30 20:27:16 phk Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index 1ad81f489c473..761d58871f085 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.c,v 1.10 2003/06/10 23:45:23 obrien 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 d65d2fcfe82c8..8b97b21620d8a 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.h
+++ b/sys/i4b/layer1/isic/i4b_hscx.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.h,v 1.2 2001/01/24 08:41:52 hm 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 8892288957cad..13d1608970102 100644
--- a/sys/i4b/layer1/isic/i4b_ipac.h
+++ b/sys/i4b/layer1/isic/i4b_ipac.h
@@ -27,7 +27,7 @@
  *	i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
  *	==========================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_ipac.h,v 1.2 2001/01/24 08:41:52 hm 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 0d56b2581c1d3..69649fe561539 100644
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.c,v 1.7 2003/06/10 23:45:23 obrien Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isac.h b/sys/i4b/layer1/isic/i4b_isac.h
index 42c6a5c296be7..7eb0958228c9d 100644
--- a/sys/i4b/layer1/isic/i4b_isac.h
+++ b/sys/i4b/layer1/isic/i4b_isac.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.h,v 1.2 2001/01/24 08:41:52 hm 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 173d1beb312aa..1b4fbd2515d3c 100644
--- a/sys/i4b/layer1/isic/i4b_isic.c
+++ b/sys/i4b/layer1/isic/i4b_isic.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.c,v 1.6 2003/06/10 23:45:23 obrien Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isic.h b/sys/i4b/layer1/isic/i4b_isic.h
index feb06afe64636..d015c032cbe6e 100644
--- a/sys/i4b/layer1/isic/i4b_isic.h
+++ b/sys/i4b/layer1/isic/i4b_isic.h
@@ -27,7 +27,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.h,v 1.3 2001/01/26 13:16:11 hm 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 ba5ae4cc7594b..1f9825893dd6e 100644
--- a/sys/i4b/layer1/isic/i4b_isic_ext.h
+++ b/sys/i4b/layer1/isic/i4b_isic_ext.h
@@ -27,7 +27,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_ext.h,v 1.2 2001/01/24 08:41:52 hm 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 a4f4b1df757c1..3068b90fd0a85 100644
--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_isa.c,v 1.8 2004/05/30 20:27:16 phk 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 acbbc26f87f26..b1abcf3830e27 100644
--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@@ -41,7 +41,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_pnp.c,v 1.11 2004/05/30 20:27:16 phk 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 c1abe7045cb8d..584e952475a06 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -58,7 +58,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_itk_ix1.c,v 1.9 2004/03/17 17:50:50 njl Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c
index 0af0ee0b2ca88..963e48df7facc 100644
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_l1.c,v 1.7 2003/06/10 23:45:23 obrien 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 463a9ab47926e..a3195ca53dca3 100644
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_l1fsm.c,v 1.7 2003/06/10 23:45:23 obrien 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 b562d50938806..5eca85dcbc6f6 100644
--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.7 2003/06/10 23:45:23 obrien Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c
index ba500e43b03d9..9fd8c79053dfa 100644
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@@ -48,7 +48,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_sws.c,v 1.7 2003/06/10 23:45:23 obrien 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 cbce4c1f0b631..f83e34e16dbf1 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s016.c,v 1.9 2004/03/17 17:50:50 njl 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 7eca0955a5415..03e8578d83eaf 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s0163.c,v 1.8 2004/03/17 17:50:50 njl 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 13fa732169c84..0de4aff96d09b 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s08.c,v 1.9 2004/03/17 17:50:50 njl 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 c860970d50ab1..a994f7595f004 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_usr_sti.c,v 1.8 2004/03/17 17:50:50 njl Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/itjc/i4b_hdlc.h b/sys/i4b/layer1/itjc/i4b_hdlc.h
index 2508e69f2aa5f..9c6fb27a3844b 100644
--- a/sys/i4b/layer1/itjc/i4b_hdlc.h
+++ b/sys/i4b/layer1/itjc/i4b_hdlc.h
@@ -29,7 +29,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.2 2002/09/11 12:44:58 phk 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 72631e510d96a..b33ee70e80b7c 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_ext.h
+++ b/sys/i4b/layer1/itjc/i4b_itjc_ext.h
@@ -27,7 +27,7 @@
  *      i4b_itjc - NetJet PCI for split layers
  *      ------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_ext.h,v 1.1 2001/01/11 14:35:45 hm 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 030da46100a53..3f907d542631e 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.4 2003/06/10 23:47:01 obrien 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 c79bf5ff226d9..20142b8caa3dd 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1.c,v 1.4 2003/06/10 23:47:01 obrien 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 72a060a9147af..b627711a84707 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c,v 1.4 2003/06/10 23:47:01 obrien 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 7233dacf600be..d73a755e66f7c 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -37,7 +37,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.13 2004/03/17 17:50:50 njl Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic.h b/sys/i4b/layer1/iwic/i4b_iwic.h
index 183bee361ac22..7717c8d909ee9 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic.h
+++ b/sys/i4b/layer1/iwic/i4b_iwic.h
@@ -27,7 +27,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic.h,v 1.2 2001/01/21 10:12:50 hm 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 78a5e37498da9..429ab7cddac4f 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.13 2003/06/10 23:48:55 obrien 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 9fb35728e8ab1..6ab5dd9897392 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_dchan.c,v 1.7 2003/06/10 23:48:55 obrien 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 210731ec84a5b..540a2d8caabc8 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_ext.h
+++ b/sys/i4b/layer1/iwic/i4b_iwic_ext.h
@@ -27,7 +27,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_ext.h,v 1.2 2001/01/21 10:12:50 hm 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 b901fd3888994..cf2cdb149af4d 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.7 2003/06/10 23:48:55 obrien 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 5257fcf47408a..e0137e41957be 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_l1if.c,v 1.8 2003/06/10 23:48:55 obrien 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 d9d2bcdd079da..1f530ebf4e6c2 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.12 2004/03/17 17:50:51 njl Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_w6692.h b/sys/i4b/layer1/iwic/i4b_w6692.h
index ec3112fac61e7..9b305bbe12bda 100644
--- a/sys/i4b/layer1/iwic/i4b_w6692.h
+++ b/sys/i4b/layer1/iwic/i4b_w6692.h
@@ -27,7 +27,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_w6692.h,v 1.2 2001/01/21 10:12:50 hm 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 8f16ab8d290db..5b12ad59072af 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_iframe.c,v 1.13 2003/06/10 23:55:01 obrien 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 41ae5089604cb..1fb86eacf0142 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2.c,v 1.19 2003/06/10 23:55:01 obrien 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 15c6ef8ee91ef..94392235e1231 100644
--- a/sys/i4b/layer2/i4b_l2.h
+++ b/sys/i4b/layer2/i4b_l2.h
@@ -27,7 +27,7 @@
  *	i4b_l2.h - ISDN layer 2 (Q.921) definitions
  *	---------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2.h,v 1.8 2002/03/17 09:33:14 hm 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 19f6cdc6c4dfc..e41d66d55d23c 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.c,v 1.16 2003/06/10 23:55:01 obrien 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 05895601a6936..8701fb363c208 100644
--- a/sys/i4b/layer2/i4b_l2fsm.h
+++ b/sys/i4b/layer2/i4b_l2fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l2fsm.h - layer 2 FSM
  *      -------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.h,v 1.8 2002/03/17 09:33:14 hm 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 91cc0cbbcf129..5f79337b477fc 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2timer.c,v 1.13 2003/06/10 23:55:01 obrien 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 052665d59c79a..13edb3e5c3703 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_lme.c,v 1.14 2003/06/10 23:55:01 obrien 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 8ebb912ae9ca6..59a6b4f00a690 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_mbuf.c,v 1.16 2003/06/10 23:55:01 obrien 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 6b7d30f3b0b3c..911d1b70812e3 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_sframe.c,v 1.14 2003/06/10 23:55:01 obrien 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 9984d0186b693..06d59ede9f34a 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_tei.c,v 1.15 2003/06/10 23:55:01 obrien 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 c86a8a2f699b1..48850ad875838 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_uframe.c,v 1.14 2003/06/10 23:55:01 obrien 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 54ce00df76727..5d187c10fe0c3 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_util.c,v 1.15 2003/06/10 23:55:01 obrien 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 17d9dfb6d7749..2fe141162cffa 100644
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.15 2003/06/10 23:59:33 obrien 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 56caf0e76ea13..703367c20242d 100644
--- a/sys/i4b/layer3/i4b_l3.h
+++ b/sys/i4b/layer3/i4b_l3.h
@@ -29,7 +29,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.7 2000/10/09 13:18:16 hm 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 04d8541473a9c..5aab979b621f9 100644
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.c,v 1.17 2003/06/10 23:59:33 obrien 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 fbb7c37e4fa7f..59e7668629940 100644
--- a/sys/i4b/layer3/i4b_l3fsm.h
+++ b/sys/i4b/layer3/i4b_l3fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l3fsm.c - layer 3 FSM
  *      -------------------------
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.h,v 1.8 2002/03/17 09:33:15 hm 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 f2f1b1c2dd36f..3b447bc482f64 100644
--- a/sys/i4b/layer3/i4b_l3timer.c
+++ b/sys/i4b/layer3/i4b_l3timer.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l3timer.c,v 1.12 2003/06/10 23:59:34 obrien 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 4be2d913609ff..fe43191941304 100644
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l4if.c,v 1.14 2003/06/10 23:59:34 obrien 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 338555a5129df..5a2048bf2c23a 100644
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.17 2003/06/10 23:59:34 obrien 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 ed5898f5c92ba..16424356fc1a9 100644
--- a/sys/i4b/layer3/i4b_q931.h
+++ b/sys/i4b/layer3/i4b_q931.h
@@ -27,7 +27,7 @@
  *	i4b_q931.h - Q931 handling header file
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q931.h,v 1.10 2003/01/01 18:48:53 schweikh 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 98a361d709026..ae0efe51ee977 100644
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_q932fac.c,v 1.13 2003/06/10 23:59:34 obrien 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 c424fa116c5c1..dba85ef609be9 100644
--- a/sys/i4b/layer3/i4b_q932fac.h
+++ b/sys/i4b/layer3/i4b_q932fac.h
@@ -27,7 +27,7 @@
  *	i4b_q932fac.h - Q932 facility handling header file
  *	--------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q932fac.h,v 1.8 2002/03/17 09:33:15 hm 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 671cba40bd27d..3b1a79c07998d 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.41 2004/06/16 09:47:10 phk Exp $");
 
 #include "i4bipr.h"
 #include "i4btel.h"
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 0b744f05f0c50..24bd3b787d814 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4.c,v 1.17 2003/06/11 00:01:05 obrien Exp $");
 
 #include "i4bipr.h"
 
diff --git a/sys/i4b/layer4/i4b_l4.h b/sys/i4b/layer4/i4b_l4.h
index 46f9aab4bd662..b61a8fb2f87be 100644
--- a/sys/i4b/layer4/i4b_l4.h
+++ b/sys/i4b/layer4/i4b_l4.h
@@ -27,7 +27,7 @@
  *	i4b_l4.h - kernel interface to userland header file
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer4/i4b_l4.h,v 1.8 2001/10/18 11:53:49 hm 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 4715c218fc4bd..421dfacf4c092 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.16 2003/06/11 00:01:05 obrien 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 72d35725dbef0..39cb6ab713ea5 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.12 2003/06/11 00:01:05 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
index a6a62f63d814e..1bc66769f5e0a 100644
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ b/sys/ia64/acpica/OsdEnvironment.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/acpica/OsdEnvironment.c,v 1.7 2004/05/06 02:18:58 njl Exp $
  */
 
 /*
diff --git a/sys/ia64/acpica/acpi_machdep.c b/sys/ia64/acpica/acpi_machdep.c
index 238975048d9a6..20e1c70aa7f11 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.4 2004/06/30 04:42:29 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/acpica/acpi_wakeup.c b/sys/ia64/acpica/acpi_wakeup.c
index 1382acc93fe0f..4bb93e76762e2 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 ad1205e0f6eb7..1f5742fbdfaf9 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 232298edb15fe..0000000000000
--- a/sys/ia64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 728047e68f5d8..d4f9e6c70139b 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.66.2.3 2004/09/22 19:23:38 andre Exp $
 
 machine		ia64
 cpu		ITANIUM
diff --git a/sys/ia64/conf/GENERIC.hints b/sys/ia64/conf/GENERIC.hints
index 7361c6e434a52..31630156c9bb3 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.7 2004/03/20 04:23:03 marcel Exp $
 hw.uart.console="io:0x3f8,br:115200"
diff --git a/sys/ia64/conf/Makefile b/sys/ia64/conf/Makefile
index 2c006e9c2c80d..be768e7ffbc9c 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 4ab54ae9d6d36..0617752d68982 100644
--- a/sys/ia64/conf/NOTES
+++ b/sys/ia64/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/NOTES,v 1.5.2.1 2004/09/08 17:41:31 marcel 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 53bc6816437da..41ccad7ea1a76 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.19.2.2 2004/09/22 19:23:38 andre Exp $
 
 machine 	ia64
 cpu		ITANIUM
diff --git a/sys/ia64/disasm/disasm.h b/sys/ia64/disasm/disasm.h
index bdd4bf6e98b41..c4c4308dac8bf 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.2 2003/10/24 02:05:53 marcel Exp $
  */
 
 #ifndef _DISASM_H_
diff --git a/sys/ia64/disasm/disasm_decode.c b/sys/ia64/disasm/disasm_decode.c
index 03402b768fec0..5f1e4f7f79f4a 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.2 2004/08/16 18:41:24 arun 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 ae173fc5fc933..450aa996232fa 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.1 2003/10/23 06:01:52 marcel 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 3c7fe27fbc038..263a7dbf47af4 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.1 2003/10/23 06:01:52 marcel 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 37e5371a5c574..64a958ccdf702 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.1 2003/10/23 06:01:52 marcel Exp $
  */
 
 #ifndef _DISASM_INT_H_
diff --git a/sys/ia64/ia32/ia32_signal.c b/sys/ia64/ia32/ia32_signal.c
index 913cd15accada..db44f11f68b2a 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 7934df1dde01e..0a744a13d5cb1 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/ia64/autoconf.c b/sys/ia64/ia64/autoconf.c
index 0772acca82c35..0317bf8fff36f 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.20 2004/07/28 21:54:56 phk Exp $
  */
 
 #include "opt_bootp.h"
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index 2c190853fc1b1..418c2d76b02ee 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.32.2.2 2004/09/09 23:45:10 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 5b1389814142e..32155e70499f8 100644
--- a/sys/ia64/ia64/clock.c
+++ b/sys/ia64/ia64/clock.c
@@ -38,7 +38,7 @@
 /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.23 2004/04/07 20:46:07 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/ia64/clock_if.m b/sys/ia64/ia64/clock_if.m
index 6df166199b5f9..655ded12f88b6 100644
--- a/sys/ia64/ia64/clock_if.m
+++ b/sys/ia64/ia64/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/ia64/ia64/clock_if.m,v 1.2 2001/10/04 15:27:35 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/ia64/ia64/context.S b/sys/ia64/ia64/context.S
index c2f9ef8a83a3d..02cc531f7c0e9 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.3 2003/07/02 12:57:07 ru Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/critical.c b/sys/ia64/ia64/critical.c
index af64b6e2effa0..80de2bf18dc59 100644
--- a/sys/ia64/ia64/critical.c
+++ b/sys/ia64/ia64/critical.c
@@ -24,7 +24,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/ia64/ia64/critical.c,v 1.5 2003/08/12 23:24:04 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/db_interface.c b/sys/ia64/ia64/db_interface.c
index 7d1bdc79dcadd..5431221fe7b2f 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.25 2004/07/10 23:47:19 marcel Exp $");
 
 /*
  * Interface to DDB.
diff --git a/sys/ia64/ia64/db_trace.c b/sys/ia64/ia64/db_trace.c
index 7f9c53cd96140..0e4c010718bcf 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.20 2004/07/21 05:07:09 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/dump_machdep.c b/sys/ia64/ia64/dump_machdep.c
index d8800ea0f5edf..4fac0d39a0b45 100644
--- a/sys/ia64/ia64/dump_machdep.c
+++ b/sys/ia64/ia64/dump_machdep.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/dump_machdep.c,v 1.10 2003/12/24 19:55:07 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/efi.c b/sys/ia64/ia64/efi.c
index a9a8fd28a6dfc..b340cac07b8b4 100644
--- a/sys/ia64/ia64/efi.c
+++ b/sys/ia64/ia64/efi.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/efi.c,v 1.4 2003/02/01 22:50:09 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/eficlock.c b/sys/ia64/ia64/eficlock.c
index a7fc591b8ec5f..111d42f2ac550 100644
--- a/sys/ia64/ia64/eficlock.c
+++ b/sys/ia64/ia64/eficlock.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/eficlock.c,v 1.2 2001/11/12 09:29:05 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/elf_machdep.c b/sys/ia64/ia64/elf_machdep.c
index 8588815fefb01..24dd248d62bb5 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 2004/08/11 02:35:05 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/exception.S b/sys/ia64/ia64/exception.S
index bc51603b1020c..f01ab57235c50 100644
--- a/sys/ia64/ia64/exception.S
+++ b/sys/ia64/ia64/exception.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/ia64/ia64/exception.S,v 1.53 2003/10/28 19:38:25 marcel Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/gdb_machdep.c b/sys/ia64/ia64/gdb_machdep.c
index 62b475577832b..eb4a0cdff9329 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.2 2004/08/07 21:40:52 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
index 790058b01a70e..19771017295bb 100644
--- a/sys/ia64/ia64/genassym.c
+++ b/sys/ia64/ia64/genassym.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.39 2004/04/07 20:46:07 imp Exp $
  */
 
 #include "opt_kstack_pages.h"
diff --git a/sys/ia64/ia64/in_cksum.c b/sys/ia64/ia64/in_cksum.c
index d58f8682f2c42..86036728718af 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.3 2001/10/05 18:58:22 dfr 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 65812c9f5bd0d..96e2ff75466fb 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.46 2004/07/02 20:21:42 jhb 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 ef2ad9c226a87..ed3c5444a4303 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.35 2004/08/07 21:55:15 marcel Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index 29f8f1b018b8c..17185dfe185fd 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.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/machdep.c,v 1.185.2.1 2004/09/09 10:03:19 julian Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
index ff66b7a45470e..86bebd8e0ea26 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.8 2003/02/19 05:47:24 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c
index 6c5cbe7a9a790..fa61685783e47 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 b7efc76c238ee..d555cd09546ef 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/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/ia64/ia64/mp_machdep.c,v 1.53 2004/02/22 02:10:48 marcel Exp $
  */
 
 #include "opt_kstack_pages.h"
diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c
index 4522314d80956..0f4088c55560c 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.7.2.1 2004/08/31 05:26:37 njl Exp $
  */
 
 /*
diff --git a/sys/ia64/ia64/pal.S b/sys/ia64/ia64/pal.S
index eca57accf4046..df223ca34f19f 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 8525dcb7f5616..cd75a335fde10 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.146 2004/08/09 20:44:41 marcel 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 5e64cc5d992d9..cdddb0e88ffb4 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.3 2003/10/28 19:38:26 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/sal.c b/sys/ia64/ia64/sal.c
index 220910c5480b0..6b2996336cbfd 100644
--- a/sys/ia64/ia64/sal.c
+++ b/sys/ia64/ia64/sal.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/sal.c,v 1.13 2004/07/25 07:07:09 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/sapic.c b/sys/ia64/ia64/sapic.c
index 0001f8c9f5c06..17a4bd47e320b 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 dd927bfa252f9..77a61d4e44f5c 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.2 2003/07/02 12:57:07 ru Exp $
 //
 // Copyright (c) 1999, 2000
 // Intel Corporation.
diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c
index a475fb519f5db..adbba5f9fb800 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.23 2004/07/15 20:47:40 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 726fec4140c23..1ed98ed72a37d 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.30 2004/06/16 09:47:11 phk Exp $
  *
  */
 
diff --git a/sys/ia64/ia64/support.S b/sys/ia64/ia64/support.S
index da70dd409b85b..3477a88753a97 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.21 2003/10/23 06:19:06 marcel 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 d4dcc1fd536a1..d6d280525de6f 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 0c0ef5ef549da..fe206ab3b33fd 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.12 2004/08/07 21:55:15 marcel Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 02a5b3d629c5a..d46b1ec176886 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.103.2.2 2004/09/19 21:04:28 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 b6c530cd0857e..8212b3982b0c3 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.4 2004/06/03 10:22:46 tjr 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 36f1054f1f45a..294546a4078cb 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.1 2003/09/20 19:27:48 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/ia64/ia64/unaligned.c b/sys/ia64/ia64/unaligned.c
index 2124e99cc2964..63aad2d864709 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.9 2004/08/16 22:09:58 arun Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/unwind.c b/sys/ia64/ia64/unwind.c
index 4ee31b200782c..0dd7aa54fdead 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.12 2004/08/14 05:00:37 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 354dcf11182b0..e6402af9ba693 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.84 2004/05/26 12:09:37 tmm Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/ia64/include/_inttypes.h b/sys/ia64/include/_inttypes.h
index e6b2536ff379b..f4069c5eee848 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 c38b194616a9a..4e289004e66d7 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.12 2004/04/07 20:46:07 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 4b752a343d6c2..2a609fb515109 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.4 2003/07/25 08:02:24 marcel Exp $
  */
 
 #ifndef _MACHINE_REGSET_H_
diff --git a/sys/ia64/include/_stdint.h b/sys/ia64/include/_stdint.h
index 1aed3e3b4efc1..f44eb8ba4667e 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 5809f630d8891..611ba465ba06d 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.8 2004/03/20 20:41:40 marcel Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/ia64/include/acpica_machdep.h b/sys/ia64/include/acpica_machdep.h
index 315476b0a8597..7adf4663499e9 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.3 2004/05/05 20:04:14 njl Exp $
  */
 
 /******************************************************************************
diff --git a/sys/ia64/include/asm.h b/sys/ia64/include/asm.h
index 8be7b8a3085af..7359c17daa447 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.10 2003/05/16 21:26:41 marcel 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 f919ae60d65b7..1908ae2684c54 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.6 2002/05/19 20:19:07 marcel Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/ia64/include/bootinfo.h b/sys/ia64/include/bootinfo.h
index 2ded69920d3df..f460b8d8da258 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.6 2002/12/08 20:32:56 marcel 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 e8e75745329d7..2babf7f4e4281 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.16 2003/11/07 23:29:42 scottl Exp $ */
 
 #ifndef _MACHINE_BUS_H_
 #define _MACHINE_BUS_H_
diff --git a/sys/ia64/include/bus_memio.h b/sys/ia64/include/bus_memio.h
index a3b5e9e8d4753..bd5f8735fe706 100644
--- a/sys/ia64/include/bus_memio.h
+++ b/sys/ia64/include/bus_memio.h
@@ -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_memio.h,v 1.1 2000/09/29 13:46:05 dfr Exp $
  */
 
 #ifndef _MACHINE_BUS_MEMIO_H_
diff --git a/sys/ia64/include/bus_pio.h b/sys/ia64/include/bus_pio.h
index 00f6e3db16bcc..f7922850eee33 100644
--- a/sys/ia64/include/bus_pio.h
+++ b/sys/ia64/include/bus_pio.h
@@ -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_pio.h,v 1.1 2000/09/29 13:46:05 dfr Exp $
  */
 
 #ifndef _MACHINE_BUS_PIO_H_
diff --git a/sys/ia64/include/clock.h b/sys/ia64/include/clock.h
index ef76769eda3cc..a4352c8126211 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.9 2003/08/04 05:13:18 marcel Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/ia64/include/clockvar.h b/sys/ia64/include/clockvar.h
index c4f5f6b899fcd..4b48443462f1b 100644
--- a/sys/ia64/include/clockvar.h
+++ b/sys/ia64/include/clockvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/clockvar.h,v 1.2 2001/10/04 15:28:27 dfr Exp $ */
 /* $NetBSD: clockvar.h,v 1.4 1997/06/22 08:02:18 jonathan Exp $ */
 
 /*
diff --git a/sys/ia64/include/cpu.h b/sys/ia64/include/cpu.h
index c7a4603881f93..b2e157a742f2b 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.44 2004/08/03 18:44:26 mux 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 29563fe8b83e9..993b4fe4127a5 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.21 2004/07/30 07:56:53 marcel Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/ia64/include/critical.h b/sys/ia64/include/critical.h
index 08c7d61f9f1f9..e0aa1ae886baa 100644
--- a/sys/ia64/include/critical.h
+++ b/sys/ia64/include/critical.h
@@ -33,7 +33,7 @@
  *	related support functions residing
  *	in <arch>/<arch>/critical.c	- prototyped
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/critical.h,v 1.5 2004/07/27 16:41:01 rwatson Exp $
  */
 
 #ifndef _MACHINE_CRITICAL_H_
diff --git a/sys/ia64/include/db_machdep.h b/sys/ia64/include/db_machdep.h
index 25288cd331e27..ad042f604dafb 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.10 2004/07/10 23:47:19 marcel Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/ia64/include/dig64.h b/sys/ia64/include/dig64.h
index 3749d2bd8ddb7..4fa3d70ba8342 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.1 2002/12/18 18:52:20 marcel Exp $
  */
 
 #ifndef _MACHINE_DIG64_H_
diff --git a/sys/ia64/include/efi.h b/sys/ia64/include/efi.h
index 1ac7154229990..b85ef5acd904e 100644
--- a/sys/ia64/include/efi.h
+++ b/sys/ia64/include/efi.h
@@ -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/efi.h,v 1.5 2001/11/19 07:25:42 peter Exp $
  */
 
 #ifndef _MACHINE_EFI_H_
diff --git a/sys/ia64/include/elf.h b/sys/ia64/include/elf.h
index 6babea9c6ca58..6bc4aa7355670 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 2293dde7cd07a..ad7027c7a73b9 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.13 2004/04/07 20:46:07 imp Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/ia64/include/exec.h b/sys/ia64/include/exec.h
index 52baf9e4ab9fd..519f81f195efa 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.1 2000/09/29 13:46:05 dfr Exp $
  */
 
 #define __LDPGSZ	4096
diff --git a/sys/ia64/include/float.h b/sys/ia64/include/float.h
index 21f160801fc8a..246dbfa89ccba 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.7 2004/07/19 08:17:25 das 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 e2faa5efd1a4b..18fef5ecbd48a 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.1 2000/09/29 13:46:05 dfr Exp $
  */
 
 #include <machine/ieeefp.h>
diff --git a/sys/ia64/include/fpu.h b/sys/ia64/include/fpu.h
index f9d426cc86bd1..be0068aa571a7 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.1 2000/09/29 13:46:05 dfr Exp $
  */
 
 #ifndef _MACHINE_FPU_H_
diff --git a/sys/ia64/include/frame.h b/sys/ia64/include/frame.h
index 262a8bfd6457b..f31bc24100481 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 1b957fb8560db..08f6d023aa613 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.2 2004/08/07 21:40:52 marcel Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/ia64/include/ia64_cpu.h b/sys/ia64/include/ia64_cpu.h
index 3e9f767728e43..b5f47ea1e2532 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 2003/08/15 05:46:33 marcel Exp $
  */
 
 #ifndef _MACHINE_IA64_CPU_H_
diff --git a/sys/ia64/include/ieee.h b/sys/ia64/include/ieee.h
index 53d5cff6ea0bf..72c1b4d25386f 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.2 2004/04/07 20:46:07 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 a97926bdcfd63..ff7575922dee5 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 a899ef0d84880..d3c5f704a913b 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.2 2004/04/07 20:46:07 imp Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/ia64/include/intr.h b/sys/ia64/include/intr.h
index 90e0974b7df20..dc6c03b726a8d 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 b9da9f5167b3b..c81c82bf7d9a3 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.5 2003/01/05 22:00:19 marcel 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 0e9e58197e116..c2ded724bdb4a 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.1 2004/07/10 18:40:11 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/ia64/include/limits.h b/sys/ia64/include/limits.h
index be9c49b1e7b30..533aaff96878f 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.11 2004/04/07 20:46:07 imp 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 97c5611c393a2..01b2b332fcf25 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.5 2002/05/29 05:19:07 marcel Exp $
  */
 
 #ifndef _MACHINE_MCA_H_
diff --git a/sys/ia64/include/md_var.h b/sys/ia64/include/md_var.h
index d1a206e25767d..12d5b92eaed5e 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.18 2004/08/11 02:35:05 marcel Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/ia64/include/memdev.h b/sys/ia64/include/memdev.h
index 32cc1fc1f4222..6c293f847d252 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 96d8f3d48a826..83ec78609cc67 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 be38f33a0753f..a942bfe5cabf1 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 6cb865d60ed72..7d792ac2bd9dd 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 c48ad11bb3f33..320902d53c898 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.18 2004/04/07 20:46:07 imp 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 fad568c0cb815..b622d88c18852 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 5d250bfeefdc2..60bd6c5508d7e 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 46d837b1f36e2..668a02fe9713c 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.1 2001/09/29 11:11:17 dfr Exp $
  *
  */
 
diff --git a/sys/ia64/include/pcpu.h b/sys/ia64/include/pcpu.h
index beb934b1052e7..f77cd1c013285 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 dbb0b2cea769c..ded6222df833f 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.22 2004/07/19 05:39:49 alc Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/ia64/include/proc.h b/sys/ia64/include/proc.h
index 9f1d7ca0b57cd..a6697da2d23fb 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.12 2003/10/23 06:41:59 marcel Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/ia64/include/profile.h b/sys/ia64/include/profile.h
index 518b974b90b65..2675ab22e3fcf 100644
--- a/sys/ia64/include/profile.h
+++ b/sys/ia64/include/profile.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/profile.h,v 1.8 2004/05/19 15:41:25 bde Exp $ */
 /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
 
 /*
diff --git a/sys/ia64/include/pte.h b/sys/ia64/include/pte.h
index 09b0b54cf2a04..9f8c3792ee055 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.3 2004/08/09 20:44:41 marcel Exp $
  */
 
 #ifndef _MACHINE_PTE_H_
diff --git a/sys/ia64/include/ptrace.h b/sys/ia64/include/ptrace.h
index 3be14822309b6..8ac66684ef913 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.5 2004/04/07 20:46:08 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/ia64/include/reg.h b/sys/ia64/include/reg.h
index 453c9b8314125..ea7725deeea59 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 a8ce0b106ab07..307a010f32a5a 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.1 2000/09/29 13:46:06 dfr Exp $
  */
diff --git a/sys/ia64/include/resource.h b/sys/ia64/include/resource.h
index 28fcc98ea1beb..32d91f99b5676 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.1 2000/09/29 13:46:06 dfr Exp $ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/ia64/include/runq.h b/sys/ia64/include/runq.h
index 79fe17d2b6869..4ddd8b6fab61d 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.4 2003/12/10 22:59:03 peter Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/ia64/include/sal.h b/sys/ia64/include/sal.h
index abe7c1f8eba81..ca24a6326d78d 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.5 2003/02/01 22:50:09 marcel Exp $
  */
 
 #ifndef _MACHINE_SAL_H_
diff --git a/sys/ia64/include/sapicreg.h b/sys/ia64/include/sapicreg.h
index 8f7dfbd34a265..41467b8cbab1e 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 130eebb4ebfa2..8a8c0bf43de79 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 0e7641eea4034..a335bdc472e11 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 8d67542e0e576..bfe3094695411 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 d0e886e9bc900..022686a12598a 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 025b97902ce68..e5aba9f8cfea9 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.12 2003/05/16 21:26:41 marcel 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 daf5911763e53..e4494ead28206 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.8 2003/05/16 21:26:41 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 51dde800de58d..27a5dbadfbc2f 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.7 2002/10/06 22:01:06 mike Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/ia64/include/sysarch.h b/sys/ia64/include/sysarch.h
index a7f39de2ffe8e..5cf9bddb965d8 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 5619d59068c9a..fd3f17787c06b 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 f203434e8b9ad..82f2b8247f1ad 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.6 2004/07/10 22:59:30 marcel Exp $
  */
 
 #ifndef _MACHINE_UNWIND_H_
diff --git a/sys/ia64/include/varargs.h b/sys/ia64/include/varargs.h
index 3ed42315c8c84..96ead78d5d1f8 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 87d374136fbc9..d2368fcbda81a 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.9 2004/04/07 20:46:08 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 01b4c3d5a050e..6bbcdd0d6abc4 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 cd7fd69839a73..1df91bb480ba5 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.6 2004/04/07 20:46:08 imp Exp $
  */
 
 /*
diff --git a/sys/ia64/pci/pci_cfgreg.c b/sys/ia64/pci/pci_cfgreg.c
index cef743b89f7aa..945dc3d120074 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/atkbd_isa.c b/sys/isa/atkbd_isa.c
index 8d238c75d4b62..3dadadea3b7f5 100644
--- a/sys/isa/atkbd_isa.c
+++ b/sys/isa/atkbd_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/atkbd_isa.c,v 1.17 2004/05/30 20:27:16 phk Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c
index 153ed9f9d8e46..44c0c180963da 100644
--- a/sys/isa/atkbdc_isa.c
+++ b/sys/isa/atkbdc_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.29 2004/05/30 20:27:16 phk Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 1ce40b224ba25..487a69a65b01a 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.37 2004/03/17 17:50:51 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 2eae66ab351de..56c7ed4b0bcaf 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.11 2002/10/16 10:38:48 phk Exp $
  */
 
 /*
diff --git a/sys/isa/isa_if.m b/sys/isa/isa_if.m
index b93d71c791aaa..07c2b2d2beaec 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.6 2000/04/08 14:17:07 dfr Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index dd04967605368..541d22996a1ef 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.14 2003/07/02 16:09:01 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index ba5fe419982d2..0f4ca15c12cfb 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.10 2004/04/07 20:46:09 imp Exp $
  */
 
 #ifdef PC98
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 5a7621ea14a61..ab88da99469c5 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.25 2003/07/08 18:56:58 jhb Exp $
  */
 
 #ifndef _ISA_ISAVAR_H_
diff --git a/sys/isa/orm.c b/sys/isa/orm.c
index f25312fbe305d..ace75e499d3b6 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 eaa4aa6475971..ad0726f27d23e 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.16 2003/06/11 00:32:45 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c
index c229373b90252..fd058613bf310 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 2a3b7e061f98b..b0d55be4c91f0 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.5 2002/04/09 11:18:40 phk 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 012d3de942cc1..e8f69598715a4 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.6 2001/09/05 03:54:28 yokota Exp $
  */
 
 #ifndef _ISA_PNPVAR_H_
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index c38a11406b0aa..fad676b72d2ce 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/psm.c,v 1.79.2.2 2004/10/01 06:26:51 philip Exp $");
 
 #include "opt_psm.h"
 
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index 35bef94e08e9a..aa40fb51e4505 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 a0f00c37e6341..ac1a3d67cc15a 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.25 2004/06/10 20:31:00 jhb Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index e1538f810e1ad..c7dd03b09cd91 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.30 2004/06/16 09:47:11 phk Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO
index b8d7f3efebb99..49f21fd48482b 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 e0842da82d5a3..0850e45504426 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 b23c0fba91258..6070134b28cb5 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.13 2004/04/07 20:46:09 imp 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 43a5a0de89604..b7560e2eefa85 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 bbff6c1075ec2..44823742d5670 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.39 2004/07/03 16:56:45 phk 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 6f73200cd2f0b..235f9bc71c2bc 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.7 2004/04/07 20:46:09 imp Exp $
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 5091378cd386a..025a67771caa9 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.49 2004/07/03 16:56:45 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 fb74f39984836..67e96affc48b9 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.27 2004/06/17 17:16:48 phk Exp $
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index aae739441846c..95f05649f02e0 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 f6fa050368d2f..b34ad2f92ccc8 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 1922627a0dad0..9f389e9556943 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 639dc75cbf77c..17af1ef3bcab4 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.121 2004/07/30 22:08:51 phk 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 a7b15585fc330..5623065d7f131 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.98 2004/04/07 20:46:09 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 412f130b1f629..a5fde4657db2d 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.27 2004/06/16 09:47:12 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 75c004c40b626..05925aed6f92e 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 421f73cf8c582..5dee028915c79 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 de5e0a30a1690..77aa5903128f6 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 2003/03/05 19:24:21 peter Exp $
 
 # Makefile for kernel tags files, init_sysent, etc.
 
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index 68685f05b037f..3cec787438721 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -24,7 +24,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.28 2004/08/12 17:26:22 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/clock_if.m b/sys/kern/clock_if.m
index 3ddb25eb4bcac..0302d25e1c743 100644
--- a/sys/kern/clock_if.m
+++ b/sys/kern/clock_if.m
@@ -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/kern/clock_if.m,v 1.1 2002/04/04 23:39:10 tmm Exp $
 
 #include <sys/bus.h>
 #include <sys/time.h>
diff --git a/sys/kern/device_if.m b/sys/kern/device_if.m
index 8b97f4e0d64f9..e1a5bc78c0769 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.10 2004/08/12 17:26:22 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/genassym.sh b/sys/kern/genassym.sh
index 70ad69ebd1d49..6da45023d4f08 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 803f7659a12bb..1ed8e0f28cf8e 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.94 2004/06/05 02:18:28 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 29d6ed8da1b42..223873b4812de 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.155 2004/08/11 02:35:05 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/kern/imgact_elf32.c b/sys/kern/imgact_elf32.c
index b286f315e1ba7..477bb83363bf2 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 db2470dd915a5..f5d0f2a2dfe8b 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 b4d985ac89415..de530e07cb030 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_gzip.c,v 1.51 2004/02/04 21:52:55 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 42a42724eb5e8..35e05fba90dc9 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.26 2003/06/11 00:56:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 9ac6364ca6b08..dfcf0de98db4f 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 6acb6b01252fa..7d335d0b4d873 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.246.2.2 2004/09/09 10:03:19 julian 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 8b892d1b2dda4..82912b70112ac 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.175.2.1 2004/10/09 15:25:40 mtm Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.176.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 5dca0f60dd137..fb9957be02f69 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.71 2004/06/17 17:16:48 phk Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c
index 7beca5c298317..15ef8b568bedb 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 399b7d14f972f..bbc415c6f602d 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.10 2003/10/25 16:10:41 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 21d627551c31f..817f406c6618d 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.172 2004/07/10 21:36:01 marcel Exp $");
 
 #include "opt_ntp.h"
 #include "opt_watchdog.h"
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c
index fc0f7996f5a15..7eee6111e436e 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.50.2.1 2004/09/03 15:14:14 jhb Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 60004fae45886..becaea0a29d22 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.155 2004/08/15 06:24:40 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_context.c b/sys/kern/kern_context.c
index 300b1f441bbd9..fa8386678acfc 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_descrip.c b/sys/kern/kern_descrip.c
index 9a448b4e938fa..29e9eb3046c8a 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.243.2.2.2.1 2004/10/21 09:30:46 rwatson Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 96b57d9170d57..4515e933c7237 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.34 2004/04/28 01:27:33 das Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 61b614c8025fa..80c7c480b9808 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.79.2.3 2004/10/15 21:58:35 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index f2495334f3f86..fbf59ab70f775 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.249.2.2 2004/10/09 04:33:02 julian Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index edb81eb4ca852..f88f41939c37d 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.245.2.1.2.1 2004/10/28 02:49:32 kensmith Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 1d0d10ba67d32..8c21644d1b75c 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.234.2.4 2004/09/18 04:11:35 julian Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c
index d3d891fd68be6..51f497f4f1b5d 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.40.2.1 2004/09/09 09:56:58 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 9d8af711aff54..02b94cbb69787 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.113.2.2 2004/09/09 10:03:19 julian Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 140dc08113c70..49263167600b6 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.44 2004/06/27 09:03:21 pjd Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index 46a62c3cfd9e9..e94b3246b8457 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.193.2.10 2004/10/09 10:36:32 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index c51524a1f20cb..dd475d37e01a2 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.32.4.1 2004/09/09 09:45:26 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c
index 10e8f7d291baf..4e24a21fcc591 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.44 2004/07/23 17:41:44 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktr.h"
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 98c0872973175..c4c264c4881cb 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.96 2004/07/26 07:24:03 cperciva Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 49ad88b51ad4e..bd2e33d4942bb 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.113.2.1 2004/09/03 19:49:25 iedowse Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 39822ea3f1588..179ccaf83f6b7 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.74.2.2 2004/09/03 15:45:31 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index b312389ffc94b..b9a2ab34c779e 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.50 2004/04/05 21:03:34 imp Exp $");
 
 #include "opt_debug_lockf.h"
 
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index d2a6749441080..f58e0ca8d1c88 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.113.4.1 2004/10/30 21:03:46 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_devfs.h"
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index a47c1cddb9799..e90fa608b03d9 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.135.2.1 2004/10/03 23:44:31 des Exp $");
 
 #include "opt_vm.h"
 
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index c2b749fb0e0da..4be06c3a75f13 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.3 2004/08/02 00:18:35 green Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 58386b36a8c66..7dfb705971adc 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.71 2004/04/05 21:03:34 imp Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index cecb2e1beeac8..06e2c5441a83a 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_module.c,v 1.45.2.1 2004/08/30 08:11:03 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c
index 468cdb14822c0..7481a19058c4a 100644
--- a/sys/kern/kern_mtxpool.c
+++ b/sys/kern/kern_mtxpool.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mtxpool.c,v 1.9 2003/07/16 01:00:38 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 012f3044a2c9d..1bc495083824b 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.147.2.3 2004/10/16 02:14:59 ups 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 964e5244adfa4..c91b24ce4477a 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.54 2004/03/14 15:23:05 phk Exp $");
 
 #include "opt_ntp.h"
 
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 803995c0380b3..93c9bd1c2e8bc 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.64 2004/08/10 21:47:11 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index ae1bb21fcd473..27f889c97a56a 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.18 2004/07/03 02:38:03 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 3f1280129c0c8..55100cbfbffe1 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.215.2.1 2004/09/09 10:03:19 julian Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.215.2.1 2004/09/09 10:03:19 julian 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 28905f210c76e..3161dbe853bd0 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.187.2.1 2004/09/03 06:11:58 julian Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 0e90a6203c33a..d2f4a9f9644a5 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.143 2004/08/06 22:04:33 rwatson Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/kern_sema.c b/sys/kern/kern_sema.c
index f29aa88327d86..fcb5c6ba0cb27 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.5 2004/06/14 18:19:05 jdp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 37d0b8cf2b7f7..f3bbc6b8d170c 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.163.2.2 2004/09/10 00:04:17 scottl Exp $");
 
 #include "opt_kdb.h"
 #include "opt_hw_wdog.h"
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 6bfaabf46d907..08fbb55b40e58 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.289.2.3.2.2 2004/10/30 02:57:28 alfred Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 8d5c6f07d9e71..6851810772072 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.88 2004/07/10 15:42:16 phk Exp $");
 
 #include "opt_zero.h"
 
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index 27392aa9cf6f9..98165b3f27b4c 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.78.2.12.2.1 2004/10/22 19:13:07 scottl Exp $");
 
 #include "opt_sched.h"
 
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
index 2d87fa5246b6b..e239925080a8b 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.24 2004/02/27 16:13:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index e5328083664a1..96989156f6dd0 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.257.2.3.2.1 2004/10/22 19:13:07 scottl Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index a437fb328cf88..7c0259534dc19 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 eda6810605ff4..3154daa52a6a5 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.159 2004/07/28 06:42:41 kan Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 984d237ec91e7..c32091515b6f6 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.162 2004/08/14 08:33:49 phk Exp $");
 
 #include "opt_ntp.h"
 
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index c57b855c76060..ea8828ada7ead 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.23.2.6 2004/10/09 15:12:33 mtm Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index bbb14af2e72e3..538133f45e7b6 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.193.2.8 2004/10/09 04:49:58 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 1a6819835a442..5a40928f59bd9 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.108 2004/06/21 22:34:57 kbyanc Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index a516a7d61b7ee..58f8004aa0b52 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.91 2004/08/06 21:49:00 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 1289cd744fb0f..0ea82cb54b7a9 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.16 2004/07/12 15:28:31 mtm Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index 92f80c7ca4bce..d99e8ae35717b 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.7 2004/01/22 13:34:11 rse Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 6840e6411063e..8e0100d623560 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.42 2004/07/26 07:24:03 cperciva Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 62843c758c924..341aecc8c067d 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 2004/08/09 18:46:13 green 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 ad4ea35831aac..932bc52718cce 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.86.2.1 2004/09/03 20:06:24 iedowse Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/linker_if.m b/sys/kern/linker_if.m
index 67bab692b475b..822ec2e38b5d8 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.5 2003/09/20 17:39:32 dfr Exp $
 #
 
 #include <sys/linker.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 4097fa6b95eeb..65a66ac114bf1 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.61 2003/12/23 03:50:43 peter Exp $
 
 set -e
 
diff --git a/sys/kern/md4c.c b/sys/kern/md4c.c
index 69ff8e8e86229..d918828e47966 100644
--- a/sys/kern/md4c.c
+++ b/sys/kern/md4c.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/md4c.c,v 1.2 2003/06/11 00:56:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index af5471ccd5953..c15e8f0d9e39e 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.23 2003/07/22 10:36:36 phk Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 83dba8bddbeef..773b2b052ff42 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.49.2.12 2004/10/09 05:25:21 julian Exp $");
 
 #define kse td_sched
 
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index c3029d02c5fc5..59fbd52dc880f 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.121.2.10.2.1 2004/10/26 02:22:54 scottl Exp $");
 
 #include <opt_sched.h>
 
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 31366a8a72e01..fc8e1e59e2cde 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.21 2004/04/05 21:03:35 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 2c83499072de1..91047fd1a177a 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 37a66480b92c4..ded2fbe298201 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.156.2.2 2004/10/15 16:03:19 njl Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c
index 1e57aa2f94401..4879bbc276b7c 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.5 2004/04/05 21:03:35 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 f7fda10fefce9..4931c894726a3 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.49 2004/06/16 09:47:12 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 9756ca6d7e4ef..115da8fbca9f7 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.80 2003/10/18 17:27:10 phk Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index b1c6f65e35654..9604c622f5a5f 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.21 2003/06/11 00:56:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c
index 0aeb55394999b..ae629711c959a 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.9 2003/07/02 16:01:38 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 08675d25d69ba..fb7af4eac85d5 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.5.2.1 2004/08/25 03:29:43 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c
index 1704a0f4a3c61..c8d90a2c7498a 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 bdb18fdabf141..a9db1a123c497 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.62 2004/06/16 09:47:12 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 9ca51991d057b..0b1153cf4eb5b 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.2 2003/12/07 21:53:41 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c
index e808246f2ccd2..79587ebf8bcbb 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.16 2004/04/05 21:03:35 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 1517129c81a1c..2db107054ade2 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 7a6aa4654c758..83e099909c52a 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.2 2003/09/05 11:12:00 phk Exp $
  */
 
 /*
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 7468c897fca85..1d895fad2a290 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.64 2004/04/05 21:03:35 imp Exp $");
 
 #include "opt_param.h"
 #include "opt_maxusers.h"
diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c
index b7fcc60d5cdbe..ac23e077b8948 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.5 2003/06/11 00:56:57 obrien Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c
index 7d6976549916b..8b5acc9e35105 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 393906f799b2d..02517a61f8349 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.113 2004/07/10 21:39:15 marcel Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index ba36093aca2d8..9d5c736765309 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.74 2004/07/16 21:04:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index e648988e705ae..9e43d41a9e733 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.35.2.1 2004/08/23 05:12:36 njl Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index 286cc04f278c5..00df6f9e8b921 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.28 2004/07/09 11:37:44 des Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index 0814953424cea..457c34b6078ac 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 7e86e227b1b43..cb00c788d3e95 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.10.2.2 2004/10/16 02:17:54 ups Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 1ea2f0f09ff81..d0a7f84e2f49d 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.188.2.2 2004/09/09 09:56:58 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index a10e7107bd897..8cf22be4f62b5 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.24 2004/08/08 02:37:21 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 3f68103934494..baa269d91e5e1 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.270.2.2 2004/09/03 06:40:25 julian Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index 980a5177f1e4e..639838159a9e1 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.147.2.2 2004/10/08 19:47:23 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 0a2dda6a94e65..c16e4478cf159 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.178.2.2 2004/09/14 03:51:20 jmg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_witness.h"
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index d329460564e3f..b4b3a1765a3a9 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.132.2.1 2004/09/15 14:56:26 andre Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index b450cdd8875e9..05df3fd6ec485 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.177 2004/08/16 01:27:24 silby Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 7063ed3b401b6..a441eca7b73c0 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.127 2004/08/08 22:26:11 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index cbaa587b7ae3a..49cab0943dc44 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.63 2004/07/22 20:40:23 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index b3f822eb16f24..0ce67267397f0 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.161.2.1 2004/10/09 15:25:40 mtm Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.176.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 789fd2dcdb2c9..39741acc7cb7c 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.176.2.1 2004/10/09 15:12:33 mtm 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 cc8531dcbab63..8e1ba1efd746f 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.27 2003/06/11 00:56:57 obrien Exp $");
 
 #include "opt_sysvipc.h"
 
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index f16b63683c5e5..d80ca3716d395 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_msg.c,v 1.53 2004/05/30 20:34:58 phk Exp $");
 
 #include "opt_sysvipc.h"
 
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index b141bc23d45a1..3e36fa7c61e0d 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.70 2004/05/30 20:34:58 phk Exp $");
 
 #include "opt_sysvipc.h"
 
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 2e807c912782e..6e8fa4174ffe0 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.96 2004/07/28 06:45:13 kan Exp $");
 
 #include "opt_compat.h"
 #include "opt_sysvipc.h"
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index fa3fe3f9fbfa5..480748564953c 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.228 2004/08/15 06:24:41 jmg Exp $");
 
 #include "opt_compat.h"
 #include "opt_tty.h"
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index f8975b6e8acad..92d98d37cdfa3 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 77a95937547fd..60c0c957f11c1 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 dd8a115e9b601..b256c7858fdaa 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.127 2004/08/15 06:24:41 jmg Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 13b48be238d0c..7d48fdbb0d747 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.129 2004/07/15 20:47:40 phk Exp $");
 
 /*
  * Pseudo-teletype Driver
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index afa1277e7ac59..a6699118cd5ca 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.42 2004/07/15 20:47:40 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index e467dd3043645..cf9a74cc0035a 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.54 2004/06/17 17:16:49 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index 1a5e1c6914fba..1fa095a68573a 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.11 2004/06/01 04:08:48 rwatson Exp $");
 
 #define ACCEPT_FILTER_MOD
 
diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c
index 6805804adeda1..904429d3e96b1 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.20 2004/04/03 09:16:26 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 5e1b264ee941c..7b61f86e32cb1 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.36 2004/04/05 21:03:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sys/kern/uipc_jumbo.c b/sys/kern/uipc_jumbo.c
index 36fcfe20e97d7..7c35433280900 100644
--- a/sys/kern/uipc_jumbo.c
+++ b/sys/kern/uipc_jumbo.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_jumbo.c,v 1.10 2004/07/23 19:36:18 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 1c2e4108a1ede..07a0a9a0f3bf9 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.135.2.1 2004/10/15 21:45:13 jmg Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index f5a35ca0aabed..1ccdf7ad18df3 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.26 2004/07/21 07:12:24 alfred Exp $");
 
 /*#define PULLDOWN_DEBUG*/
 
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 68be294015074..23ef3abce8eab 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 48c954def68c1..5f3f80f0114e2 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.12 2004/05/30 20:34:58 phk Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 1ed2261bbdd45..09b54b7b01f0d 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.208.2.3.2.2 2004/11/04 01:17:31 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_mac.h"
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 577889567efc9..adcd6dbff326c 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.137.4.1 2004/10/28 20:04:14 maxim Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 809bdfaba18e3..9efe239206fde 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.200.2.1 2004/10/08 23:37:19 alc Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 6b97f94ad235d..2711410b99634 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.138.2.2.2.1 2004/10/21 09:30:46 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 21bc1019b2286..92bd02361d670 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.174.2.1 2004/09/06 19:32:00 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 7acabb315a2d3..d62190ea9a3c5 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.444 2004/07/25 21:24:21 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 3efc3559dc8e1..52d1ad1c30a70 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.87 2004/04/05 21:03:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 453831fe0a4f5..bcea87406e83e 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.150 2004/07/25 21:24:21 phk Exp $");
 
 #include "opt_debug_cluster.h"
 
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 5812a03578fb5..669947249046e 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.97 2004/07/12 08:14:08 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index dd217822b2b5e..65db2ab9f94a0 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.327 2004/07/12 08:14:08 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index be8f2afe9d85a..09ae9aa96e558 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.72 2004/07/30 22:08:52 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 14107543f5229..acaaa77680a7c 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.64 2004/08/04 18:39:07 rwatson Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 9f995f4aec1f9..9e82aa1c0ee63 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.138 2004/07/30 22:08:52 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ad6d7490caa57..7895581179801 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.522.2.1 2004/08/30 08:09:06 truckman Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 38d6de6480b92..01a6f4ac17cc6 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.356 2004/07/26 07:24:03 cperciva Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index d8204b6e98561..c8b8fd81925d3 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.207 2004/08/15 06:24:41 jmg Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index d469b398c2ac8..bf7695ba17bea 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.67 2004/04/05 21:03:37 imp Exp $
 #
 
 #
diff --git a/sys/libkern/alpha/bswap16.S b/sys/libkern/alpha/bswap16.S
index 98cf054488475..5caa03d88689a 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.1 2002/02/27 17:16:02 tmm Exp $
  */
 
 #define	NAME	__bswap16
diff --git a/sys/libkern/alpha/bswap32.S b/sys/libkern/alpha/bswap32.S
index bc1b127b3d6ac..f0b41764b16c0 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.1 2002/02/27 17:16:02 tmm Exp $
  */
 
 #define	NAME	__bswap32
diff --git a/sys/libkern/alpha/byte_swap_2.S b/sys/libkern/alpha/byte_swap_2.S
index 613eef645bf4b..2a7562e7804e4 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.4 2002/02/27 17:16:02 tmm 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 2a66f17d9fb75..e67af95963d94 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.4 2002/02/27 17:16:02 tmm 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 3a3227cd211f0..12b5d383d2ab1 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/ashldi3.c b/sys/libkern/ashldi3.c
index 435a35af79d81..3969ffa121f88 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 1eab1d60d99f2..86f5aa9a0b9e9 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 c58bf0119ed05..3a1958fdea2ff 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.6 2003/06/11 05:23:04 obrien Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index cdbe4a61cdaf7..212fc48569a5c 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.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 #include <machine/endian.h>
diff --git a/sys/libkern/bsearch.c b/sys/libkern/bsearch.c
index 389346e16762f..c50f648da23d9 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.7 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/crc32.c b/sys/libkern/crc32.c
index 7fa56d1e2f279..b58ed2326629a 100644
--- a/sys/libkern/crc32.c
+++ b/sys/libkern/crc32.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/crc32.c,v 1.2 2003/06/11 05:23:04 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index 27b1cf0a04294..353f36d57fbd4 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 057ee3defc141..bddfd59ca348e 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 0aa005c63f99f..c53a44f43bb6d 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 202d9524de192..296bdad89d22a 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 73533c4b32b58..bbad6d0ed6465 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 04bcbcab851c2..ddc3cdd108b0d 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.18 2004/04/07 20:46:10 imp Exp $");
 
 /*
  * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
diff --git a/sys/libkern/ia64/__divdi3.S b/sys/libkern/ia64/__divdi3.S
index e704d83af3558..514163ca8f6ce 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.1 2000/10/04 17:53:03 dfr Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/__divsi3.S b/sys/libkern/ia64/__divsi3.S
index c6528078e202b..68d32a8c7fe52 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.1 2000/10/04 17:53:03 dfr Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/__moddi3.S b/sys/libkern/ia64/__moddi3.S
index 5f36b4fc3d1a9..95ce076bcb069 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.3 2003/02/11 20:15:11 schweikh Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/__modsi3.S b/sys/libkern/ia64/__modsi3.S
index 427be3446a3f2..fb8c33ffa8342 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.1 2000/10/04 17:53:03 dfr Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/__udivdi3.S b/sys/libkern/ia64/__udivdi3.S
index 017c10ef006bd..6a1c367718a72 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.1 2000/10/04 17:53:03 dfr Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/__udivsi3.S b/sys/libkern/ia64/__udivsi3.S
index b3353efbbb2b4..69e0561fe6adb 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.1 2000/10/04 17:53:03 dfr Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/__umoddi3.S b/sys/libkern/ia64/__umoddi3.S
index ebc23399e768e..83b87f66a1af4 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.3 2003/02/11 20:15:11 schweikh Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/__umodsi3.S b/sys/libkern/ia64/__umodsi3.S
index b93b6fd7adce6..da793fe994494 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.1 2000/10/04 17:53:03 dfr Exp $
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
diff --git a/sys/libkern/ia64/bswap16.S b/sys/libkern/ia64/bswap16.S
index 746e906d2d22a..c1eff3648cd70 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.1 2002/02/27 17:16:08 tmm Exp $
  */
 
 #define	NAME	__bswap16
diff --git a/sys/libkern/ia64/bswap32.S b/sys/libkern/ia64/bswap32.S
index d2a22b230def8..559a7843ef966 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.1 2002/02/27 17:16:08 tmm Exp $
  */
 
 #define	NAME	__bswap32
diff --git a/sys/libkern/ia64/byte_swap_2.S b/sys/libkern/ia64/byte_swap_2.S
index b9ea7d2a650df..aecc62fb7b3a3 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.4 2002/02/27 17:16:08 tmm 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 facce77501fc6..c45ea29e26e5e 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.4 2002/02/27 17:16:08 tmm 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 cfdc28af1f020..809d385975a84 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.8 2004/07/27 22:32:01 phk 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 cc5054fb6f4ca..5232a78100a6f 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.2 2003/09/26 20:26:24 fjoe Exp $
 #
 
 #include <sys/iconv.h>
diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c
index 8ab4d6c2b3bed..d0492d73e1e25 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 68d468ab68088..e23bbd4881924 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.2 2003/12/08 08:32:20 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/libkern/index.c b/sys/libkern/index.c
index d9f470945550d..ac0ad95a7920e 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 61de6b7dc956c..fc568a2bc42ec 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.5 2003/06/11 05:23:04 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index 4701394196534..7199335d1146e 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 1a9f8aca48e61..30f231346c5dd 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.22 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/gmon.h>
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index 050d47e255be3..34f11bf31de0c 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 c014f028d6c02..7858703873f81 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 bb0baee73c9f8..746cea85905c0 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 386d1cf61e9db..55dd24833494a 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.1 2004/07/15 23:58:23 glebius Exp $
  */
 #define I_AM_QSORT_R
 #include "libkern/qsort.c"
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index 5100bef033a52..9dd1d0ef75f87 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 360ff81cf35d5..79ba5cf70e408 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 13daa8f1da973..d83edb1ef4ab0 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.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 28a5b7ec1f140..d6d401e189b2a 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 9f4124bde2602..bd1589babaf73 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/strcat.c b/sys/libkern/strcat.c
index 405dc0552190e..f1eb2898814f3 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.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 7313e6011c044..042a589952cf5 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 b40d662773f83..9307ff4ba4cee 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.11 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strdup.c b/sys/libkern/strdup.c
index 5922f569b20f0..d506932f117dd 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 ab617560b7a10..404eefc5f2b24 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.8 2002/09/06 06:04:36 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strlcpy.c b/sys/libkern/strlcpy.c
index 0eedeb15d41a2..d0efb6ac57f74 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.6 2002/09/06 06:04:36 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 4a2e6454ba5b9..f015e1f5bfbe3 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 1ca8e595a58be..b0afbce86689f 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.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 7daaaea3dc1da..c63ad8f923b03 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 46122697e8bbb..0d583d13148f4 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/strtol.c b/sys/libkern/strtol.c
index 3d734ab18dc88..e5606f4799e06 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 ea4e7edbc02e4..9399244799483 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 5c97ca9125796..0fc92a70ecbc8 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 4ed72a18f29e8..6b04b0a8d973f 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 a0f0a35baadc0..fcb213e18e75e 100644
--- a/sys/libkern/strvalid.c
+++ b/sys/libkern/strvalid.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strvalid.c,v 1.3 2003/06/11 05:23:04 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index 376d9c4e6cbd4..c215bfe3765d4 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 71c9272364d88..27090cfb29bd7 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 e3776413722ce..0460beea15e85 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 fd0d010ed9941..6d49e0b7eee9d 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 3e19abdc384df..08dd2e5d8c31a 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/Makefile,v 1.393.2.2.2.1 2004/10/24 18:02:52 scottl Exp $
 
 # pcic -- currently broken and being worked on out of tree.
 # oldcard -- specialized use for debugging only.
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc
index 9dc38af9623f0..ce95b7e8ebfa4 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 f4f01752697e7..77c022478c648 100644
--- a/sys/modules/aac/Makefile
+++ b/sys/modules/aac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aac/Makefile,v 1.7 2003/02/26 06:56:46 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/aac
 
diff --git a/sys/modules/aac/Makefile.inc b/sys/modules/aac/Makefile.inc
index 265f86d1ed55a..f8121d40d4fa9 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 4247a2280878c..752b8cade4d7f 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 6c5216c07a656..31b0c4f55a151 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 b942d3e7639e0..72d2b5da83e79 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 9009d0019d93a..cd915d0db86ec 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/Makefile,v 1.40 2004/07/21 14:47:54 nyan Exp $
 
 SUBDIR=		acpi acpi_asus acpi_panasonic acpi_toshiba acpi_video
 
diff --git a/sys/modules/acpi/Makefile.inc b/sys/modules/acpi/Makefile.inc
index 265f86d1ed55a..a3cda978c916e 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 3152685275a04..3fa6e71c66e03 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.8 2004/07/01 04:14:55 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 5132a37d968dd..d4cfd932dd246 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.4 2004/08/03 21:27:42 njl Exp $
 
 .PATH:	${.CURDIR}/../../../i386/acpica
 
diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile
index 61515ac4325db..d9ab09de39993 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.2 2004/08/03 21:27:42 njl Exp $
 
 .PATH:	${.CURDIR}/../../../i386/acpica
 
diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile
index a1ed3904034ce..6d1fd74daa60f 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.3 2004/08/03 21:27:43 njl Exp $
 
 .PATH:	${.CURDIR}/../../../i386/acpica
 
diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile
index 8adfd1c636661..d432bd4dd9bf2 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.3 2004/08/03 21:27:43 njl Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpica
 
diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile
index e8a69fb6e3af6..5f41f4e193a6e 100644
--- a/sys/modules/agp/Makefile
+++ b/sys/modules/agp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/agp/Makefile,v 1.12 2004/08/16 16:01:40 nyan Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile
index 44b4f93540bd8..a7d6c98578d21 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 d759bbbe39b92..4f2af0e4933aa 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 860d9a8a94993..66702941b85c0 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 47550f0de2c46..f59b32b58bc81 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 265f86d1ed55a..80ad4daaa915e 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 34a47f52f840b..e6908b1494f11 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.5 2004/08/17 00:14:31 gibbs Exp $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahc
diff --git a/sys/modules/aic7xxx/ahc/Makefile.inc b/sys/modules/aic7xxx/ahc/Makefile.inc
index 265f86d1ed55a..0556c73c0df48 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 5e5d9c2088579..bbe2d1d0cb224 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 965e74db9c328..23f263229b6a1 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 9a595806500df..2e1178fb6e1d0 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 7744a7d75b910..fd8c81dee1c24 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.4 2003/01/22 21:56:54 gibbs Exp $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahd
diff --git a/sys/modules/aic7xxx/aicasm/Makefile b/sys/modules/aic7xxx/aicasm/Makefile
index b1b2cf7a293fd..a93efca5a9394 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.5 2002/11/03 23:48:14 scottl Exp $
 
 MAKESRCPATH=	${.CURDIR}/../../../dev/aic7xxx/aicasm
 
diff --git a/sys/modules/aio/Makefile b/sys/modules/aio/Makefile
index 4136135d73500..e7055cdefff8f 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 fbaae5c7b7f66..9ec22ac150423 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 53045c8bb2ce5..379869845bc52 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 c2c66d5fa7008..52ee338bbe553 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 203d9cfca3ddb..356f6f4886b30 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 6d82b9049f4c0..8d97c9a0b5077 100644
--- a/sys/modules/apm/Makefile
+++ b/sys/modules/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/apm/Makefile,v 1.7 2003/03/25 05:19:17 mdodd Exp $
 
 .PATH: ${.CURDIR}/../../i386/bios
 
diff --git a/sys/modules/ar/Makefile b/sys/modules/ar/Makefile
index fae9452ef4140..4a88ddbf81d44 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/arcnet/Makefile b/sys/modules/arcnet/Makefile
index ab1d961bdfe0c..a73ea3ca62217 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 e99e5b1b66e22..2b2aa8bc395f5 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.2 2004/03/18 09:45:17 fjoe Exp $
 
 .PATH:	${.CURDIR}/../../dev/arl
 
diff --git a/sys/modules/asr/Makefile b/sys/modules/asr/Makefile
index 69a640976bab7..d79712c35bc9c 100644
--- a/sys/modules/asr/Makefile
+++ b/sys/modules/asr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/asr/Makefile,v 1.4 2004/04/22 02:22:17 njl Exp $
 
 .PATH: ${.CURDIR}/../../dev/asr
 
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile
index 15e760cd9811d..4f86cbfaf365e 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 a47541d75693c..43e2973246ce7 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.2 2003/06/30 05:25:36 sam Exp $
 #
 
 #
diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile
index c7bb645391e0b..b917f3bfac89f 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/awi/Makefile b/sys/modules/awi/Makefile
index 554ffe5c01ab1..5247af6fe1c89 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 fa00d095fbac4..2e125c1430941 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 6fbe93ab854a2..dca07b83fe3bd 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 9a28f3b1dfbfb..fef27e28f6c86 100644
--- a/sys/modules/bge/Makefile
+++ b/sys/modules/bge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bge/Makefile,v 1.2 2003/01/19 02:59:33 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/bge
 
diff --git a/sys/modules/bios/Makefile b/sys/modules/bios/Makefile
index d150806c045d3..d76e4b7225856 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 30c9058dea2f0..ef6a11c9423ab 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.1 2003/03/29 15:20:44 mdodd Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
diff --git a/sys/modules/bios/smbios/Makefile b/sys/modules/bios/smbios/Makefile
index 40df8e80db470..412bc01601efb 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 d1dd8f1d92152..29905cea3e75b 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 1a9e0376921fc..97178d2b12d50 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 265f86d1ed55a..c91b77b49aecd 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 f77900bbd499b..cd8a42f35302b 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.6 2003/08/12 09:45:34 alex 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 5e9f6b5f7a22b..dab26e559ea98 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 d2c1e32391da1..64f69f75ce37c 100644
--- a/sys/modules/bridge/Makefile
+++ b/sys/modules/bridge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bridge/Makefile,v 1.3.4.1 2004/09/22 19:23:38 andre Exp $
 
 .PATH:	${.CURDIR}/../../net
 KMOD=	bridge
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index fdb9986a668f3..c5715db9e1ab8 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/cam/Makefile,v 1.11 2004/04/19 17:26:46 njl Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 S=	${.CURDIR}/../..
diff --git a/sys/modules/canbepm/Makefile b/sys/modules/canbepm/Makefile
index 0eb911243eee9..630e601a4e645 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 19487e01ef3dc..4e576f77ec73a 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 67019ee0dd4e9..9ceb2796dc2eb 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 a071485ccd734..32d241e18c30e 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 6dffbc9cabe95..a53d8f791da99 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 49104d383cf29..04f9eeb3b6ca2 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/ciss/Makefile b/sys/modules/ciss/Makefile
index 2ea619c5786c2..696124a8e1c42 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 3f2067b469853..beb64e50171a3 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 9274f2f648c93..be8bcb77b80c9 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coda/Makefile,v 1.13 2003/09/07 07:43:10 tjr Exp $
 
 .PATH: ${.CURDIR}/../../coda
 
diff --git a/sys/modules/coda5/Makefile b/sys/modules/coda5/Makefile
index 595e65eb1ce2d..025e82ec9a4c3 100644
--- a/sys/modules/coda5/Makefile
+++ b/sys/modules/coda5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coda5/Makefile,v 1.1 2003/09/07 07:43:10 tjr Exp $
 
 .PATH: ${.CURDIR}/../../coda
 
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index 95956e5c9784f..ecae7161d9957 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 df22b523478c6..61db6b1810bd1 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.1 2004/05/05 16:14:00 rik Exp $
 
 .PATH:  ${.CURDIR}/../../dev/cp
 KMOD	= if_cp
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 0d2168e91345d..bdd164a105c70 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/crypto/Makefile,v 1.2 2003/12/15 21:49:41 bms Exp $
 
 .PATH:	${.CURDIR}/../../opencrypto
 .PATH:	${.CURDIR}/../../crypto
diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile
index b2692a6902188..57e93a4ed341e 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 49f7e1169568a..d4a6e6b3c9435 100644
--- a/sys/modules/cs/Makefile
+++ b/sys/modules/cs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cs/Makefile,v 1.2 2004/05/26 00:53:01 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/cs
 
diff --git a/sys/modules/ctau/Makefile b/sys/modules/ctau/Makefile
index 137fb0a74f5e9..dac42c38add74 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.2 2004/06/23 14:22:14 rik 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 939e714aacfdc..aba0fe89eeaf2 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 889834c3699a1..fc1708ce14a6b 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.3 2004/06/23 14:22:13 rik Exp $
 
 .PATH:  ${.CURDIR}/../../dev/cx
 KMOD=   if_cx
diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile
index ac56533935fbd..385d2fdeb0804 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 7869ee8594ed3..462b1a46b5006 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.2 2004/07/13 09:37:49 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 
diff --git a/sys/modules/dcons_crom/Makefile b/sys/modules/dcons_crom/Makefile
index 74c168e0fb660..ba7ceac9c124e 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.1 2003/10/24 15:44:10 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 
diff --git a/sys/modules/de/Makefile b/sys/modules/de/Makefile
index f625252152d07..2abce9ae076ee 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 9d9aea61da703..c881da1445db5 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 265f86d1ed55a..b11eaf0d7213d 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 5737af536f054..4a62c5cffa674 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 2d833dec8fffd..7d7135340c3dc 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 65afb17f2d6ce..3279f3ec48c3a 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 e9d95b01d1478..7692ee6ec9348 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 d1119cc0bb543..2fbc877f6c272 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 4c8f9e53c62c7..a8234b2b2e6dd 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 0a49ddd07f75f..1b5294ea06f5c 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 786ce79a1c606..2bf16d71aa679 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 3f681b0c0dfba..0be23a1065a8a 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 b496fa94d5cf1..f466bc31a115e 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/Makefile,v 1.3 2003/09/09 00:29:02 anholt Exp $
 
 SUBDIR = mga r128 radeon sis tdfx
 
diff --git a/sys/modules/drm/Makefile.inc b/sys/modules/drm/Makefile.inc
index 265f86d1ed55a..922d96595e673 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/mga/Makefile b/sys/modules/drm/mga/Makefile
index d88d12c78d03a..0b15554ddfd64 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 e80a0d803f8bb..cb20f2431baa3 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 d72bf2f3b5eba..8d600fa1fbb57 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 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= radeon
diff --git a/sys/modules/drm/sis/Makefile b/sys/modules/drm/sis/Makefile
index 885ce2863bb4e..fcfc28c81bb18 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 2e015a7cead71..0c071cd76731c 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 18f6eedfefd87..dccbdce0bf997 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 dda16edcd34aa..0790866f2678d 100644
--- a/sys/modules/ed/Makefile
+++ b/sys/modules/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ed/Makefile,v 1.8 2004/05/26 00:53:02 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ed
 
diff --git a/sys/modules/el/Makefile b/sys/modules/el/Makefile
index 78394059226f6..520d480e2ec16 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 a7776578931bf..518e70bd3b8ea 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 9518d68289756..9059a0bd07119 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 42909facad405..0dcdcdad54ccd 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 ec7b392addecc..073d1ebb759ed 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ep/Makefile,v 1.7 2004/06/27 12:33:16 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ep
 
diff --git a/sys/modules/esp/Makefile b/sys/modules/esp/Makefile
index 2b747fdd6be76..644a73e63b05e 100644
--- a/sys/modules/esp/Makefile
+++ b/sys/modules/esp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/esp/Makefile,v 1.3 2004/08/12 17:41:30 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/esp
 
diff --git a/sys/modules/ex/Makefile b/sys/modules/ex/Makefile
index 5c394aa5e11f1..abe0b4f10f2f3 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 b7a8d522b283d..9bec941b0c07a 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 b746452d5baa0..d1c9531355efe 100644
--- a/sys/modules/ext2fs/Makefile
+++ b/sys/modules/ext2fs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ext2fs/Makefile,v 1.4 2002/05/16 19:08:03 iedowse Exp $
 
 .PATH:	${.CURDIR}/../../gnu/ext2fs
 KMOD=	ext2fs
diff --git a/sys/modules/fatm/Makefile b/sys/modules/fatm/Makefile
index f6d39672a4f2b..d7f07976fa759 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 a7f53ee2eedc1..dd6f7e540ab4c 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fdc/Makefile,v 1.12 2004/07/16 18:37:00 njl Exp $
 
 KMOD=	fdc
 WARNS?=	2
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index eead3ec0862bd..0c454763b11b7 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 77af85bfd63b3..32aedc41ddb62 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 379ad58ba0ea9..13592482db91b 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 265f86d1ed55a..cf896c7280782 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 8e4e06f0fc919..68bcddbd44cdd 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 6b26606b04e07..ed37b792b6e05 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 002bd9a85491c..51d75a7ef1335 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 7acf1a39fb326..336c522349c15 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 04eaa9466fb21..058c3db708b8e 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 0904e1a1b7898..9a67b7c71b6c0 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 4352bd636f86a..b6830fe7d7965 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 e072ffb913b6f..e394d5487b1f8 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/Makefile,v 1.12 2004/08/16 06:36:21 pjd Exp $
 
 SUBDIR=	geom_apple \
 	geom_bde \
diff --git a/sys/modules/geom/Makefile.inc b/sys/modules/geom/Makefile.inc
index 265f86d1ed55a..b985b59dd6e92 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 4ec59a6292890..e97c3b3d90b83 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 2da5bf411ce77..c1b90eece3163 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 884ac6e98bad8..e5e84abb9db9d 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 18d6eeb04718b..dde3fdca07283 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 3de201a79b487..15ad249321641 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_fox/Makefile b/sys/modules/geom/geom_fox/Makefile
index adf8c2e8e8bf7..3f1b6f51fe6c6 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 783a58ac2d824..56b3a0e30f3c7 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 ca074bda369c8..2b6febd07eda2 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 839a48ef17fb4..c30588c2f5450 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 2004/07/02 19:40:34 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/label
 
diff --git a/sys/modules/geom/geom_mbr/Makefile b/sys/modules/geom/geom_mbr/Makefile
index 1820f3bc3bdd8..b50bfe4c5a5e9 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 3e653ce540c4b..5c3def41be22b 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 139e12422ea23..71c983e4c866f 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 2c5952d3e4f03..0ad176ccecb24 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 b202237a611fa..29df04423437a 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_stripe/Makefile b/sys/modules/geom/geom_stripe/Makefile
index 278d3accfdc6f..4968df58a61ea 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 840395aaf1dee..4ff6266c420e8 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 8e468451773bd..9ed2e0b98a742 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.1.2.1 2004/09/10 07:00:38 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 9da767516f5db..d70716b8fde4a 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 2004/06/12 21:18:40 le Exp $
 
 .PATH: ${.CURDIR}/../../../geom/vinum
 
diff --git a/sys/modules/geom/geom_vol_ffs/Makefile b/sys/modules/geom/geom_vol_ffs/Makefile
index de9b75806dfe6..aee68421fade2 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/gx/Makefile b/sys/modules/gx/Makefile
index 72c64947ee652..27f57acb8654f 100644
--- a/sys/modules/gx/Makefile
+++ b/sys/modules/gx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/gx/Makefile,v 1.1 2001/10/19 02:21:16 jlemon Exp $
 
 .PATH: ${.CURDIR}/../../dev/gx
 
diff --git a/sys/modules/harp/Makefile b/sys/modules/harp/Makefile
index e6d75ed1d5558..e64b32de59a57 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 f455f810a6c25..00e6103fa8fb9 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 9640830904424..3593245182329 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 265f86d1ed55a..deafde7d2385d 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 bc4f30de70cda..28707a17063bf 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 3c8694ca06843..27088531c1145 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 3e62752b31cd1..00faf2ee0a133 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 3862c296624a9..3c3f918687b84 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 33e6a77c3f591..1e63bfcb4bc13 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 8f403710ce138..85e0d9f936848 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 4388603079141..11465ea43deec 100644
--- a/sys/modules/hpfs/Makefile
+++ b/sys/modules/hpfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hpfs/Makefile,v 1.7 2002/01/11 15:48:40 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/hpfs
 
diff --git a/sys/modules/hptmv/Makefile b/sys/modules/hptmv/Makefile
index a444cd66a9e4e..8762e1bf68d69 100644
--- a/sys/modules/hptmv/Makefile
+++ b/sys/modules/hptmv/Makefile
@@ -2,7 +2,7 @@
 # Makefile for RR182x FreeBSD driver
 # Copyright (c)  2003-2004 HighPoint Technologies, Inc. All rights reserved
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.2 2004/10/24 08:38:29 scottl Exp $
 
 HPTMV= ${.CURDIR}/../../contrib/dev/hptmv
 .PATH: ${.CURDIR}/../../dev/hptmv ${HPTMV}
diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile
index 7ba1f436f4951..c234a5490000e 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 265f86d1ed55a..03593a43aa7d8 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 b132bb1f2089d..e12e7666ce1c5 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.3 2003/06/15 04:24:28 nyan Exp $
 
 .if ${MACHINE} == "pc98"
 SUBDIR = lpbb
diff --git a/sys/modules/i2c/controllers/Makefile.inc b/sys/modules/i2c/controllers/Makefile.inc
index 265f86d1ed55a..607c6327d0111 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 5429b9cee4dbc..6184792059fd1 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 5f6d7ed295ba3..5c3930ef2967a 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/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile
index 7cef578707b91..4c108735c307d 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 77e84d2caf22e..ce4f50d40a069 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 42d3adef8c69b..a75b1a6761152 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 4c3e3a6981ff8..76e2d95f738b4 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 67dd7344585bd..b9da2d9b140de 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 0ac8678c6d00d..89ad521d003e6 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 ea991e082e064..d40cf2466d75f 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 c3fc8e3f52258..63d3b89e2674c 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 d0c676482e5c4..fe470383b59d7 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 f6f960c02126e..b90de9ff1068e 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 24462d0385123..9a5683f12baed 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 f258fa9019335..87255d8bb3a7b 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 880ec82a28ef2..b3f73f248a46f 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 e97ac69db1238..e51ebdfd8204d 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 8f1a08ee225b9..45748d9c021bb 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 8e3485e19b7bf..1a40cd394c5db 100644
--- a/sys/modules/ie/Makefile
+++ b/sys/modules/ie/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ie/Makefile,v 1.1 2003/03/29 13:40:41 mdodd Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/ie
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index f88df14eb6490..d58e04186dacc 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 03e1e5087cf45..9d6ebb5811ed3 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 959d5e287fc0f..12405c907ccc2 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 067f8b9c9f3ed..e4eb112b7b6ec 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.3 2002/08/12 15:27:17 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile
index bce7c969da24a..625a1db663816 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.4 2004/05/26 00:53:04 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/if_ndis
 
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index f2b11d5abaf2a..f65bb453be9a9 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.31 2002/08/09 15:30:43 brooks Exp $
 
 .PATH:  ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index e57301317f087..8a18964360c3e 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 2ea7363437a02..0f2ee211397df 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 29e0a903053da..ffa30dfa4abf6 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.3 2001/01/06 13:59:50 obrien Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 1c804e12c02f9..414c5b607bab2 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.27 2003/03/08 21:54:32 jlemon Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile
index 797ece457eda9..f41fc568736d1 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 591fef8c0e88f..568a16bbca632 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 ffb3442e0a7a4..549b5797f1e9c 100644
--- a/sys/modules/io/Makefile
+++ b/sys/modules/io/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/io/Makefile,v 1.1 2004/08/01 11:40:53 markm Exp $
 
 .PATH: ${.CURDIR}/../../dev/io
 .PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH}
diff --git a/sys/modules/ip6fw/Makefile b/sys/modules/ip6fw/Makefile
index 42ca025507cc4..4b205c6d944f1 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 be135def40263..bb3cb333f1da7 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/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index 7297cd238447a..e5d8aa027a034 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.14 2004/06/08 23:52:22 darrenr Exp $ 
 
 .PATH: ${.CURDIR}/../../contrib/ipfilter/netinet
 
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index cd5a6f791e49a..6c8bb0ac8e493 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.17 2004/08/17 22:05:53 andre Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile
index 4ec20a3d05ba9..c8ab489401ba6 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/isp/Makefile b/sys/modules/isp/Makefile
index b3ddc39103905..218a8f9978310 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 07b9f8b27b86c..3537a52523b98 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/ixgb/Makefile b/sys/modules/ixgb/Makefile
index 4396c2d3e7f8b..46c127a0d0d94 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 71ba7f14692db..44a5557356615 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/kue/Makefile b/sys/modules/kue/Makefile
index 8569f16f5b41e..f3bb8af74f187 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 0728e6e94bb4c..3a2b8cc18ecfa 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/libiconv/Makefile b/sys/modules/libiconv/Makefile
index 66460642104e9..8744290150967 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 efd15ec759c70..e78f00920a595 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 fd151ec6ab725..4ba8a3bebd02f 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 b31f9cb60bc70..942b0aea2eaa5 100644
--- a/sys/modules/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linprocfs/Makefile,v 1.11.4.1 2004/08/29 06:15:44 tjr Exp $
 
 .PATH: ${.CURDIR}/../../compat/linprocfs
 
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 7cb1f4b48c208..d151b946fa4d2 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linux/Makefile,v 1.62 2003/11/19 05:08:26 imp Exp $
 
 MAINTAINER=	emulation@FreeBSD.org
 
diff --git a/sys/modules/lnc/Makefile b/sys/modules/lnc/Makefile
index 46225c349ebd9..c4f1849431e27 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 b57960d572f4a..37ce2843092d9 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 76ae8e8265cea..0c1214ab4bce6 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 93388fe03eb14..8156c689a1319 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 fc1a60037fc40..0669b6aff32e1 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 6216a578483c8..f5e413dd018e4 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 d4aa5cec7e30a..b4b2b694df6bb 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 b180f718794ff..fb98d46799e73 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 b04d181777e53..b39fa3215031b 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 f1e036a3f9549..4be846739436f 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.1 2003/03/02 23:01:42 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_portacl
 
diff --git a/sys/modules/mac_seeotheruids/Makefile b/sys/modules/mac_seeotheruids/Makefile
index d27aefb947b9f..c821df4c46196 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 3b98cb00e62df..64ff542ffddbe 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 94b5aa87198f4..96486494cd32a 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 1602c0304c7f6..24019ba586f65 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 3f0654fbbe633..917ab06afb88d 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 60747db9e8d04..804e0750144cc 100644
--- a/sys/modules/mem/Makefile
+++ b/sys/modules/mem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mem/Makefile,v 1.2.4.1 2004/10/21 19:32:15 markm Exp $
 
 .PATH: ${.CURDIR}/../../dev/mem
 .PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH}
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 61fec9858353e..d2143da6e7cb4 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 ba0951ac4e67c..5135ae0c4725e 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 e8773def4b9ae..0999eed615728 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 464db2297995b..1e74c4ed54d90 100644
--- a/sys/modules/mpt/Makefile
+++ b/sys/modules/mpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mpt/Makefile,v 1.1 2002/10/31 19:39:23 jhb Exp $
 
 .PATH: ${.CURDIR}/../../dev/mpt
 
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index 9ee84514a5141..8a01f8b8826d6 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/msdosfs/Makefile,v 1.21 2004/07/03 13:22:38 tjr Exp $
 
 .PATH: ${.CURDIR}/../../fs/msdosfs
 
diff --git a/sys/modules/msdosfs_iconv/Makefile b/sys/modules/msdosfs_iconv/Makefile
index 8d2e41da121e5..f4ff99f3dbb07 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/my/Makefile b/sys/modules/my/Makefile
index 4b454a88722c0..4d75a561d22b0 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 fb9d9937c83ce..ee494c727b082 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 b1a273aae5206..3139139f33dbf 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 9d5380baeb4e0..458b350fbd09d 100644
--- a/sys/modules/ndis/Makefile
+++ b/sys/modules/ndis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ndis/Makefile,v 1.6 2004/03/07 02:49:06 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../compat/ndis
 
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index 150177c2af7e5..e0c9d91435325 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.35 2004/07/07 22:48:30 emax Exp $
 
 SUBDIR=	UI \
 	async \
diff --git a/sys/modules/netgraph/Makefile.inc b/sys/modules/netgraph/Makefile.inc
index ffc44fea7af33..4bfdfab383c65 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.2 2002/01/11 01:19:25 msmith 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 413308c138128..52bbf2937a586 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 921eabcf27270..e07a852c73a1d 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 02de9774ffa7c..2d105736532f8 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 265f86d1ed55a..4bdab85286274 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 ebd94e13f40e7..ea2d9bc050083 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 1ad4bb6b60798..046c70e45b9cc 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 324fbdfc922ec..05b66709e3e4c 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 562653611a2d2..113fab3f354d0 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 278159f267974..9d9244eeba48a 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 b9334dd98ab39..53ef9f95c2af0 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 57c20b0265e34..fad8415a6ac23 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 fd47b5c029589..d98eb1fcba072 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 8fdd89643c97f..954c669289007 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 265f86d1ed55a..41ddd24578950 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 a3c951f6dfa31..b1022e9d726a2 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 753400eddda55..d3e2da2a294b2 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 849d899f490ce..baf749098fcff 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 729ea7b5b234c..3a31ff4816870 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 5b66e0988f72f..a436f77724f4d 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 5342c2aaba88e..caf06e7bd8de2 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 4a57242b3e178..b097625cdd049 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.6 2004/06/28 19:06:30 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 01390b30e0aea..0775acd38e6da 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.4 2004/06/28 19:06:30 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
diff --git a/sys/modules/netgraph/bpf/Makefile b/sys/modules/netgraph/bpf/Makefile
index 0bde4f25e1980..84f03b01f63ab 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 318142900c91e..4badb78f6c17c 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 2e3000dd3bf53..dd23f2cf7e416 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 9f8515106a848..9d6d4771816c4 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.1 2002/06/18 21:32:33 julian Exp $
 KMOD=   ng_device
 SRCS=   ng_device.c
 
diff --git a/sys/modules/netgraph/echo/Makefile b/sys/modules/netgraph/echo/Makefile
index d7cce8d461ef7..a6bda8d93f3e5 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 6e8b800c8ec48..fff0ffd3d0e29 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 d807bc91c848b..c654584de7f19 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 fc1833322a180..0b6e277443d9b 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.3 2002/01/12 17:31:25 archie Exp $
 
 KMOD=	ng_ether
 SRCS= 	ng_ether.c
diff --git a/sys/modules/netgraph/fec/Makefile b/sys/modules/netgraph/fec/Makefile
index 1d437f58d8694..5310f5c96e4b6 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/fec/sample_startup b/sys/modules/netgraph/fec/sample_startup
index 32cfa539333f7..f62a01f7efd8e 100644
--- a/sys/modules/netgraph/fec/sample_startup
+++ b/sys/modules/netgraph/fec/sample_startup
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/fec/sample_startup,v 1.1 2002/10/29 19:12:44 julian Exp $
 kldload ./ng_fec.ko
 ngctl mkpeer fec dummy fec
 ngctl msg fec0: add_iface '"dc0"'
diff --git a/sys/modules/netgraph/frame_relay/Makefile b/sys/modules/netgraph/frame_relay/Makefile
index 81a2a96aeeb9c..f48efb56725bb 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 4c18c27e50c22..870777a565988 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 56de5adf8ed0a..1be3ec0a51794 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 c7502bfccf85b..4c62e1a6127fa 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 9ebb54de8f2c3..bfbeafa62f114 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 98940efbf564b..7e9a6f7f08137 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 7a40c45c2dc84..5af1eb966d7f9 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/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile
index f8fd73f875685..e9ec420df72ee 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 799437c4e70a7..dbac0b26f33fb 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 e1b08876d1b1d..775b7142daa78 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 7e337f4f4c443..e48320164b7da 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/netgraph/Makefile b/sys/modules/netgraph/netgraph/Makefile
index a34d6164c9083..2614beaf7d8d0 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 74a0a6c6273e9..ffe7fcce93873 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 6ce720ab95878..a2869cc1474ff 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 642dbdde21067..9b35abccb1325 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 34cbbf6e28675..c7016618d0ded 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 6ba065345129e..77d8ff1d77219 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 701752662ed57..bc0e17c01d43c 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 a44ba0ff6330d..b5e3a6ad476b0 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 c70a6bb748f66..1723ba66f7315 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 2eb4fa399b4a4..778b76414bd65 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 203e83e437ae5..0b08fb0821d9b 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 bc51040f0d155..1f9a8afefce39 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 16a291ca46541..e09974fff3050 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/tee/Makefile b/sys/modules/netgraph/tee/Makefile
index 7d5115831a49d..c64fb10ebcefc 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 3f19a7cd4e41c..dac2a0cc90cf1 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 4921ac953bb28..1277ae9653ef9 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 e6cdf0dbbc160..4ea9df0aab017 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 723f571debf17..64e3618ac8e2c 100644
--- a/sys/modules/nfs4client/Makefile
+++ b/sys/modules/nfs4client/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfs4client/Makefile,v 1.3 2004/07/08 22:35:35 brian Exp $
 
 .PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs4client \
 	${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 11b83eb8f261d..205ac243e4170 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfsclient/Makefile,v 1.29 2004/07/08 22:35:35 brian Exp $
 
 .PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs4client \
 	${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index fb9d0f2dae09a..79b15a8c6f486 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 15dc9555e0dfd..98eed27144d08 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 4982c382a45f3..61e37fad64a20 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 3cdc7051079f7..b7d5ce5111331 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 367af98792d24..87daf45dcef53 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 33e6d42a155e2..0e799051940fc 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 22cbf003afbd8..75740c372f672 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/nwfs/Makefile b/sys/modules/nwfs/Makefile
index 255aabc51a4be..32fa51b4bfa7b 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 cbe92d7767020..e0795bd7a27c9 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 9701c9f7a7ea3..6ef588c540edf 100644
--- a/sys/modules/oltr/Makefile
+++ b/sys/modules/oltr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/oltr/Makefile,v 1.4 2003/03/15 23:24:17 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../contrib/dev/oltr
 KMOD	= if_oltr
diff --git a/sys/modules/osf1/Makefile b/sys/modules/osf1/Makefile
index 3c899041da4a6..34c51b1c00961 100644
--- a/sys/modules/osf1/Makefile
+++ b/sys/modules/osf1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/osf1/Makefile,v 1.12 2004/02/13 10:11:00 ru Exp $
 
 MAINTAINER=	gallatin@FreeBSD.org
 
diff --git a/sys/modules/owi/Makefile b/sys/modules/owi/Makefile
index 85f5c7182d370..75d405f9c56b4 100644
--- a/sys/modules/owi/Makefile
+++ b/sys/modules/owi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/owi/Makefile,v 1.2 2004/05/26 00:53:06 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/owi
 
diff --git a/sys/modules/patm/Makefile b/sys/modules/patm/Makefile
index daa483b6529d3..c77538511a80d 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 f77bc571aa78b..fa7f2ff4f58b4 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 2004/05/26 00:53:07 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/pccard
 
diff --git a/sys/modules/pcfclock/Makefile b/sys/modules/pcfclock/Makefile
index 107a0674ba21e..fb9e181d9e27a 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/pcic/Makefile b/sys/modules/pcic/Makefile
index 00b0643decbec..6a06921233076 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pcic/Makefile,v 1.25 2004/05/26 00:53:07 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/pcic ${.CURDIR}/../../dev/pccard
 
diff --git a/sys/modules/pcn/Makefile b/sys/modules/pcn/Makefile
index 637692eb6ee9d..3053594cddeac 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 951558efdeee3..f1564d3c12d04 100644
--- a/sys/modules/pecoff/Makefile
+++ b/sys/modules/pecoff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pecoff/Makefile,v 1.6 2004/02/13 10:11:01 ru Exp $
 
 MAINTAINER=	takawata@FreeBSD.org
 
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index d4eb9840b291d..4f50928331b88 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pf/Makefile,v 1.4 2004/08/14 15:32:40 dwmalone Exp $
 
 .PATH: ${.CURDIR}/../../contrib/pf/net
 .PATH: ${.CURDIR}/../../contrib/pf/netinet
diff --git a/sys/modules/plip/Makefile b/sys/modules/plip/Makefile
index 9aa5bd41c3781..cf6c3ec9be6ec 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 30c1581b049f0..070e0ea69a0cb 100644
--- a/sys/modules/pmc/Makefile
+++ b/sys/modules/pmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pmc/Makefile,v 1.2 2002/11/06 13:46:59 nyan Exp $
 
 .PATH: ${.CURDIR}/../../pc98/pc98
 
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index ef6955b5d1416..e016a3fd12f0f 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 1347e6482bcbe..8026df45238dd 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 568fddfd4282d..2c1186ea1c8fb 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 7e70bb2973ad6..6500015790f1a 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 75e23a0750f50..392629df34e0d 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 2002/10/26 14:38:22 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../fs/procfs
 
diff --git a/sys/modules/pseudofs/Makefile b/sys/modules/pseudofs/Makefile
index e84a6391ae0ae..2c457ed06f50e 100644
--- a/sys/modules/pseudofs/Makefile
+++ b/sys/modules/pseudofs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pseudofs/Makefile,v 1.3 2002/08/01 01:33:12 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../fs/pseudofs
 
diff --git a/sys/modules/pst/Makefile b/sys/modules/pst/Makefile
index 46e552ddaf749..6e2083d31d616 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/random/Makefile b/sys/modules/random/Makefile
index 37c4d829bc3b5..c379265fed2b2 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 84eb9d9585689..c39a3cca681b9 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 9cc8f03065522..d98b00caa3f9b 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 95f609eac0164..61ee38d247bdb 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 c28eb842c5893..b0950bea70243 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/rl/Makefile b/sys/modules/rl/Makefile
index 23a06a1daa616..ee8edd2758324 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 f818704a861e6..5be96d6ae365d 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 cff6e12dad003..bbbb8f7dece54 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 7e61752483351..28ec0fefc1e3f 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 c0babcbc37174..e545f59c67d3b 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 b47a594011d9e..31e1d6ecf1530 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 9dfab90f59ab5..d627d14cb6792 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 74569567c4702..6a31e25c5a963 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 4cf41456fa4e1..b15ba760e3b67 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 d8e3cc36a7cea..ca06184bf3498 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 0a1dba56a7123..070b06ac322b9 100644
--- a/sys/modules/sem/Makefile
+++ b/sys/modules/sem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sem/Makefile,v 1.1 2002/09/19 00:43:32 alfred Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index 1725f098267d6..6bce16363faf9 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 74235635a795f..012633a02c2d1 100644
--- a/sys/modules/sio/Makefile
+++ b/sys/modules/sio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sio/Makefile,v 1.6 2004/05/26 00:53:08 imp Exp $
 
 .if ${MACHINE} == "pc98"
 .PATH: ${.CURDIR}/../../pc98/pc98
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index 8fa9ec46ed7e5..bac388cfad39a 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 28ad56bcd1369..68cd0a609ee8f 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 44a6a9e154c7a..be318920d1fae 100644
--- a/sys/modules/smbfs/Makefile
+++ b/sys/modules/smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.7 2004/01/19 14:00:26 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 b248c757643c9..633942a7dbd4f 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 4b158fb9992ad..1e5c3336d200c 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 9cafd330e7b66..afa691965ae02 100644
--- a/sys/modules/snp/Makefile
+++ b/sys/modules/snp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/snp/Makefile,v 1.3 2002/01/11 15:48:57 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/snp
 
diff --git a/sys/modules/sound/Makefile b/sys/modules/sound/Makefile
index d6867331eb674..bf5bd35ed30cc 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 265f86d1ed55a..beabedaf50e10 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 2994097d4676c..acd1a13945a8e 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.15 2002/08/17 16:23:44 orion Exp $
 
 SUBDIR  = als4000 ad1816 cmi cs4281 csa ds1 emu10k1 es137x ess
 SUBDIR += fm801 ich maestro maestro3 mss neomagic sb16 sb8 sbc solo
diff --git a/sys/modules/sound/driver/Makefile.inc b/sys/modules/sound/driver/Makefile.inc
index 63bf7601dc367..6be4dd51ec0c5 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 9c7fa9ec5d856..05f59675bfb0a 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 59dc73ac05bd2..fcb9096d446a5 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 b00a90f473096..02420c041f5bb 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/cmi/Makefile b/sys/modules/sound/driver/cmi/Makefile
index 85f9ba160b980..20efaee687af3 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 ed3ddbc1574b1..72de13d994ef5 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 521005e143e23..0e0a703b17fcf 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 56a8461e3e6f8..585cc45e804ba 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 c8f90ec781d6b..294ee7500533a 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 3d9984c5840a4..3ce87ce870b2d 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 d2a2d58cc3436..d555b5f933e8a 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 4c8da8165809f..e8a5534c85e4c 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 a8ed6bd95ee44..b0e1ebdf43fd6 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 e0f2ce7e36261..4547436006cdd 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 4816f22b9143d..1e355a3f32ecd 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.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/maestro3/Makefile b/sys/modules/sound/driver/maestro3/Makefile
index d4378b8b790a9..7fd526b327455 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 44880788998b6..f02f3883ceee5 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 9eabb5ccaf997..d4bbb3041b32a 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 bf009f7035b8e..b6fe341d5c7e5 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 f2b0da834c7ae..24e92cefd7377 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 8e2343df26637..ae8c1a14db3e3 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 01059faf35366..2ac2f6a482b7b 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 7cd91402f49e7..179a6f662a28e 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 af5604af6b062..02fe1b65d41b9 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.2 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/usb
 
diff --git a/sys/modules/sound/driver/via8233/Makefile b/sys/modules/sound/driver/via8233/Makefile
index fa3fd960185c6..e0f01cd441be0 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 d53576ce9fce5..d2527313bb5d5 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 663d8a00969c5..456b99280cb86 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 752fadd344788..82cfe6e2c9215 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.15 2004/07/16 03:58:25 tanimura Exp $
 
 .PATH: ${.CURDIR}/../../../dev/sound/pcm
 .PATH: ${.CURDIR}/../../../dev/sound/isa
diff --git a/sys/modules/speaker/Makefile b/sys/modules/speaker/Makefile
index 69267d522b3eb..342a6560bb270 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 1c634bf4bf983..a159afb227568 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 265f86d1ed55a..21cbb45f0da0e 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 a169fdfec21a2..376bf83572e41 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 188dafcd0f02d..ddbad01ac81e1 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 7353089d0b8b8..4b6c38ef87ca2 100644
--- a/sys/modules/sppp/Makefile
+++ b/sys/modules/sppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sppp/Makefile,v 1.5 2002/06/17 05:40:49 jhay Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/sr/Makefile b/sys/modules/sr/Makefile
index b49d21edbdbec..76b85b8c884e0 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 6ad69a8f27055..8b89f0c18078f 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 83362d3e9a352..978068299eb20 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 ab343005eb9d7..305be8e4434be 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 25345e750c609..c90b18ec25dfa 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 a14e2b735401a..9ddd10824a5cf 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 078b80d8943a3..e4d2c41c78fe4 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 198c98245aa5f..c254b7ece73b1 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 b6cac1c93a337..363905cc5b470 100644
--- a/sys/modules/syscons/Makefile
+++ b/sys/modules/syscons/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/Makefile,v 1.14 2004/01/19 12:36:08 ru Exp $
 
 SUBDIR=	${_apm} \
 	blank \
diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc
index 265f86d1ed55a..960e646f9c0c7 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 d2e31d8c15ba2..1ea0c11317605 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 673b6bd2ff556..a6ef563f8f105 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 b027972c8d837..9da1f9a214419 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 95ebecd53982e..04d1ce854b88f 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 76919617dae87..f4ed1722b5d1b 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 219017e7f897f..cb43420c0be5a 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 255171ebb4456..d0d2a1e812842 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 b4439f2ddb991..9114f67242539 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 5c0d1265a1980..5c688f90351e9 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 9edf830068173..5d98ec2f04808 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 ca3075fe1e846..67a2b87687537 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 3ff59d3c4ea3e..43f8ff80110a0 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 6c65857836d22..6acc4466fd74e 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 265f86d1ed55a..4fe9ceee9fe38 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 e60b8a2fd1d86..37681fb3f3820 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.3 2001/02/04 08:23:13 peter Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile
index 13fe06ad3f845..361c071a17d92 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.3 2001/02/04 08:23:13 peter Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile
index 0f06ec80cd72c..204de524a65a3 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.4 2001/10/10 23:06:53 ps Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 84b026c1479af..1fc0dd403771b 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ti/Makefile,v 1.13 2002/06/26 03:34:49 ken Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index bbd30a13e6058..05befe48e86ec 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 f984794b30708..c7874d9df08e1 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 36456e53f7851..6c8c0e3a04dff 100644
--- a/sys/modules/twa/Makefile
+++ b/sys/modules/twa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/twa/Makefile,v 1.3 2004/04/10 02:41:22 vkashyap Exp $
 
 #
 # In the line following this comment, a value of 0 on the right hand
diff --git a/sys/modules/twe/Makefile b/sys/modules/twe/Makefile
index 052c541fab512..caa152df8fa45 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 8d4ded9237986..0b866bdf88f4b 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 7e1f500e85c58..6ad64411b3aaf 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 8a418faa11bc5..826ab1b911725 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uart/Makefile,v 1.11 2004/08/14 23:54:27 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/uart
 
diff --git a/sys/modules/ubsa/Makefile b/sys/modules/ubsa/Makefile
index dbb9a0a759dc0..c8b4aac954ead 100644
--- a/sys/modules/ubsa/Makefile
+++ b/sys/modules/ubsa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubsa/Makefile,v 1.3 2004/06/27 12:33:17 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ubsec/Makefile b/sys/modules/ubsec/Makefile
index 4c9f58cf14b17..98734494074ef 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 66f2a8797087b..23a44332416b8 100644
--- a/sys/modules/ubser/Makefile
+++ b/sys/modules/ubser/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubser/Makefile,v 1.2 2004/06/27 12:33:17 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ucom/Makefile b/sys/modules/ucom/Makefile
index a30cf4f2e272b..e79a88294b38f 100644
--- a/sys/modules/ucom/Makefile
+++ b/sys/modules/ucom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ucom/Makefile,v 1.3 2004/06/27 12:33:17 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/udav/Makefile b/sys/modules/udav/Makefile
index 02a9d721f9b96..0126a4e8d7502 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 574aa6b8d09a4..4453d7f5469f5 100644
--- a/sys/modules/udbp/Makefile
+++ b/sys/modules/udbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/udbp/Makefile,v 1.7 2004/06/27 12:33:17 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/udf/Makefile b/sys/modules/udf/Makefile
index 220cba1e08ceb..3beb472672c5a 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 008f722bcba19..4de2bcc4d9ba7 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 28bbc90e3a093..b1ae1727bf9d3 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 2b8c7eaae70bc..7857318f48575 100644
--- a/sys/modules/ufs/Makefile
+++ b/sys/modules/ufs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ufs/Makefile,v 1.2 2003/06/23 19:41:00 iedowse Exp $
 
 .PATH:	${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs
 
diff --git a/sys/modules/uftdi/Makefile b/sys/modules/uftdi/Makefile
index aaa4430ee79de..35324202a7968 100644
--- a/sys/modules/uftdi/Makefile
+++ b/sys/modules/uftdi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uftdi/Makefile,v 1.3 2004/06/27 12:33:17 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index e4679acbd0ba7..82538c5ad790b 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ugen/Makefile,v 1.12 2004/06/27 12:33:18 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index 58127bfa2b6aa..c4320b185473e 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/uhid/Makefile,v 1.12 2004/06/27 12:33:18 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index fe0091196840a..5007719c466e9 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ukbd/Makefile,v 1.16 2004/06/27 12:33:18 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index 2b57a985ff2cb..ea1f65559241f 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ulpt/Makefile,v 1.12 2004/06/27 12:33:18 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index 761d588dba223..2726d56e712bd 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 b0412ff920fe1..945514f2637e6 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/umass/Makefile,v 1.13 2004/06/27 12:33:18 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/umct/Makefile b/sys/modules/umct/Makefile
index 0ca9dc4983785..3c70f925d12b2 100644
--- a/sys/modules/umct/Makefile
+++ b/sys/modules/umct/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umct/Makefile,v 1.3 2004/06/27 12:33:18 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 777d3a2ee12b9..a9e71991d4d0e 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/umodem/Makefile,v 1.12 2004/06/27 12:33:19 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index f0659441a5888..06d49f9f2bd79 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ums/Makefile,v 1.12 2004/06/27 12:33:19 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index 64d38c5f2a823..4e155c333fd8c 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 774e47a87168c..ab84fc3d43354 100644
--- a/sys/modules/uplcom/Makefile
+++ b/sys/modules/uplcom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uplcom/Makefile,v 1.4 2004/06/27 12:33:19 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile
index 53526f53671db..719dd576dac9b 100644
--- a/sys/modules/urio/Makefile
+++ b/sys/modules/urio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/urio/Makefile,v 1.6 2004/06/27 12:33:19 imp Exp $ 
 
 MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
 
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index d4ab9d32ef8b8..3e9e52068e881 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/usb/Makefile,v 1.15 2004/07/12 21:59:06 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index 96bd071685467..555dd8f01b6e7 100644
--- a/sys/modules/uscanner/Makefile
+++ b/sys/modules/uscanner/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/uscanner/Makefile,v 1.5 2004/06/27 12:33:19 imp Exp $ 
 
 MAINTAINER=	n_hibma@freebsd.org
 
diff --git a/sys/modules/utopia/Makefile b/sys/modules/utopia/Makefile
index 19150cecf498f..3ce1e28b397e9 100644
--- a/sys/modules/utopia/Makefile
+++ b/sys/modules/utopia/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/utopia/Makefile,v 1.1 2003/06/12 14:28:32 harti Exp $
 
 .PATH: ${.CURDIR}/../../dev/utopia
 
diff --git a/sys/modules/uvisor/Makefile b/sys/modules/uvisor/Makefile
index 1d7dedb6317eb..42f297dc7e036 100644
--- a/sys/modules/uvisor/Makefile
+++ b/sys/modules/uvisor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uvisor/Makefile,v 1.3 2004/06/27 12:33:20 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/uvscom/Makefile b/sys/modules/uvscom/Makefile
index 4753e9bc4b647..b53ab35b03daa 100644
--- a/sys/modules/uvscom/Makefile
+++ b/sys/modules/uvscom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uvscom/Makefile,v 1.4 2004/06/27 12:33:20 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index eb49f933c9ba9..796d574e16dd0 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 8569f6831d60d..9db7ab2eccd75 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.2.1 2004/09/14 21:22:32 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../dev/vge
 
diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile
index 663b3c5b63aef..e4ad70ff514c3 100644
--- a/sys/modules/vinum/Makefile
+++ b/sys/modules/vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vinum/Makefile,v 1.24 2002/10/24 03:56:16 kris Exp $
 
 .PATH: ${.CURDIR}/../../dev/vinum
 
diff --git a/sys/modules/vpo/Makefile b/sys/modules/vpo/Makefile
index cad169a856fbf..bf871953d166c 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 fd58ab0cb26f0..af23bac6b9436 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 37d036f654a6f..05907ef112f97 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 e53d9861cb6af..ef78c31b266a2 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 ee577e8bd4ac1..0e98b6d70580b 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 d2aa5c7dce73a..f6053666962cc 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan/Makefile,v 1.3 2004/04/10 19:41:15 kan Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/xe/Makefile b/sys/modules/xe/Makefile
index f900854352b45..505bc82c6ef33 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 3c2c1627b36d7..4dc0ef6bace9e 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 0a475b55fce35..f96100648e8d0 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 118d266a20f2c..e4d433913d5a7 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.133.2.2 2004/10/11 03:45:21 green Exp $
  */
 
 #include "opt_bpf.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index f758412317082..6be01ff83ed3c 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.36 2004/05/30 17:03:48 dwmalone Exp $
  */
 
 #ifndef _NET_BPF_H_
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index 94a2ff49f9e85..f92ee09dc25c1 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 cc1d11e3510b0..f6ce65244b1aa 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.22 2004/04/07 20:46:11 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 35619271961dd..038f7b4d87c87 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.27.2.1 2004/09/14 02:59:20 rwatson Exp $
  */
 
 #ifndef _NET_BPFDESC_H_
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index 75f7c307fd90a..5fdf23b35800e 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.82.2.2 2004/10/03 17:04:39 mlaier Exp $
  */
 
 /*
diff --git a/sys/net/bridge.h b/sys/net/bridge.h
index de30210d27bdd..d60263548eded 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.12 2002/11/15 00:00:14 sam Exp $
  */
 
 extern int do_bridge;
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index dd08a92895637..d3939fb392047 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -36,7 +36,7 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bsd_comp.c,v 1.21 2004/04/07 20:46:11 imp Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index 27fb6d5ce5084..bb047c5d21be3 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.23 2004/06/02 21:34:14 naddy Exp $
  *
  */
 
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 541502779ab49..6f45209924a95 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.13 2002/11/15 00:00:14 sam Exp $
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/net/firewire.h b/sys/net/firewire.h
index 5c63a0537dd37..3c002d56d7582 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.2 2004/06/14 08:17:51 dfr Exp $
  */
 
 #ifndef _NET_FIREWIRE_H_
diff --git a/sys/net/if.c b/sys/net/if.c
index b93e81b113c6c..9a83a2b15dfa5 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.199.2.7.2.2 2004/10/30 22:01:43 rwatson Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/net/if.h b/sys/net/if.h
index 77ffb1a2be3e9..e371f5e545d91 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.88.2.2 2004/09/13 05:11:40 brooks Exp $
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h
index db3cb985e6028..099c0da97d84c 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.6 2004/04/07 20:46:11 imp Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index a4a487ef702a6..2d83b94101c6e 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.22 2004/06/15 23:57:41 mlaier Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Ignatios Souvatzis
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index a9cdd42a3dfbb..8bd914c45c333 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.20 2004/06/13 10:54:35 dfr Exp $
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_atm.h b/sys/net/if_atm.h
index 48bfa61ff5b5d..765e48ebccc90 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.21 2004/01/26 12:13:11 harti Exp $ */
 
 /*
  *
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index e7df9c324c41f..87f6989199eaf 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.35 2004/04/25 09:24:51 luigi Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index 7a519ee452d5e..01b3870899d42 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.2.2.1 2004/09/20 07:12:21 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h
index 61f1f1fc2107e..af037af813c93 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.1 2004/06/22 20:13:25 brooks Exp $
  */
 
 #ifndef	_NET_IF_CLONE_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 1b71630622cb0..c820147336f32 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.44 2004/07/15 08:26:06 phk Exp $
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index f13b4198670df..c253f44c9d884 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.13 2004/04/07 20:46:11 imp Exp $
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index c8ae300535fbd..c85312b0f4011 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.32 2004/07/28 06:48:36 kan Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 2a5a030d48a3c..5b492be7f8a0e 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.177.2.1 2004/10/16 07:04:49 scottl Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 91b727c14c23c..0d2d2af8ffdfd 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.32 2004/07/15 08:26:06 phk Exp $
  */
 /*
  * derived from
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index a38c1cc19f942..da53f33790f67 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.95 2004/06/15 23:57:41 mlaier Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index 331f361466f88..81c95e8444776 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.5.2.1 2004/08/24 14:19:33 rwatson Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 6d2221c2d7990..75edb18a4a46f 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.49 2004/07/15 08:26:06 phk 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 c3a9df26b180a..ed3b5b82e8345 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.15 2004/04/05 16:55:15 ru 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 34dafef986f9a..760859c7b10f4 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.28 2004/08/05 08:12:46 sobomax Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 2910f2f96a8f6..18fbd5d8ac55d 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.11 2004/03/22 16:04:42 rwatson Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index dfe31e2292b89..9a085949ef974 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.65 2004/06/15 23:57:41 mlaier Exp $
  *
  */
 
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index a458b2b4066ab..31253ac5496ea 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.10 2004/04/07 20:46:11 imp Exp $
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 1ddf74fcfe280..f39cd0a7ba924 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.101.2.1 2004/09/15 15:14:18 andre Exp $
  */
 
 /*
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 535115790c6e7..d649b44dbb329 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.20 2003/10/31 18:32:08 brooks Exp $ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 3638b8feb5aad..5cfc84131ce10 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.28 2004/08/12 23:48:26 tackerman Exp $ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index f104b77bfd2b4..3a278a32e952c 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.13 2003/10/31 18:32:08 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_mib.h b/sys/net/if_mib.h
index 6c29389f68765..b1a7bcfd54564 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.6 1999/08/28 00:48:19 peter Exp $
  */
 
 #ifndef _NET_IF_MIB_H
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index eaab431ada317..65c93eb613635 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_ppp.c,v 1.100.2.1 2004/09/15 15:14:18 andre 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 713d39a22a305..0d4b6078f4640 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -16,7 +16,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.14 1999/08/28 00:48:20 peter Exp $
  */
 
 #ifndef _IF_PPP_H_
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index 7323fa14effde..943f66b3d70cd 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -39,7 +39,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.20 2002/08/09 15:30:46 brooks Exp $
  */
 
 /*
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 85a7d5c929194..66dc14c152cd0 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.122.2.2 2004/09/15 15:14:18 andre Exp $
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index 2de9533bbde7c..d4af75e4e364a 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.22 2004/04/07 20:46:11 imp Exp $
  */
 
 #ifndef _NET_IF_SLVAR_H_
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index e602aa55a6828..182651c1f4d27 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -16,7 +16,7 @@
  *
  * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_sppp.h,v 1.24 2001/12/30 20:42:29 joerg Exp $
  */
 
 #ifndef _NET_IF_SPPP_H_
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 71019750bfd96..5504490f8d9e9 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -17,7 +17,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.113.2.1 2004/09/15 15:14:18 andre Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index eff2c7ea2f872..ee93ede16cd28 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.42 2004/07/15 08:26:06 phk 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 07d3d57a562cd..3dbc61a0df2ef 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.4 2002/04/19 04:46:21 suz 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 59b1780c2304c..cb884926df3ca 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.46.2.1 2004/09/20 05:49:40 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 30f742129191d..13db17ddd3f7b 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.1 2000/07/20 17:01:10 nsayer 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 512a33d7e95cb..6e40a7f5d0e3d 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.8 2004/06/16 09:47:14 phk 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 065f6c9b055ad..eb057c328a0cd 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.144 2004/07/15 08:26:06 phk Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 185930af318b5..ed98e43fd0155 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.17 2000/01/23 01:47:12 brian Exp $
  */
 
 #ifndef _NET_IF_TUN_H_
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index e23af2ddb3215..058150583de02 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.16 2004/04/07 20:46:11 imp 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 8604359566843..03bc31ec99bf6 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.84.4.3 2004/10/30 22:01:43 rwatson Exp $
  */
 
 #ifndef	_NET_IF_VAR_H_
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 7a8429d641db1..91c1537eabb65 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.73 2004/08/15 06:24:42 jmg Exp $
  */
 
 /*
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 871c0d3871fa7..1ccdc588aa2b1 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.19 2004/01/18 19:29:04 yar Exp $
  */
 
 #ifndef _NET_IF_VLAN_VAR_H_
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index 1333cc572cac0..07613c66cdf9c 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.13 2003/03/15 23:55:33 mdodd Exp $
  *
  * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
  * the Mach token ring driver.
diff --git a/sys/net/net_osdep.c b/sys/net/net_osdep.c
index 90601e20a051f..b0385db7e8af2 100644
--- a/sys/net/net_osdep.c
+++ b/sys/net/net_osdep.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/net_osdep.c,v 1.8 2003/10/31 18:32:08 brooks Exp $	*/
 /*	$KAME: net_osdep.c,v 1.12 2002/12/02 14:28:57 itojun Exp $	*/
 
 /*
diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h
index 2cafa0283ba3a..e58ebbe09de26 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.12 2003/11/04 14:08:31 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 632c8c7354c65..e3e31cd8026c5 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.10.2.3 2004/10/14 19:19:24 andre Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 1b11fca890c4b..d8b0524d041d5 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.32 2004/06/09 02:48:23 rwatson Exp $
  */
 
 #ifndef _NET_NETISR_H_
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index bfd382db6bed3..2565c26db9d18 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/pfil.c,v 1.8.4.3 2004/10/11 03:45:57 green 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 ed5a3d030fc26..3f042ec5eac6c 100644
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/pfil.h,v 1.11.2.1 2004/10/03 17:04:39 mlaier 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 a164f3befe524..dfe5de94110cc 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/pfkeyv2.h,v 1.13 2004/02/11 04:26:01 bms 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 d75e6a78fdbeb..9f63329f52a98 100644
--- a/sys/net/ppp_comp.h
+++ b/sys/net/ppp_comp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_comp.h,v 1.11 2002/03/24 09:34:04 bde Exp $
  */
 
 #ifndef _NET_PPP_COMP_H
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index 3c7884e033d7a..7587575b41d7e 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.20 2003/02/19 05:47:29 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 be891ee55ff31..11a3fef1de432 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_defs.h,v 1.7 2001/06/11 12:38:58 ume Exp $
  */
 
 #ifndef _PPP_DEFS_H_
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 3a14150eb552f..a1297490f2ede 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/ppp_tty.c,v 1.61 2004/07/15 20:47:41 phk Exp $ */
 
 #include "opt_ppp.h"		/* XXX for ppp_defs.h */
 
diff --git a/sys/net/radix.c b/sys/net/radix.c
index f4f99d350931d..b0d851e93dd42 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.36 2004/04/21 15:27:36 luigi Exp $
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index 2796b9d420d42..9b2ac058cac3a 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.25 2004/04/18 11:48:35 luigi Exp $
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index b6ab2083a0fe6..02e980ebdd71b 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.29.4.1 2004/10/21 09:30:46 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 177dedff6ae2d..b2bd313fc3a57 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.18 2004/06/15 04:13:59 rwatson Exp $
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index f444b571ba42a..dba5805d99eea 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.34.4.1 2004/10/21 09:30:46 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index f2db78cf7c4be..7d6b45044ba77 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.106.2.1 2004/09/02 14:49:34 csjp Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/route.h b/sys/net/route.h
index 16716a351b41f..f7adf9282a16c 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.61 2004/07/28 06:51:33 kan Exp $
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 8616e23788279..ffa2efc3ce3f5 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.113.2.3 2004/09/15 15:14:18 andre Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index d58cd3d0d5446..832961bc284c4 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 c506d2b9f30c1..99ee01be3a54d 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -30,7 +30,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slcompress.h,v 1.18 2004/04/07 20:46:12 imp Exp $
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net/slip.h b/sys/net/slip.h
index 7b4164e8bef6a..e361ae4f08334 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 b25d4a29a1527..80149d8e684fb 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.18 2004/06/20 17:42:34 markm Exp $
  */
 
 /* 
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index 35119fb96dcfd..1bb66ce7db714 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/net/zlib.h,v 1.9 2002/05/29 20:24:09 phk Exp $	*/
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 7bbeedcd83447..0ecb9714a8d8c 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.13 2004/05/30 17:57:45 phk Exp $");
 
 /*
  * IEEE 802.11 generic handler
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index f21c99a0ba439..35d5de3f5aa3f 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.5 2004/04/05 17:47:40 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_H_
 #define _NET80211_IEEE80211_H_
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index 6cb9ee0c7279a..6959242f3c7a8 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.3 2003/10/17 23:15:30 sam Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
index 89b13dc27328f..0b247140cbd34 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.2 2003/06/27 05:13:52 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_CRYPTO_H_
 #define _NET80211_IEEE80211_CRYPTO_H_
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 74aa1c4baa096..c4d6819d4bd54 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.21 2004/06/13 17:29:09 mlaier Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 75995910d2534..d1df164ec2e4c 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.13 2004/03/30 22:57:57 sam Exp $");
 
 /*
  * IEEE 802.11 ioctl support (FreeBSD-specific)
diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h
index d8c2b024a249a..ade31e06e904d 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.5 2004/03/30 22:57:57 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 5d4f0f5656d24..efaa6dc32d54d 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.22 2004/04/05 04:15:55 sam Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index dfb8d4e1738e9..ca2952993d068 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.10 2004/04/05 22:10:26 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 b08fff046f747..cd8198e26230f 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.11 2004/07/27 23:20:45 rwatson Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 1f4301af17680..6fbe7b5727fd6 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.9 2004/07/27 23:20:45 rwatson Exp $");
 
 /*
  * IEEE 802.11 protocol support.
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index 8c85003061051..69d98e8b31e76 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.4 2003/08/19 22:17:03 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 68e936799adab..2ddcbdd1583bd 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.3 2004/04/05 22:13:21 sam Exp $ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.3 2003/11/16 09:02:42 dyoung Exp $ */
 
 /*-
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index c5ef197347a20..2cb78febbb4fa 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.15 2004/04/05 22:10:26 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index 33d99b2fc0a14..79c1de04b12a5 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.33 2004/08/10 03:23:05 rwatson Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/netatalk/aarp.h b/sys/netatalk/aarp.h
index 1a8771c817b24..56721d781e6d3 100644
--- a/sys/netatalk/aarp.h
+++ b/sys/netatalk/aarp.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/aarp.h,v 1.3 1999/12/29 04:45:57 peter Exp $
  */
 
 #ifndef _NETATALK_AARP_H_
diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 93e91da548202..5b577edd9b666 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.6 2002/09/06 17:02:29 sobomax Exp $
  */
 
 #ifndef __AT_HEADER__
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index 7742d4a1bffea..ef42034259b54 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_control.c,v 1.42 2004/07/19 17:18:58 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h
index bbb1bc9227a89..cdf075d24b619 100644
--- a/sys/netatalk/at_extern.h
+++ b/sys/netatalk/at_extern.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_extern.h,v 1.14 2004/04/25 09:24:51 luigi Exp $
  */
 struct mbuf;
 struct sockaddr_at;
diff --git a/sys/netatalk/at_rmx.c b/sys/netatalk/at_rmx.c
index 85e5797064eee..167617612a903 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.8 2004/07/12 18:37:31 rwatson 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 4bbe110183966..61f43a6e93286 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.12 2004/03/22 04:50:36 rwatson Exp $
  */
 
 #ifndef _NETATALK_AT_VAR_H_
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index 6f849830fcbb7..307e761084592 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.26 2004/08/10 03:23:05 rwatson Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c
index 7270d543b2acd..620104ca11953 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.24 2004/06/13 02:50:05 rwatson Exp $ */
 
 #include "opt_mac.h"
 
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index dd69850cd8fdb..c9753ea76b93f 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -3,7 +3,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.44.4.1 2004/10/21 09:30:46 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/ddp_pcb.h b/sys/netatalk/ddp_pcb.h
index 85ec0ccdf54c8..a2c9d7f93cabf 100644
--- a/sys/netatalk/ddp_pcb.h
+++ b/sys/netatalk/ddp_pcb.h
@@ -3,7 +3,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_pcb.h,v 1.2 2004/07/12 18:39:59 rwatson Exp $
  */
 
 #ifndef _NETATALK_DDP_PCB_H_
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 1621f1f8745e3..fc24a67996125 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -3,7 +3,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.42 2004/07/12 18:39:59 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/ddp_var.h b/sys/netatalk/ddp_var.h
index 6fb3aedd81213..df1487c502ae4 100644
--- a/sys/netatalk/ddp_var.h
+++ b/sys/netatalk/ddp_var.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.7 2004/07/12 18:39:59 rwatson Exp $
  */
 
 #ifndef _NETATALK_DDP_VAR_H_
diff --git a/sys/netatm/atm.h b/sys/netatm/atm.h
index c92312e418aed..cdfa3eaad618a 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.5 2002/04/21 01:41:04 arr Exp $
  *
  */
 
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index 04e5d7e1f84ee..110f7be7a2a41 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.19 2004/06/14 18:16:20 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index aa3b0eacc4df3..8ed215a20cf2b 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.31 2003/07/26 14:20:37 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index 05f2acea67680..b0543f88e29da 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.7 2002/11/08 18:27:29 jhb Exp $
  *
  */
 
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index 4481a35a511bb..b3018622b0ee4 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.25 2003/07/25 06:43:41 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index 81edae181b6fb..157bf312f81c3 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.28 2003/10/31 18:32:10 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index 73c40d227e6cc..6ec6af9061f7f 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.18 2003/10/31 18:32:10 brooks Exp $
  *
  */
 
diff --git a/sys/netatm/atm_ioctl.h b/sys/netatm/atm_ioctl.h
index 7fce9be122ea3..fa7348bdf40c5 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.9 2004/06/08 13:46:31 stefanf Exp $
  *
  */
 
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index af273fa69f60a..9024982d86e1c 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.3 2000/10/12 07:42:32 phk Exp $
  *
  */
 
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 174852cabe41e..97d9d749da3d4 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.11 2003/07/24 10:33:01 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netatm/atm_sap.h b/sys/netatm/atm_sap.h
index 35f54351c4f53..c35974f5eb269 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.2 1999/08/28 00:48:37 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index 227b71fed6ed5..c6663784fd281 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.4 2002/03/20 02:39:07 alfred Exp $
  *
  */
 
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 1ff5e7f588110..11933250eb0c8 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.12 2003/06/11 06:56:50 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 99dbaf6ceac60..ab67f07354006 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.20.4.1 2004/10/21 09:30:47 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index 4981ae2752220..13349643b57ea 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.5 2002/11/08 18:27:29 jhb Exp $
  *
  */
 
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index d816dfd63129f..cdb38b21e7e05 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.42 2004/02/21 12:55:07 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index d070d7f6b266d..9dc3b142c6c94 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.7 2002/06/14 19:31:07 arr Exp $
  *
  */
 
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 9b587416d0b9a..cc9f92ed3a4c3 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.21 2003/11/18 00:39:03 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index 141a737994eed..8db80a9507705 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.24 2003/10/31 18:32:10 brooks Exp $
  *
  */
 
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index c4f66a5c21ee3..f614b177b9f37 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.4 2003/07/29 13:32:10 harti Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm.h b/sys/netatm/ipatm/ipatm.h
index 887509c0fee82..54625b6478433 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.2 1999/08/28 00:48:43 peter Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 7c68ca1f2210d..0283542f8cd2e 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.9 2003/06/11 07:00:30 obrien 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 7f85cde64a1c4..13736a1d85685 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.16 2003/07/22 15:11:08 harti 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 d1d52bcede65f..0154e808e8cbe 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.13 2003/07/24 15:25:17 harti 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 3334518fe45e6..0f52f107133ae 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.19 2003/07/24 15:25:17 harti 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 195d8d15be20c..c4d3efdba2087 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.12 2003/07/24 15:25:17 harti 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 f12562de7ea53..90ce89fc86144 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.3 2002/03/20 08:00:50 alfred Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index 99d1575c41439..cdb48d18e2c72 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.14 2003/10/31 18:32:10 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 d0e0d3e098a6b..9f148e9ca61a7 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.8 2003/07/25 08:35:26 harti Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 490bbdc977dfa..a917ca1dc1150 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.17 2003/11/14 21:02:10 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index d8c7ceb64f919..06cebac8f18e4 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.15 2003/02/23 22:26:39 obrien Exp $
  *
  */
 
diff --git a/sys/netatm/queue.h b/sys/netatm/queue.h
index 67bff75481a88..25b64c116d8f5 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.2 1999/08/28 00:48:41 peter Exp $
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index 8fab9b702fd28..a23b9119c5c73 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.17 2003/07/29 13:32:10 harti 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 708521ffd332d..e2c2ae52df5fb 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.13 2003/06/11 07:06:31 obrien 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 7e6af34b763a2..850622f94862e 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.4 2002/03/20 08:00:50 alfred Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index 63f7245e273d3..19365f25a5c6f 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.19 2003/10/31 18:32:10 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 22f7e2cc41e4e..a261727359b8f 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.19 2003/07/25 12:32:08 harti 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 3c7a7ffe673d6..576cc07019c2d 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.3 2000/10/12 07:42:33 phk Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index c4f071e7111a3..793c7daf63709 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.15 2003/07/29 13:32:10 harti 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 e0421f46c5d2b..c7b8fa4185cf8 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.14 2004/07/28 06:52:26 kan Exp $");
 
 /*
  * xdr.c, Generic XDR routines implementation.
diff --git a/sys/netatm/spans/spans_kxdr.h b/sys/netatm/spans/spans_kxdr.h
index 6ffead77b1577..c209a72f64cda 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.2 2003/01/01 18:48:55 schweikh Exp $
  */
 
 #ifndef _SPANS_KXDR_H
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index a578a12538f1a..1f10a15b7b20b 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.15 2003/06/11 07:11:35 obrien 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 68daa18c3dd98..070d7a1e57779 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.10 2003/06/11 07:11:35 obrien 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 e46bde15e8241..c9965ce788aac 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.13 2003/07/24 14:37:01 harti 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 19263dda35ef5..098ba4d1c9852 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.12 2003/06/11 07:11:35 obrien 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 15638cddd7ada..7f02e72630571 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.10 2003/06/11 07:11:35 obrien 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 7ea994224c5df..0505b4556ca11 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.8 2003/07/24 14:37:01 harti Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_xdr.x b/sys/netatm/spans/spans_xdr.x
index 7a3c118fc1878..dd46b6f169e0c 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.4 2002/09/17 08:57:52 peter 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.4 2002/09/17 08:57:52 peter Exp $";
 %#endif
 %
 #endif
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index 6f01b99c2753d..f8e57bb6b166a 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.10 2003/06/11 07:22:30 obrien 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 74d239b7ec83c..783a42b2449a8 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.11 2003/06/11 07:22:30 obrien 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 5f0eece6e3f10..84ec61616da08 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.8 2003/06/11 07:22:30 obrien 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 7d5e5cde0bdfe..e702354eb648f 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.10 2003/06/11 07:22:30 obrien 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 4df194f7b6e68..d1c24319cf05d 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.11 2003/06/11 07:22:30 obrien 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 d82ae1d0bc7c5..fe413b9696a33 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.8 2003/06/11 07:22:30 obrien 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 3706244dabf9b..d9ac3a878417e 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.21 2003/07/24 12:24:41 harti 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 e55d6b8e9d304..359024a613162 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.2 1999/08/28 00:48:56 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 76bae53210cca..fa02afb957dcb 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.12 2003/07/24 12:24:41 harti 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 3f127e6e881e4..f79ec3ec30bdf 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.11 2003/06/11 07:22:30 obrien 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 934bdaa0be58d..6eaeee8762e59 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.7 2003/07/24 09:14:49 harti Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index cc424beb14556..2db65f22f007e 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.17 2003/07/22 12:46:30 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop.h b/sys/netatm/uni/sscop.h
index 89ca468bcc37f..b8aacd4e456a2 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.2 1999/08/28 00:48:58 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 086250b830962..cae3b7cf97a1f 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.14 2003/06/11 07:22:30 obrien 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 5fcea10bcc0f4..ec24a7d1a4692 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.2 1999/08/28 00:48:59 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index eeed1a033b257..2ea8568c17513 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.13 2003/07/24 09:14:50 harti 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 9a930d0feaff7..560b921af6527 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.2 1999/08/28 00:48:59 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 528d1a229deb9..0634b3540e2b3 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.9 2003/06/11 07:22:30 obrien 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 919ba41767fd1..ad59d9e56e2b1 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.10 2003/06/11 07:22:30 obrien 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 c4d2f4c1d1a1b..9f374b714e291 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.15 2003/06/11 07:22:30 obrien 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 da388d3d45205..eaf0000ebbd6a 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.10 2003/06/11 07:22:30 obrien 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 4b22e96677574..099a5556bdc78 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.13 2003/06/11 07:22:30 obrien 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 9ba9ca6a8d0cf..fa565dbc601e3 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.8 2003/07/24 09:14:50 harti Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni.h b/sys/netatm/uni/uni.h
index b7cd1bd48b4a6..c48fb009bfee7 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.2 1999/08/28 00:49:01 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index 2f594d41f3797..b57407cfcefbe 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.11 2003/06/11 07:22:30 obrien Exp $");
 
 #ifndef ATM_UNI_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index ff6819fa12fa8..8da4284706405 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.21 2003/10/31 18:32:10 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 3aba40a40b8bc..837d6b60b0bdf 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.13 2003/07/29 13:32:10 harti 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 b2cef44356fc7..9c35c6639fc7a 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.15 2003/07/25 06:39:46 harti 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 e2547e08056ba..5b2da468056b3 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.9 2003/06/11 07:22:30 obrien 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 2f2915bf5f7f5..d12a6b4167df2 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.10 2003/06/11 07:22:30 obrien 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 3a2bc8adc8c81..d2cff5a11409f 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.14 2003/07/23 14:28:57 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 1e07d75058dc2..c2a903f8512d9 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.15 2003/07/22 12:46:30 harti 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 fd5129a4f766d..53f82ae3af6ae 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.8 2003/07/29 13:46:43 harti Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig.h b/sys/netatm/uni/unisig.h
index 1f06f5ccffc13..3402efd4b146d 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.2 1999/08/28 00:49:04 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index 3f7f30462fd48..32fc6fcee35a9 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.16 2003/07/23 14:28:57 harti 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 1e9a986df6009..20ee1dc14ff97 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.3 2002/03/20 08:00:54 alfred Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 932290628a069..41135ca52c28a 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.13 2003/06/11 07:22:30 obrien 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 30846e13df992..4956c3920a9bc 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.16 2003/07/29 13:32:10 harti 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 c2f5bbb9216c6..3fae98dc75dfc 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.10 2003/06/11 07:22:30 obrien 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 986ae43ab5cba..e2edcbb80a593 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.2 1999/08/28 00:49:06 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 08b793478674c..a1b17de5623e4 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.16 2003/07/25 06:39:46 harti 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 9ea3c4db924f0..b388437a03663 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.3 1999/08/28 00:49:07 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index a6d7919e85a80..d5f57851d6e64 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.11 2003/06/11 07:22:30 obrien 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 22f440a06abc3..74c155501ecc6 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.2 1999/08/28 00:49:07 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index e5e8b93a1c738..3bf8df9934d5c 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.11 2003/07/25 06:39:46 harti 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 ad4a8d2051eb5..effd4d56c102d 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.13 2003/06/11 07:22:30 obrien 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 faa7b0b383cc4..77add481256aa 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.16 2004/07/19 12:54:00 harti 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 815242b988379..edabdae1c8cc8 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.11 2003/06/11 07:22:30 obrien 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 77e5048ea98fc..3aebbc695ccf8 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.8 2003/07/25 06:39:46 harti Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 81ff8fc4f4f51..a946949b2e482 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.16 2003/07/23 14:28:57 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/NOTES b/sys/netgraph/NOTES
index 0ddc02f5a6636..2050cc41511f6 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 b5eb2e5a4c91c..a12f7c95326b1 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.2 2004/05/29 00:51:14 julian 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 13077564632de..ce68914607e19 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.1.4.1 2004/09/15 15:14:19 andre 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 f295461678dc8..6826861ab2171 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.1 2003/08/11 08:40:02 harti Exp $
  */
 
 /*
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c
index 3f85a6048d0e3..40e4b2a814677 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.1 2004/08/12 14:22:00 harti Exp $
  *
  * ATM call control and API
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ccatm/ng_ccatm.c,v 1.1 2004/08/12 14:22:00 harti 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 5720e8bd28059..58202dde8994c 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.1 2004/08/12 14:22:00 harti Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index dc55a4fe84062..8eb4f75917b39 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.11 2004/07/28 06:54:55 kan 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 ebf7cb69843c8..773c14dbc0f80 100644
--- a/sys/netgraph/atm/ng_atm.h
+++ b/sys/netgraph/atm/ng_atm.h
@@ -28,7 +28,7 @@
  *
  * Netgraph module to connect NATM interfaces to netgraph.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_atm.h,v 1.4 2004/01/26 14:57:49 harti 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 b45df7578a0b0..e11dc17bffb86 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.1 2003/08/11 08:40:00 harti Exp $
  */
 
 #ifndef _NETGRAPH_ATM_NG_ATMPIF_H_
diff --git a/sys/netgraph/atm/ng_ccatm.h b/sys/netgraph/atm/ng_ccatm.h
index ecc0738a47bee..a4c5eddd8607c 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.1 2004/08/12 14:22:00 harti Exp $
  *
  * Interface to ng_ccatm
  */
diff --git a/sys/netgraph/atm/ng_sscfu.h b/sys/netgraph/atm/ng_sscfu.h
index 600d892f2c6c5..4f7bbcc61c102 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.1 2003/10/24 07:39:11 harti 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 17713ca01193e..f5bd0e6b406c7 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.2 2003/11/13 13:00:56 harti Exp $
  *
  * Netgraph module for Q.2110 SSCOP
  */
diff --git a/sys/netgraph/atm/ng_uni.h b/sys/netgraph/atm/ng_uni.h
index 957f3ad41a098..7b3e01e0640be 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.1 2003/11/07 09:15:14 harti Exp $
  *
  * Netgraph module for UNI 4.0
  */
diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c
index 7881fa371bd3e..22386efd541cb 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.2 2003/12/08 01:18:04 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/module.h>
diff --git a/sys/netgraph/atm/ngatmbase.h b/sys/netgraph/atm/ngatmbase.h
index 39153ee419b3d..2c5ce4ce19363 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.2 2003/11/13 13:00:56 harti 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 10caa4980fd47..1499d05c30cbe 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.3 2004/05/29 00:51:15 julian 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 dcc197acbd4dd..9b8c3bd27088c 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.1 2003/10/24 07:39:11 harti 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 0d5906d75ff61..136854cff09c9 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.2 2004/05/29 00:51:15 julian 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 bf9dd8a49b586..4003ba8e52db8 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.1 2003/10/24 07:39:11 harti 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 494092efb06c7..35f4c27255e6c 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.3 2004/05/29 00:51:16 julian 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 121d7ab8d588a..a1b6a68b667db 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.2 2004/06/25 19:22:03 julian Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c
index ae5cc777e4ce4..98e6ea18f8322 100644
--- a/sys/netgraph/bluetooth/common/ng_bluetooth.c
+++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c
@@ -26,7 +26,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.4 2004/05/30 20:27:17 phk 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 fc1ead31d846b..ff754f22c1dd8 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -26,7 +26,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.8 2004/05/29 07:16:49 julian 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 12ad7704cefc5..e51a9b057ec05 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
@@ -26,7 +26,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.2 2003/05/10 21:44:39 julian 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 d1066590b4680..66802bcaa593d 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 1710a4c535cf3..e6d4da8e1d262 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4.c,v 1.5 2003/05/10 05:51:25 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c,v 1.10 2004/06/26 08:44:04 phk 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 a4e74a48c622f..3b1289ba0f529 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
index 932a04eefc713..41bca63f8b163 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/drivers/ubt/TODO b/sys/netgraph/bluetooth/drivers/ubt/TODO
index 90f9d1db5094d..608c3b0a099fc 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 aca8dc1a54d1f..ffe156dd8df57 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -26,7 +26,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.19 2004/06/27 16:51:01 imp 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 fef818977ef0c..e1d613475e1f0 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -26,7 +26,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.3 2004/06/16 09:47:15 phk 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 695d269217926..837782d07dee5 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -26,7 +26,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.9 2004/06/27 16:51:01 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/TODO b/sys/netgraph/bluetooth/hci/TODO
index 6f66d7b84d0f2..0cc8f74184c32 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 90c085996e89b..b06f7d0c29358 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -26,7 +26,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.6 2004/04/27 16:38:14 emax 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 781e9fc24ff22..ac163e6fa5402 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax 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 5fe192a8247b3..0d13f6996f4fa 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -26,7 +26,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.7 2004/04/27 16:38:14 emax 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 09769daaf8c07..6d442caf3c971 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax 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 ad44254f589ce..bdcd4536e6c52 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_main.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c
@@ -26,7 +26,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.4 2004/05/29 00:51:17 julian 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 6d0977a6dc1fd..3f5d95ec3de21 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -26,7 +26,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.7 2004/04/27 16:38:14 emax 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 33250f27878d1..9a1918aa0916b 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
@@ -26,7 +26,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.4 2003/11/14 03:45:29 emax 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 5f0e3f04d58fe..d0cee10599731 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_prse.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index 8d5088493eb73..61ffae77e7daf 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -26,7 +26,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.7 2004/04/27 16:38:14 emax 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 28c3adebd9163..64a9707e382c8 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
@@ -26,7 +26,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.2 2003/05/10 21:44:40 julian 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 1a38990060db6..494bf7b3661e9 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_var.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_var.h
@@ -26,7 +26,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.4 2004/04/09 23:01:39 emax 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 387504a04567d..1c00d7eba2d17 100644
--- a/sys/netgraph/bluetooth/include/ng_bluetooth.h
+++ b/sys/netgraph/bluetooth/include/ng_bluetooth.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax Exp $
  */
 
 #ifndef _NETGRAPH_BLUETOOTH_H_
diff --git a/sys/netgraph/bluetooth/include/ng_bt3c.h b/sys/netgraph/bluetooth/include/ng_bt3c.h
index 2af1837c9ba69..c4e93d993ee0b 100644
--- a/sys/netgraph/bluetooth/include/ng_bt3c.h
+++ b/sys/netgraph/bluetooth/include/ng_bt3c.h
@@ -26,7 +26,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.3 2004/05/10 02:24:55 emax 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 f02b5f7abab5c..2885a1d57c223 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -26,7 +26,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.5.2.1 2004/08/26 20:58:46 julian 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 129ebb67c44d0..fcb0fbca3778c 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax 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 7498149aae636..6c6ad3394ece7 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax 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 e3d8aa9efc442..19284b18e1bb5 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -26,7 +26,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.2 2003/11/14 03:45:29 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 b1910290f4e94..f2ac7754b7d48 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -26,7 +26,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.4 2004/05/10 02:24:55 emax Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index a304d04e03637..478b1564f2c67 100644
--- a/sys/netgraph/bluetooth/include/ng_hci.h
+++ b/sys/netgraph/bluetooth/include/ng_hci.h
@@ -26,7 +26,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.4 2004/08/10 00:38:50 emax Exp $
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_l2cap.h b/sys/netgraph/bluetooth/include/ng_l2cap.h
index 57593898a94cb..a743f33461582 100644
--- a/sys/netgraph/bluetooth/include/ng_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_l2cap.h
@@ -26,7 +26,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.2 2003/05/10 21:44:41 julian Exp $
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_ubt.h b/sys/netgraph/bluetooth/include/ng_ubt.h
index bdfc47a4dc9be..79cbe1a815ee7 100644
--- a/sys/netgraph/bluetooth/include/ng_ubt.h
+++ b/sys/netgraph/bluetooth/include/ng_ubt.h
@@ -26,7 +26,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.2 2003/05/10 21:44:41 julian Exp $
  */
 
 #ifndef _NG_UBT_H_
diff --git a/sys/netgraph/bluetooth/l2cap/TODO b/sys/netgraph/bluetooth/l2cap/TODO
index 7c7bb27c59aa2..0d7aa2971639e 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 e7089904ad243..67aa51532f0f2 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
@@ -26,7 +26,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.4 2004/04/27 16:38:15 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 ed8e84f1b69e9..3916fc15c7fe4 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -26,7 +26,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.4 2003/05/10 21:44:41 julian 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 9a40d2649ccd3..27702b5c20b4b 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -26,7 +26,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.7 2004/04/27 16:38:15 emax 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 c7cf8ac90ac72..0c42d5eff84a6 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
@@ -26,7 +26,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.2 2003/05/10 21:44:41 julian 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 8f9e506573f4e..fd1824b86c815 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -26,7 +26,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.7 2004/04/27 16:38:15 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 9efc835542518..8a2942a6896cc 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
@@ -26,7 +26,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.2 2003/05/10 21:44:41 julian 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 d58b1446f1bad..4ae821a6f2b04 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
@@ -26,7 +26,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.4 2004/05/29 00:51:17 julian 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 075df7d6fcd7c..86618032429f3 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -26,7 +26,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.7 2004/04/27 16:38:15 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 b588e17fe8ce2..36dbe444900ad 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -26,7 +26,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.4 2003/11/14 03:45:29 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 08a9169260d10..da6c2b28c88f8 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
@@ -26,7 +26,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.3 2003/11/14 03:45:29 emax Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
index ffce0f36c8b25..f3ff918bf64e1 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
@@ -26,7 +26,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.4 2004/04/27 16:38:15 emax 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 109b5b7974e2e..70ec8d4162a15 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
@@ -26,7 +26,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.2 2003/05/10 21:44:41 julian 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 d3e2d6b36c177..9902f00e29897 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
@@ -26,7 +26,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.4 2004/04/09 23:01:40 emax Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_VAR_H_
diff --git a/sys/netgraph/bluetooth/socket/TODO b/sys/netgraph/bluetooth/socket/TODO
index c1aa3b2d476d5..b40b7dcee86a2 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 9932b8ce97137..1aa15841734fd 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c
@@ -26,7 +26,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.7 2004/06/25 23:03:33 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 7c347c370a9da..add1e1a76f01a 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -26,7 +26,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.15.4.1 2004/10/21 09:30:47 rwatson 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 cb91fd79a8568..14a01602d4964 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -26,7 +26,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.13.4.1 2004/10/21 09:30:47 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 97e924748e558..324dfe4d7b955 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -26,7 +26,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.12.4.1 2004/10/21 09:30:47 rwatson 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 1ba72114a1ea7..7022b59581bfb 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -26,7 +26,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.12.4.1 2004/10/21 09:30:47 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index 8ef9aa6249973..e0e183c3c10fc 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -35,7 +35,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.43.2.1 2004/08/26 20:58:46 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 085804f38ea3c..344e86a5739e4 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.c,v 1.19 2004/06/25 21:11:14 julian 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 146c185f02712..247e71c650324 100644
--- a/sys/netgraph/ng_UI.h
+++ b/sys/netgraph/ng_UI.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.h,v 1.4 2003/11/11 12:30:37 ru 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 4c2f3f601e6bc..5729fcb890a3a 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.c,v 1.21 2004/07/04 16:11:02 stefanf 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 3ecfaa23a0558..ee34d8bb6d1a2 100644
--- a/sys/netgraph/ng_async.h
+++ b/sys/netgraph/ng_async.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.h,v 1.10 2003/11/11 12:30:37 ru 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 d355cb8a2f10b..b410a4c58fcaf 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.2 2004/05/29 00:51:10 julian Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_atmllc.h b/sys/netgraph/ng_atmllc.h
index f9aed55c1649a..573ca307f32b0 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.1 2004/03/08 10:54:35 benno Exp $
  */
 
 #ifndef	_NETGRAPH_ATMLLC_H_
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index 601ac9bead3b0..f1a22e5ab5664 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -36,7 +36,7 @@
  * Authors: Julian Elischer <julian@freebsd.org>
  *          Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.84 2004/07/27 20:30:55 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 45c5023e1c616..a468e894bd642 100644
--- a/sys/netgraph/ng_bpf.c
+++ b/sys/netgraph/ng_bpf.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.c,v 1.18 2004/06/23 02:37:10 archie 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 478dd65844389..5ccfcb11202c0 100644
--- a/sys/netgraph/ng_bpf.h
+++ b/sys/netgraph/ng_bpf.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.h,v 1.9 2004/01/26 14:05:31 harti 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 de6d754552c2a..b560283f8ec1a 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.28 2004/08/17 22:05:53 andre Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_bridge.h b/sys/netgraph/ng_bridge.h
index 79c4de66b975f..1f229cc241ce5 100644
--- a/sys/netgraph/ng_bridge.h
+++ b/sys/netgraph/ng_bridge.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bridge.h,v 1.2 2002/05/31 23:48:02 archie Exp $
  */
 
 #ifndef _NETGRAPH_NG_BRIDGE_H_
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index 6b37ddb55c4ee..1afe0d4a973ea 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.23 2004/05/29 00:51:10 julian 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 db3cd60e0c21e..956986becf1e3 100644
--- a/sys/netgraph/ng_cisco.h
+++ b/sys/netgraph/ng_cisco.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.h,v 1.7 2003/11/11 12:30:37 ru 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 7dcaea3c9bb64..534bf3cb86250 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -26,7 +26,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.11 2004/07/20 13:16:17 glebius Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_device.h b/sys/netgraph/ng_device.h
index 5596134335473..e5314b5ad5cdc 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.3 2004/06/29 15:46:12 marks Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_echo.c b/sys/netgraph/ng_echo.c
index 6e956be8f33b5..98c975d1ce64f 100644
--- a/sys/netgraph/ng_echo.c
+++ b/sys/netgraph/ng_echo.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elisher <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.c,v 1.11 2004/05/29 00:51:10 julian 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 2e1bbe662ac18..45920b273bc22 100644
--- a/sys/netgraph/ng_echo.h
+++ b/sys/netgraph/ng_echo.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.h,v 1.3 2003/11/11 12:30:37 ru 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 aa70861a4b280..01a41ddb1e420 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.17 2004/07/14 20:26:29 rwatson Exp $
  */
 
 
diff --git a/sys/netgraph/ng_eiface.h b/sys/netgraph/ng_eiface.h
index 54dfd38fc074d..2a62b44e40914 100644
--- a/sys/netgraph/ng_eiface.h
+++ b/sys/netgraph/ng_eiface.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_eiface.h,v 1.6 2003/12/17 13:03:32 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_EIFACE_H_
diff --git a/sys/netgraph/ng_etf.c b/sys/netgraph/ng_etf.c
index f41746cd61cd1..7e172d5edc358 100644
--- a/sys/netgraph/ng_etf.c
+++ b/sys/netgraph/ng_etf.c
@@ -28,7 +28,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_etf.c,v 1.6 2004/06/26 22:24:16 julian Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_etf.h b/sys/netgraph/ng_etf.h
index 5bf19c3b43a87..efad5e61c51da 100644
--- a/sys/netgraph/ng_etf.h
+++ b/sys/netgraph/ng_etf.h
@@ -28,7 +28,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_etf.h,v 1.4 2004/01/26 14:05:31 harti Exp $
  */
 
 #ifndef _NETGRAPH_NG_ETF_H_
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index 3000b7eb4041a..a6e981994324d 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -37,7 +37,7 @@
  * Authors: Archie Cobbs <archie@freebsd.org>
  *	    Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.38 2004/07/28 06:54:55 kan Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_ether.h b/sys/netgraph/ng_ether.h
index 98a0b4c5c6089..155620e07b344 100644
--- a/sys/netgraph/ng_ether.h
+++ b/sys/netgraph/ng_ether.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ether.h,v 1.10 2004/02/20 08:26:27 pjd 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 39f80aa63883c..82fa21fab25ea 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -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/sys/netgraph/ng_fec.c,v 1.14 2004/07/28 06:54:55 kan Exp $
  */
 /*
  * Copyright (c) 1996-1999 Whistle Communications, Inc.
diff --git a/sys/netgraph/ng_fec.h b/sys/netgraph/ng_fec.h
index 5708ef78bb898..7b98667139603 100644
--- a/sys/netgraph/ng_fec.h
+++ b/sys/netgraph/ng_fec.h
@@ -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/sys/netgraph/ng_fec.h,v 1.2 2003/11/11 12:30:37 ru 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 b86a31bab1307..be9b2906787a3 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.23 2004/07/12 04:35:42 rwatson 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 0c25f7ea3d5ed..c276064341b79 100644
--- a/sys/netgraph/ng_frame_relay.h
+++ b/sys/netgraph/ng_frame_relay.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.h,v 1.3 2003/11/11 12:30:37 ru 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 fa54cd269be9c..fb9ade869212c 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -60,7 +60,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.15 2004/07/28 06:54:55 kan Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_gif.h b/sys/netgraph/ng_gif.h
index 03dc5230a7954..dd784fd173fef 100644
--- a/sys/netgraph/ng_gif.h
+++ b/sys/netgraph/ng_gif.h
@@ -60,7 +60,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.4 2001/10/04 07:51:42 bde Exp $
  */
 
 #ifndef _NETGRAPH_NG_GIF_H_
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index b1fbaffc8bbfa..246795d510caa 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -60,7 +60,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.9 2004/07/04 16:11:02 stefanf Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_gif_demux.h b/sys/netgraph/ng_gif_demux.h
index de03dbc3d0b22..0153b8ef236a8 100644
--- a/sys/netgraph/ng_gif_demux.h
+++ b/sys/netgraph/ng_gif_demux.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/netgraph/ng_gif_demux.h,v 1.4 2003/03/05 19:24:22 peter Exp $
  */
 
 #ifndef _NETGRAPH_NG_GIF_DEMUX_H_
diff --git a/sys/netgraph/ng_hole.c b/sys/netgraph/ng_hole.c
index 91cb253f4b8f2..f5b8242a02d24 100644
--- a/sys/netgraph/ng_hole.c
+++ b/sys/netgraph/ng_hole.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elisher <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.c,v 1.13 2004/05/29 00:51:11 julian 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 3ca22923b55cc..ea292f9a735e1 100644
--- a/sys/netgraph/ng_hole.h
+++ b/sys/netgraph/ng_hole.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.h,v 1.5 2004/05/19 11:35:03 ru 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 ba298e56b13bc..3f6bfaead3b72 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 a735d7b64dfff..4d5f308a13ea2 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 67ad539ec48f1..e0fd908a301ff 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.34 2004/07/14 20:24: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 6c3bbbc56df03..025cabd848f41 100644
--- a/sys/netgraph/ng_iface.h
+++ b/sys/netgraph/ng_iface.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.6 2004/03/07 23:00:44 ru 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 24fa660f05e32..bf831aa19611c 100644
--- a/sys/netgraph/ng_ip_input.c
+++ b/sys/netgraph/ng_ip_input.c
@@ -62,7 +62,7 @@
  * Author:		Brooks Davis <brooks@FreeBSD.org>
  * Derived from:	ng_hole.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ip_input.c,v 1.3 2004/05/29 00:51:11 julian Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_ip_input.h b/sys/netgraph/ng_ip_input.h
index e60ee3733fc5e..6ddc9d3b7ed5b 100644
--- a/sys/netgraph/ng_ip_input.h
+++ b/sys/netgraph/ng_ip_input.h
@@ -62,7 +62,7 @@
  * Author:		Brooks Davis <brooks@FreeBSD.org>
  * Derived from:	ng_hole.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ip_input.h,v 1.2 2003/11/11 12:30:37 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_IP_INPUT_H_
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index 735b5ffd2446b..e9875910b022b 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.46.2.1 2004/09/07 23:09:37 rwatson 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 224c37d9eea90..46d92ac73747f 100644
--- a/sys/netgraph/ng_ksocket.h
+++ b/sys/netgraph/ng_ksocket.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.h,v 1.10 2004/06/25 22:59:59 julian 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 6e5d6a7ebda2c..59e2f786a5a11 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -37,7 +37,7 @@
  * 
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.12 2004/08/03 06:52:55 bz Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_l2tp.h b/sys/netgraph/ng_l2tp.h
index 748a36acd2953..ae77f97091d07 100644
--- a/sys/netgraph/ng_l2tp.h
+++ b/sys/netgraph/ng_l2tp.h
@@ -37,7 +37,7 @@
  * 
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_l2tp.h,v 1.4 2004/08/03 06:52:55 bz Exp $
  */
 
 #ifndef _NETGRAPH_NG_L2TP_H_
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index 368d2015bcb09..6f333cf489ba2 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.19 2004/06/25 19:22:03 julian 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 7c79504eef77c..d735c390e2d4d 100644
--- a/sys/netgraph/ng_lmi.h
+++ b/sys/netgraph/ng_lmi.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.h,v 1.3 2003/11/11 12:30:37 ru 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 a8f42546e10ce..09a3dc17449ed 100644
--- a/sys/netgraph/ng_message.h
+++ b/sys/netgraph/ng_message.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.23.2.1 2004/08/26 20:58:46 julian 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 02be055413e3e..931cef75717e0 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -37,7 +37,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.21 2004/05/29 00:51:11 julian Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_mppc.h b/sys/netgraph/ng_mppc.h
index 6cb6813761aaa..da7c337dbba87 100644
--- a/sys/netgraph/ng_mppc.h
+++ b/sys/netgraph/ng_mppc.h
@@ -37,7 +37,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.4 2003/11/11 12:30:37 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_MPPC_H_
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c
index 83f39d657f4d5..8f8e0805fb6ae 100644
--- a/sys/netgraph/ng_one2many.c
+++ b/sys/netgraph/ng_one2many.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_one2many.c,v 1.17 2004/06/26 22:24:16 julian Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_one2many.h b/sys/netgraph/ng_one2many.h
index bf79859c14a4e..e0a14b4b9c760 100644
--- a/sys/netgraph/ng_one2many.h
+++ b/sys/netgraph/ng_one2many.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_one2many.h,v 1.6 2004/02/20 08:26:27 pjd Exp $
  */
 
 #ifndef _NETGRAPH_NG_ONE2MANY_H_
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index 4e89c5f06066c..58cc83ea92b48 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -37,7 +37,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.23 2004/07/28 06:54:55 kan Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/netgraph/ng_parse.h b/sys/netgraph/ng_parse.h
index 9155551455023..f273e7af7076c 100644
--- a/sys/netgraph/ng_parse.h
+++ b/sys/netgraph/ng_parse.h
@@ -37,7 +37,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.10 2004/01/26 14:05:31 harti Exp $
  */
 
 #ifndef _NETGRAPH_NG_PARSE_H_
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 6a0a8de60bb35..fbbda5a6212fc 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.51 2004/08/03 06:34:55 bz 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 27ce469aa743b..d76af969e48f1 100644
--- a/sys/netgraph/ng_ppp.h
+++ b/sys/netgraph/ng_ppp.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.h,v 1.10 2003/11/11 12:30:37 ru 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 1443287fd01d9..86a40e69307d1 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.67 2004/08/01 20:39:33 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 892d655b4be07..48f5723d85150 100644
--- a/sys/netgraph/ng_pppoe.h
+++ b/sys/netgraph/ng_pppoe.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.h,v 1.20 2004/07/27 19:47:13 glebius 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 62b17f5d9ea7b..f0641eaa514d6 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.33.2.1 2004/09/10 06:16:34 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 4367565db1785..7be131d1794f6 100644
--- a/sys/netgraph/ng_pptpgre.h
+++ b/sys/netgraph/ng_pptpgre.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.h,v 1.8 2004/04/26 14:26:54 archie 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 ab6b4158fff82..32f063f4b279b 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.c,v 1.23 2004/06/25 21:11:14 julian 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 295098822b136..39f5d7abb9b11 100644
--- a/sys/netgraph/ng_rfc1490.h
+++ b/sys/netgraph/ng_rfc1490.h
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.h,v 1.6 2004/06/13 15:43:59 julian 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 4bb4684b84685..97ab3ecab93ca 100644
--- a/sys/netgraph/ng_sample.c
+++ b/sys/netgraph/ng_sample.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.c,v 1.24 2004/07/29 08:05:02 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 f74f4949f313e..9a3b71f9d2e61 100644
--- a/sys/netgraph/ng_sample.h
+++ b/sys/netgraph/ng_sample.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.h,v 1.6 2003/11/11 12:30:37 ru 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 8a0fd291f643e..98e0b60ec645a 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -35,7 +35,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.53.2.1 2004/09/02 15:41:44 rwatson 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 08d1414df8f55..b72b107082258 100644
--- a/sys/netgraph/ng_socket.h
+++ b/sys/netgraph/ng_socket.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.h,v 1.5 2003/11/11 12:30:37 ru 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 4a4541e2ea452..fc63fac42a26d 100644
--- a/sys/netgraph/ng_socketvar.h
+++ b/sys/netgraph/ng_socketvar.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socketvar.h,v 1.8 2003/11/11 12:30:37 ru 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 72fee44d5cea8..69ce5346cb1bb 100644
--- a/sys/netgraph/ng_source.c
+++ b/sys/netgraph/ng_source.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.18 2004/07/20 17:15:37 julian 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 3d93baf86d41b..e8f2b8536861a 100644
--- a/sys/netgraph/ng_source.h
+++ b/sys/netgraph/ng_source.h
@@ -43,7 +43,7 @@ EXEMPLARY,
  *
  * Author: Dave Chapeskie <dchapeskie@sandvine.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_source.h,v 1.3 2004/01/26 14:54:39 harti Exp $
  */
 
 #ifndef _NETGRAPH_NG_SOURCE_H_
diff --git a/sys/netgraph/ng_split.c b/sys/netgraph/ng_split.c
index 4d45efcb5fb34..0412762ef1a7a 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.4 2004/05/29 00:51:11 julian Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_split.h b/sys/netgraph/ng_split.h
index 6e0854b9e090f..857acd6e87250 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.3 2003/11/11 12:30:37 ru Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 22fcbd7329d84..2047b1a358f48 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -15,7 +15,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.4 2004/07/04 16:11:02 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/ng_sppp.h b/sys/netgraph/ng_sppp.h
index 2616f0334c806..f6c5d1005bede 100644
--- a/sys/netgraph/ng_sppp.h
+++ b/sys/netgraph/ng_sppp.h
@@ -12,7 +12,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.1 2004/03/24 17:21:34 rik 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_tee.c b/sys/netgraph/ng_tee.c
index c9d57cd753f91..a4f754247b29b 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.31 2004/06/26 22:24:16 julian 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 b86c0f595bc0b..d5368186d238d 100644
--- a/sys/netgraph/ng_tee.h
+++ b/sys/netgraph/ng_tee.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.h,v 1.7 2003/11/11 12:30:37 ru 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 9ae20a0612b8a..2d18fe91112ca 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.29.2.1 2004/09/03 03:12:57 rwatson 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 a9a180740d678..bac6f8af9aa64 100644
--- a/sys/netgraph/ng_tty.h
+++ b/sys/netgraph/ng_tty.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.h,v 1.3 2003/11/11 12:30:37 ru 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 508a098b61370..c20dbac847ab9 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.24 2004/05/29 00:51:11 julian 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 e0a66562d3499..fb90cc1e4de54 100644
--- a/sys/netgraph/ng_vjc.h
+++ b/sys/netgraph/ng_vjc.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.h,v 1.8 2003/11/11 12:30:37 ru 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 cf94709a8d868..64568c4c6fd9a 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.2 2004/05/29 00:51:11 julian Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_vlan.h b/sys/netgraph/ng_vlan.h
index 579e3baf26ae6..db522daa1f9ee 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 4694e8e68960c..559ef999ada6a 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 d7843bc31474f..75d39be905c0e 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.15 2004/06/14 18:16:21 rwatson Exp $
  */
 
 #define ACCEPT_FILTER_MOD
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 345798fc09965..21518ef745432 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.15 2004/04/07 20:46:13 imp 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 3af80de9a40fc..1c8e5c0f98e27 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.24 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 1f4cb7fc898eb..36f6333e014a0 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.18 2004/08/16 18:32:07 rwatson Exp $");
 
 /*
  * IP <=> ATM address resolution.
diff --git a/sys/netinet/if_atm.h b/sys/netinet/if_atm.h
index 4f9a5fb685a98..3f3ce343334dd 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.6 2004/08/16 18:32:07 rwatson 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 1ea80cd54e6e7..05edb5d38e369 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.128.2.1.2.1 2004/10/26 17:28:36 bms Exp $
  */
 
 /*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index a901397cb1017..ff1b6dd551628 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.30 2004/04/07 20:46:13 imp Exp $
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 37463967a44dc..2bccaa48d114a 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.46 2004/06/11 03:42:37 rwatson Exp $
  */
 
 /*
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 96f3844ab88c5..e82ddc439af69 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.12 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 17e0baf0a2403..d1454e0521ef0 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.20 2004/04/07 20:46:13 imp Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 43a5260ce82f4..226d77c9a77b8 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in.c,v 1.77 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 4e4f5b173a14e..4f9310bf34856 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.87 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index 1a5c6e20fbe80..f33080540b234 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.7 2004/04/07 20:46:13 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 873255f29f212..15ef6977bea93 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.26 2004/06/18 02:04:07 bms 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 b2e3a681657c3..edb84285f398d 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.11 2003/10/07 17:46:18 ume 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 9c295d359b806..6948c073c44da 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.153.2.1.2.1 2004/10/21 09:30:47 rwatson Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 53a418ac526c2..05d229f423c7d 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.76 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 28fff4be23059..c85c0a752c98f 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.73 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #include "opt_ipdivert.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index ea1179255ffd1..31ef0716725bc 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.51 2003/11/20 20:07:37 andre Exp $
  */
 
 /*
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index a63dcca30a45d..276e65f1f5aa6 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.11 2004/04/07 20:46:13 imp Exp $
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 6b26e69d9a56c..90be7a96030c3 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.51 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 24d44051769d0..21f48c1ae8b87 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.28 2004/04/07 20:46:13 imp Exp $
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 9b7991f1ff94d..2e225a1a6e13d 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip6.h,v 1.12 2004/04/07 20:46:13 imp Exp $	*/
 /*	$KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $	*/
 
 /*
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 106aa56ed8a10..1ba6154d0c636 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.98 2004/08/17 22:05:54 andre Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_divert.h b/sys/netinet/ip_divert.h
index d925918cca350..95547ade1fc88 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.3 2004/02/25 19:55:28 mlaier Exp $
  */
 
 #ifndef _NETINET_IP_DIVERT_H_
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 71b3299ccffc8..9e5fc896d95b6 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.83.2.1 2004/09/14 16:05:06 pjd Exp $
  */
 
 #define	DUMMYNET_DEBUG
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index f241dcd8a863d..7825c71b62e1d 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.32 2004/08/17 22:05:54 andre Exp $
  */
 
 #ifndef _IP_DUMMYNET_H
diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index 9ea2f6bce5803..9f83c89242dc7 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.6 2003/10/29 15:07:03 ume 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 01163edccf9c5..1be7fad4900ac 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.6 2003/10/29 15:07:03 ume 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 5d70e0e2384ac..36c3d10b4c92b 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.19 2004/03/10 02:48:50 rwatson 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 518f502274c80..cfc6bca8c5173 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.3 2002/03/19 21:25:46 alfred 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 909575695af2d..17f17a69d129a 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.17.2.3 2004/10/03 17:04:40 mlaier Exp $
  */
 
 /*
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index ac903f504b3b3..056c9bd2fe2af 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.89.2.2 2004/10/03 17:04:40 mlaier Exp $
  */
 
 #ifndef _IPFW2_H
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index 2d8197f2c7b2f..bc752553d0654 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.70.2.7 2004/10/13 22:07:05 green Exp $
  */
 
 #define        DEB(x)
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c
index 3b08f693c74fb..9e403e181aefd 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.1.2.7 2004/10/03 17:04:40 mlaier Exp $
  */
 
 #if !defined(KLD_MODULE)
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index a66f00e162f86..18c02e974b3ff 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.17 2004/08/16 18:32:07 rwatson Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index b34baf6cdb1f1..ef672c8fbadec 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.2 2002/10/16 22:27:27 alfred Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index e9221112b9e52..9bfea85170d7a 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.96.2.1 2004/09/23 16:38:53 andre Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 5ecd18cc374dd..fdb0d2a7653b8 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.22 2004/04/07 20:46:13 imp Exp $
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index eebc0697fffb7..ab5a842cf57aa 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.6 2004/08/16 18:32:07 rwatson Exp $
  */
 
 /*
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 5d2f694d0b762..c132c92532f80 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.283.2.7 2004/10/03 17:04:40 mlaier Exp $
  */
 
 #include "opt_bootp.h"
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 0df480754badc..99c16d4425f1a 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -17,7 +17,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.106.2.3 2004/10/09 15:12:04 rwatson Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index d4bb51748d5cc..db344eaebfccc 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.23 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index cb7e939a026ae..54a2691da6431 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.225.2.5 2004/10/03 17:04:40 mlaier Exp $
  */
 
 #include "opt_ipfw.h"
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 2fa80d3561514..f3d4ac4e67b6f 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.89.2.2 2004/09/23 16:38:53 andre Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/ipprotosw.h b/sys/netinet/ipprotosw.h
index cead7abedf383..879405a78eb5e 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.5 2004/04/07 20:46:13 imp Exp $
  */
 
 #ifndef _NETINET_IPPROTOSW_H_
diff --git a/sys/netinet/pim.h b/sys/netinet/pim.h
index 3642aeb963148..93c47db1c00d7 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.2 2004/03/08 07:45:32 hsu Exp $
  */
 
 #ifndef _NETINET_PIM_H_
diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h
index 54c6322af5c44..dbb4a7733fa59 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.1 2003/08/07 18:17:43 hsu Exp $
  */
 
 #ifndef _NETINET_PIM_VAR_H_
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 49e5904209b58..ccbf94912deb8 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.142.2.2 2004/10/14 11:45:26 rwatson Exp $
  */
 
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index cda7257cd92e0..300bc1ccdac3f 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.26 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index 0c8eba662dab2..a3eb2a94740fb 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.25 2004/04/07 20:46:13 imp Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index b6033ce749ca8..a7edb1c27fbb2 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.14 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index b02e83438540f..fd65bcbc68969 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.16 2004/04/07 20:46:13 imp Exp $
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index bebd51fae0657..be50ddb006997 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.7 2004/08/16 18:32:07 rwatson Exp $
  */
 
 /*
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 3b70e990e9a20..10a2be478448c 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.252 2004/08/17 22:05:54 andre Exp $
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index c64c9f064c3e3..101be10d4c086 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.100.2.1.2.1 2004/10/30 20:50:06 rwatson Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index 1cf44f2ba73da..d70838eb4e39b 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.3 2004/08/17 22:05:54 andre Exp $
  */
 
 /*
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index c029b12531155..6a265a49ac580 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.22 2004/06/23 21:04:37 ps Exp $
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 6232190f70886..909e1569434cb 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.201.2.1.2.1 2004/10/21 09:30:47 rwatson Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index e648fc91e3e35..bd68e0a93f2cf 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.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/netinet/tcp_syncache.c,v 1.66.2.1 2004/09/23 16:38:53 andre Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 65d9d6520f07b..1d8642834b672 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.66 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 22d938ea6b48a..6da0644647785 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.26 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 525b48a2780e6..d0443e5d1ac07 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.107 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 4ba7a91194e6c..8e8ed1c35c840 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.109 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index c410da78ea55f..a135d28add02b 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.11 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 0f3d712a2bcbc..8be3cd872e521 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.8 2004/04/07 20:46:14 imp Exp $
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index c3fd5166e620f..09b12d73355ae 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.162.2.3 2004/10/14 11:49:25 rwatson Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 4fc9a1da529d2..c2af0c8f978fd 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.28 2004/08/16 18:32:07 rwatson Exp $
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netinet6/README b/sys/netinet6/README
index 70cec5e1c6250..9bcf59c1455ca 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 e09242408c960..8fcefcb8fd4c6 100644
--- a/sys/netinet6/ah.h
+++ b/sys/netinet6/ah.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ah.h,v 1.11 2003/11/15 06:16:36 ume 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 c8e64a572e8a3..f84ae3b1a7541 100644
--- a/sys/netinet6/ah6.h
+++ b/sys/netinet6/ah6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ah6.h,v 1.5 2003/10/12 11:08:18 ume 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 7c230e09f470d..3362b3df6061f 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.1 2003/10/13 04:56:04 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet6/ah_aesxcbcmac.h b/sys/netinet6/ah_aesxcbcmac.h
index df1fad7a99cd3..63fa8e591de22 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.1 2003/10/13 04:56:04 ume 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 96400b53ae35b..3d9df533de467 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.23 2004/03/10 04:56:54 rwatson 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 24e59ea2f5a74..a0bcf6d5d7400 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.18.4.1 2004/09/15 15:14:19 andre 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 bbd697f579f53..9fd958bf7b071 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.14 2003/10/12 12:03:25 ume 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 5e3eb3e4ad47f..64711a81241ce 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/dest6.c,v 1.9 2003/10/12 15:14:33 ume 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 ba6c7ae0c67cd..da7ff596c0e3f 100644
--- a/sys/netinet6/esp.h
+++ b/sys/netinet6/esp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp.h,v 1.7 2003/10/13 14:57:41 ume 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 d774d24706522..933fe2ac7368e 100644
--- a/sys/netinet6/esp6.h
+++ b/sys/netinet6/esp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp6.h,v 1.4 2001/06/11 12:39:04 ume 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 9fbd61530a89a..cefdb901b7ff5 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.1 2003/10/13 14:57:41 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet6/esp_aesctr.h b/sys/netinet6/esp_aesctr.h
index bb7f7eaf0e4f2..6a1f7d12dd6e9 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.1 2003/10/13 14:57:41 ume Exp $
  */
 
 extern int esp_aesctr_mature __P((struct secasvar *));
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index 76457eb48856c..e5e765ddf1939 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.21 2003/11/15 06:18:09 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 bb3c4afab135d..5d5597459e29d 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.24.4.1 2004/09/15 15:14:19 andre 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 bbc2d134d7af6..9af2cbce51a3f 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.12 2003/11/15 05:41:41 ume 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 cbb9705c9f406..6693b25c672b1 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.4 2003/11/11 18:58:54 ume 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 91f2d94b2b669..659cb49e5139a 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.3 2003/11/10 10:39:14 ume 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 8be7d52478066..1b95540b42497 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/frag6.c,v 1.24 2004/08/14 15:32:20 dwmalone 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 ed3b849b5d83a..6cf521e5b8c32 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/icmp6.c,v 1.53 2004/04/07 20:46:15 imp 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 a6414efccb7ef..300b8aca2e33b 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 5b4d810108af4..e51cbf0d58f68 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6.c,v 1.47.2.1 2004/08/27 04:46:27 rwatson 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 c6f051a484e2b..dcd462e883487 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6.h,v 1.35 2004/04/07 20:46:15 imp 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 509c927951c02..355451404d676 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.9 2004/04/07 20:46:15 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 e3cd124d01fbc..3b9d6ea806b47 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.16 2003/10/29 15:07:04 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 8d2ede4e2ed44..719c2404e2f26 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.6 2003/10/08 18:26:08 ume 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 4a9bd605d0ff6..e1daf57697ea7 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.23.2.1 2004/08/27 04:46:27 rwatson 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 5804159207ced..6ce35e327aaaa 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.4 2003/10/31 15:51:28 ume 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 e7941030aa8cc..553f64266729a 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.59.2.1.2.1 2004/10/21 09:30:47 rwatson 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 cc8e643525f34..903fbc612aaf8 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.15 2004/08/06 03:45:45 rwatson 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 561ad4d3aff03..a7c76eb9931dc 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.29.2.1 2004/08/27 04:46:27 rwatson 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 b68852d01d4b2..903752f4bc8c4 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.12 2003/11/20 20:07:39 andre 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 7d8103e629753..618567d1a9a92 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.28 2004/04/07 20:46:15 imp 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 aa111eab747dc..7310ba4068cc1 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.19 2004/04/07 20:46:15 imp 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 9eec13fb25ec1..528ff7ce31e67 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 6644b561e1417..9d315ba961262 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.5 2003/10/29 15:07:04 ume 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 c85e5e5c9a5f9..c395b4ebe9446 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.25.2.2 2004/10/03 17:04:40 mlaier 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 c7c812d6f2528..808acd550d461 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.32 2004/07/15 08:26:07 phk 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 03df44fcfeddd..0c34d85a02b4e 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.14 2003/10/31 18:32:12 brooks 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 cb75277b746dc..3b1382bf47a4f 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.6 2004/08/14 15:32:20 dwmalone Exp $ */
 
 /*
  * Copyright (C) 2003 WIDE Project.
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index dc3b3183ab3f3..a8423660882d4 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.75.2.3 2004/10/03 17:04:40 mlaier 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 0f6e47c8869b0..87b0f645f2e6a 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.28 2004/04/07 20:46:15 imp 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 4c752986cfd6f..0cd915c688bdd 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.5 2002/04/19 04:46:23 suz 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 22be481afd87b..75142a46870ed 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.82.2.3 2004/10/10 13:59:39 scottl 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 2841b635dbba1..bd177c8c2040a 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.27.2.1 2004/09/22 19:23:39 andre 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 669e2ab7a8fc0..ec808eb517658 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6protosw.h,v 1.12 2004/04/07 20:46:16 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 ed587682ffdb0..c9302e0799b22 100644
--- a/sys/netinet6/ipcomp.h
+++ b/sys/netinet6/ipcomp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipcomp.h,v 1.4 2002/04/19 04:46:23 suz 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 4a1046af9074d..e5ec1537d2665 100644
--- a/sys/netinet6/ipcomp6.h
+++ b/sys/netinet6/ipcomp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipcomp6.h,v 1.2 2001/06/11 12:39:06 ume 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 2abc500808dfa..bd667dc224e99 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.8 2003/10/08 18:26:08 ume 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 ca4f808565bf3..016fe058bb5db 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.7 2003/10/09 18:44:54 ume 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 f07e06cd8355c..9cbabe1310dca 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.7 2003/04/28 08:21:57 suz 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 6f3dd5c32e87d..07a923989d928 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipsec.c,v 1.36.2.1 2004/09/03 03:12:58 rwatson 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 efbf24303842b..334e0092bcebe 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipsec.h,v 1.17 2004/02/16 17:02:44 ume 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 47948cbc4c059..e3e2e2b742109 100644
--- a/sys/netinet6/ipsec6.h
+++ b/sys/netinet6/ipsec6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipsec6.h,v 1.9 2004/02/16 17:02:44 ume 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 daf6c32430b2d..a16d38efcf4d9 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/mld6.c,v 1.17 2004/04/07 20:46:16 imp 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 154949ac1abbd..bc4ff8631b144 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.5 2003/10/31 16:07:15 ume 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 fef8855a69ec1..3005a5fb66df5 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6.c,v 1.43.2.3 2004/10/11 03:46:38 green 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 fc6e65a06de52..ba030fe81c516 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6.h,v 1.18 2003/10/31 16:06:04 ume 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 6fd7b2506f68a..5542d1b4946f5 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.26 2004/04/19 08:02:52 luigi 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 7d3e6043139ed..3e3bb85542986 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.25 2004/04/18 11:45:28 luigi 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 d420db9f0e8bf..b5c5fd8b2a8ba 100644
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/pim6.h,v 1.2 2000/07/04 16:35:10 itojun 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 358a195d2a3c3..6fe6f6abebce3 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.3 2000/07/04 16:35:10 itojun 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 6495a13d37b0b..b525d9b838734 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.45.2.1 2004/09/02 21:18:09 rwatson Exp $
  */
 
 /*
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index cfb390b4cc1d8..7efd75dcb41d2 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.1 2001/06/11 12:39:06 ume 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 c4b0f61b57284..a1984a52748f2 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/route6.c,v 1.10 2003/10/29 12:49:12 ume 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 fd22657bc0b69..ab1e06c954109 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/scope6.c,v 1.10 2003/10/22 15:13:36 ume 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 0744d4849065c..04ee4ba32f241 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.3 2003/10/17 15:46:31 ume 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 8a864a5360060..d5236cdbc4de1 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.6 2004/04/07 20:46:16 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.6 2004/04/07 20:46:16 imp Exp $
  */
 
 #ifndef _NETINET_TCP6_VAR_H_
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 936f780ab54ea..dcdee93bafb15 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.18 2004/04/07 20:46:16 imp 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 6b1dc25e4ddd5..d9a6227179298 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.51 2004/08/06 03:45:45 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 94a50f1a3df6a..d60824ddf44ac 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.6 2004/04/07 20:46:16 imp Exp $
  */
 
 /*
diff --git a/sys/netipsec/ah.h b/sys/netipsec/ah.h
index 1ba959a237665..0c3738bc2ad3d 100644
--- a/sys/netipsec/ah.h
+++ b/sys/netipsec/ah.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ah.h,v 1.1 2002/10/16 02:10:07 sam 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 a4cf4c9e411cf..162a305491b7c 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.1 2002/10/16 02:10:07 sam 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 920d334efc8fe..4d8602d7956da 100644
--- a/sys/netipsec/esp.h
+++ b/sys/netipsec/esp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/esp.h,v 1.1 2002/10/16 02:10:07 sam 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 22cf3aa3afdcf..c5c9851552f32 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.1 2002/10/16 02:10:07 sam 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 26f37594b7b6f..d381ca2599c90 100644
--- a/sys/netipsec/ipcomp.h
+++ b/sys/netipsec/ipcomp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipcomp.h,v 1.1 2002/10/16 02:10:07 sam 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 9b10b1c3d9a52..cdc2402598542 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.1 2002/10/16 02:10:07 sam 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 3004beb912328..98c9350838eeb 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.1 2002/10/16 02:10:07 sam 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 e53cede49a0ce..c5c4d4731ec03 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec.c,v 1.8.2.1 2004/10/02 04:55:47 sam 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 b15a9193adf30..75b5b23024963 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec.h,v 1.7 2004/02/11 04:26:03 bms 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 d23159653268d..947471f011a1a 100644
--- a/sys/netipsec/ipsec6.h
+++ b/sys/netipsec/ipsec6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec6.h,v 1.1 2002/10/16 02:10:07 sam 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 7258446686db9..ee56d2f2e0bb6 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.7.4.1 2004/09/15 15:14:19 andre 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 f44ff7aba54b4..91b53abbee082 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 86bef77727be5..a7669b964c171 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.1 2003/09/29 22:47:45 sam 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 c90524b5c2cc3..3762948a6277a 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 8e8ef390d4fd5..4d7de31c201c5 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key.c,v 1.16.2.1 2004/10/02 04:55:47 sam 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 75707d09ad980..f03f2d532a80d 100644
--- a/sys/netipsec/key.h
+++ b/sys/netipsec/key.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key.h,v 1.2.4.1 2004/10/02 04:55:47 sam 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 a8e5296f50464..00b54f8c6da7a 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.2 2003/09/29 22:57:43 sam 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 f105e85f3c814..8e63581d3973f 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.1 2002/10/16 02:10:07 sam 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 e10cb99908999..3102334bc821d 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.1 2002/10/16 02:10:07 sam 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 047f819beee4f..1b30987455a34 100644
--- a/sys/netipsec/keydb.h
+++ b/sys/netipsec/keydb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keydb.h,v 1.3.4.1 2004/09/30 20:11:46 mlaier 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 787f84633cad2..cce005f288d44 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keysock.c,v 1.8 2004/06/23 01:58:22 bms 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 7d9080ae48820..a034726ceb7a3 100644
--- a/sys/netipsec/keysock.h
+++ b/sys/netipsec/keysock.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keysock.h,v 1.1 2002/10/16 02:10:07 sam 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 04c2e07339c01..1509515d353dc 100644
--- a/sys/netipsec/xform.h
+++ b/sys/netipsec/xform.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform.h,v 1.1 2002/10/16 02:10:07 sam 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 32f73f03cf86d..ee5165fed9d1b 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.6 2003/09/29 22:57:43 sam 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 49a6a21c9a226..2dc5c0f20a678 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.9 2004/01/27 17:43:49 sam 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 9533d0015d7cc..df4db378eaf62 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.7 2004/01/27 17:43:49 sam 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 b71d56b1c96bb..41a641dde6138 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.9.2.1 2004/09/15 15:14:19 andre 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 27e85c1d6338a..f80a022a66385 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.3 2004/04/20 14:53:35 bms Exp $ */
 
 /*
  * Copyright (c) 2003 Bruce M. Simpson <bms@spc.org>
diff --git a/sys/netipx/README b/sys/netipx/README
index 8afd66fdfd4fe..60797ff0dfc1f 100644
--- a/sys/netipx/README
+++ b/sys/netipx/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netipx/README,v 1.2 2000/05/01 20:14:29 peter 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 840f802fae494..0786419868dcd 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.26.4.1 2004/09/03 03:12:58 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index 7f4ef164d3ac6..95819f99d9f6a 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.18 2004/06/22 21:46:49 bms Exp $
  */
 
 #ifndef _NETIPX_IPX_H_
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index b63b807a5e72a..2c0742477edb1 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.11 2004/07/28 06:58:23 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index 13bc607684807..ad52abacee6ad 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.13 2003/03/04 23:19:53 jlemon Exp $
  */
 
 #ifndef _NETIPX_IPX_IF_H_
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index a511a4f623ec7..de25007ac1857 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.34 2003/11/08 22:28:40 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index d069fb9bd34a1..c4a3692cbd595 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.36 2003/10/31 18:32:12 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 2eb3c8e23c870..8bc60c5207cc4 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.15 2002/03/20 02:39:13 alfred Exp $
  */
 
 #ifndef _NETIPX_IPXIP_H_
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index bdca9a2bfb188..e7375ccd4f7d5 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.19 2003/06/11 05:25:14 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index b1e2cabd3dcfa..6fe0fa85356e7 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.28.4.1 2004/10/21 09:30:47 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 32adcc889b603..ebacdd8e57300 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_pcb.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_pcb.h,v 1.18 2003/01/01 18:48:56 schweikh Exp $
  */
 
 #ifndef _NETIPX_IPX_PCB_H_
diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index d4998d501342c..1114d472ad324 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.17 2003/06/11 05:25:14 obrien Exp $");
 
 #include "opt_ipx.h"
 
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index cff94bc4ba36a..c0f3554b860a7 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.40.4.1 2004/10/21 09:30:47 rwatson Exp $");
 
 #include "opt_ipx.h"
 
diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h
index ff2045e933f31..67b9efe95022e 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.17 2003/03/04 23:19:53 jlemon Exp $
  */
 
 #ifndef _NETIPX_IPX_VAR_H_
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index e496aeca56497..589d518888af4 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.17 2002/03/20 02:39:13 alfred Exp $
  */
 
 #ifndef _NETIPX_SPX_H_
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index a0a44e452e050..d779a14ea36ad 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.15 2003/06/11 05:25:14 obrien Exp $");
 
 #include "opt_inet.h"
 #include "opt_tcpdebug.h"
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index 31744eda80e12..771b77b76f63e 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.14 2002/07/27 23:15:08 dwmalone Exp $
  */
 
 #ifndef _NETIPX_SPX_DEBUG_H_
diff --git a/sys/netipx/spx_timer.h b/sys/netipx/spx_timer.h
index 602200975fad4..db0cec51130f1 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.10 1999/08/28 00:49:44 peter Exp $
  */
 
 #ifndef _NETIPX_SPX_TIMER_H_
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 67edf45492e4c..ef00ada6d2758 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.46 2004/07/12 19:35:29 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 7dfb783ee89da..772ae808b3080 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.9 1999/08/28 00:49:44 peter Exp $
  */
 
 #ifndef _NETIPX_SPX_VAR_H_
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index 8d3569913296d..adb9e7994d345 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.65.2.2 2004/10/01 19:18:55 scottl Exp $");
 
 /*
  * This code is referd to RFC 2367
diff --git a/sys/netkey/key.h b/sys/netkey/key.h
index 6bd18501c1368..d66b2e4825917 100644
--- a/sys/netkey/key.h
+++ b/sys/netkey/key.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/key.h,v 1.10 2003/11/04 16:02:05 ume 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 a0de240d2eb59..ada11dd79ecb1 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.24 2003/11/04 16:02:05 ume Exp $");
 
 #ifdef _KERNEL
 #include "opt_inet.h"
diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h
index 215b9d9d14915..1a4058c673632 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.11 2003/09/30 09:06:58 ume 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 9c8d1d4ee93e6..1c985eec817e0 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.7 2003/10/07 15:14:33 ume 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 697b6e54976b0..d39ff60f0a0bb 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.5 2003/11/04 16:02:05 ume Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h
index c9a4bb30626f8..07822a2afe3ac 100644
--- a/sys/netkey/keydb.h
+++ b/sys/netkey/keydb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/keydb.h,v 1.10 2003/11/04 16:02:05 ume 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 ef1b1341f1b44..e19a26e12e3e6 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.27 2004/06/21 00:20:43 rwatson Exp $");
 
 #include "opt_ipsec.h"
 
diff --git a/sys/netkey/keysock.h b/sys/netkey/keysock.h
index 5ea58f5bf7993..4be3fa394e9d0 100644
--- a/sys/netkey/keysock.h
+++ b/sys/netkey/keysock.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/keysock.h,v 1.7 2003/11/02 09:13:33 ume 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 f999f32346a83..a2b3aa442f895 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.34.4.1 2004/10/21 09:30:48 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 9cc925d948932..2880b35f0e2ce 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.9 2003/08/06 14:34:38 harti Exp $ */
 
 /*
  *
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 01455276be9df..bdd7a831100f1 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.14 2003/08/06 13:46:15 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c
index 535262fec905e..7e877a18322a6 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.13 2003/11/08 22:28:40 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp.h b/sys/netncp/ncp.h
index cfe60abcd0c08..e55fc7b689b70 100644
--- a/sys/netncp/ncp.h
+++ b/sys/netncp/ncp.h
@@ -4,7 +4,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.6 2003/02/28 04:31:29 tjr Exp $
  */
 
 #ifndef _NETNCP_NCP_H_
diff --git a/sys/netncp/ncp_cfg.h b/sys/netncp/ncp_cfg.h
index 82a30d748d5d2..748af5abd6642 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 41a01ec198f06..b3b227a5da9ac 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.25 2004/02/26 00:27:03 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 4ef147e0f6c86..7fee00ed37e3f 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.11 2003/02/26 21:25:54 fjoe 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 9899ef6984bb9..fcda29fac8d36 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 24dae7ed805ae..6881e8fe20efe 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.3 2002/09/23 18:54:32 alfred Exp $
  */
 
 #ifndef _NETNCP_NCP_FILE_H_
diff --git a/sys/netncp/ncp_lib.h b/sys/netncp/ncp_lib.h
index 840156cb952ae..7d3233bbec6e5 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.6 2002/07/27 23:16:49 dwmalone Exp $
  */
 
 #ifndef _NETNCP_NCP_LIB_H_
diff --git a/sys/netncp/ncp_login.c b/sys/netncp/ncp_login.c
index cf2e1c264fedb..983af386f43a2 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.5 2003/06/11 05:30:35 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_mod.c b/sys/netncp/ncp_mod.c
index 83e970868a3c8..5f4ce09ccbd86 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.14 2004/06/16 09:47:17 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_ncp.c b/sys/netncp/ncp_ncp.c
index bf51b438480a6..d94e4f2968469 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.18 2003/07/24 01:59:17 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_ncp.h b/sys/netncp/ncp_ncp.h
index fd522b219c3cc..ad49478e2a880 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.7 2003/02/26 21:25:55 fjoe 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 db0243d8182ce..0e52bdee1c777 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.6 2003/06/11 05:30:35 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_nls.h b/sys/netncp/ncp_nls.h
index 86a6aadf5c833..e329e261c1639 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.6 2002/04/20 05:35:02 bp 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 815b8ddc23937..67a053460c687 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.4 2000/05/26 02:06:21 jake 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 28ddaca743983..0f90a2c5b3c40 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.13 2003/06/11 05:30:35 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_rq.h b/sys/netncp/ncp_rq.h
index 62c7ce4ad69c0..b25728bd73187 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.7 2003/02/26 21:25:55 fjoe 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 651d2dc454635..39d0300cb209e 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.14 2003/06/11 05:30:35 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_sock.h b/sys/netncp/ncp_sock.h
index ee670dff5a6ad..513d4c444ffab 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.5 2003/02/26 21:25:55 fjoe 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 b21373337b115..125ef8a776c0c 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.13 2004/03/14 02:06:28 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_subr.h b/sys/netncp/ncp_subr.h
index 124649ac60f57..a6a06195055d9 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.8 2003/02/26 21:25:55 fjoe 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 62ba7773deed0..f48b5d3224b63 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.2 1999/12/12 05:50:06 bp Exp $
  */
 #ifndef _NETNCP_NCP_USER_H_
 #define _NETNCP_NCP_USER_H_
diff --git a/sys/netncp/ncpio.h b/sys/netncp/ncpio.h
index 53c90eac96c63..b9a4240ccdaf0 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 8dc7a93022b0b..93fb510167c73 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 b4d69de3a649f..1e8354325256a 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.4 2003/03/05 19:24:23 peter Exp $
  */
 #ifndef _NETSMB_NETBIOS_H_
 #define	_NETSMB_NETBIOS_H_
diff --git a/sys/netsmb/smb.h b/sys/netsmb/smb.h
index a6dc8eeb4fa33..9f5ab7a0d938e 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.9 2003/01/01 18:48:56 schweikh Exp $
  */
 
 /*
diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c
index aacb9bcc07aee..0504c01c949fd 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.13 2004/07/28 06:59:18 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_conn.h b/sys/netsmb/smb_conn.h
index 4092dcba3714b..d0f3c451e2018 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.10 2004/01/02 22:38:42 tjr Exp $
  */
 
 /*
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index 9d01217e4a976..0ffb30dad19f2 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.7 2004/01/02 22:38:42 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c
index a69d0f0d100b0..2753fa11d46e6 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.24 2004/06/17 17:16:51 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netsmb/smb_dev.h b/sys/netsmb/smb_dev.h
index a2f22ecd2ea4f..c07be0beb21f5 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.4 2004/02/11 12:49:49 tjr Exp $
  */
 #ifndef _NETSMB_DEV_H_
 #define _NETSMB_DEV_H_
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index e2abac56bcbf1..6bcfaced6f49c 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.15 2004/01/02 22:38:42 tjr Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 51afaee8b35d2..6c829a4d5ea4f 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.15 2004/05/30 20:27:18 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_rq.h b/sys/netsmb/smb_rq.h
index 8cdc1f6d2f36e..5a9e1cd42daa1 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.3 2004/01/02 22:38:42 tjr 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 c7d2a0702d1ab..118fdc4954c11 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.12 2004/01/02 22:38:42 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index 6993337f05b3a..9fe5cf1b27ae6 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.17 2003/06/11 05:32:09 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h
index 62c084a2b28d6..fc52ca282fd59 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.11 2004/01/02 22:38:42 tjr 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 66620832dbe3e..ce30978e46b23 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.3 2002/09/16 10:57:13 bp Exp $
  */
 
 #ifndef _NETSMB_SMB_TRAN_H_
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index 5029ad5a1ba64..815d574b12f1a 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.21 2004/06/17 22:48:11 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/condvar.h>
diff --git a/sys/netsmb/smb_trantcp.h b/sys/netsmb/smb_trantcp.h
index 482d77ebe7fee..3dffbe0057f48 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.3 2002/09/18 07:38:10 bp 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 fd0a326e7f18b..4792cccfe8d36 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.5 2003/07/24 01:59:18 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 019918d2470a6..72c68e42d6d53 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.115 2004/04/07 04:59:56 imp 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 f68dad18d0645..e3f219b644109 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.35 2004/04/07 04:59:56 imp Exp $
  */
 
 
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index 84443010e0736..8fec9ee0a47c0 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.10 2004/04/07 04:59:56 imp Exp $
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index c644a5649c823..39d520d65877c 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.13 2004/04/07 04:59:56 imp Exp $
  */
 
 
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index e45b83bda0005..249ae63cb9ca7 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.14 2004/04/07 04:59:56 imp Exp $
  */
 
 
diff --git a/sys/nfs4client/nfs4.h b/sys/nfs4client/nfs4.h
index 148c22465464b..1f1d5db809f6d 100644
--- a/sys/nfs4client/nfs4.h
+++ b/sys/nfs4client/nfs4.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4.h,v 1.1 2003/11/14 20:54:08 alfred 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 b675e5508b27b..bf031aaae1070 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.6 2004/06/16 09:47:17 phk 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 4d4817c544c9e..81ba05c6f6f96 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.2 2004/03/26 22:44:59 rees 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 803f5444ee346..d76489455b8f0 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.4 2004/02/21 22:52:02 rees 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 86cd01b175db1..1e03a13af3aeb 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.1 2003/11/14 20:54:08 alfred 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 caf2e2eccb35c..7742980fbf9a4 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.3 2004/04/07 20:46:16 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.3 2004/04/07 20:46:16 imp Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfs4client/nfs4_subs.c b/sys/nfs4client/nfs4_subs.c
index 9cf7b0eba7bb0..dc0400973aadf 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.4 2004/02/27 19:37:43 rees 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 18772be311858..a91060d375981 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.1 2003/11/14 20:54:08 alfred 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 ecd8b1dcda989..7adb555c7e3e0 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.1 2003/11/14 20:54:08 alfred 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 b8e8a321e5b9b..2eac8ee517ba4 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.11 2004/07/30 22:08:52 phk 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.11 2004/07/30 22:08:52 phk Exp $");
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"
diff --git a/sys/nfs4client/nfs4_vn.h b/sys/nfs4client/nfs4_vn.h
index d9847131430d9..936355bfb9231 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.1 2003/11/14 20:54:08 alfred 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 cded7f57a5dea..54b1552a7c2eb 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.2 2004/06/17 17:16:51 phk 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 75532a18f5091..11a41063516d1 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.6 2004/07/28 06:59:55 kan 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.6 2004/07/28 06:59:55 kan 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 534c8366700ff..345a97b94ce01 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.1 2003/11/14 20:54:08 alfred 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 bdc98d2fbd7cf..e314e1ee548b1 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.61 2004/07/28 21:54:57 phk Exp $");
 
 #include "opt_bootp.h"
 
diff --git a/sys/nfsclient/krpc.h b/sys/nfsclient/krpc.h
index 44b84e019fb16..7778f2392c538 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 0bcf6948fcf0d..29d1c80ac887a 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.27 2004/06/16 03:12:50 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 697068b89cba2..f6dd8222cfa76 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.82 2004/07/06 09:12:02 alfred Exp $
  */
 
 #ifndef _NFSCLIENT_NFS_H_
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 998f216132c65..fd18505768a30 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.133.2.1 2004/10/09 17:11:22 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c
index 212a1650632b8..1b72199046872 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.8 2004/07/28 21:54:57 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c
index 88b9609ba1a77..c8dbfb6770187 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.39 2003/11/14 20:54:08 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_lock.h b/sys/nfsclient/nfs_lock.h
index e4bb794e3878b..c9a49e0ea7677 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.5 2002/08/15 21:52:22 alfred Exp $
  */
 
 /*
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index bf6175ac6d273..a74545591dfef 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.81 2004/04/11 13:30:20 peadar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index e6b2d946836e0..7285754ec646c 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.67 2004/04/11 13:30:20 peadar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 094a2e11009c5..964c8e521f040 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.114.2.1 2004/08/30 21:58:31 rwatson Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 0ab2fa0e22c28..84f73bc1566a5 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.130 2004/07/04 08:52:34 phk 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 25b5248421ddf..701bdceda719f 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.158 2004/07/30 22:08:52 phk Exp $");
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 663e3b00070a6..844c3b2ee8c59 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.220 2004/07/25 21:24:22 phk Exp $");
 
 /*
  * vnode op calls for Sun NFS version 2 and 3
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index e4be3f5689b5c..045f24660471d 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.66 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSARGS_H_
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index 4b5cb162afca6..e3baaf58847d7 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.16 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSDISKLESS_H_
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index a91777ea6f138..21dc34bffd3f9 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.34 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSM_SUBS_H_
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index 5064370e0a427..e1df66a5ff68c 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.27 2004/07/06 09:12:03 alfred Exp $
  */
 
 #ifndef _NFSCLIENT_NFSMOUNT_H_
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 893927f3c682c..5f0b1b9eeaf24 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.43 2004/04/14 23:23:55 peadar Exp $
  */
 
 #ifndef _NFSCLIENT_NFSNODE_H_
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index a24f5c30acc2a..81c43c1b3a7c7 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.64 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSSTATS_H_
diff --git a/sys/nfsclient/nlminfo.h b/sys/nfsclient/nlminfo.h
index 3dc55b4e9a728..5cf42ab0c9c46 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 2001/09/18 23:31:53 peter Exp $
  */
 
 /*
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 3f83115114670..9c7e80fc25eaf 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.75 2004/05/24 04:06:14 rwatson Exp $
  */
 
 #ifndef _NFSSERVER_NFS_H_
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index e55e2d63263ed..61e4fd5199a10 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.147.2.1.2.1 2004/10/21 09:01:02 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 b41942d6407cb..ca948161efb55 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.39 2004/07/03 19:17:06 rwatson Exp $");
 
 /*
  * Reference: Chet Juszczak, "Improving the Performance and Correctness
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 83911eec6cb03..a18161249739e 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.92 2004/07/24 02:07:09 rwatson Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 55c9f20107d69..f4e75838d9baa 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.131 2004/07/24 02:32:27 rwatson 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 d58fce4f6215c..95416022aa660 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.101 2004/06/17 22:48:11 rwatson Exp $");
 
 #include "opt_inet6.h"
 #include "opt_mac.h"
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 8e404d8ed8a6f..0ca6b359b5ebc 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.36 2004/05/24 04:06:14 rwatson Exp $
  */
 
 #ifndef _NFSSERVER_NFSM_SUBS_H_
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index 7782ceee52ccc..08f75193df918 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.16 2004/04/07 04:59:58 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVCACHE_H_
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 54773801274fc..05a44135f3a0c 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.64 2004/04/07 04:59:58 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVSTATS_H_
diff --git a/sys/opencrypto/cast.c b/sys/opencrypto/cast.c
index d1129a4354bdb..1534be7a6d6d6 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.2 2003/06/11 05:57:50 obrien Exp $");
 
 #include <sys/types.h>
 #include <opencrypto/cast.h>
diff --git a/sys/opencrypto/cast.h b/sys/opencrypto/cast.h
index 06aaf9d82d960..5f8b9b636811d 100644
--- a/sys/opencrypto/cast.h
+++ b/sys/opencrypto/cast.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cast.h,v 1.1 2002/10/04 20:31:22 sam 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 739d06ecf36a9..d31830dc1fd9f 100644
--- a/sys/opencrypto/castsb.h
+++ b/sys/opencrypto/castsb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/castsb.h,v 1.1 2002/10/04 20:31:22 sam 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 4831fac24ecf1..82641dde284a3 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.2 2003/06/11 05:57:50 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index ccc2ef8eaf9f6..aa88330b075f4 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.15 2004/05/30 20:27:18 phk Exp $");
 
 #define	CRYPTO_TIMING				/* enable timing support */
 
diff --git a/sys/opencrypto/crypto_if.m b/sys/opencrypto/crypto_if.m
index 0ef17e60537ca..826359b4d4e4d 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.1 2002/10/04 20:31:22 sam Exp $
 #
 
 #include <crypto/cryptodev.h>
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index 9b0da7ce30264..e8463bf812ca6 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.22 2004/08/10 03:26:17 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h
index 0da86330528f9..aae4a430416ad 100644
--- a/sys/opencrypto/cryptodev.h
+++ b/sys/opencrypto/cryptodev.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.9 2004/02/02 17:06:34 phk 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 4a0c837d657dc..10caa67616810 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.7 2004/02/02 17:06:34 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/cryptosoft.h b/sys/opencrypto/cryptosoft.h
index dea997e2f89c2..bba65a41b58d9 100644
--- a/sys/opencrypto/cryptosoft.h
+++ b/sys/opencrypto/cryptosoft.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cryptosoft.h,v 1.1 2002/10/04 20:31:22 sam 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 6ffc7a71a4d61..13ec9e5549956 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.2 2003/06/11 05:57:50 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
diff --git a/sys/opencrypto/deflate.h b/sys/opencrypto/deflate.h
index 81a8be7406b4e..8d9e0bc355f26 100644
--- a/sys/opencrypto/deflate.h
+++ b/sys/opencrypto/deflate.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/deflate.h,v 1.1 2002/10/04 20:31:22 sam Exp $	*/
 /* $OpenBSD: deflate.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
 
 /*
diff --git a/sys/opencrypto/rijndael.c b/sys/opencrypto/rijndael.c
index e3895af934080..c118cb70ac931 100644
--- a/sys/opencrypto/rijndael.c
+++ b/sys/opencrypto/rijndael.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/rijndael.c,v 1.3 2004/02/04 08:44:10 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/rijndael.h b/sys/opencrypto/rijndael.h
index 5c530e151c319..09669dc6a10d9 100644
--- a/sys/opencrypto/rijndael.h
+++ b/sys/opencrypto/rijndael.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/rijndael.h,v 1.1 2002/10/04 20:31:22 sam Exp $	*/
 /*	$OpenBSD: rijndael.h,v 1.7 2001/12/19 17:42:24 markus Exp $ */
 
 /**
diff --git a/sys/opencrypto/rmd160.c b/sys/opencrypto/rmd160.c
index 3a05588ee02c7..070ac579db2b2 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.2 2003/06/11 05:57:50 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/rmd160.h b/sys/opencrypto/rmd160.h
index 604b0c9e3cab5..9898292288af8 100644
--- a/sys/opencrypto/rmd160.h
+++ b/sys/opencrypto/rmd160.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/rmd160.h,v 1.1 2002/10/04 20:31:22 sam 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 7fb59f2efd540..b5042085bf8e2 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.2 2003/06/11 05:57:50 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/opencrypto/skipjack.h b/sys/opencrypto/skipjack.h
index 70df788c62154..62fc0ad4ea97e 100644
--- a/sys/opencrypto/skipjack.h
+++ b/sys/opencrypto/skipjack.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/skipjack.h,v 1.1 2002/10/04 20:31:22 sam 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 e63659ca9247c..7b906420ab2b8 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.2 2003/06/11 05:57:50 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/xform.h b/sys/opencrypto/xform.h
index a4960b98de227..9c33541226728 100644
--- a/sys/opencrypto/xform.h
+++ b/sys/opencrypto/xform.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/xform.h,v 1.1 2002/10/04 20:31:23 sam 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 2d21f9e31bad4..68acec868d38b 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.3 2002/09/17 01:48:58 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/compile/.cvsignore b/sys/pc98/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/pc98/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index fec25003e6c03..2660cc284306e 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.255.2.4 2004/09/22 19:23:39 andre Exp $
 
 machine		pc98
 #cpu		I386_CPU		# Do not enable with other cpu types
diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index 6dcec81890a40..14518548f15d0 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.20 2004/07/17 10:22:42 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 2c006e9c2c80d..c87a6d7b4ec4c 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 5aba91861a312..1d5cbb60b5fc7 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.42 2004/08/01 13:01:36 nyan Exp $
 #
 
 #
diff --git a/sys/pc98/conf/gethints.awk b/sys/pc98/conf/gethints.awk
index f471e43315e71..a52579fdd4a4f 100644
--- a/sys/pc98/conf/gethints.awk
+++ b/sys/pc98/conf/gethints.awk
@@ -6,7 +6,7 @@
 # 'hints' directive.  See how GENERIC and GENERIC.hints fit together for
 # a static example.  You should use loader(8) if at all possible.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/gethints.awk,v 1.2 2002/07/26 03:52:30 peter Exp $
 
 # skip commented lines, empty lines and not "device" lines
 /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; }
diff --git a/sys/pc98/i386/busio.s b/sys/pc98/i386/busio.s
index b80f98a5e5aaa..ea2918d8d489a 100644
--- a/sys/pc98/i386/busio.s
+++ b/sys/pc98/i386/busio.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/i386/busio.s,v 1.3 2003/11/05 17:01:51 nyan Exp $ */
 /*	$NecBSD: busio.s,v 1.16.4.1 1999/08/16 09:06:08 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/pc98/i386/busiosubr.c b/sys/pc98/i386/busiosubr.c
index f88e8e4895171..c1b5216a38e21 100644
--- a/sys/pc98/i386/busiosubr.c
+++ b/sys/pc98/i386/busiosubr.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/i386/busiosubr.c,v 1.4 2003/09/23 08:22:33 nyan Exp $ */
 /*	$NecBSD: busiosubr.c,v 1.30.4.4 1999/08/28 02:25:35 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 20cbd716384e7..2032baac6d387 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.342.2.1 2004/09/09 10:03:20 julian Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/pc98/pc98/30line.h b/sys/pc98/pc98/30line.h
index c62ec41733cd6..0e96a999565f2 100644
--- a/sys/pc98/pc98/30line.h
+++ b/sys/pc98/pc98/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/pc98/30line.h,v 1.4 2000/10/15 04:54:17 nyan Exp $
  */
 
 #ifndef __PC98_PC98_30LINE_H__
diff --git a/sys/pc98/pc98/atapi.c b/sys/pc98/pc98/atapi.c
index d52fff5a6fea3..d3db9bcaece1d 100644
--- a/sys/pc98/pc98/atapi.c
+++ b/sys/pc98/pc98/atapi.c
@@ -13,7 +13,7 @@
  *
  * Version 1.9, Mon Oct  9 22:34:47 MSK 1995
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/atapi.c,v 1.10 2003/03/02 16:54:39 des Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/atapi.h b/sys/pc98/pc98/atapi.h
index 66989a46e694e..4bb8ae8b58703 100644
--- a/sys/pc98/pc98/atapi.h
+++ b/sys/pc98/pc98/atapi.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Version 1.9, Thu Oct 12 15:53:50 MSK 1995
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/atapi.h,v 1.19 2000/01/24 17:15:59 peter Exp $
  */
 
 #define atapi_attach wdc_atapi_attach
diff --git a/sys/pc98/pc98/canbepm.c b/sys/pc98/pc98/canbepm.c
index 5c347a07e187f..059defeef209c 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 893ac29b46ffb..869b0f6e4b627 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.4 2004/03/17 17:50:51 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/canbus.h b/sys/pc98/pc98/canbus.h
index b63cc765cd6f1..ce47a56342d73 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 b9ec8ca5d5614..957b0c9f39ef5 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.2 2003/02/04 16:17:13 nyan Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/pc98/pc98/canbusvars.h b/sys/pc98/pc98/canbusvars.h
index fc2acc11a976c..afaec674d4366 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/clock.c b/sys/pc98/pc98/clock.c
index 72a968ec71641..3c0339fb3714b 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.140 2004/07/13 12:58:36 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/epsonio.h b/sys/pc98/pc98/epsonio.h
index 105c9b86a2893..a40ef4e557069 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.8 2001/07/14 04:14:29 nyan Exp $
  */
 
 #ifndef __PC98_PC98_EPSONIO_H__
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index f9bc6af38ac2e..dd1a3f3cdd85e 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -50,7 +50,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.153 2004/07/17 10:07:19 nyan Exp $
  */
 
 #include "opt_fdc.h"
diff --git a/sys/pc98/pc98/fdc_cbus.c b/sys/pc98/pc98/fdc_cbus.c
index 0980e0036d671..b72fc39fe97b3 100644
--- a/sys/pc98/pc98/fdc_cbus.c
+++ b/sys/pc98/pc98/fdc_cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/fdc_cbus.c,v 1.4 2004/07/17 10:07:19 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/pc98/pc98/fdcvar.h b/sys/pc98/pc98/fdcvar.h
index 4ae53d95ac597..afea84708bb7f 100644
--- a/sys/pc98/pc98/fdcvar.h
+++ b/sys/pc98/pc98/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/pc98/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/pc98/fdreg.h b/sys/pc98/pc98/fdreg.h
index 6d8e7e115d0d3..62c3d299b8cd1 100644
--- a/sys/pc98/pc98/fdreg.h
+++ b/sys/pc98/pc98/fdreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/fdreg.h,v 1.11 2004/04/07 04:59:58 imp Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/isa_dma.c b/sys/pc98/pc98/isa_dma.c
index e9d46042be657..3938cc86cb23d 100644
--- a/sys/pc98/pc98/isa_dma.c
+++ b/sys/pc98/pc98/isa_dma.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/isa_dma.c,v 1.17 2004/07/08 13:48:49 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/module.h b/sys/pc98/pc98/module.h
index b533b3a0fe36d..fd7dee14dce8e 100644
--- a/sys/pc98/pc98/module.h
+++ b/sys/pc98/pc98/module.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/pc98/module.h,v 1.2 2000/04/27 13:34:28 nyan Exp $ */
 
 #define	LINE30_ROW	30
 #define	_HS	1 + 1
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index 9b8b83bcc12e5..c89329afeb5e3 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/mse.c,v 1.46 2004/06/16 09:47:18 phk Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/pc98/pc98/nmi.c b/sys/pc98/pc98/nmi.c
index 431dd060cc19c..3a19b84adfcf6 100644
--- a/sys/pc98/pc98/nmi.c
+++ b/sys/pc98/pc98/nmi.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/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/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index dc523db8db4b6..f25285aa0d228 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/olpt.c,v 1.26 2004/06/16 09:47:19 phk Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/pc98.h b/sys/pc98/pc98/pc98.h
index 9788cb0b5bae4..c21cd681749ee 100644
--- a/sys/pc98/pc98/pc98.h
+++ b/sys/pc98/pc98/pc98.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98.h,v 1.17 2004/07/08 13:47:56 nyan Exp $
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/pc98/pc98_machdep.c b/sys/pc98/pc98/pc98_machdep.c
index f2022e3c0a7ab..0a23fb5020156 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.22 2001/05/21 12:51:44 nyan Exp $
  */
 
 #include "opt_pc98.h"
diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h
index 7c97d4d951b1c..8dd9d659d5986 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.11 2002/03/20 12:22:31 kato Exp $
  */
 
 #ifndef __PC98_PC98_PC98_MACHDEP_H__
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index a22ad992f56cc..1cc97b9ea81d1 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.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/pc98/pc98gdc.c,v 1.43 2004/06/16 09:47:19 phk Exp $
  */
 
 #include "opt_gdc.h"
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index 2d1fc018e49b3..7e454e8bcdb24 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.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/pc98/pc98kbd.c,v 1.27 2004/03/17 17:50:52 njl Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/pc98/pc98/pmc.c b/sys/pc98/pc98/pmc.c
index 13eade08322b3..28e31a92c4801 100644
--- a/sys/pc98/pc98/pmc.c
+++ b/sys/pc98/pc98/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/pc98/pmc.c,v 1.5 2004/06/03 06:10:02 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index 5e5da2d95e502..71e429b8e6a74 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/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/pc98/ppc.c,v 1.17 2004/06/07 06:04:27 phk Exp $
  *
  */
 
diff --git a/sys/pc98/pc98/ppcreg.h b/sys/pc98/pc98/ppcreg.h
index 2aa5ce49d89a3..f3b935f356406 100644
--- a/sys/pc98/pc98/ppcreg.h
+++ b/sys/pc98/pc98/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/pc98/ppcreg.h,v 1.4 2001/06/26 11:53:12 nyan Exp $
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/pc98/pc98/sc_machdep.h b/sys/pc98/pc98/sc_machdep.h
index ea7b3ba7069a3..a72ec37fd1ab9 100644
--- a/sys/pc98/pc98/sc_machdep.h
+++ b/sys/pc98/pc98/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/pc98/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/pc98/scgdcrndr.c b/sys/pc98/pc98/scgdcrndr.c
index abebc75801a31..0a4b475ddee49 100644
--- a/sys/pc98/pc98/scgdcrndr.c
+++ b/sys/pc98/pc98/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/pc98/scgdcrndr.c,v 1.12 2004/06/04 13:04:10 phk Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/pc98/scterm-sck.c b/sys/pc98/pc98/scterm-sck.c
index b1e006a55826c..842cfb8181619 100644
--- a/sys/pc98/pc98/scterm-sck.c
+++ b/sys/pc98/pc98/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/pc98/scterm-sck.c,v 1.15 2004/06/04 13:04:10 phk Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c
index 2d0ea3f032841..e3063a4226884 100644
--- a/sys/pc98/pc98/scvtbpc98.c
+++ b/sys/pc98/pc98/scvtbpc98.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/pc98/scvtbpc98.c,v 1.13 2003/02/19 05:47:40 imp Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 210e21ef9febf..65364e73a0fe2 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/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/pc98/sio.c,v 1.227 2004/07/24 15:13:42 nyan Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/pc98/pc98/sio_cbus.c b/sys/pc98/pc98/sio_cbus.c
index acc52f0ca8e38..cac1c2264233f 100644
--- a/sys/pc98/pc98/sio_cbus.c
+++ b/sys/pc98/pc98/sio_cbus.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/pc98/pc98/sio_cbus.c,v 1.6 2004/03/07 05:39:38 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/syscons_pc98.c b/sys/pc98/pc98/syscons_pc98.c
index df8934eabea08..b275f7a99a6e5 100644
--- a/sys/pc98/pc98/syscons_pc98.c
+++ b/sys/pc98/pc98/syscons_pc98.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/pc98/syscons_pc98.c,v 1.20 2003/10/31 13:48:24 nyan Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 2a8cb29e81c74..091b27bec2fa3 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/wd.c,v 1.137 2004/04/07 04:59:58 imp Exp $
  */
 
 /* TODO:
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 5ac001ea018de..42bf9772b2e23 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.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/pc98/wd_cd.c,v 1.53 2004/06/16 09:47:19 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/wd_cd.h b/sys/pc98/pc98/wd_cd.h
index 223d9ae2643e0..0753631c12799 100644
--- a/sys/pc98/pc98/wd_cd.h
+++ b/sys/pc98/pc98/wd_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/pc98/pc98/wd_cd.h,v 1.4 2004/03/07 14:16:42 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/wdreg.h b/sys/pc98/pc98/wdreg.h
index 65fe518f86086..fdc8d4010c146 100644
--- a/sys/pc98/pc98/wdreg.h
+++ b/sys/pc98/pc98/wdreg.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/wdreg.h,v 1.5 2004/04/07 04:59:58 imp Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/wormio.h b/sys/pc98/pc98/wormio.h
index 4d95d348c14f5..0e3027e0b7435 100644
--- a/sys/pc98/pc98/wormio.h
+++ b/sys/pc98/pc98/wormio.h
@@ -1,5 +1,5 @@
 /* Shared between kernel & process */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/pc98/wormio.h,v 1.2 2000/04/29 05:55:33 nyan Exp $ */
 
 #ifndef	_SYS_WORMIO_H_
 #define	_SYS_WORMIO_H_
diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h
index fe13598b2859b..3d742903e3488 100644
--- a/sys/pccard/cardinfo.h
+++ b/sys/pccard/cardinfo.h
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pccard/cardinfo.h,v 1.29 2003/04/23 23:39:21 imp Exp $ */
 
 #ifndef	_PCCARD_CARDINFO_H_
 #define	_PCCARD_CARDINFO_H_
diff --git a/sys/pccard/cis.h b/sys/pccard/cis.h
index a0765b499f869..137bbe4be0aab 100644
--- a/sys/pccard/cis.h
+++ b/sys/pccard/cis.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/pccard/cis.h,v 1.4 2000/04/26 15:36:24 iwasaki Exp $
  *
  */
 
diff --git a/sys/pccard/driver.h b/sys/pccard/driver.h
index f5705ab935f35..25590734306be 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 884f1dbd02500..5cfc9a9f2db48 100644
--- a/sys/pccard/i82365.h
+++ b/sys/pccard/i82365.h
@@ -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/sys/pccard/i82365.h,v 1.28 2004/08/13 06:57:31 imp Exp $
  */
 
 #define	PCIC_I82365	0		/* Intel i82365SL-A/B or clone */
diff --git a/sys/pccard/mecia.c b/sys/pccard/mecia.c
index 07e58ca6421d3..19583689d4e4c 100644
--- a/sys/pccard/mecia.c
+++ b/sys/pccard/mecia.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/pccard/mecia.c,v 1.5 2004/03/17 17:50:52 njl Exp $
  *
  * Based heavily on the FreeBSD pcic driver's pcic98 support, derived
  * from PAO3 tree.  This copyright notice likely needs modification for
diff --git a/sys/pccard/meciareg.h b/sys/pccard/meciareg.h
index b54ae4d618437..a528d171481f7 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.c b/sys/pccard/pccard.c
index 876c2414f10e3..ea2a7a35e8e96 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.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/sys/pccard/pccard.c,v 1.163 2004/06/16 09:47:19 phk Exp $
  */
 
 #define OBSOLETE_IN_6
diff --git a/sys/pccard/pccard_beep.c b/sys/pccard/pccard_beep.c
index e608dc19397a0..674485ae93e8c 100644
--- a/sys/pccard/pccard_beep.c
+++ b/sys/pccard/pccard_beep.c
@@ -3,7 +3,7 @@
  * Nate Williams, October 1997.
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pccard/pccard_beep.c,v 1.10 2003/06/12 04:46:42 imp Exp $ */
 
 #define OBSOLETE_IN_6
 
diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c
index 866dcb0115789..60ccb1d8b96b1 100644
--- a/sys/pccard/pccard_nbk.c
+++ b/sys/pccard/pccard_nbk.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/pccard/pccard_nbk.c,v 1.44 2003/06/12 04:46:42 imp Exp $
  */
 
 /*
diff --git a/sys/pccard/pccard_nbk.h b/sys/pccard/pccard_nbk.h
index a6a4152d259d3..eab392273ec6f 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.6 2002/01/08 19:35:27 msmith Exp $
  */
 
 #ifndef PCCARD_PCCARD_NBK_H
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index 4fe27a3e84b82..900e06d30fd4f 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.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/pccard/pcic.c,v 1.185 2004/08/13 06:57:31 imp Exp $
  */
 
 #define OBSOLETE_IN_6
diff --git a/sys/pccard/pcic_isa.c b/sys/pccard/pcic_isa.c
index b1228462d84c8..8f05142118358 100644
--- a/sys/pccard/pcic_isa.c
+++ b/sys/pccard/pcic_isa.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/pccard/pcic_isa.c,v 1.26 2004/08/13 06:57:31 imp Exp $
  */
 
 #define OBSOLETE_IN_6
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index d6a52e29b9b9e..5cd01882a1fee 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.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/pccard/pcic_pci.c,v 1.128 2004/03/17 17:50:52 njl Exp $
  */
 
 #define OBSOLETE_IN_6
diff --git a/sys/pccard/pcic_pci.h b/sys/pccard/pcic_pci.h
index d5f7a83079fa3..2273705e53ad6 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.36 2002/09/29 23:37:07 imp Exp $
  */
 
 /* Share the devid database with NEWCARD */
diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h
index da372e2d46f83..fd71ba9336afb 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.29 2002/07/20 22:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h
index a91098328553d..9366017e0a02e 100644
--- a/sys/pccard/slot.h
+++ b/sys/pccard/slot.h
@@ -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/sys/pccard/slot.h,v 1.39 2004/06/16 09:47:19 phk Exp $
  */
 
 #ifndef _PCCARD_SLOT_H
diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index a7f2bfe91121d..459392c319a3f 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.45 2004/08/16 12:25:48 obrien Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_ali.c b/sys/pci/agp_ali.c
index cff5260d74f3c..f49e2b61eaee2 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.12 2004/05/30 20:00:40 phk Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index c8760267a46bd..38b9ede081952 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.21 2004/08/16 12:23:53 obrien Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_amd64.c b/sys/pci/agp_amd64.c
index a4372f3c0a05b..fe85087fa815c 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.1 2004/08/16 12:25:48 obrien Exp $");
 
 #include "opt_bus.h"
 #ifdef __i386__
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 37c033d8c94e3..a1ae20bc5e4d6 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.30 2004/05/30 20:00:40 phk Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_if.m b/sys/pci/agp_if.m
index 9d81584a8ecd0..4639879c67465 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.2 2003/04/07 10:06:48 murray Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c
index ce70b4fdeb58f..9727088b9170b 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.24 2004/05/30 20:00:40 phk Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_nvidia.c b/sys/pci/agp_nvidia.c
index 5b6c96d31eb74..1d600b2a6aa8e 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.6 2004/05/30 20:00:40 phk Exp $");
 
 /*
  * Written using information gleaned from the
diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c
index 9d1348bd70268..bedc58ba68b84 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.14.2.1 2004/08/23 05:23:16 imp Exp $");
 
 #include "opt_bus.h"
 #ifndef PC98
diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c
index 5fa0730f20772..e37cbdd153d84 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.18.2.1 2004/08/23 05:23:16 imp Exp $");
 
 #include "opt_bus.h"
 #ifndef PC98
diff --git a/sys/pci/agppriv.h b/sys/pci/agppriv.h
index 7e846d17cdffb..dba984fb62e85 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 4b2d5b3088dcf..d934560923d3e 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 0869c26d2b861..797c88a680f93 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 7a062e300ea3f..7ccaa8aefb626 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.22 2004/03/17 17:50:53 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index 5333e6789a0d3..ce57d130e524f 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.13 2004/04/20 13:36:44 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/dc21040reg.h b/sys/pci/dc21040reg.h
index c0ff1916578fb..432f494d2b9df 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 22743e80dba50..9298879e8b8aa 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.148.2.2 2004/10/16 00:53:44 green 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 ce7334d0c800b..4c5196d4d5628 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.42 2004/06/29 20:38:44 imp Exp $
  */
 
 /*
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index bbbe2a3793284..3016bee901efa 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.158.4.1 2004/10/23 03:12:33 jmg Exp $");
 
 #define	TULIP_HDR_DATA
 
diff --git a/sys/pci/if_devar.h b/sys/pci/if_devar.h
index ee02be56d4dd7..b89ca85725f2b 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.31 2004/07/09 02:19:07 bms 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 387714f4549bf..90d85d9561842 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.44 2004/06/21 21:57:31 phk Exp $");
 
 /*
  * Stuff to describe the MUNIC32X and FALC54 chips.
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index ead2845a086b5..ca2bc85730c4c 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.59.2.2 2004/09/09 13:19:39 brueffer 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 0f3b86ddeb0b7..ccc57ef07d3a2 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.8 2003/11/14 19:00:31 sam Exp $
  */
 
 /*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 1fae9fe955be4..1da7ee8c9a6c5 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.145 2004/08/09 20:22:17 green Exp $");
 
 /*
  * RealTek 8129/8139 PCI NIC driver
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index a96dc2a45dae1..346c47abf8859 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.44.2.3 2004/10/12 21:51:20 jmg Exp $
  */
 
 /*
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 91a9441f98697..29a1631067f70 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.72.2.1 2004/09/02 20:57:40 rwatson 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 630f0b20dfacf..5c71ac98c3deb 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.10 2003/11/14 19:00:31 sam Exp $
  */
 
 /*
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 0fe85ab4ea278..4b5b87fb44da7 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.103.2.1 2004/10/09 15:20:18 mlaier 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 aebc2af788807..bca9e1e8f5174 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.26 2003/12/25 22:14:25 phk Exp $
  */
 
 /*
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 49ad9e2b36f47..9019b3f996627 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.83.2.2 2004/08/25 21:19:06 jmg 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.83.2.2 2004/08/25 21:19:06 jmg Exp $";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h
index 2ef61c4569453..d72fd6b1e379e 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.20.2.2 2004/08/25 21:19:06 jmg Exp $
  */
 
 /*
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 2284d667de5d4..89925668e554c 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.76.2.1 2004/09/02 20:57:40 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/if_stereg.h b/sys/pci/if_stereg.h
index d5ecac7c17e62..6550c6fb5846b 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.16 2004/04/06 11:04:54 ru Exp $
  */
 
 /*
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index f9ee1e4e54256..75b7e403aa5c3 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.96.2.1 2004/09/02 20:57:40 rwatson Exp $");
 
 #include "opt_ti.h"
 
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index 35525149996f1..6ae3e3597a200 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.28 2004/06/16 09:47:20 phk Exp $
  */
 
 /*
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index e453b9294258e..f13bc0af36646 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.93.2.1 2004/09/02 20:57:40 rwatson 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 086738d70d254..70186a7db2a5d 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.19 2003/11/14 19:00:32 sam Exp $
  */
 
 
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 6febeaf05d735..c1139e13c616b 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.94.4.1 2004/10/28 17:51:33 bms Exp $");
 
 /*
  * VIA Rhine fast ethernet PCI NIC driver
diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h
index 2c3bb4553345c..69934724d0783 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.20 2004/07/09 00:12:41 bms Exp $
  */
 
 /*
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index ef38978052efa..4746436a70cdb 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.73.2.1 2004/09/02 20:57:40 rwatson Exp $");
 
 /*
  * Winbond fast ethernet PCI NIC driver
diff --git a/sys/pci/if_wbreg.h b/sys/pci/if_wbreg.h
index 5467de6a27ac4..e2452b6ddc1ce 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.10 2003/11/14 19:00:32 sam Exp $
  */
 
 /*
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index fa38695554724..c4f9e9ac73dab 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.179.2.1 2004/09/17 19:46:40 glebius Exp $");
 
 /*
  * 3Com 3c90x Etherlink XL PCI NIC driver
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index 1c39f8d8bdf56..b5909f708ed99 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.50 2004/07/09 00:11:25 bms Exp $
  */
 
 #define XL_EE_READ	0x0080	/* read, 5 bit address */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index ef30a526ff1f5..b71cb063b47db 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.31 2004/03/17 17:50:54 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/intpmreg.h b/sys/pci/intpmreg.h
index 73816e7748d5a..7fd49024eb889 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 89688e1c6af22..dfd8e54f93bc3 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 89b5f042e767b..efbb19447b4dc 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -39,7 +39,7 @@
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/ncr.c,v 1.182.2.1 2004/09/20 20:57:37 se Exp $");
 
 
 #define NCR_DATE "pl30 98/1/1"
diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h
index fcc72124377f3..37c3c50ef6f95 100644
--- a/sys/pci/ncrreg.h
+++ b/sys/pci/ncrreg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** $FreeBSD$
+** $FreeBSD: src/sys/pci/ncrreg.h,v 1.13 1999/08/28 00:51:03 peter 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 89f5c9f9dae70..e06ef85370dd1 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 e54c920531e53..6d46ed297dc3b 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 8d37024772f25..1e4f69adfede3 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.7 2004/03/17 17:50:54 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/xmaciireg.h b/sys/pci/xmaciireg.h
index 137f47ee062b2..f7eac00c9c536 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.3 2000/04/22 02:16:37 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 7ec18a5c61243..824b9c2384739 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/xrpu.c,v 1.39 2004/06/16 09:47:20 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/yukonreg.h b/sys/pci/yukonreg.h
index 0230aaedcff5d..2e395b59c2e38 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.1 2003/09/20 15:49:22 wilko Exp $
  */
 
 /* General Purpose Status Register (GPSR) */
diff --git a/sys/posix4/_semaphore.h b/sys/posix4/_semaphore.h
index 91106ff99e51a..e65181f5d9958 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.3 2004/02/03 22:27:03 deischen Exp $
  */
 #ifndef __SEMAPHORE_H_
 #define __SEMAPHORE_H_
diff --git a/sys/posix4/ksched.c b/sys/posix4/ksched.c
index 6ef2940b6826d..bbdd67779f75b 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.25 2003/09/13 18:46:24 nectar Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/posix4/mqueue.h b/sys/posix4/mqueue.h
index 8fb98fbed9edd..f04c72aaa9604 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 51c0032a76bd8..c1c219b9445e7 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.22 2003/06/11 06:28:14 obrien Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/posix4/posix4.h b/sys/posix4/posix4.h
index b17e9270e675a..ae5077a84d28e 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 3c6bb976a733b..24d7ab56eed1b 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.8 2003/06/11 06:28:14 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/posix4/sched.h b/sys/posix4/sched.h
index 92fad6da914d1..0079d9ac21c38 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 180625221f2e0..b2daf3459ee16 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/rpc/rpcclnt.c b/sys/rpc/rpcclnt.c
index 18c11b1fb6cc8..e4658135ea122 100644
--- a/sys/rpc/rpcclnt.c
+++ b/sys/rpc/rpcclnt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.11 2004/07/15 22:21:25 rees 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 fa22939d82a90..baa36074d5291 100644
--- a/sys/rpc/rpcclnt.h
+++ b/sys/rpc/rpcclnt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcclnt.h,v 1.3 2004/04/07 05:00:00 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 b7fb06710c833..4e18e3cd80441 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.2 2004/04/07 05:00:00 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 beb65eff8f853..ee278a86ff0cf 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 4fcbd807cac74..51ab401c29696 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.111 2004/02/26 03:51:04 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac/mac_label.c b/sys/security/mac/mac_label.c
index 19bd5b06e3621..359ef132d3aae 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.2 2004/08/02 00:18:35 green Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index d0afba9374308..1482621ed7432 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.116 2004/06/24 03:34:44 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 16de8423f55ac..d81a28fb996cc 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_process.c b/sys/security/mac/mac_process.c
index 4f3a6c0a761b2..29cdaad29a922 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.106 2004/02/22 00:33:10 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_socket.c b/sys/security/mac/mac_socket.c
index 7b48f7976db8c..d0a5965672dd5 100644
--- a/sys/security/mac/mac_socket.c
+++ b/sys/security/mac/mac_socket.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_socket.c,v 1.2 2004/06/13 02:50:07 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 83b22e13b4e5a..699bae9a27842 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.104 2004/05/30 20:27:19 phk Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 647260733e5cf..bf21e190aeb0c 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.106 2004/06/16 09:47:20 phk 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 85028e0000b9a..2809599b82f91 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.80 2004/07/28 07:01:33 kan Exp $
  */
 
 /*
diff --git a/sys/security/mac_biba/mac_biba.h b/sys/security/mac_biba/mac_biba.h
index 05eefab05b0df..e2c5cae5a4cd9 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 0d8985eb003e9..98d2a8878ac65 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.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_bsdextended/mac_bsdextended.c,v 1.18.2.3 2004/09/13 20:21:32 trhodes Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.h b/sys/security/mac_bsdextended/mac_bsdextended.h
index 7798a112d233c..101ac97cbaa08 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.3 2004/02/22 00:33:11 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 c80d3dd84941b..b0f4114922c26 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 4dd1572880396..64eb5f99cce82 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.32 2004/07/28 07:01:33 kan Exp $
  */
 
 /*
diff --git a/sys/security/mac_lomac/mac_lomac.h b/sys/security/mac_lomac/mac_lomac.h
index bac08a69ad652..43cf2ec7ded88 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.3 2004/02/22 00:33:11 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 3c5a88b97e614..086672da911f8 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.66 2004/07/28 07:01:33 kan Exp $
  */
 
 /*
diff --git a/sys/security/mac_mls/mac_mls.h b/sys/security/mac_mls/mac_mls.h
index 7bed921b87fb7..d4f0d348838ce 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 11910a6b4f8d4..2830a6635a56b 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 2004/02/22 00:33:12 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c
index 397e44abb59c5..38f7ab8ec1eb9 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 2004/02/22 00:33:12 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_partition/mac_partition.h b/sys/security/mac_partition/mac_partition.h
index f5675e2e428c0..2765ac209fee0 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 7524155d48a85..5aeada2a09a2c 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.5 2004/05/15 20:55:19 cperciva Exp $
  */
 
 /*
diff --git a/sys/security/mac_seeotheruids/mac_seeotheruids.c b/sys/security/mac_seeotheruids/mac_seeotheruids.c
index 9da454cbc9d62..62960621f59a1 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.6 2004/02/22 00:33:12 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index 01cb99fb67fd3..45d194653f000 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.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_stub/mac_stub.c,v 1.42 2004/06/24 03:34:45 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
index b2ad10f38eab7..dea0490334ab7 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.48 2004/07/10 21:47:53 marcel Exp $
  */
 
 /*
diff --git a/sys/sparc64/central/central.c b/sys/sparc64/central/central.c
index d26f9af55e089..b211c5a3d979b 100644
--- a/sys/sparc64/central/central.c
+++ b/sys/sparc64/central/central.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/central/central.c,v 1.4 2004/08/12 17:41:31 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/compile/.cvsignore b/sys/sparc64/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/sparc64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 294d7d05dd03c..221355619e3fa 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.78.2.3 2004/09/22 19:23:39 andre Exp $
 
 machine		sparc64
 cpu		SUN4U
diff --git a/sys/sparc64/conf/GENERIC.hints b/sys/sparc64/conf/GENERIC.hints
index e8c0da7a1d7eb..30d9b32767d68 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 2c006e9c2c80d..50f097a1ffcf8 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 311b80fd486d2..74abb6308e32a 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.9 2004/08/16 23:21:06 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 b3be9e2ae5d3d..d6765170ebb4b 100644
--- a/sys/sparc64/creator/creator.h
+++ b/sys/sparc64/creator/creator.h
@@ -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/creator/creator.h,v 1.2 2004/06/16 09:47:23 phk Exp $
  */
 
 #ifndef _DEV_FB_CREATOR_H_
diff --git a/sys/sparc64/creator/creator_upa.c b/sys/sparc64/creator/creator_upa.c
index 1541c8a65c0eb..9d520f0b4f85c 100644
--- a/sys/sparc64/creator/creator_upa.c
+++ b/sys/sparc64/creator/creator_upa.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/creator/creator_upa.c,v 1.6 2004/07/09 23:12:22 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index bf12a26db2de6..61407b381db22 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.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/ebus/ebus.c,v 1.19 2004/08/12 17:41:32 marius Exp $
  */
 
 /*
diff --git a/sys/sparc64/fhc/fhc.c b/sys/sparc64/fhc/fhc.c
index 69e7aab180751..196984b09ce97 100644
--- a/sys/sparc64/fhc/fhc.c
+++ b/sys/sparc64/fhc/fhc.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/fhc/fhc.c,v 1.9 2004/08/12 17:41:32 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/fhc/fhc_central.c b/sys/sparc64/fhc/fhc_central.c
index 50dc6696791b8..de9841aed5ed1 100644
--- a/sys/sparc64/fhc/fhc_central.c
+++ b/sys/sparc64/fhc/fhc_central.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/fhc/fhc_central.c,v 1.4 2004/08/12 17:41:32 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/fhc/fhc_nexus.c b/sys/sparc64/fhc/fhc_nexus.c
index 4943329dea962..6b4a190986605 100644
--- a/sys/sparc64/fhc/fhc_nexus.c
+++ b/sys/sparc64/fhc/fhc_nexus.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/fhc/fhc_nexus.c,v 1.4 2004/08/12 17:41:32 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/fhc/fhcreg.h b/sys/sparc64/fhc/fhcreg.h
index 46cda1fc9c5bd..5ee3e35c27e2e 100644
--- a/sys/sparc64/fhc/fhcreg.h
+++ b/sys/sparc64/fhc/fhcreg.h
@@ -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/fhcreg.h,v 1.2 2003/02/19 08:23:38 jake Exp $
  */
 
 #ifndef _SPARC64_FHC_FHCREG_H_
diff --git a/sys/sparc64/fhc/fhcvar.h b/sys/sparc64/fhc/fhcvar.h
index 55665651a8da8..c7f8c8c2040d6 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.3 2004/08/12 17:41:32 marius Exp $
  */
 
 #ifndef _SPARC64_FHC_FHCVAR_H_
diff --git a/sys/sparc64/include/_inttypes.h b/sys/sparc64/include/_inttypes.h
index e6b2536ff379b..9b669288cc077 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 353711c3cb16f..602360cdfe236 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.11 2003/05/19 20:29:07 kan Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/sparc64/include/_stdint.h b/sys/sparc64/include/_stdint.h
index 1aed3e3b4efc1..f3844dd342064 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 f014b54eb1f70..3d2ef7de738d2 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.7 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/sparc64/include/asi.h b/sys/sparc64/include/asi.h
index 78850dc55d4a8..ec9f0701578eb 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 8182fe77fe76a..f36a728ce8b9f 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 a0e317b218e48..49ff402501555 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 46804b53599ad..c4d09ccc0417c 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 2004/05/22 00:52:16 marius Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h
index 4aa0a7b65f2a7..96480d8937fb4 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.33 2004/06/28 03:49:13 scottl Exp $
  */
 
 #ifndef	_MACHINE_BUS_H_
diff --git a/sys/sparc64/include/bus_common.h b/sys/sparc64/include/bus_common.h
index 845e11e7d878d..ce307eafb9095 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.4 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_BUS_COMMON_H_
diff --git a/sys/sparc64/include/bus_memio.h b/sys/sparc64/include/bus_memio.h
index f27ce0018fe8a..2b36c3110dbb1 100644
--- a/sys/sparc64/include/bus_memio.h
+++ b/sys/sparc64/include/bus_memio.h
@@ -25,7 +25,7 @@
  *
  * 	from: FreeBSD: src/sys/i386/include/bus_memio.h,v 1.2 1999/08/28
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_memio.h,v 1.1 2001/11/09 20:05:48 tmm Exp $
  */
 
 #ifndef _MACHINE_BUS_MEMIO_H_
diff --git a/sys/sparc64/include/bus_pio.h b/sys/sparc64/include/bus_pio.h
index 06a996b560955..0d2e2327585f8 100644
--- a/sys/sparc64/include/bus_pio.h
+++ b/sys/sparc64/include/bus_pio.h
@@ -25,7 +25,7 @@
  *
  * 	from: FreeBSD: src/sys/i386/include/bus_pio.h,v 1.2 1999/08/28
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_pio.h,v 1.1 2001/11/09 20:05:48 tmm Exp $
  */
 
 #ifndef _MACHINE_BUS_PIO_H_
diff --git a/sys/sparc64/include/bus_private.h b/sys/sparc64/include/bus_private.h
index ba15cd9080142..68bbb3cd5e907 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 c4aa506a87dc3..d90f3ab051983 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.11 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_CACHE_H_
diff --git a/sys/sparc64/include/ccr.h b/sys/sparc64/include/ccr.h
index 2b7ac84ec9b6b..76b0888f6f0d2 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 fbedfea57de97..33b950227c8b1 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 4dfe1e9af0fae..0297be838291a 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 ea82ada2d535b..d6881fc0a1494 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.18 2004/05/22 00:47:26 marius Exp $
  */
 
 #ifndef	_MACHINE_CPUFUNC_H_
diff --git a/sys/sparc64/include/critical.h b/sys/sparc64/include/critical.h
index 381ec453602a6..c3c1069e882b5 100644
--- a/sys/sparc64/include/critical.h
+++ b/sys/sparc64/include/critical.h
@@ -33,7 +33,7 @@
  *	related support functions residing
  *	in <arch>/<arch>/critical.c	- prototyped
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/critical.h,v 1.5 2004/07/27 16:41:01 rwatson Exp $
  */
 
 #ifndef _MACHINE_CRITICAL_H_
diff --git a/sys/sparc64/include/db_machdep.h b/sys/sparc64/include/db_machdep.h
index bb29debe249f6..58242fa2fb1a0 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.8 2004/07/10 23:47:20 marcel Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/sparc64/include/eeprom.h b/sys/sparc64/include/eeprom.h
index 57a7ff519a9e6..fee4d8d5c52ab 100644
--- a/sys/sparc64/include/eeprom.h
+++ b/sys/sparc64/include/eeprom.h
@@ -47,7 +47,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/eeprom.h,v 1.3 2004/08/12 17:41:32 marius Exp $
  */
 
 #ifndef _MACHINE_EEPROM_H_
diff --git a/sys/sparc64/include/elf.h b/sys/sparc64/include/elf.h
index d4f1824fce793..f86a313c741a8 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 a3b9c2db476ea..4aaea5a24565f 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.14 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/sparc64/include/exec.h b/sys/sparc64/include/exec.h
index c0f93b68bf905..89b285a357e95 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 6526c5f12e924..44b7996fe5d9a 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.5 2004/04/25 02:36:29 das Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/sparc64/include/floatingpoint.h b/sys/sparc64/include/floatingpoint.h
index 74f995d53afd9..0695c068fc784 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.1 2002/02/10 14:27:20 obrien Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/sparc64/include/fp.h b/sys/sparc64/include/fp.h
index bf0d79a8aba6b..241a6ba6b6351 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 500a38fafe26d..094be1085dcd9 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 61a81f7ef965f..105754b77aba0 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 b30ad04b634aa..c2d4a43d612df 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.1 2004/07/10 17:47:22 marcel Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/sparc64/include/idprom.h b/sys/sparc64/include/idprom.h
index 1f500b8afcb0b..424eab3c70031 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.1 2001/11/18 20:50:11 tmm Exp $
  */
 
 #ifndef _MACHINE_IDPROM_H_
diff --git a/sys/sparc64/include/ieee.h b/sys/sparc64/include/ieee.h
index 929460844bf2e..730f5086d036b 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.2 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_IEEE_H_
diff --git a/sys/sparc64/include/ieeefp.h b/sys/sparc64/include/ieeefp.h
index 6fb8d567669d8..f74ef24a2028b 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.3 2002/09/14 18:00:44 tmm Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/sparc64/include/in_cksum.h b/sys/sparc64/include/in_cksum.h
index 7fbba02de676f..dfa76dd133cdd 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 57ab1e6597a76..d26475cbaf57c 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.6 2002/07/16 17:44:01 tmm Exp $
  */
 
 #ifndef _MACHINE_INSTR_H_
diff --git a/sys/sparc64/include/intr_machdep.h b/sys/sparc64/include/intr_machdep.h
index 9d297307625b6..c4c332a57c3ab 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 88b626ab5a668..c7f85d46acb2d 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.5 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_IOMMUREG_H_
diff --git a/sys/sparc64/include/iommuvar.h b/sys/sparc64/include/iommuvar.h
index 2bdf55d7505f2..59f81830043d6 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.14 2003/07/10 23:27:35 tmm Exp $
  */
 
 #ifndef _MACHINE_IOMMUVAR_H_
diff --git a/sys/sparc64/include/kdb.h b/sys/sparc64/include/kdb.h
index baf6fa2dc660f..d5a4c2aa96886 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.1 2004/07/10 18:40:12 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/sparc64/include/kerneldump.h b/sys/sparc64/include/kerneldump.h
index 7fad3fce88dde..04d43f32454a5 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 e6b7f28a6a52c..c715529c6fd7d 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 b0de83dceee6d..0bbbcebec4e12 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.10 2003/05/19 20:29:07 kan Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/sparc64/include/lsu.h b/sys/sparc64/include/lsu.h
index a8787dcabdc75..66d595f5a7220 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 899d1bb103436..2b4fa688ab6fa 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.15 2003/08/16 16:57:57 marcel Exp $
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/sparc64/include/memdev.h b/sys/sparc64/include/memdev.h
index 671a6b467d7ef..f1205ca76b2e4 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 dca626f7055c0..d42800b29d378 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.4 2003/05/01 03:31:18 peter Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/sparc64/include/mutex.h b/sys/sparc64/include/mutex.h
index c9b2e1ddde073..25cdbc6111e5b 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 dd8ebfc73c3b0..c9b22cc04e82a 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 1e9004e15d77a..44d45cd253f62 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 f7062f7f939a1..e16395adc03f1 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.5 2004/08/14 21:43:37 marius Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_
diff --git a/sys/sparc64/include/ofw_mem.h b/sys/sparc64/include/ofw_mem.h
index af9089ed034a6..ed6f549840249 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 7ee0c401910ee..21e3e00dcab8c 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.3 2002/01/02 18:26:59 tmm Exp $
  */
 
 #ifndef _MACHINE_OFW_UPA_H_
diff --git a/sys/sparc64/include/param.h b/sys/sparc64/include/param.h
index 7f5ade6afbce9..53ee8eb166e2f 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.18 2003/10/03 19:49:08 alc Exp $
  */
 
 /*
diff --git a/sys/sparc64/include/pcb.h b/sys/sparc64/include/pcb.h
index 1f1e8dcb25403..8aa9bcf4f6e3c 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 b854921a3fdbd..18afe8434c47c 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.19 2004/05/26 12:06:51 tmm Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/sparc64/include/pmap.h b/sys/sparc64/include/pmap.h
index ed7f60ecb6b12..a89c033084a9c 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.42 2004/08/10 20:53:25 alc Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
diff --git a/sys/sparc64/include/proc.h b/sys/sparc64/include/proc.h
index c7de9bcc365e9..437a579fd98da 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.12 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/sparc64/include/profile.h b/sys/sparc64/include/profile.h
index 2cf1cef582b65..82208cb79d4b2 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.6 2004/05/19 15:41:26 bde Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/sparc64/include/pstate.h b/sys/sparc64/include/pstate.h
index 4f536303c82b3..eb25a4871b98e 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 dd4ff6e7dfd48..e883860256c7c 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.7 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef	_MACHINE_PTRACE_H_
diff --git a/sys/sparc64/include/reg.h b/sys/sparc64/include/reg.h
index d2241861d209e..66bd5904fcd30 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 a8ce0b106ab07..be066e29653dd 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.1 2001/11/18 17:56:46 jake Exp $
  */
diff --git a/sys/sparc64/include/resource.h b/sys/sparc64/include/resource.h
index 783a1c468a384..95eba95bdb89b 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.2 2001/07/31 06:05:04 jake Exp $
  */
 
 #ifndef _MACHINE_RESOURCE_H_
diff --git a/sys/sparc64/include/runq.h b/sys/sparc64/include/runq.h
index 9f844b69fe5f9..391ca900e1b21 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.2 2002/06/20 06:21:20 peter Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/sparc64/include/sc_machdep.h b/sys/sparc64/include/sc_machdep.h
index 3a492f2383ba4..c91a45d043205 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 c38bcabadd65d..adf06b6601c63 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 b6ee1cc20b69e..bec993b4e403e 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 fd40afdd1209b..2ab2243817471 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 45e352f02820d..aa87f0f6f4196 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.11 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/sparc64/include/smp.h b/sys/sparc64/include/smp.h
index 3f3b0b967b130..3ffea7d142742 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.16.6.1 2004/10/01 04:04:22 kensmith Exp $
  */
 
 #ifndef	_MACHINE_SMP_H_
diff --git a/sys/sparc64/include/stdarg.h b/sys/sparc64/include/stdarg.h
index 3f8b615334e2c..5c2d31e696d2f 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.6 2002/10/06 22:01:07 mike Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/sparc64/include/sysarch.h b/sys/sparc64/include/sysarch.h
index c209ef8048d2f..867a99671b992 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 e317bd8df0001..662372cc77a1f 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.3 2002/10/25 17:42:14 tmm Exp $
  */
 
 #ifndef _MACHINE_TICK_H_
diff --git a/sys/sparc64/include/tlb.h b/sys/sparc64/include/tlb.h
index 235a18652bdb9..d9829c529b999 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 28929f4d3519e..0b707c01222d2 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 fa1feffc82fa3..2607a36f528c3 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 bead8184451c2..bb1f110f8cfbc 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 70337fe4113dc..0c12a5020961a 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 c05ec26a90533..9fbb1a75d1a64 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 3e56917b63833..9ab82c00108b0 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 38a40b0166e56..e0de35d5790b6 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 c9403eedc892c..e6ea81589c717 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.6 2003/09/01 03:01:45 kan Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/sparc64/include/ver.h b/sys/sparc64/include/ver.h
index 7c73488af12d3..9e13b6db8ab5c 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.4 2002/11/07 16:07:46 tmm Exp $
  */
 
 #ifndef	_MACHINE_VER_H_
diff --git a/sys/sparc64/include/vmparam.h b/sys/sparc64/include/vmparam.h
index de4112b13d769..59794351e14f3 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 bb658f9efb53e..232b532ef1cc5 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 7ce0a495d5d2b..d2253ce02a1b2 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 cfe9e87267335..ac3d8a3d0db91 100644
--- a/sys/sparc64/isa/isa.c
+++ b/sys/sparc64/isa/isa.c
@@ -26,7 +26,7 @@
  *
  *	from: FreeBSD: src/sys/alpha/isa/isa.c,v 1.26 2001/07/11
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/isa/isa.c,v 1.13 2004/08/12 17:41:32 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/isa/ofw_isa.c b/sys/sparc64/isa/ofw_isa.c
index 362f1bd5e8111..63d51a69cedd3 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.8 2004/05/08 13:53:47 marius Exp $
  */
 
 /*
diff --git a/sys/sparc64/isa/ofw_isa.h b/sys/sparc64/isa/ofw_isa.h
index 5e74efeb9b404..c055a67532b12 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.4 2004/05/08 13:53:47 marius Exp $
  */
 
 #ifndef _SPARC64_ISA_OFW_ISA_H_
diff --git a/sys/sparc64/pci/apb.c b/sys/sparc64/pci/apb.c
index 4fc8fd24cfd57..4826b25cc9f9b 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.10 2004/08/12 17:41:32 marius Exp $
  */
 
 /*
diff --git a/sys/sparc64/pci/ofw_pci.c b/sys/sparc64/pci/ofw_pci.c
index 46b283a876f25..1d709d51f6324 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.14 2004/05/08 13:53:47 marius Exp $
  */
 
 #include "opt_ofw_pci.h"
diff --git a/sys/sparc64/pci/ofw_pci.h b/sys/sparc64/pci/ofw_pci.h
index d5fdf127190a3..f36145cb49608 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.8 2004/08/12 17:41:32 marius 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 ef203b6c6f965..b3c5852a7652f 100644
--- a/sys/sparc64/pci/ofw_pci_if.m
+++ b/sys/sparc64/pci/ofw_pci_if.m
@@ -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/pci/ofw_pci_if.m,v 1.5 2004/08/12 17:41:32 marius 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 bf2f1d7236b74..edacbc9b29923 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 b297d3402c95c..6dab19e39e8ea 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 8c17e2caeae3d..836d4cd0c034a 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 c4cf9e5a07b59..dea03e934a4a9 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.4 2004/08/15 21:37:52 marius Exp $
  */
 
 #include "opt_ofw_pci.h"
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 6b42f014b1c94..eed6ce8150dd3 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.52 2004/08/12 17:41:32 marius Exp $
  */
 
 /*
diff --git a/sys/sparc64/pci/psychoreg.h b/sys/sparc64/pci/psychoreg.h
index 7318c20460308..3370e5ecba807 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.8 2004/04/25 00:30:28 tmm Exp $
  */
 
 #ifndef _SPARC64_PCI_PSYCHOREG_H_
diff --git a/sys/sparc64/pci/psychovar.h b/sys/sparc64/pci/psychovar.h
index 0c420d6ed76f0..397231c570d55 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.11 2004/05/08 13:53:47 marius Exp $
  */
 
 #ifndef _SPARC64_PCI_PSYCHOVAR_H_
diff --git a/sys/sparc64/sbus/lsi64854.c b/sys/sparc64/sbus/lsi64854.c
index dca8526f71800..08e71f6d8a857 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.1 2004/06/10 05:11:39 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sbus/lsi64854reg.h b/sys/sparc64/sbus/lsi64854reg.h
index 763d312feefd9..ca10760b93be0 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.1 2004/06/10 05:11:39 scottl Exp $ */
 
 /*
  * LSI 64854 DMA engine. Contains three independent channels
diff --git a/sys/sparc64/sbus/lsi64854var.h b/sys/sparc64/sbus/lsi64854var.h
index 04b2297e9c302..b76cbddf12941 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.1 2004/06/10 05:11:39 scottl 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 8db6a3217364e..942e01fa1fa7d 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 4ae43d1210a7d..69a64f05421fc 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -96,7 +96,7 @@
  *	from: @(#)sbus.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.31 2004/08/12 17:41:33 marius Exp $
  */
 
 /*
diff --git a/sys/sparc64/sbus/sbusreg.h b/sys/sparc64/sbus/sbusreg.h
index 6497f2abaf265..00f8cc59bb7d7 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.1 2002/02/13 16:11:36 tmm Exp $
  */
 
 #ifndef _SPARC64_SBUS_SBUSREG_H_
diff --git a/sys/sparc64/sbus/sbusvar.h b/sys/sparc64/sbus/sbusvar.h
index 1f4a05dd065b1..658f8ba800369 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.4 2004/08/12 17:41:33 marius Exp $
  */
 
 #ifndef _SPARC64_SBUS_SBUSVAR_H_
diff --git a/sys/sparc64/sparc64/autoconf.c b/sys/sparc64/sparc64/autoconf.c
index 24783ab20e23d..33dc7d14eaea6 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.10 2002/11/18 03:28:23 jake Exp $
  */
 
 #include "opt_isa.h"
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 2bdf01c26cc50..27e63d15ebc33 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.39.2.2 2004/09/10 20:22:50 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/cache.c b/sys/sparc64/sparc64/cache.c
index a26553543ecbf..7f8d5e0cc18bc 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.19 2004/04/07 05:00:01 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/cheetah.c b/sys/sparc64/sparc64/cheetah.c
index 14f099d37138c..4ab753e5e0565 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 37341fd3ba437..dc4d75d97f10d 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 3e934659f9b0e..3b3d41367babf 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.5.2.1 2004/10/05 17:01:16 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/critical.c b/sys/sparc64/sparc64/critical.c
index 622a6dc08a3c4..4f9dad25c66be 100644
--- a/sys/sparc64/sparc64/critical.c
+++ b/sys/sparc64/sparc64/critical.c
@@ -24,7 +24,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/sparc64/sparc64/critical.c,v 1.8 2003/08/12 23:24:05 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_disasm.c b/sys/sparc64/sparc64/db_disasm.c
index 89d51732c3cd3..9227fdd9b3da9 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.7 2003/01/16 08:53:03 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_hwwatch.c b/sys/sparc64/sparc64/db_hwwatch.c
index ca92c37220c7a..904fd0df1396b 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 77e1493652eb7..7af3888102ab0 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 b5fdec9f42b08..8fd5945c8d207 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.20 2004/07/21 05:07:09 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/dump_machdep.c b/sys/sparc64/sparc64/dump_machdep.c
index 64058283c8495..09db90c6999e7 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.7 2003/12/26 14:30:19 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index 5f67a31c0e23d..da4b99cd2f807 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -47,7 +47,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/eeprom.c,v 1.5 2004/08/12 17:41:33 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/eeprom_ebus.c b/sys/sparc64/sparc64/eeprom_ebus.c
index 645602bfb62a5..7e89206400d55 100644
--- a/sys/sparc64/sparc64/eeprom_ebus.c
+++ b/sys/sparc64/sparc64/eeprom_ebus.c
@@ -47,7 +47,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/eeprom_ebus.c,v 1.7 2004/08/12 17:41:33 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/eeprom_sbus.c b/sys/sparc64/sparc64/eeprom_sbus.c
index 9273193294fd4..097bd63b1a472 100644
--- a/sys/sparc64/sparc64/eeprom_sbus.c
+++ b/sys/sparc64/sparc64/eeprom_sbus.c
@@ -47,7 +47,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/eeprom_sbus.c,v 1.7 2004/08/12 17:41:33 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/elf_machdep.c b/sys/sparc64/sparc64/elf_machdep.c
index edc18ac0e1958..d43bc8a43bc46 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 5c200f754961e..69ea32c62464f 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.68 2003/07/16 00:08:43 jmg 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 219ac13ffdb28..37a8d3a8e6889 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.1 2004/07/10 17:47:21 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/genassym.c b/sys/sparc64/sparc64/genassym.c
index 28b75ff8da864..45d2a13f8a5fb 100644
--- a/sys/sparc64/sparc64/genassym.c
+++ b/sys/sparc64/sparc64/genassym.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.55 2004/05/26 12:06:52 tmm Exp $
  */
 
 #include "opt_kstack_pages.h"
diff --git a/sys/sparc64/sparc64/identcpu.c b/sys/sparc64/sparc64/identcpu.c
index db553c9bf532c..ec3670e6c50bf 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.12 2004/04/30 14:04:21 marius 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 8239b110e772f..88f5de167ff64 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 69f8cd8bac03b..040783239b7ac 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.7 2003/07/16 00:08:43 jmg 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 c9ba8eaccfe9d..bbd8bfc78eebd 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/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/sparc64/sparc64/intr_machdep.c,v 1.19 2004/07/02 20:21:43 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index 733ffe3cfb278..4eee06ec5dbe9 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.40 2004/07/03 20:56:16 imp Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/locore.S b/sys/sparc64/sparc64/locore.S
index deb1033fe4a21..2f6ed9fff2dbb 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 f7f08c481e8f2..4315f19eac253 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -33,7 +33,7 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * 	from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.112.2.2 2004/10/07 22:18:35 kensmith Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index 5960fe85cf355..f1034fb68f8bb 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 eca488258085c..a5c96496c4755 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 718e7c8f4c44b..618ee6f7a08e4 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 97ef3548836d4..f31e0cd5b7444 100644
--- a/sys/sparc64/sparc64/mp_machdep.c
+++ b/sys/sparc64/sparc64/mp_machdep.c
@@ -52,7 +52,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.26 2004/07/10 23:10:07 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c
index 7f130c2acbb78..dd14bdd6ebe43 100644
--- a/sys/sparc64/sparc64/nexus.c
+++ b/sys/sparc64/sparc64/nexus.c
@@ -30,7 +30,7 @@
  *
  * 	from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/nexus.c,v 1.15 2004/08/16 15:45:27 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index 844e55ba3c3c4..88235ec3a4ea3 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.11 2004/08/16 15:45:27 marius Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/ofw_machdep.c b/sys/sparc64/sparc64/ofw_machdep.c
index 3bd7394d8fdbd..26b971a5adc0d 100644
--- a/sys/sparc64/sparc64/ofw_machdep.c
+++ b/sys/sparc64/sparc64/ofw_machdep.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/ofw_machdep.c,v 1.12 2004/08/16 15:45:27 marius Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index f76a45c14f645..98df7d7aa06d4 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.139 2004/08/13 18:54:21 alc Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/prof_machdep.c b/sys/sparc64/sparc64/prof_machdep.c
index 065a1daa44c27..fe8012b8b14c4 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/rwindow.c b/sys/sparc64/sparc64/rwindow.c
index 675379e5c3d9b..dbd48be62cb2f 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.7 2002/10/25 16:00:47 jake Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/sc_machdep.c b/sys/sparc64/sparc64/sc_machdep.c
index 885d25e865e72..f1a30c7e2c68a 100644
--- a/sys/sparc64/sparc64/sc_machdep.c
+++ b/sys/sparc64/sparc64/sc_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/sc_machdep.c,v 1.1 2003/08/24 00:47:40 jake Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/spitfire.c b/sys/sparc64/sparc64/spitfire.c
index abbcdaee3cfab..36bd393e80a88 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 57ca637924205..dd2f7f1fb10e7 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 df5f0ab089c57..3d10e1286a654 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 d26efbb783cf1..3f18d43b27c5b 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.13 2003/08/22 07:38:08 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/tick.c b/sys/sparc64/sparc64/tick.c
index 6189653c129cc..1e76e38cef05c 100644
--- a/sys/sparc64/sparc64/tick.c
+++ b/sys/sparc64/sparc64/tick.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/tick.c,v 1.14 2003/08/22 07:38:08 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/tlb.c b/sys/sparc64/sparc64/tlb.c
index 2226e02278223..60f455a42453d 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 06772ea208125..b18f037645ddc 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.70.2.2 2004/09/03 06:40:26 julian Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/tsb.c b/sys/sparc64/sparc64/tsb.c
index b3f794b8d58e1..32e857c1fb4dc 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.36 2004/08/10 20:53:26 alc Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/uio_machdep.c b/sys/sparc64/sparc64/uio_machdep.c
index f3e2018fa6b23..be38667ed4a27 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.6.2.1 2004/08/25 18:49:56 alc 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 70d44515ea5db..4fd8966532c4a 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.66.2.1 2004/09/30 17:26:51 kensmith Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sys/_iovec.h b/sys/sys/_iovec.h
index eb6492c7c3deb..d93a3e9bea5c7 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.3 2004/04/07 04:19:48 imp Exp $
  */
 
 #ifndef _SYS__IOVEC_H_
diff --git a/sys/sys/_label.h b/sys/sys/_label.h
index 8c10079ea122f..5dae68725db23 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 1770487d709f3..14018c8233395 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 9b24459456bdb..b1fb0455fd0f6 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 72e7f85bf1a9d..29209a9713bdf 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.6 2004/03/05 08:10:19 markm Exp $
  */
 
 #ifndef NULL
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 0306c6f28946a..ce02d3c71b594 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.35 2004/04/07 04:19:48 imp Exp $
  */
 
 #ifndef _SYS__SIGSET_H_
diff --git a/sys/sys/_task.h b/sys/sys/_task.h
index f459c2370ac51..ad11e07b2ee23 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.2 2004/07/28 09:12:54 mux Exp $
  */
 
 #ifndef _SYS__TASK_H_
diff --git a/sys/sys/_timespec.h b/sys/sys/_timespec.h
index d29b2a3f0fd57..9b725d25cc301 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 2004/04/07 04:19:48 imp Exp $
  */
 
 /*
diff --git a/sys/sys/_timeval.h b/sys/sys/_timeval.h
index d9ea6f5edbdda..9784bcfce1549 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 c77f683fc53e4..2e73691d5cba9 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.19 2004/06/19 17:58:32 marcel Exp $
  */
 
 #ifndef _SYS__TYPES_H_
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 167a90ccb9228..5a3dac6c0cfee 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 3a8e8ead15072..3df97892714a3 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.27 2004/05/10 18:38:07 rwatson Exp $
  */
 /* 
  * Developed by the TrustedBSD Project.
diff --git a/sys/sys/agpio.h b/sys/sys/agpio.h
index 8c1294f698634..a265415bb3e4e 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 e9e2bd14275c8..f311e3c396f1a 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.29 2002/01/06 21:03:39 alc Exp $
  */
 
 #ifndef _SYS_AIO_H_
diff --git a/sys/sys/alq.h b/sys/sys/alq.h
index 98c414d028e21..78afc1d1d9aea 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.4 2003/06/22 22:28:55 rwatson Exp $
  *
  */
 #ifndef _SYS_ALQ_H_
diff --git a/sys/sys/assym.h b/sys/sys/assym.h
index 9316a4e4996c6..c9dc097a94699 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 be12cf3616066..27d16db4ba545 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.23 2004/05/20 15:09:41 des Exp $
  */
 
 #ifndef _SYS_ATA_H_
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index bb9e6c20e449c..b7541ee9fd11e 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.139.2.1.2.1 2004/10/21 17:49:45 phk Exp $
  */
 
 #ifndef _SYS_BIO_H_
diff --git a/sys/sys/bitstring.h b/sys/sys/bitstring.h
index c6badb14aa3ef..e18fdabdc35c1 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.4 2004/04/07 04:19:48 imp Exp $
  */
 
 #ifndef _SYS_BITSTRING_H_
diff --git a/sys/sys/blist.h b/sys/sys/blist.h
index e1d8fff8074cc..95a0946add387 100644
--- a/sys/sys/blist.h
+++ b/sys/sys/blist.h
@@ -47,7 +47,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.8 2004/06/04 04:03:25 alc Exp $
  */
 
 #ifndef _SYS_BLIST_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 4aa5e4fe781d6..c17a14c48eb0e 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.167 2004/07/25 21:24:23 phk Exp $
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 3c88b4dca20f7..c37b04eabd2b6 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.62 2004/07/18 16:30:31 dfr Exp $
  */
 
 #ifndef _SYS_BUS_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index 50dedbfc9b2dc..f0e10818876f7 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.27 2004/04/20 15:49:31 cperciva Exp $
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 77f1fd425df67..38aa3fa7bd0f0 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.84 2004/08/13 00:53:40 julian Exp $
  */
 
 #ifndef	_SYS_CDEFS_H_
@@ -308,7 +308,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.84 2004/08/13 00:53:40 julian Exp $");
  */
 #ifndef	__FBSDID
 #if !defined(lint) && !defined(STRIP_FBSDID)
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index a3eb271a7514d..1c38473fabd90 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.25 2003/10/20 09:29:40 sos Exp $
  */
 
 /*
diff --git a/sys/sys/cdrio.h b/sys/sys/cdrio.h
index b664a585af151..f3258551adb75 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 e1ae110aee269..0219a4df93c1e 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.16 2003/05/31 16:54:37 phk Exp $
  */
 
 #ifndef	_SYS_CHIO_H_
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 5edc145a976d7..cda18a5bf2de3 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 1c71d0e37d0bb..a53ccd85c34df 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 a8c9db72c0b11..05eb57dec252d 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 e1cfa0a9dff26..df2ac2d16cf33 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.190.2.1 2004/09/14 05:49:18 phk Exp $
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index 92322e3de34d6..3ef18f13d0a87 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.36 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index 24b7b969d84e2..742a12a35ba34 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.16 2002/08/19 16:32:09 sobomax Exp $
  */
 
 #ifndef	_SYS_CONSIO_H_
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 47182edd6f480..87b3b6066e8bb 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.17 2003/12/31 22:27:51 imp Exp $
  */
 
 
diff --git a/sys/sys/ctype.h b/sys/sys/ctype.h
index 5022d40c15b2e..507085326799f 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 69afbf9a08c42..300fadcdf359c 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 222b21d80c30a..977bf7a7aeea0 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.1 2000/10/23 12:55:51 non Exp $
  */
 
 #if defined(__NetBSD__)
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 734d31a4cad12..24f3a672d1f1a 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.25 2003/05/31 21:10:01 phk Exp $
  */
 
 #ifndef _DEVICESTAT_H
diff --git a/sys/sys/digiio.h b/sys/sys/digiio.h
index 7382c0a77f77e..d593bb27323cf 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 c50773440f5d0..d5091fd3aaf49 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.8 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_DIR_H_
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index b2686f6c23f86..c5fb25adb7f90 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 4cb585880584e..1ac37ffa5588e 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.39 2003/04/01 18:55:04 phk Exp $
  *
  */
 
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 0817eb5af4123..1ec5eeef6c728 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.105 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 27da229a6995d..426c32e8b869c 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.99 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_DISKMBR_H_
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 3fe9fa088cc69..49e4928fdd74a 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.100 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_DISKPC98_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index a9bdf45d549ed..a4b7bdb904286 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 a789e1beb13e1..e5e39a70c0460 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.19 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/dvdio.h b/sys/sys/dvdio.h
index 37940719a1b6e..eac709e510272 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 55ba93debf86f..5dfe9c8b05232 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 9118d437181d8..30aee19aa486f 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 2e77d29937ec8..f637c9a50f284 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 cc0c471ad90ca..5aed2992a7e68 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 35a43804b92c8..33b43072d8800 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 14366b846323b..d775e9882bf22 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.26 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/eui64.h b/sys/sys/eui64.h
index 7c9c6ce079466..9bb9ea35f961f 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.1 2004/05/26 22:58:06 brooks Exp $
  */
 #ifndef _SYS_EUI64_H
 #define _SYS_EUI64_H
diff --git a/sys/sys/event.h b/sys/sys/event.h
index e39177f737d74..12a612f9b0f90 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.26 2004/08/15 15:36:18 jmg Exp $
  */
 
 #ifndef _SYS_EVENT_H_
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index c734c19f74d56..83ddd8b22f74a 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.32 2004/03/14 02:06:28 peter Exp $
  */
 
 #ifndef SYS_EVENTHANDLER_H
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index bdb3adf572719..778befe0e6fa3 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 07becafe0f250..77ab4a1855634 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.31 2004/07/15 08:26:07 phk Exp $
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h
index 30daac76af676..56514777b0e46 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 4fca9fcd91c0d..4642de068cba8 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.14 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_FBIO_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 4b7b511f0cfa5..2fb656eaee733 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 d1b4568ffdbb0..695f041127678 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.17.8.1 2004/09/18 04:57:55 imp Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 6ec55bde91c59..3f5bf825234d7 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.65 2004/06/19 11:38:00 phk Exp $
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 7b7c6b9961374..ce3e0cc6fb4cc 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.61 2004/08/15 06:24:42 jmg Exp $
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index 17cad5c271f71..7bf13b9fb88f4 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.8 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/fnv_hash.h b/sys/sys/fnv_hash.h
index 24254cf386d18..256af0282468c 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.2 2001/03/20 02:10:18 peter Exp $
  */
 
 typedef u_int32_t Fnv32_t;
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index ac405abb726eb..5531b817a59b1 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 b437607d8851b..9d917998c7fc4 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.7 2004/08/02 18:46:52 marcel Exp $
  */
 
 #ifndef _SYS_GPT_H_
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h
index 754bea7b7f542..149ebf4d72256 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.8 2003/12/08 08:32:20 fjoe Exp $
  */
 #ifndef _SYS_ICONV_H_
 #define _SYS_ICONV_H_
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index 142d0297ed4b1..668a5e415c158 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.36 2004/04/24 06:44:33 bde Exp $
  */
 
 #ifndef _SYS_IMGACT_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index a68a0d9efed50..07a3aea72b767 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.21 2004/06/22 17:05:37 obrien Exp $
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 345478744fdee..8975a75e1b734 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 659988c346ca9..8c4a5788393c3 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.13 2002/03/26 08:29:40 phk Exp $
  *
  */
 #ifndef	_SYS_INFLATE_H_
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 28d64132d01c3..3bf611eb0852d 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.28 2004/07/02 20:21:43 jhb Exp $
  */
 
 #ifndef _SYS_INTERRUPT_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 7d25b393f3ec5..67eb299d2c0a2 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 530e2d4a9e0f5..a46e6e1fb0260 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.13 2004/06/11 11:16:26 phk Exp $
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index a290a1ad5dafc..1b95aaeeb00f1 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.7 2004/06/21 22:57:16 phk Exp $
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index d25e92fe0b1fb..c2e4ad2aab777 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.24 2004/04/07 04:19:49 imp Exp $
  */
 
 /*
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index 605b5a5122b55..0f6b21d13f223 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.21 2004/04/26 19:46:52 bmilekic Exp $
  *
  */
 
diff --git a/sys/sys/joystick.h b/sys/sys/joystick.h
index 5afe82c0124b5..52ae9235ebe20 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.5 2002/06/02 20:05:56 schweikh Exp $
  */
 
 #ifndef	_SYS_JOYSTICK_H_
diff --git a/sys/sys/jumbo.h b/sys/sys/jumbo.h
index 3d7cc285743c4..3a2e711731dd7 100644
--- a/sys/sys/jumbo.h
+++ b/sys/sys/jumbo.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/sys/jumbo.h,v 1.5 2003/03/25 01:47:29 jake Exp $
  */
 
 #ifndef _SYS_JUMBO_H_
diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
index 0ea30875dc6f3..eaf05bc74d683 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 2001/03/11 22:47:04 ache Exp $
  */
 
 #ifndef	_SYS_KBIO_H_
diff --git a/sys/sys/kdb.h b/sys/sys/kdb.h
index 55a88f42f86b3..425039beec246 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.3 2004/07/21 04:49:48 marcel Exp $
  */
 
 #ifndef _SYS_KDB_H_
diff --git a/sys/sys/kenv.h b/sys/sys/kenv.h
index 0a30ddb35d160..efca13adcbebb 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 9c449ec93a4a6..d108568545dc6 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.117.2.1 2004/09/03 03:09:54 rwatson Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/kerneldump.h b/sys/sys/kerneldump.h
index ae49ad5776cfb..368c62d5f1879 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.6 2002/10/20 17:03:15 tmm Exp $
  */
 
 #ifndef _SYS_KERNELDUMP_H
diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index d2cd0da6b74b4..296ea070b3dc4 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 2de3d95984a60..fbc2681d39f34 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.26 2004/08/08 22:32:20 davidxu Exp $
  */
 
 #ifndef _SYS_KSE_H_
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index 5f41cfc3c0082..fe270225102bf 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 fa49e76c8571f..94f3a7a4ceb3b 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.22 2004/08/06 21:46:51 rwatson Exp $
  */
 
 /*
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 0eca887cf84a2..91445c4fbb385 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.28 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 70d19a9985732..61babd49d6433 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.46 2004/07/15 23:58:23 glebius Exp $
  */
 
 #ifndef _SYS_LIBKERN_H_
diff --git a/sys/sys/limits.h b/sys/sys/limits.h
index 3af450ff8c6ac..3d8fb497ecaf5 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.8 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_LIMITS_H_
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 659aa4b560252..25fb238887cd4 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 0d32a3be535f2..3fefa5597cc62 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.24 2002/08/22 20:35:23 peter Exp $
  */
 
 /*
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 3a7392c50c37d..8395a721d3c96 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.25 2003/02/13 17:47:44 kan Exp $
  */
 
 /*
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index ba91af249aaeb..b6000f4194bce 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.38.2.1 2004/09/03 18:32:24 iedowse Exp $
  */
 
 #ifndef _SYS_LINKER_H_
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index d51ad4d228318..5bf5cf308f1f3 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.15 2004/07/28 07:07:16 kan Exp $
  */
 
 #ifndef _SYS_LINKER_SET_H_
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 34a22e29ca213..ee3b7aa7f02ed 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.50 2004/01/28 20:39:57 jhb Exp $
  */
 
 #ifndef _SYS_LOCK_H_
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 2d2892aad4190..b7f87c2b368ff 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.16 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index b93c1a8dd856e..dfb01b5d4857d 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.40 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef	_SYS_LOCKMGR_H_
diff --git a/sys/sys/mac.h b/sys/sys/mac.h
index 172c8c2eb21e6..9992ee18e4734 100644
--- a/sys/sys/mac.h
+++ b/sys/sys/mac.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/mac.h,v 1.58 2004/06/16 09:47:24 phk Exp $
  */
 /*
  * Userland/kernel interface for Mandatory Access Control.
diff --git a/sys/sys/mac_policy.h b/sys/sys/mac_policy.h
index 53ad281784046..1506e1d0ce759 100644
--- a/sys/sys/mac_policy.h
+++ b/sys/sys/mac_policy.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/mac_policy.h,v 1.55 2004/06/24 03:34:43 rwatson Exp $
  */
 /*
  * Kernel interface for MAC policy modules.
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 6f9f63a6a477a..f12c7f3cc184f 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/malloc.h,v 1.77 2004/07/19 06:21:26 green Exp $
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbpool.h b/sys/sys/mbpool.h
index 60ad4f8be399b..6a7b303603239 100644
--- a/sys/sys/mbpool.h
+++ b/sys/sys/mbpool.h
@@ -32,7 +32,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.1 2003/07/15 08:59:37 harti Exp $
  */
 #ifndef _SYS_MBPOOL_H_
 #define	_SYS_MBPOOL_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 78053e911f115..e8605bf66bd79 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.157.2.2 2004/10/15 21:45:13 jmg Exp $
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h
index 7e31e44bd8d9e..b71552958bc51 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.7 2003/02/21 16:24:49 bmilekic Exp $
  */
 #ifndef _SYS_MCHAIN_H_
 #define _SYS_MCHAIN_H_
diff --git a/sys/sys/md4.h b/sys/sys/md4.h
index 5a648c87f63a0..05bc8fec6dd6c 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.1 2001/04/10 07:59:06 bp Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index 964698b2ad7cf..4eabbf9fc7f86 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.16 2002/06/24 14:18:39 mux Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/sys/sys/mdioctl.h b/sys/sys/mdioctl.h
index 4243f49e18eae..ab1e6ead48155 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.16 2004/08/09 06:45:20 jmg Exp $
  */
 
 #ifndef _SYS_MDIOCTL_H_
diff --git a/sys/sys/memrange.h b/sys/sys/memrange.h
index ace778d5bfd43..8adb04bc723be 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 204add0232b7d..a4c8b6e487e78 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.39 2004/04/27 13:13:20 mux Exp $
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/module.h b/sys/sys/module.h
index 5beb9bb6f22ca..760b53d8667f7 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 b9cade4524f7c..f1a97bcc568bb 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.174 2004/08/04 18:57:41 maxim Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h
index 08e1a76f9fbba..7c045234a60e1 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.20 2004/07/30 00:59:40 njl Exp $
  */
 
 #ifndef _SYS_MOUSE_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 7094e6c7a02d1..afd9c61e2d09b 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/msg.h,v 1.16 2003/01/26 20:09:34 alfred 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 b5e7f4422067a..a8a2969f4da94 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.25 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 7f3d8d1e5e05b..5ab346d288b95 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.28 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef	_SYS_MTIO_H_
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 22756857dca0b..14f78b1d6de2b 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.73 2004/08/04 20:18:45 jhb Exp $
  */
 
 #ifndef _SYS_MUTEX_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 0407c10e3044f..4153d9fc90fa7 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.41 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
index a4e11c3975a9c..6537470f5f31c 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 2d206023ff9d9..e3521550daffd 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.209.2.4 2004/10/03 17:04:41 mlaier Exp $
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h
index d8d8156fe8e31..f5ddec60aed2e 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 4c08ea06fc2bd..f719d61a69dc4 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.13 2004/03/27 18:21:24 marcel Exp $
  */
 
 #ifndef _SYS_PCPU_H_
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index 497bf27dece07..56bd6535758e3 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.12 2002/08/04 01:06:58 mdodd Exp $
  */
 
 #ifndef _SYS_PIOCTL_H
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index de86d30f5a077..06ba7976b29c9 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.28 2004/07/21 03:11:41 silby Exp $
  */
 
 #ifndef _SYS_PIPE_H_
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index c955f321c7528..9ea42b9ddfc50 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 62784b2e49d3d..941a7329c8387 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 51fbce536b2a4..c51d836f802f1 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.2 2001/09/05 01:22:14 obrien Exp $
  */
 
 #ifndef _SYS_PRIORITY_H_
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index c3bf6e1970284..60aefcb4afaf7 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.392.2.12.2.1 2004/10/22 19:13:07 scottl Exp $
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index b03e73dd8c424..9a1e025062815 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 617ab59da89dd..9f41fd022b3a9 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.43 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index 1292280528d3d..f1d60e12cde2a 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 5596790e768c4..b936ef07ab6c5 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.25 2004/08/08 22:26:11 davidxu Exp $
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index 627aaa22c0e3f..e31b26c5005b1 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.58 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sys/sys/random.h b/sys/sys/random.h
index c2e992f40aed9..99559cdda16ed 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.33 2002/10/04 20:34:08 sam Exp $
  */
 
 #ifndef	_SYS_RANDOM_H_
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index c296c89e9810a..5c77ff7d1ae82 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.24 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/regression.h b/sys/sys/regression.h
index 8ee757ed170a4..0ce5be6d9ec8c 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 6b905f4482d8b..0d300c1463404 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.23 2004/06/13 22:07:58 das Exp $
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 9fb4aa4b97b19..9d6bc0c2d8dc7 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.45 2004/08/04 18:14:19 rwatson Exp $
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index e4b0442d62c2f..3a2c2d4d0b62f 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.22 2004/07/01 16:20:58 imp Exp $
  */
 
 #ifndef _SYS_RMAN_H_
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index f4e44a929afc4..b8aaa814d04e2 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.13 2002/03/19 20:18:41 alfred Exp $
  */
 
 #ifndef _SYS_RTPRIO_H_
diff --git a/sys/sys/runq.h b/sys/sys/runq.h
index 93ffda4b7f852..44b43a9a1700c 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.4.8.1 2004/10/09 05:25:22 julian Exp $
  */
 
 #ifndef	_RUNQ_H_
diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index 0c1e6e1e0cf82..dd35beb49cccc 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 8d228572da522..9505a9a7acf4c 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.14.2.5 2004/09/18 04:11:36 julian Exp $
  */
 
 #ifndef _SYS_SCHED_H_
diff --git a/sys/sys/select.h b/sys/sys/select.h
index 342a8491fb12b..9bfb4948748fc 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 946da8c9de44f..add8f5e54d247 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 25ad4a257349f..9ed20b8398094 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/sem.h,v 1.27 2003/06/02 17:23:37 schweikh 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 473832e3ba7ff..949fab789ce9d 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.3 2001/10/10 10:26:07 bde Exp $
  */
 
 #ifndef	_SYS_SEMA_H_
diff --git a/sys/sys/serial.h b/sys/sys/serial.h
index 8c223af24cf99..33b0559952e82 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 7d6389d39031b..c28328507e12e 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.4 2004/04/03 09:16:27 alc Exp $
  */
 
 #ifndef _SYS_SF_BUF_H_
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index a56e40d442d53..8422bc32e3261 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/shm.h,v 1.19 2003/01/25 21:33:05 alfred 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 cc9784ad3cccd..cc2934f572a71 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.2 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_SIGIO_H_
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 425bf337ee067..11c75a808cd7b 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 83301c81eb5bf..8dd0daff76c40 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.67 2004/07/13 07:20:09 davidxu Exp $
  */
 
 #ifndef _SYS_SIGNALVAR_H_
diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h
index 3314ddc0c1e05..5e90a391f3c8a 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.3.2.1 2004/09/03 15:14:15 jhb Exp $
  */
 
 #ifndef _SYS_SLEEPQUEUE_H_
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index 54701d46ddae7..47cb16c626971 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.77.2.2 2004/09/09 09:56:59 julian Exp $
  */
 
 #ifndef _SYS_SMP_H_
diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h
index 992be9b43aad0..91497b9ea51d4 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.23 2004/06/17 17:16:52 phk Exp $
  */
 
 #ifndef _SYS_SNOOP_H_
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 165192bdf441d..097469bd9538f 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.83 2004/08/11 10:18:49 andre Exp $
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 391ed3f7b8024..ed688fbe4a938 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.133.2.1.2.1 2004/10/21 09:30:48 rwatson Exp $
  */
 
 #ifndef _SYS_SOCKETVAR_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 4c064e25450f2..b323cd166988e 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.27 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_SOCKIO_H_
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 4d4c7ff6f7897..60dc1299d6ab1 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.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/sys/soundcard.h,v 1.43 2003/11/22 03:27:09 matk Exp $
  */
 
 #ifndef _SYS_SOUNDCARD_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 0f7e349404b56..93ef5781c8c4a 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.40 2004/06/17 17:16:52 phk Exp $
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/statvfs.h b/sys/sys/statvfs.h
index 15be8ce79a6df..cb73ffa0c7273 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.3 2002/08/21 16:20:01 mike Exp $
  */
 
 #ifndef _SYS_STATVFS_H_
diff --git a/sys/sys/stddef.h b/sys/sys/stddef.h
index 8e7f206d61971..3e0b15dff51e3 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 27f6dae997fda..b0d6632637fea 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 e99239fb1ebf0..470e929587747 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.9 2004/06/01 20:18:25 joerg Exp $ 
  */
 
 #ifndef _SYS_SUN_DISKLABEL_H_
diff --git a/sys/sys/sx.h b/sys/sys/sx.h
index 43f89fba50995..592233e64699b 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.20 2004/07/11 16:07:07 darrenr Exp $
  */
 
 #ifndef	_SYS_SX_H_
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 56a031d005bbb..eff1e29a66428 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.159.2.1 2004/10/09 15:25:41 mtm Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.176.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 6d712ad619e6a..84bab91b69ae0 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.114.2.1 2004/10/09 15:25:41 mtm Exp $
 # created from FreeBSD: src/sys/kern/syscalls.master,v 1.176.2.1 2004/10/09 15:12:33 mtm Exp 
 MIASM =  \
 	syscall.o \
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 82ca8011c3e81..0ab53c13a9396 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.11 2004/07/17 21:06:36 dwmalone Exp $
  */
 
 #ifndef _SYS_SYSCALLSUBR_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 1431f64ec467f..984da42a76c47 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.132 2004/07/28 07:08:39 kan Exp $
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 969e96ab43829..6f30f0fc4e732 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.44 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_SYSENT_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 292891786dc2e..1f2fdd9cce5c1 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.18 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index bc18d6961c6eb..727cf4f73892b 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.24 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index b0b8784d4e56a..24f664c516467 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.158.2.1 2004/10/09 15:25:41 mtm Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.176.2.1 2004/10/09 15:12:33 mtm Exp 
  */
 
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index f0dff466d5dd3..f210964b58c7a 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.213 2004/08/05 07:15:35 cperciva Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index 355f1ce562aed..4e97f024318a5 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.11 2004/08/08 02:37:22 jmg Exp $
  */
 
 #ifndef _SYS_TASKQUEUE_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 44cf74f826945..a5621d0e72336 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.19 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/thr.h b/sys/sys/thr.h
index 4be6d6628b1ef..8b358beceec87 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.3.2.1 2004/10/09 15:12:33 mtm Exp $
  *
  */
 
diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h
index 442dceb012c06..7b4dca4465fed 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 01e441f3a1b2d..b9edb53b189b3 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.65 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 2a88f6b3f7d89..ccd83fb4471a7 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 3457630f9c352..4d21e61bebce3 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.18 2003/11/23 18:52:23 phk 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 043d37670b080..f159a3cd0e997 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.4 1999/08/28 00:52:05 peter Exp $
  *
  * Description : Basic timers header.
  */
diff --git a/sys/sys/times.h b/sys/sys/times.h
index b6b1e1dba1ea5..d5c34f13bf785 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 b5b03ef91350e..7c8b42a1feaf4 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.3 2004/04/07 04:19:50 imp Exp $
  */
 
 /*
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index d5a818b4c0e95..37094977bf5cb 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 08a9bcd5af838..8389fe5ed9bd0 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -44,7 +44,7 @@
  * 17 Sep 93    David L. Mills
  *      Created file
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timex.h,v 1.17 2002/04/28 09:51:45 bde Exp $
  */
 /*
  * This header file defines the Network Time Protocol (NTP) interfaces
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index b5ea49d650f13..97a114cf38f21 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.89 2004/07/15 20:47:41 phk Exp $
  */
 
 #ifndef _SYS_TTY_H_
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 67d69e55c4a71..6cd4529218f8d 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 07db4ec4a532d..a5012b8d05043 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 829059b7d6269..659e804952048 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.15 2004/04/07 04:19:50 imp Exp $
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index f6e3791b4491b..9f9bde1bd1b83 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 68b7e79d92f6f..902706e6242a9 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.4 2004/04/06 19:08:40 jhb Exp $
  */
 
 #ifndef _SYS_TURNSTILE_H_
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 4910204a5057b..011e265457f0e 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.90 2004/06/19 17:58:32 marcel Exp $
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
index 85a5fd640e5ee..6ca4dda86c067 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 d964de96c07cc..4321d69a170c0 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.49.2.1 2004/09/03 06:11:59 julian Exp $
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index f89c9c4c9d640..4ddb43b94dabb 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.36 2004/07/10 15:42:16 phk Exp $
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/umtx.h b/sys/sys/umtx.h
index 979ae77b827c6..1d4b4745f4721 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.4 2004/07/02 00:40:07 marcel Exp $
  *
  */
 
diff --git a/sys/sys/un.h b/sys/sys/un.h
index b4434ce06cf8b..09de6451f171b 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.27 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 44ddf755663f9..d2a5d97d122c9 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.40 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index df34dddfd40e8..954fd14c6fad1 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.17 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 68ed894442143..9c6a5764a132b 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.61 2004/07/12 04:53:33 alfred Exp $
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 410e06566b368..50876a54d9007 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 b18d5b094c4e1..35a9291f5dd60 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.3 2003/05/31 16:47:07 phk Exp $
  */
 
 #ifndef _SYS_UUID_H_
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 793f32d377386..0c695b7edf2e2 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 166cd53f4c57a..f300e0aedfe67 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.243 2004/08/15 06:24:42 jmg Exp $
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 6b8d1e5a09afc..982a737115f61 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.20 2004/04/09 13:14:32 bde Exp $
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h
index a67b68b4392dc..abfb37b0ea4fe 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 70de800d9a4a3..c0c0e675e9f60 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.2 1999/08/28 00:52:12 peter Exp $
  *
  */
 
diff --git a/sys/tools/acpi_quirks2h.awk b/sys/tools/acpi_quirks2h.awk
index 6dad71e7a7e02..3560f6a1eaaf7 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.2 2004/06/30 04:40:20 njl Exp $
 #
 # Copyright (c) 2004 Mark Santcroos <marks@ripe.net>
 # All rights reserved.
diff --git a/sys/tools/emu10k1-mkalsa.sh b/sys/tools/emu10k1-mkalsa.sh
index 2e78f5bd0499a..c83c9b0868b4e 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 038fdd539ff22..5344a18c19c2f 100644
--- a/sys/tools/makeobjops.awk
+++ b/sys/tools/makeobjops.awk
@@ -33,7 +33,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.5 2004/07/11 16:14:24 dfr Exp $
 
 #
 #   Script to produce kobj front-end sugar.
diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk
index 1b0cb81d8f7b8..7ac83d225067c 100644
--- a/sys/tools/miidevs2h.awk
+++ b/sys/tools/miidevs2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) 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.5 2004/05/26 00:19:39 imp Exp $
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/tools/pccarddevs2h.awk b/sys/tools/pccarddevs2h.awk
index d53761cf018b6..d202bb7380d2d 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.3 2003/03/28 06:43:50 imp Exp $
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
 # All rights reserved.
diff --git a/sys/tools/usbdevs2h.awk b/sys/tools/usbdevs2h.awk
index 7b3e0dfa2e80b..99edb40df8d13 100644
--- a/sys/tools/usbdevs2h.awk
+++ b/sys/tools/usbdevs2h.awk
@@ -1,6 +1,6 @@
 #! /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.3 2004/04/16 05:22:11 obrien 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 8977546adb73b..ad0051cc7d27f 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/vnode_if.awk,v 1.40 2004/04/07 04:19:52 imp Exp $
 #
 # Script to produce VFS front-end sugar.
 #
@@ -139,7 +139,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.40 2004/04/07 04:19:52 imp Exp $\n" \
     " */\n" \
     "\n";
 
diff --git a/sys/ufs/ffs/README.snapshot b/sys/ufs/ffs/README.snapshot
index 7704c7ee3475b..2ca5a1937fa76 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 3b9c675c09fbc..a965f4faaecf1 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 5faba0b35006f..1b06fab12b496 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.123 2004/07/28 06:41:26 kan Exp $");
 
 #include "opt_quota.h"
 
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 3cdd25969bc74..baa3f258c278b 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.44 2004/04/07 03:47:20 imp 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 556ad5d0f5a6a..0c14471f4ee8f 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.57 2004/07/30 22:08:52 phk Exp $
  */
 
 #ifndef _UFS_FFS_EXTERN_H
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index ce0d77e06d2c3..b53b8501fd26a 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.93 2004/07/28 06:41:26 kan Exp $");
 
 #include "opt_quota.h"
 
diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c
index fcc6193f8bc57..fe37dd906da01 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.13 2004/06/03 01:47:37 tjr 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 6e130de36f163..7cf92b907a227 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.84 2004/07/28 06:41:27 kan 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 435e32d3a7132..ebc75159e6bf7 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.156 2004/08/08 13:21:54 phk Exp $");
 
 /*
  * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index 9401b859508e0..486bc58345685 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep_stub.c,v 1.27 2003/06/11 06:31:28 obrien Exp $");
 
 /* 
  * Use this file as ffs_softdep.c if you do not wish the real ffs_softdep.c
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 84295b9bba557..846faecffa5d9 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.39 2004/07/10 20:45:47 marcel Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index 442116c2b58a4..fc8d0b5b83092 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.11 2004/04/07 03:47:20 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 8fc3741513c6d..123e5701782ec 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.240 2004/07/30 22:08:52 phk 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 bddd2e49cecce..01f68efc39405 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.133 2004/08/15 06:24:42 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index c859e02c0cbc4..6e9e1f13f164a 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.43.2.1 2004/09/03 15:19:06 jhb Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index f29e89f2622d2..94567e2f1fe39 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.16 2002/07/19 07:29:38 mckusick Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/ufs/ufs/README.acls b/sys/ufs/ufs/README.acls
index 28a9d4f59d875..ef752c73b2553 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 a3be6e6a45dcb..a6e07d02c4c03 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 b53e3284df1e7..6c3cc990470b1 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 cedecd9f7cd5e..f455d9ae59be4 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.13 2004/06/20 03:11:19 bde Exp $
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index e3317e59446a7..44e1e8981457d 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.10 2004/04/07 03:47:20 imp Exp $
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/dirhash.h b/sys/ufs/ufs/dirhash.h
index 7f3aef9550d9a..77177f18966d8 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.4 2003/01/01 18:48:59 schweikh Exp $
  */
 
 #ifndef _UFS_UFS_DIRHASH_H_
diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h
index cf3222767172a..49809b631f576 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.18 2003/07/28 18:53:28 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 66254e9db100f..cb8c1e657cee9 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.46 2004/07/28 06:41:27 kan Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 88db1609b2873..ff5c5406c947d 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.26 2004/04/07 03:47:20 imp Exp $
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c
index e3005f49cc1bd..deb149747551d 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 af4292f3bab6c..e580c4d6ee421 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.60 2004/04/07 03:47:20 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 5d2c79154c904..b8825a2a86835 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.19 2004/08/16 10:00:44 dwmalone Exp $");
 
 #include "opt_ufs.h"
 
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index e78ea938e934b..e2122c744dcfe 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.73 2004/07/12 08:14:09 alfred Exp $");
 
 #include "opt_ufs.h"
 
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 56b48f284efc0..8a510fb28edc3 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.50 2004/06/16 09:47:25 phk Exp $
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index ceaae673ceff8..995e5d4a135a9 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_ihash.c,v 1.39 2004/06/16 09:47:25 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index e665c93f9333a..5b44641dcc21a 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.54 2004/07/28 06:41:27 kan 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 a2453ea4d99cc..004fbd97986ec 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.71 2004/07/28 06:41:27 kan 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 35e09f99d52de..038f2fcb7879b 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.73 2004/07/26 07:24:04 cperciva 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 8876e5105dffc..c5b6edd37a712 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.39 2004/07/12 08:14:09 alfred 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 8509bc15994d9..85b1fee24de33 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.242.2.1 2004/09/02 01:12:20 csjp Exp $");
 
 #include "opt_mac.h"
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 6d5352c22f892..6694ed6b5a15e 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.30 2004/06/16 09:47:25 phk Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 50c985f455f19..28aa51bd7ebd5 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.34 2003/08/06 12:05:48 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index e1ce161215263..61b0a34d89e4b 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.75 2004/08/04 08:58:58 dfr Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index cdeb61495c6ce..665157490f556 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.22 2004/04/25 07:58:59 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index c274d0d8bb928..7ec377f7d361f 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.69 2004/04/10 22:41:46 alc Exp $
  */
 
 /*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 41992896fb5b3..c5042ee062acf 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.256.2.1 2004/09/27 04:53:18 das Exp $");
 
 #include "opt_mac.h"
 #include "opt_swap.h"
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index d6f5c21c917aa..61ace31c34d20 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.49 2004/04/06 20:15:36 imp Exp $
  */
 
 #ifndef	_VM_SWAP_PAGER_H_
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index bcfb5bba5b52c..64bbed15f0d1e 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.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/uma.h,v 1.19 2004/08/02 00:18:35 green Exp $
  *
  */
 
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 569934b251973..503ba957fe661 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.105.2.1 2004/10/16 01:41:34 green Exp $");
 
 /* I should really use ktr.. */
 /*
diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c
index 963a36e6e6679..2172db0953fea 100644
--- a/sys/vm/uma_dbg.c
+++ b/sys/vm/uma_dbg.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/uma_dbg.c,v 1.15.2.1 2004/10/16 01:41:34 green Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/uma_dbg.h b/sys/vm/uma_dbg.h
index 200f05d475b8b..c6642abee9fc1 100644
--- a/sys/vm/uma_dbg.h
+++ b/sys/vm/uma_dbg.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/uma_dbg.h,v 1.5 2004/08/02 00:18:35 green Exp $
  *
  */
 
diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index 1f62d27b2c037..1f3b712f283ab 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_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/vm/uma_int.h,v 1.25 2004/07/29 15:25:40 bmilekic Exp $
  *
  */
 
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 61f5fa6ee4137..3022e487f2ad1 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.24 2004/08/16 06:16:12 alc Exp $
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_contig.c b/sys/vm/vm_contig.c
index 40b79e324b2cb..c3dd859b0677c 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.38 2004/08/05 21:54:11 green Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 7bb61b1b9854b..2310ddbc9abde 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.74 2004/07/25 20:08:59 alc Exp $
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 1fa921d00d57f..966ac4590c3fb 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.192 2004/08/16 06:16:12 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 7893012f9c905..e72019c2e8987 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.202 2004/07/30 20:31:02 alc 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 d57738a124653..6868cdda2313d 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.44 2004/08/07 05:58:31 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 5231d2ca10898..4caa971d4cd2b 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.120 2004/08/10 14:42:48 green Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index d2e06b8dafb59..22b8e3751f822 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.27 2004/04/06 20:15:36 imp Exp $
  */
 
 #ifndef _VM_VM_KERN_H_
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 2a486e8535d86..cb71a772f2272 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.360 2004/08/16 06:16:12 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index e05d4cbcd50bf..fc13566aad918 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.116 2004/08/13 08:06:34 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 3f2caf3842cb6..e0317d3d132b2 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.76 2004/08/16 06:16:12 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 4487986c0b369..362de6a782275 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.192 2004/08/05 07:04:33 phk Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 8ed952eae8403..a168d9a027dea 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.331 2004/08/02 00:18:36 green Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 64e4d76ff80b2..3d07a13ec8c47 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.106 2004/07/25 07:48:47 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index e9adf50e2b0c7..5b10afe7505b2 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.290 2004/07/29 18:56:31 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 633b7f981c554..580438ab6bca2 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.132 2004/07/19 06:21:27 green Exp $
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 412c43093ae9b..a52abf9dab973 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.261 2004/07/18 04:38:11 alc Exp $");
 
 #include "opt_vm.h"
 #include <sys/param.h>
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 9085ae78589f1..c462d5b5f49da 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.39 2004/04/06 20:15:37 imp Exp $
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c
index ceda1e180740b..3badb639cf358 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.14 2004/06/07 19:33:05 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index b6fa7a6b111ec..2ae1ed93112ae 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.95 2004/04/08 19:08:49 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 6b30f8036b84f..d78461cb5ad7c 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.47 2004/04/08 19:08:49 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index dab1245f4f7a3..cbced1ecdbfc5 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.19 2004/06/17 17:16:53 phk Exp $
  */
 
 /*
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index be34fe1efc648..9510b063a3e81 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.45 2004/04/06 20:15:37 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 9d779de097f20..733fa03015594 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.26.2.3 2004/09/10 00:04:18 scottl Exp $");
 
 #include <opt_sched.h>
 
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 4f6ec452bbf1c..7abc9f6b330eb 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.196 2004/05/06 05:03:23 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 568568568fe2a..f596db8bb3bb0 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.18 2004/04/06 20:15:37 imp Exp $
  */
 
 #ifndef	_VNODE_PAGER_
diff --git a/tools/KSE/ksetest/Makefile b/tools/KSE/ksetest/Makefile
index b5838f272c2ee..4281f82e5f2d7 100644
--- a/tools/KSE/ksetest/Makefile
+++ b/tools/KSE/ksetest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/KSE/ksetest/Makefile,v 1.3 2002/10/02 17:07:39 archie Exp $
 
 PROG=		ksetest
 NOMAN=
diff --git a/tools/KSE/ksetest/kse_asm.S b/tools/KSE/ksetest/kse_asm.S
index 20dc1dbba258a..e37f24d2b4403 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 3ab09f98a1e38..908c042a57865 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 2dae6abd5d08b..b1af67833b873 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 b97d263934bad..0d09204d31ae5 100644
--- a/tools/KSE/rr/Makefile
+++ b/tools/KSE/rr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/KSE/rr/Makefile,v 1.1.1.1 2003/02/26 01:05:09 davidxu Exp $
 
 PROG=		rr	
 NOMAN=
diff --git a/tools/KSE/rr/kse_asm.S b/tools/KSE/rr/kse_asm.S
index 20dc1dbba258a..c079d9ed6147c 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 a75ce2e505e2a..a82d67365e3a0 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 2dae6abd5d08b..7b60d13274fdb 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 fbf63896c71d1..963a6e56cc138 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 99ec8e9241f7a..eedb1fa1bb61d 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 7b25322b53412..dc953cdf31e2a 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/Makefile,v 1.7 2004/03/01 17:47:38 ru Exp $
 
 .PATH: ${.CURDIR}/../../include
 
diff --git a/tools/build/dummy.c b/tools/build/dummy.c
index b656a0305a976..562d0b6fb3377 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/endian.h b/tools/build/endian.h
index bde044e5bfcc4..e351329d86857 100644
--- a/tools/build/endian.h
+++ b/tools/build/endian.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/build/endian.h,v 1.2 2003/04/06 03:30:44 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/build/langinfo.h b/tools/build/langinfo.h
index 419c7214ed7eb..072ed0dc4a138 100644
--- a/tools/build/langinfo.h
+++ b/tools/build/langinfo.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/build/langinfo.h,v 1.1 2003/04/05 20:30:30 imp Exp $ */
 
 #ifndef LANGINFO_H
 #define LANGINFO_H
diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot
index ba2c5f724aaba..da678512e863c 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.1 2003/04/12 15:07:46 ru Exp $
 
 # FreeBSD didn't always have the __FBSDID() macro in <sys/cdefs.h>.
 # We could do this with a sys/cdefs.h wrapper, but given that this would
diff --git a/tools/build/mk/bsd.lib.mk b/tools/build/mk/bsd.lib.mk
index 744f5b5a8b9d4..3be67c2168cb3 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 d650665d6200a..3172e159084ca 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/build/progname.c b/tools/build/progname.c
index dc1611e9ac281..dc8934d2fcdc3 100644
--- a/tools/build/progname.c
+++ b/tools/build/progname.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/build/progname.c,v 1.1 2003/04/05 20:30:30 imp Exp $ */
 
 /*
  * Compat shims for those programs that use this newer interface.  These
diff --git a/tools/build/regex.h b/tools/build/regex.h
index 3de60765855b3..1a8a183570df2 100644
--- a/tools/build/regex.h
+++ b/tools/build/regex.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/build/regex.h,v 1.1 2004/02/20 11:55:13 ru Exp $ */
 
 #include <sys/types.h>
 #include "/usr/include/regex.h"
diff --git a/tools/debugscripts/README b/tools/debugscripts/README
index bd28cdc547af0..c10dc625e966c 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 39033ac8e1520..f71f294544d2b 100644
--- a/tools/debugscripts/dot.gdbinit
+++ b/tools/debugscripts/dot.gdbinit
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/dot.gdbinit,v 1.6 2003/12/29 06:35:14 grog 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 38a3c99fbd6f0..dc3b0f6b254e7 100644
--- a/tools/debugscripts/gdbinit.i386
+++ b/tools/debugscripts/gdbinit.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/gdbinit.i386,v 1.3 2003/12/30 02:08:29 grog 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 4d0d14011199a..b56d7aaf233a7 100644
--- a/tools/debugscripts/gdbinit.kernel
+++ b/tools/debugscripts/gdbinit.kernel
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/gdbinit.kernel,v 1.7 2003/12/31 00:37:24 grog Exp $
 # General kernel macros
 
 # Print the command name of the current process
diff --git a/tools/debugscripts/gdbinit.vinum b/tools/debugscripts/gdbinit.vinum
index 6a55d72c9b644..a9a521aa9d316 100644
--- a/tools/debugscripts/gdbinit.vinum
+++ b/tools/debugscripts/gdbinit.vinum
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/gdbinit.vinum,v 1.3 2003/12/30 02:08:29 grog Exp $
 # gdb macros for debugging Vinum.
 # This file gets included from the .gdbinit files in 
 # the kernel build directory and /var/crash.
diff --git a/tools/debugscripts/kgdb b/tools/debugscripts/kgdb
index 2293c5beecb22..5262b87fe5e4c 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.1 2004/08/04 18:03:43 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 3d8e01d70f9da..a6ddc719a9cfc 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.1 2004/08/04 18:03:43 jmg Exp $
 
 import sys
 import os
diff --git a/tools/diag/README b/tools/diag/README
index 814794367921e..6a5fda3064e0d 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 48c1cad0db797..d7087a05f6da6 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 a3ffe3192f3cd..d3f3055efd294 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 fbc2219dd4de0..0901978e1ed95 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 14cd360a22b32..1739447ff50dc 100644
--- a/tools/diag/dumpvfscache/Makefile
+++ b/tools/diag/dumpvfscache/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/dumpvfscache/Makefile,v 1.2 2004/02/05 21:52:33 ru Exp $
 
 PROG=	dumpvfscache
 DPADD=	${LIBKVM}
diff --git a/tools/diag/dumpvfscache/dumpvfscache.c b/tools/diag/dumpvfscache/dumpvfscache.c
index 3f5eb5793a8a0..83ff5490e8395 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 a7f35be90cdc6..60699c2d2f186 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 2136e3086004b..18798aac82f6c 100644
--- a/tools/diag/localeck/Makefile
+++ b/tools/diag/localeck/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/localeck/Makefile,v 1.3 2002/03/26 13:02:15 ru Exp $
 
 PROG=	localeck
 NOMAN=	noman
diff --git a/tools/diag/localeck/docheck.sh b/tools/diag/localeck/docheck.sh
index 7f47851f7bdf6..7075b56420acf 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 4ce7e458f147d..d85667165ddc0 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 594d4de7a1353..b1388ea73469e 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 d430cc2a09f1d..be936c4ca5e4c 100644
--- a/tools/lib32/README
+++ b/tools/lib32/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/lib32/README,v 1.1 2004/03/30 22:57:11 peter Exp $
 
 This script is a stopgap for building tuned 32 bit (but i386 ABI compatable)
 libraries for amd64 systems.  We *know* we have things like CMOV, SSE2 etc
diff --git a/tools/lib32/build32.sh b/tools/lib32/build32.sh
index 45baad5efb0a7..475bddf9c075f 100644
--- a/tools/lib32/build32.sh
+++ b/tools/lib32/build32.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/lib32/build32.sh,v 1.1.2.1 2004/10/06 23:37:35 peter Exp $
 #
 # This script is for running on a self-hosted amd64 machine, with an up-to-date
 # world and toolchain etc.  ie: the installed world is assumed to match the sources.
diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index c79be8751b797..6c8445d6da0b2 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 0c98abb606b2a..f29467dc1c8fa 100644
--- a/tools/regression/README
+++ b/tools/regression/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/README,v 1.11 2004/02/20 16:54:01 green Exp $
 
 This directory is for regression test programs.
 
diff --git a/tools/regression/atm/Funcs.sh b/tools/regression/atm/Funcs.sh
index c981f101df944..453cf0c726d6b 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 509a08dad6db3..bbb8b12ac889a 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 53fe605571966..39344d9c762d7 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 329b6967858bf..bb37e127d0bb1 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 ac6cebb01a13b..44b18a95b7d31 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 f6c7ce00d3362..1acba631d7ed0 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 2f08659372244..81cb5a89585c2 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 60812deeb6edb..160cf604fba1c 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 8b9c9e5e38c96..d070629b903b7 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 1e6b4dfe59e89..d3f40deb2c7b7 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 33eea10f2a3cd..5f4bd284c346b 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 5b4ae8ed6a9e1..556d9eea8cbd4 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 62d4726528a83..d8102e67ede2a 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 0f71b18dc96ee..f540575c345b2 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 470f2dce2c0a0..d6f1f036c13ac 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 470f2dce2c0a0..e01885b782e32 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 593c413f5966f..f3829abaa6029 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 593c413f5966f..dfde539ffe42c 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 9f8aebc122697..5e74f49982f95 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 44a28186e4a1a..5f3be5c8e7325 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 44a28186e4a1a..65b368b70bbb9 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 6fc421a38ea6b..a9a5437560260 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 53cfc79854667..807870af00ca4 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 ba42742e6745d..73ac82f20edbb 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 12de5a4b7df4a..65bcd43c6957e 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 12de5a4b7df4a..ebd1df34e9d3e 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 caf85b195ec96..cc1f3b8fede40 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 e00fa6c6caec0..c114365db31a1 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 06c4890d96e18..4abab576f633f 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 3b57123ba46f1..432834f136114 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 7cccecf330e74..31fafe269c48b 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 db2dcd80af23d..24103c02fa83f 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 c459487ab4c0c..4556df0095a6b 100644
--- a/tools/regression/fsx/Makefile
+++ b/tools/regression/fsx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fsx/Makefile,v 1.1 2001/12/20 04:15:57 jkh Exp $
 
 PROG=	fsx
 
diff --git a/tools/regression/fsx/fsx.c b/tools/regression/fsx/fsx.c
index b57efe670c1e7..8b2209bcb431e 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 2166aee20fa1c..3305e79889d40 100644
--- a/tools/regression/gaithrstress/Makefile
+++ b/tools/regression/gaithrstress/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/gaithrstress/Makefile,v 1.1 2004/02/20 16:54:01 green Exp $
 
 PROG=	gaithrstress
 LDADD+=	-pthread
diff --git a/tools/regression/gaithrstress/gaithrstress.c b/tools/regression/gaithrstress/gaithrstress.c
index 023e0b57355b0..ed00af9ed3886 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 1ddf502f9110b..9298f028fc200 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 e4ac676a5dcc3..68756d77b4cda 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.6 2004/02/24 20:52:58 johan Exp $
 
 PROG=	ConfCmp
 SRCS+=	ConfCmp.c
diff --git a/tools/regression/geom/ConfCmp/a1.conf b/tools/regression/geom/ConfCmp/a1.conf
index 94171cdacb10e..89803598e75f4 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 01110f39f8af2..2d0bfac03cf64 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 46f423b28ec03..b974a43ac7f6b 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 1b5a2b939c2ea..8c102fe2282e3 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 a9063c554b358..e647487c21b80 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 6688fd1ea4514..4fffdd7435d8d 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 3d35fe9d32c9a..54293025c0ba6 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 58c0e15b64f10..cc6decac53fbe 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 381c4106a52f5..6c7cad3010131 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 bccaed5e43fab..ff519563a1007 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 670fcc38d596f..57b1ea9db8646 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 5b341b174d6db..933c369446412 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 ecdd5236497ce..b9fac69013ba3 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 96ad5f74ddef7..cf51f17ac215b 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 9e93b24143459..dcb987827a8b9 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 88c603ac95677..128ede7730707 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 0a8d3ca9379b2..de0beb17de9ba 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 2302a7c66c993..81eae7e63c43c 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 6640c4875167c..5ed7adcf9ff12 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 868a88f782379..36deb5faf6c23 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 d057d1ac75d50..eaebf39f7baac 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 6bae97fd2d923..d69a0ea59cbe7 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 826581f086b02..2fb2bfdfdf451 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 0aac8e584d4ad..cb59b18c4b7a6 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 56383abf1c4cc..8bc7a196bf2c7 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 ef8972cde7e28..10f2feb515f7b 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.3 2004/02/24 20:52:58 johan Exp $
 
 PROG=	MdLoad
 DPADD=	${LIBSBUF} ${LIBBSDXML}
diff --git a/tools/regression/geom/MdLoad/MdLoad.c b/tools/regression/geom/MdLoad/MdLoad.c
index 710d7d385ed59..ff1b4a86c5c20 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 a300f0d5734d6..d7284e78f4ce5 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 7ef7573e729e8..388505796fe42 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 a2a0f984b47ec..110b55443d72e 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 b6aa32e2e031f..2777cffd69d04 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 0620bfebb1a44..a8440f5071495 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 659b4167ff60a..c5f987fcfb31b 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 629816a448cde..21c3d60200d77 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 89e2df4941af8..94af3345e81b9 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 6ff67a03c1355..8009efa8b5521 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 dc2aced401573..2d27fe57622ea 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 c176c587ff433..9bc043f3fa08d 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 5ffb0c98d86fd..33bc9d51602c6 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 15b97c821b124..9a5399e002492 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 004771be96e73..b971d32e8b1d8 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 6d537ddc26507..756caa807a1e0 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 46a14b4ab828b..2358f2df1d504 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_concat/Makefile b/tools/regression/geom_concat/Makefile
index 5df6a3becacd9..19a689beb32b9 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 38089c5daedf8..1c2872bf212fd 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 9304ebdbdbda3..e36d18b0046d1 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-2.sh b/tools/regression/geom_concat/test-2.sh
index 990ecfc3b9aba..6c480d10d6551 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_gate/Makefile b/tools/regression/geom_gate/Makefile
index c5c24adaa4dcf..7cddc706f7ae3 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 38089c5daedf8..f2e0c519f666d 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 44a49606ff4c2..f7c55e2550942 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-2.sh b/tools/regression/geom_gate/test-2.sh
index 498ac45d005e3..3f174f153d488 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-3.sh b/tools/regression/geom_gate/test-3.sh
index ca73a5a26ba09..2ea33c67bab8f 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_mirror/Makefile b/tools/regression/geom_mirror/Makefile
index 88687b191b6b9..8fe1d53d70755 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 7e30b95f3069b..0162ab8eeb5cd 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 e521564211cd3..23c6c32102660 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.1 2004/07/30 23:13:45 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 89bfdd4df85ce..63eb45afd7ce4 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.1 2004/07/30 23:13:45 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 67a41516ea591..40724dd59beaf 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.1 2004/07/30 23:13:45 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 0b764cad67bc9..04ef03bf2523d 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.1 2004/07/30 23:13:45 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 d1958d587cb36..50d5a9194c192 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.1 2004/07/30 23:13:45 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 db36726b2929d..13849776b2989 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.1 2004/07/30 23:13:45 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 f39c531fb79a8..3c54a412d9c9e 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.1 2004/08/04 12:18:42 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_nop/Makefile b/tools/regression/geom_nop/Makefile
index 6cd8fbd3e0337..f83c8008bdadf 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 38089c5daedf8..467aeb2b680e3 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 07e083573b89f..33f42df4e32e7 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 0bc31f659d9cf..7b670588c96c0 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 9eb76c66ffaa6..4725293f7dbce 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 b22c1ff924bed..85bfddb026dd3 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 7c116ad4686a3..a79497ee05433 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.1 2004/08/16 09:09:23 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 2265aa6227811..4ed1a7e6bdb51 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.2.1 2004/09/14 15:53:51 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 c91ae73985ab3..00ef901fb41fa 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.2.1 2004/09/14 15:53:51 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 5e562f81dae8b..f604f3ba21a59 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.1.2.1 2004/09/14 15:53:51 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 49a7de006529d..14ccfffd5abb3 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 d6765903b9d89..d8e5e4934e48e 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 19eed35a7baef..ae67fdf9da1fb 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 5de21960debe5..f16ce7dd7b593 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 778f38fd58a6a..e8c21d1d3455d 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 b39de20da4376..1b4c368c7c663 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 ea319686418b8..cad09a382f453 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 eeb5429956ce1..eb326ec122f58 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_stripe/Makefile b/tools/regression/geom_stripe/Makefile
index de8d14baad901..76b1ef123593f 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 38089c5daedf8..c5e34e6f4226f 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 a5d4668bf9455..f267367d65325 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 b78221de54894..e10db9aa3c23c 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 1e4f1642f8696..0000000000000
--- 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 bab058e19ce69..1af46f741bee0 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 cb8acf31f650e..7900b58500c02 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 60e78b5407467..0f405fee5b91a 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 4ba70e9976194..e03cd4ca75c1a 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 6e9144930510d..23fe4578de3cc 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 0a9b684b91596..c3fdf95c63228 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/Makefile b/tools/regression/ia64_unaligned/Makefile
index a5f110755ba01..ae9d808d1dc8a 100644
--- a/tools/regression/ia64_unaligned/Makefile
+++ b/tools/regression/ia64_unaligned/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ia64_unaligned/Makefile,v 1.1 2001/10/19 22:10:13 dfr Exp $
 
 PROG= unaligned
 NOMAN= t
diff --git a/tools/regression/ia64_unaligned/unaligned.c b/tools/regression/ia64_unaligned/unaligned.c
index e45bcd98046b3..26f35ca5e398e 100644
--- a/tools/regression/ia64_unaligned/unaligned.c
+++ b/tools/regression/ia64_unaligned/unaligned.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/ia64_unaligned/unaligned.c,v 1.1 2001/10/19 22:10:13 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/lib/libc/gen/Makefile b/tools/regression/lib/libc/gen/Makefile
index 140b789dec11e..a13667791be12 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 8431fe84f557c..ecf520e9b6362 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 49490d8c52acb..a6bb86db447d2 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 374610d184cfa..ff40124646d29 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.7 2004/07/21 13:47:48 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 a28e4f58b3da9..5ea95ccf3e3ac 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.3 2002/11/10 11:03:32 tjr Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-iswctype.c b/tools/regression/lib/libc/locale/test-iswctype.c
index 26ca883dd5b7a..4571bb236d6cd 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.1 2003/06/06 09:42:21 tjr Exp $");
 
 #include <assert.h>
 #include <locale.h>
diff --git a/tools/regression/lib/libc/locale/test-mblen.c b/tools/regression/lib/libc/locale/test-mblen.c
index 236cbc7ed1c04..1c5b9a83da05c 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.2 2004/04/07 11:02:51 tjr Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-mbrlen.c b/tools/regression/lib/libc/locale/test-mbrlen.c
index c18df64396f0e..c0cc99d66a5e3 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.1 2002/10/26 07:56:47 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbrtowc.c b/tools/regression/lib/libc/locale/test-mbrtowc.c
index ec6132d39fc1c..f74be073c5160 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.4 2004/05/11 13:10:47 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbsnrtowcs.c b/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
index 2f1b0272f74d5..76c753d6beb3c 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.1 2004/07/21 13:47:48 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbsrtowcs.c b/tools/regression/lib/libc/locale/test-mbsrtowcs.c
index 6579be05bc312..efd33ea02a2be 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.1 2002/10/26 07:56:47 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbstowcs.c b/tools/regression/lib/libc/locale/test-mbstowcs.c
index 1b75be612f6d9..84fe07d8f06bc 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.1 2002/11/09 04:33:02 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbtowc.c b/tools/regression/lib/libc/locale/test-mbtowc.c
index a58d261eff571..a44f0f7f6df83 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.2 2004/04/07 11:02:51 tjr Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-sgetrune.c b/tools/regression/lib/libc/locale/test-sgetrune.c
index feb6edf5ce6a7..8e8b501f781ac 100644
--- a/tools/regression/lib/libc/locale/test-sgetrune.c
+++ b/tools/regression/lib/libc/locale/test-sgetrune.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-sgetrune.c,v 1.1 2003/10/30 11:51:36 tjr Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-sputrune.c b/tools/regression/lib/libc/locale/test-sputrune.c
index dc910e346a966..bccac94afbcab 100644
--- a/tools/regression/lib/libc/locale/test-sputrune.c
+++ b/tools/regression/lib/libc/locale/test-sputrune.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-sputrune.c,v 1.1 2003/10/30 11:51:36 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-towctrans.c b/tools/regression/lib/libc/locale/test-towctrans.c
index 0ac0022f92c47..4a6ac47096620 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.2 2004/07/19 08:53:41 tjr Exp $");
 
 #include <assert.h>
 #include <locale.h>
diff --git a/tools/regression/lib/libc/locale/test-wcrtomb.c b/tools/regression/lib/libc/locale/test-wcrtomb.c
index c00792b9a78b8..5c12a63cd74ed 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.3 2002/12/19 02:01:39 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcsnrtombs.c b/tools/regression/lib/libc/locale/test-wcsnrtombs.c
index f84c04669bc70..e96bebe562432 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.1 2004/07/21 13:47:48 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcsrtombs.c b/tools/regression/lib/libc/locale/test-wcsrtombs.c
index 9ed3ff9cc5c8b..dac4234c76ff4 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.1 2002/10/26 07:56:47 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcstombs.c b/tools/regression/lib/libc/locale/test-wcstombs.c
index 29a5af99024c7..b17c6d392f419 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.1 2002/11/09 04:33:02 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wctomb.c b/tools/regression/lib/libc/locale/test-wctomb.c
index 8227f90987b8b..0a73ddcbf0941 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.2 2004/04/07 11:02:51 tjr Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/net/Makefile b/tools/regression/lib/libc/net/Makefile
index 609eaf4b08943..14eae57f80436 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.1 2004/05/26 22:58:06 brooks 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 ea82a10c14878..477e3b76d9e4d 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 7957d57de67e2..aa06baa46290a 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.2 2004/05/27 17:23:32 brooks Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_line.c b/tools/regression/lib/libc/net/test-eui64_line.c
index 463042a4cdcef..777a319e3b4c7 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.2 2004/05/27 17:23:32 brooks Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.c b/tools/regression/lib/libc/net/test-eui64_ntoa.c
index c320329d24d0a..b6b747afa7d11 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.2 2004/05/27 17:23:32 brooks Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/regex/Makefile b/tools/regression/lib/libc/regex/Makefile
index f91bef24ffe99..e522a8febfeef 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/stdio/Makefile b/tools/regression/lib/libc/stdio/Makefile
index a246b998fda0f..7108d61fb9334 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.3 2003/06/28 09:03:44 das Exp $
 
 TESTS=	test-perror test-printfloat test-scanfloat
 
diff --git a/tools/regression/lib/libc/stdio/test-perror.c b/tools/regression/lib/libc/stdio/test-perror.c
index 7d831551c8158..7aadb0051c80d 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.1 2002/12/19 09:46:10 tjr Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/tools/regression/lib/libc/stdio/test-printfloat.c b/tools/regression/lib/libc/stdio/test-printfloat.c
index ab4d5025f68e4..a9f6275c8314a 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.6 2004/01/19 05:59:07 das Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/tools/regression/lib/libc/stdio/test-scanfloat.c b/tools/regression/lib/libc/stdio/test-scanfloat.c
index 791a33af2608c..e07a7c80c45e3 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.3 2004/01/19 05:30:56 das Exp $");
 
 #include <assert.h>
 #include <float.h>
diff --git a/tools/regression/lib/libc/stdlib/Makefile b/tools/regression/lib/libc/stdlib/Makefile
index c707795b65203..72b8ce2e54931 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 ad6dc89421c37..72580fbaf0d66 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.1 2004/06/25 12:31:12 sobomax Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-mergesort.c b/tools/regression/lib/libc/stdlib/test-mergesort.c
index c9817cadd0e48..aa27748b0e4f0 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.1 2004/06/25 12:31:12 sobomax Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-qsort.c b/tools/regression/lib/libc/stdlib/test-qsort.c
index 8002549a2f929..cbf067549d35d 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.1 2004/06/25 12:31:12 sobomax Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-sort.h b/tools/regression/lib/libc/stdlib/test-sort.h
index e060f72c9f62a..263ff8bcf42eb 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 5c136e958830d..362844b42861b 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.1 2002/12/18 16:59:08 mike Exp $
 
 TESTS=	test-strerror
 
diff --git a/tools/regression/lib/libc/string/test-strerror.c b/tools/regression/lib/libc/string/test-strerror.c
index 375ca6421019d..961f253d33b7b 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.1 2002/12/18 16:59:08 mike Exp $
  */
 
 #include <assert.h>
diff --git a/tools/regression/lib/msun/Makefile b/tools/regression/lib/msun/Makefile
index 7806d6d187f19..a42676fd24016 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.1 2004/06/11 03:22:34 das Exp $
 
 TESTS=	test-fenv
 CFLAGS+= -O0 -lm
diff --git a/tools/regression/lib/msun/test-fenv.c b/tools/regression/lib/msun/test-fenv.c
index d8bda6d5706f0..d5b37a0df9b05 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.2 2004/07/19 08:17:47 das Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/tools/regression/netatalk/simple_send/Makefile b/tools/regression/netatalk/simple_send/Makefile
index 54e486f4c10d1..2000274e5eade 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.1 2004/07/17 17:12:15 rwatson 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 162253c1d1eb4..371d698639642 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/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile
index f19516db1b58d..c915530f04c9c 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.2 2004/08/13 14:21:49 ru Exp $
 
 PROG=p1003_1b
 
diff --git a/tools/regression/p1003_1b/README b/tools/regression/p1003_1b/README
index e0b7037549274..51080b6ab6260 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 455f7f9adc5fb..803b8c8680ad0 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 0e87c6ca68bf2..4d428a2718af2 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 b55b4056dac84..e58167a9c8af3 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 538deaf878639..edd0cec81a629 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 e0e3d6f8fa68c..16ae68b3c0972 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 3387b994b1513..e4af986445683 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 bd978f8d49421..8dffc583e548a 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 ac31a99f250ac..c005326a29435 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 ff9f501775b1d..3d52131f46788 100644
--- a/tools/regression/pipe/Makefile
+++ b/tools/regression/pipe/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/pipe/Makefile,v 1.1 2003/07/31 12:40:56 pb Exp $
 #
 # "make" then "make regress".
 #
diff --git a/tools/regression/pipe/bigpipetest.c b/tools/regression/pipe/bigpipetest.c
index d5185c5bf71b3..668266cd40f01 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.2 2004/07/21 03:13:53 silby Exp $
  */
 
 void write_frame(int fd, char *buf, unsigned long buflen)
diff --git a/tools/regression/pipe/pipe-fstatbug.c b/tools/regression/pipe/pipe-fstatbug.c
index ed038c20a69a5..52b6f2d6ead46 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-reverse.c b/tools/regression/pipe/pipe-reverse.c
index f4ae16747d0b2..81c28340a3b7e 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 ab673e9b180ab..d18a0b537c8c7 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 4b8039fc1c5d6..8c29658ff6973 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.1 2001/09/20 20:03:58 rwatson Exp $
 
 PROG=	testaccess
 NOMAN=	yes
diff --git a/tools/regression/security/access/testaccess.c b/tools/regression/security/access/testaccess.c
index 46bb01c4150d1..5634fbfb56f0d 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 65323f4ab3657..dda262e10d20e 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.2 2001/04/11 20:23:23 rwatson Exp $
 
 PROG=	testuid
 NOMAN=	yes
diff --git a/tools/regression/security/proc_to_proc/README b/tools/regression/security/proc_to_proc/README
index 01857b834dcee..474abf4104a1a 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 0e3e476df54ba..cf43ab40bbfd5 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 da087207c5a73..d94bf07d071b3 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 a9b81a08541c0..ae76b04f0be12 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 69ac015e18527..695d3f310dd87 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.1 2004/07/17 16:56:46 rwatson 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 6d81eb903f68f..12b352163a7d5 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.1 2004/07/17 16:56:46 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
index 66ae99a85a840..ad4a0f1c62109 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.1 2004/07/26 03:53:47 rwatson 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 203b3e7f46501..e3d43abbc461b 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.1 2004/07/26 03:53:47 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile
index bf389c9ea50f7..231129e87cf0e 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.1 2004/08/04 03:46:35 rwatson Exp $
 #
 
 PROG=	socketpair
diff --git a/tools/regression/sockets/socketpair/socketpair.c b/tools/regression/sockets/socketpair/socketpair.c
index a1d0946c7b585..ea42b1ce80724 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/sysvmsg/Makefile b/tools/regression/sysvmsg/Makefile
index 45f7b72e87d59..c582894311ee7 100644
--- a/tools/regression/sysvmsg/Makefile
+++ b/tools/regression/sysvmsg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvmsg/Makefile,v 1.1 2002/08/15 06:34:37 alfred 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 f115b9967ed15..40843b8c3fc2a 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 37981d91e6249..9ecbc86e4bfc8 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 f5a37268f0df4..533933703d028 100644
--- a/tools/regression/sysvsem/Makefile
+++ b/tools/regression/sysvsem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvsem/Makefile,v 1.1 2002/08/15 06:34:37 alfred 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 33b9706817dae..6e15daffe34db 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 83f73e97356f6..87544afe2cbcb 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 990538558da75..77a661c83c7b3 100644
--- a/tools/regression/sysvshm/Makefile
+++ b/tools/regression/sysvshm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvshm/Makefile,v 1.1 2002/08/15 06:34:37 alfred 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 4e0125eec8efe..b788f5bd12728 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 22f626edce498..54ad443e8e837 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 aea3025f706eb..86ab815d99f7d 100644
--- a/tools/regression/tls/Makefile
+++ b/tools/regression/tls/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/Makefile,v 1.1 2004/08/03 09:04:00 dfr Exp $
 
 SUBDIR=libxx libyy ttls1 ttls2
 
diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile
index b3fe79eb079cd..e0bc9b2b9cd64 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.1 2004/08/03 09:04:00 dfr Exp $
 
 LIB=		xx
 SHLIB_MAJOR=	1
diff --git a/tools/regression/tls/libxx/xx.c b/tools/regression/tls/libxx/xx.c
index 6d1e73f79a05c..0b031c9bea70f 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 c425977f611c7..191beea363ae3 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.1 2004/08/03 09:04:00 dfr Exp $
 
 LIB=		yy
 SHLIB_MAJOR=	1
diff --git a/tools/regression/tls/libyy/yy.c b/tools/regression/tls/libyy/yy.c
index c00cb8770ec40..bd0d12c65ab23 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 86ed613b73db9..d2e40441ff12a 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.2 2004/08/16 09:35:49 dfr 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 9c514aeecf7a4..cdd4e91dde64c 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 63b5d07eaec8e..27e567bcc10f5 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.2 2004/08/16 09:35:49 dfr Exp $
 
 PROG=	ttls2
 LDADD+= -lpthread
diff --git a/tools/regression/tls/ttls2/ttls2.c b/tools/regression/tls/ttls2/ttls2.c
index f528e3dcc7398..4729aadf8d4c3 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 b171181e74fbc..fdec518d01857 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 0fad08d90a7c4..b979912e1f6ca 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 bc88ad1383ddb..0935a34c09de5 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 539b6ce1ed113..231ebcbaa70b8 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/usr.bin/Makefile b/tools/regression/usr.bin/Makefile
index acc6b665c6f20..fb660e5f6ed22 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.8 2002/06/07 05:32:00 jmallett Exp $
 
 SUBDIR=	file2c join jot m4 make sed uudecode uuencode xargs
 
diff --git a/tools/regression/usr.bin/file2c/Makefile b/tools/regression/usr.bin/file2c/Makefile
index b937d41a4e4a8..2c7dae4b20797 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 75585295348fb..29d9841abef50 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.3 2002/06/24 14:22:35 jmallett Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/join/Makefile b/tools/regression/usr.bin/join/Makefile
index b937d41a4e4a8..f227f317e5675 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 ee041f2aa4b8c..cdfec8758a115 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.3 2002/06/24 14:22:38 jmallett Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/jot/Makefile b/tools/regression/usr.bin/jot/Makefile
index b937d41a4e4a8..04b0644bdc533 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 5b7d43a01190a..15f45dbbe2cc7 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.3 2002/06/24 14:22:40 jmallett Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/m4/Makefile b/tools/regression/usr.bin/m4/Makefile
index 99036706a8180..badbadc498720 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 b73d41093fcb4..82349a36ab31a 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.3 2002/06/24 14:29:19 jmallett Exp $
 
 # Go into the regression test directory, handed to us by make(1)
 TESTDIR=$1
diff --git a/tools/regression/usr.bin/make/Makefile b/tools/regression/usr.bin/make/Makefile
index a58f9ab72baa8..2e5ef15ddad60 100644
--- a/tools/regression/usr.bin/make/Makefile
+++ b/tools/regression/usr.bin/make/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/Makefile,v 1.20 2004/08/12 19:14:10 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/regression/usr.bin/regress.m4 b/tools/regression/usr.bin/regress.m4
index 8a4551c69607a..a0aed641ab50c 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.4 2002/06/25 12:40:04 jmallett 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 b937d41a4e4a8..e91662548b705 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 fc5a135199500..82025f9f4e915 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.8 2003/06/04 15:26:23 fanf Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/uudecode/Makefile b/tools/regression/usr.bin/uudecode/Makefile
index b937d41a4e4a8..104026df85f6e 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 f4f745aabeccc..6fe77b009b4c9 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.4 2002/06/24 14:22:44 jmallett Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/uuencode/Makefile b/tools/regression/usr.bin/uuencode/Makefile
index b937d41a4e4a8..a9ecaf6341f9b 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 ec78286073b0c..67950d4cd383e 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.6 2002/06/24 13:52:28 jmallett Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/xargs/Makefile b/tools/regression/usr.bin/xargs/Makefile
index b937d41a4e4a8..59818b1b2181b 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 dbf0ecc68c457..b377ec76befeb 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.5 2002/06/24 13:52:28 jmallett Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/test/README b/tools/test/README
index aacc781436579..b469ee636bdca 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 ea4cb5f64032b..0aee741e2c8c9 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 d0b6aa89da586..e6a49b7841b50 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 32a6a9caf5502..5b1fb5d1079f7 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 03fdbdd5b39d9..de28beb7c117a 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 6637ab1ba33ac..de9c5131668ec 100644
--- a/tools/test/malloc/Makefile
+++ b/tools/test/malloc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/malloc/Makefile,v 1.3 2002/01/02 06:42:34 kbyanc 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 2a0502928c062..dcb200ab9f069 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 514e18b893a77..767449546f7cd 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 6cee558bb362e..8cdb516372be5 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 e9670fe252413..9e0c0857fa637 100644
--- a/tools/test/ppsapi/Makefile
+++ b/tools/test/ppsapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/ppsapi/Makefile,v 1.1 2003/12/08 20:49:40 phk Exp $
 
 PROG=	ppsapitest
 NOMAN=	yeah
diff --git a/tools/test/ppsapi/README b/tools/test/ppsapi/README
index 1460a5f5a6a9a..80ce126254732 100644
--- a/tools/test/ppsapi/README
+++ b/tools/test/ppsapi/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/ppsapi/README,v 1.1 2003/12/08 20:49:40 phk 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 78e73825e16c7..8d255879b77d4 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 4f3206f92f46b..dee6b40dd6f16 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/README,v 1.31.2.1 2004/09/14 16:02:32 pjd Exp $
 
 This directory is for tools.
 
diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile
index 4267b72d85c6f..4d8e60077573e 100644
--- a/tools/tools/aac/Makefile
+++ b/tools/tools/aac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/aac/Makefile,v 1.2 2004/02/07 16:58:23 ru Exp $
 
 PROG=	aac_checkq
 NOMAN=	sorry
diff --git a/tools/tools/aac/aac_checkq.c b/tools/tools/aac/aac_checkq.c
index 9fb79be0f54bc..f8737d4ef97f8 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/80211stats.c b/tools/tools/ath/80211stats.c
index fb515b1ac5cbc..e25724d20837f 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.2 2003/12/07 21:38:28 sam Exp $
  */
 
 /*
diff --git a/tools/tools/ath/Makefile b/tools/tools/ath/Makefile
index e7dc3a57243e5..3f7457d7ece2e 100644
--- a/tools/tools/ath/Makefile
+++ b/tools/tools/ath/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/ath/Makefile,v 1.3 2003/12/07 21:38:44 sam Exp $
 #
 # Copyright (c) 2002, 2003	Sam Leffler, Errno Consulting
 # All rights reserved.
diff --git a/tools/tools/ath/athstats.c b/tools/tools/ath/athstats.c
index 7e3bd746369a6..3e38dd9e2bac1 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.4 2003/12/07 21:40:52 sam Exp $
  */
 
 /*
diff --git a/tools/tools/backout_commit/backout_commit.rb b/tools/tools/backout_commit/backout_commit.rb
index 264c271b60bf7..9d9b3a579335f 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 d33d47806fcf6..24020aa794864 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 e855efb067661..b33f0d0edf8c6 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 9e0197796b94f..96ca92dfea75d 100644
--- a/tools/tools/crypto/Makefile
+++ b/tools/tools/crypto/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/crypto/Makefile,v 1.7 2004/01/22 05:57:48 imp 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 16b6bdb0d8ca8..cf33e8613b631 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 a031faf3c014a..83a3e531ece83 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 83b8a67ac7c2a..3eac0e6e0ae23 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/hifnstats.c b/tools/tools/crypto/hifnstats.c
index 1f40cd55ac0bc..e85cb38d281e4 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 48931f6a7891b..42a9893ec7941 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 ea7601a8e070a..03e9f0551f57f 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 ebf7c526acbaf..10c71be735428 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 0aea2c247a64c..6f21f58fb5f14 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 26d4706de30ba..e587a4a128d2f 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.1 2002/10/04 03:06:16 wollman Exp $
 PROG=	find-sb
 NOMAN=
 
diff --git a/tools/tools/find-sb/README b/tools/tools/find-sb/README
index fae701c816c3a..bdada71d55da8 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 72a5546c82584..a4499fe440722 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 28b62a6ec76e0..a7d4a75208c0a 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.1 2004/03/28 18:01:15 marcel Exp $
 PROG=gdb_regofs
 SRCS=${MACHINE_ARCH}.c
 NOMAN=yes
diff --git a/tools/tools/gdb_regofs/ia64.c b/tools/tools/gdb_regofs/ia64.c
index 59e0055253b60..c42d9ebdb4f35 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/hcomp/Makefile b/tools/tools/hcomp/Makefile
index 06029b7a90d0c..3db193aee09ca 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 9c48bba123c09..6164026b29806 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 29ea1f2db81dd..fd2ea5fc83d70 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 2fe0e83260f5b..9a5b16fa53c40 100644
--- a/tools/tools/ifinfo/Makefile
+++ b/tools/tools/ifinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ifinfo/Makefile,v 1.4 1999/08/28 00:54:28 peter Exp $
 
 PROG=	ifinfo
 SRCS=	ifinfo.c rfc1650.c
diff --git a/tools/tools/ifinfo/ifinfo.c b/tools/tools/ifinfo/ifinfo.c
index 54ca164264303..ee9b60abb989a 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 c05a8b82eca58..a00414d4083a4 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 60f89d82bf392..d7c7adb346550 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 4941b07082c4b..9dd50c1a6eea1 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 87288c54bd218..d9aafb04f27c4 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 1efe4c278fc2c..80e0e7dfba70a 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 439f3857a811e..04ac30a25e508 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.19 2003/01/03 17:21:39 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 2f2feb3709bbc..b9cab907dea66 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 f78c8d66b07a9..1a9f4435d472b 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 d96b0f24ebafe..6e2cb6c80efbf 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.2 2003/11/13 21:25:08 sam 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 d7815306b4ab0..5ae9d331d63ee 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 a3fb89794dd0d..87d867e4f8ee5 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.3 2004/06/14 21:42:01 rwatson 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 1375f6ef6c9db..25fc401d3a22f 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/mid/mid-build b/tools/tools/mid/mid-build
index 0a2d4480a5a8b..9df99f8b7f643 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 a5ec10b78f3b8..6afa74bbf4c83 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 17e26c2b63e90..7217ced827740 100644
--- a/tools/tools/ministat/Makefile
+++ b/tools/tools/ministat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ministat/Makefile,v 1.3 2004/02/05 22:01:28 ru Exp $
 PROG=	ministat
 NOMAN=	yes
 DPADD=	${LIBM}
diff --git a/tools/tools/ministat/README b/tools/tools/ministat/README
index cc5fe27df73ea..29b174f5408ed 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 c554c998c1525..294464aa2fbde 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 d6996c125802b..967f58323a70e 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 dbe3cde6b5018..07880c3e58912 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.3 2003/10/31 13:25:43 phk Exp $");
 
 #include <stdio.h>
 #include <math.h>
diff --git a/tools/tools/mtxstat/mtxratio.sh b/tools/tools/mtxstat/mtxratio.sh
index 02a66a94a246b..453d0bc1d0268 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 cfa7edd7bf0e5..f33190b838aef 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/Makefile b/tools/tools/nanobsd/Makefile
index f63292f688674..e85650c45a122 100644
--- a/tools/tools/nanobsd/Makefile
+++ b/tools/tools/nanobsd/Makefile
@@ -3,7 +3,7 @@
 #
 # See /usr/share/examples/etc/bsd-style-copyright for license terms.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Makefile,v 1.8 2004/08/16 22:41:58 thomas Exp $
 
 .include "${.CURDIR}/make.conf"
 
diff --git a/tools/tools/nanobsd/customize.sh b/tools/tools/nanobsd/customize.sh
index 5aa79741dbba4..012465be0b67c 100644
--- a/tools/tools/nanobsd/customize.sh
+++ b/tools/tools/nanobsd/customize.sh
@@ -6,7 +6,7 @@
 #
 # See /usr/share/examples/etc/bsd-style-copyright for license terms.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/customize.sh,v 1.1 2004/08/16 22:46:58 thomas Exp $
 # 
 # Usage:
 #
diff --git a/tools/tools/nanobsd/i386.diskimage b/tools/tools/nanobsd/i386.diskimage
index a5d7028319f20..626c0c5104ca1 100644
--- a/tools/tools/nanobsd/i386.diskimage
+++ b/tools/tools/nanobsd/i386.diskimage
@@ -4,7 +4,7 @@
 #
 # See /usr/share/examples/etc/bsd-style-copyright for license terms.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/i386.diskimage,v 1.8.2.1 2004/09/06 20:57:28 thomas Exp $
 #
 # Called as:
 #
diff --git a/tools/tools/nanobsd/localfiles b/tools/tools/nanobsd/localfiles
index e18a038b115e6..17a6aebc676c0 100644
--- a/tools/tools/nanobsd/localfiles
+++ b/tools/tools/nanobsd/localfiles
@@ -5,7 +5,7 @@
 #
 # See /usr/share/examples/etc/bsd-style-copyright for license terms.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/localfiles,v 1.1 2004/08/16 22:55:51 thomas Exp $
 # 
 #
 # Syntax:
diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf
index 968c4e6ac0493..1f18c8a42a5ba 100644
--- a/tools/tools/nanobsd/make.conf
+++ b/tools/tools/nanobsd/make.conf
@@ -4,7 +4,7 @@
 #
 # See /usr/share/examples/etc/bsd-style-copyright for license terms.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/make.conf,v 1.3 2004/08/16 22:52:40 thomas Exp $
 #
 KERNCONF?=GENERIC
 NO_SENDMAIL=yes
diff --git a/tools/tools/pciid/mk_pci_vendors.pl b/tools/tools/pciid/mk_pci_vendors.pl
index aa1974caa74bd..bdf1702b83d6e 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 10871434cfbd5..d96ae2d1d634e 100644
--- a/tools/tools/pirtool/Makefile
+++ b/tools/tools/pirtool/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/pirtool/Makefile,v 1.1 2004/01/06 20:59:49 bms Exp $
 
 PROG=   pirtool
 SRCS=   pirtool.c
diff --git a/tools/tools/pirtool/pirtable.h b/tools/tools/pirtool/pirtable.h
index d71eeeee8051f..9e8a2f3cacdb0 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.1 2004/01/06 20:59:49 bms Exp $
  */
 
 /*
diff --git a/tools/tools/pirtool/pirtool.c b/tools/tools/pirtool/pirtool.c
index 047a7215349ef..605aaa47993b3 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.1 2004/01/06 20:59:49 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 f3dcf5039b922..08d36617f4468 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 bb437a6bbc0b5..edc42aced9aab 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/raidtest/Makefile b/tools/tools/raidtest/Makefile
index e629f82dc1c7f..2b68104da31a4 100644
--- a/tools/tools/raidtest/Makefile
+++ b/tools/tools/raidtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/raidtest/Makefile,v 1.1.2.1 2004/09/14 16:02:32 pjd Exp $
 
 PROG=	raidtest
 NOMAN=	true
diff --git a/tools/tools/raidtest/README b/tools/tools/raidtest/README
index b0150401862ea..084078f41bf02 100644
--- a/tools/tools/raidtest/README
+++ b/tools/tools/raidtest/README
@@ -1,4 +1,4 @@
-[ $FreeBSD$ ]
+[ $FreeBSD: src/tools/tools/raidtest/README,v 1.1.2.1 2004/09/14 16:02:32 pjd Exp $ ]
 
 This utility can be used to test performance of storage devices.
 First, one need to generate file with I/O operations:
diff --git a/tools/tools/raidtest/raidtest.c b/tools/tools/raidtest/raidtest.c
index f5eb962f9d722..92d052b5fb868 100644
--- a/tools/tools/raidtest/raidtest.c
+++ b/tools/tools/raidtest/raidtest.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/raidtest/raidtest.c,v 1.2.2.1 2004/09/14 16:02:32 pjd Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/tools/tools/release/chk_dokern.sh_and_drivers.conf b/tools/tools/release/chk_dokern.sh_and_drivers.conf
index a47c700e152b2..47a8a4a36eaf7 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 0827182d6e5f9..88ba13d360c32 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/tinderbox/Makefile b/tools/tools/tinderbox/Makefile
index a20a32c19169e..8060e7e405ea1 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 da0abdf9a395b..a54dc4bf2b7bb 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.8 2004/06/14 11:35:59 des Exp $
 
 ETCFILES	 = default.rc releng_4.rc releng_5.rc stable.rc current.rc
 ETCFILES	+= update_stable.rc update_current.rc
diff --git a/tools/tools/tinderbox/etc/current.rc b/tools/tools/tinderbox/etc/current.rc
index 70ec128e44907..faa8da92cdcba 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 023c872bf0d57..5054227ced146 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.5 2004/02/14 09:52:22 des Exp $
 #
 
 comment		= %%branch%% tinderbox
diff --git a/tools/tools/tinderbox/etc/releng_4.rc b/tools/tools/tinderbox/etc/releng_4.rc
index 43b5e42b5b222..224a8f7036c8f 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.8 2004/02/14 09:52:22 des Exp $
 #
 
 branches	= RELENG_4_8, RELENG_4_9
diff --git a/tools/tools/tinderbox/etc/releng_5.rc b/tools/tools/tinderbox/etc/releng_5.rc
index 0026bda8c6d10..7c14ca71e78a3 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.6 2004/02/14 09:52:22 des Exp $
 #
 
 branches	= RELENG_5_2
diff --git a/tools/tools/tinderbox/etc/stable.rc b/tools/tools/tinderbox/etc/stable.rc
index 17a009a33ca2f..dfd529cf47088 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 e8a1fa0ecfc5d..87e82a1c23079 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_stable.rc b/tools/tools/tinderbox/etc/update_stable.rc
index 6c865eb193272..92c6230e02ba5 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 ce27e71f08971..96a554c23ab35 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 96d90e3da6df5..5177f05ba8b55 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.14 2004/06/21 14:49:22 des Exp $
 .\"
 .Dd June 21, 2004
 .Dt TBMASTER 1
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 687d940214def..86d73c65cde63 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.50 2004/06/21 14:49:22 des Exp $
 #
 
 use 5.006_001;
diff --git a/tools/tools/tinderbox/tinderbox.1 b/tools/tools/tinderbox/tinderbox.1
index ea1f193e7f03d..861904872c1ab 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 6910f99509b00..fa342c4556228 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.40 2004/07/09 13:15:32 des Exp $
 #
 
 use 5.006_001;
diff --git a/tools/tools/tinderbox/www/Makefile b/tools/tools/tinderbox/www/Makefile
index acb4c877c4301..de00616a2816c 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 92f9de3fbdd03..55e5e69f781c3 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.23 2004/06/12 11:23:04 des Exp $
 #
 
 use 5.006_001;
diff --git a/tools/tools/tinderbox/www/tb.css b/tools/tools/tinderbox/www/tb.css
index ae433365b16a2..9415386f075da 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 3c9564851e16f..e17e956db0fc4 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 e5252000dc25c..18c0110a1143f 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 ffe86934bdc01..b9116ec384a2f 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.tcl b/tools/tools/vop_table/vop_table.tcl
index 1b76d18bae0d1..ebc3eeb394e55 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 876a318c3f44a..0ff712faf8c47 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 6a8e21e0c4a97..9860156b259a9 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 6a378162c75e5..2ef48fa78bf04 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.266.2.2 2004/09/30 23:36:09 dougb 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 2ee98c34aab58..f5da842c7f624 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 fbfcd11248e84..c2d56fec809d7 100644
--- a/usr.bin/alias/Makefile
+++ b/usr.bin/alias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/alias/Makefile,v 1.3 2003/04/01 12:37:54 ru Exp $
 
 SCRIPTS=generic.sh
 SCRIPTSNAME=alias
diff --git a/usr.bin/alias/generic.sh b/usr.bin/alias/generic.sh
index 33a39ad97831c..ebc2b8550fbf0 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 0355588b3c394..5fd09ea2024ae 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 ce944df70f66e..dcd041552a37d 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.15 2004/07/17 04:04:30 tjr Exp $
 .\"
 .Dd July 17, 2004
 .Dt APPLY 1
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 25ba374d97e93..97f3db97b021f 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 c2a221ae027be..6bc0ccca3ee83 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 c526b5e3d9b59..9fe50232566ea 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.3 2002/05/30 13:33:59 ru Exp $
 .\"
 .Dd May 9, 2002
 .Dt ASA 1
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 95cb588a052ee..e7d9c74dddabb 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.5 2002/05/15 03:31:40 tjr Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 47d2574e7f5c5..ddf7026a06122 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 3eb3e740f7e4c..3d9eb361c8f57 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 3d72bbbdbbd44..ff8008d58dca1 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 8a0b4ba5cf7b1..bfc2aa004f9be 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.34 2003/03/26 02:38:18 keramida Exp $
 .Dd January 13, 2002
 .Dt "AT" 1
 .Os
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index ef5265b4c1d25..76831a8a8ebbd 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 832de83a7d986..d656d6185b9d2 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 4590ad1204484..7f1e93f2630db 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 91176b471249d..872ce44dbae7b 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 b55b5fb786a71..92d0e31f10d7c 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 50dd6b108af47..cb5adf6705754 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 9ed46ef7a16d2..5f7daefc539af 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 265f86d1ed55a..e971f6f5e318b 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 16703bb35bd66..260a8ab482875 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.2.2.1 2004/09/26 03:10:15 des Exp $
 
 CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop
 
diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index 1d3642b6a8323..5e3321cc7c693 100644
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/awk/Makefile,v 1.11 2003/06/06 13:46:55 kuriyama Exp $
 
 AWKSRC=	${.CURDIR}/../../contrib/one-true-awk
 .PATH: ${AWKSRC}
diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile
index 67d4ba7fecd1d..d5bb0e2b1f058 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 0c2f22823ed5a..0930e9f53a8d0 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.7 2001/07/15 08:01:06 dd Exp $
 .\"
 .Dd April 29, 1995
 .Dt BANNER 6
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 99914e047de01..3ff939ca1e481 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 d647395c83d90..78bae81fcdb64 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 856a6d6d45ce4..f1141c714dcc5 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.14 2004/07/03 00:24:39 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index d94ee67a3a1dc..3078949096e0a 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 15109434e5afd..8592fbf8ebb57 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 11947705eeeaf..05e81624ce946 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.19 2002/08/16 03:08:25 johan Exp $
 .\"
 .Dd July 9, 2002
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index c04c8d39f9fa8..b12d1597ae452 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 9ef16cc8aae6c..3cd0778944ca4 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 c0e05cfa1da6b..eb32d7b65ad80 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 a761bbc6967ec..78de9cea30b9c 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.1 2003/10/12 22:04:21 emax Exp $
 
 PROG=		bthost
 MAN=		bthost.1
diff --git a/usr.bin/bluetooth/bthost/bthost.1 b/usr.bin/bluetooth/bthost/bthost.1
index d475f924e9b56..9b19ec8bb1f7d 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.2 2004/05/19 10:43:34 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 2dd56359fbaf7..74738dab43d69 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 c2314ba7d53e0..edbb228ca6630 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.3 2003/10/12 22:04:22 emax Exp $
 
 PROG=		btsockstat
 MAN=		btsockstat.1
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.1 b/usr.bin/bluetooth/btsockstat/btsockstat.1
index b4127aeb470f3..bcab0819fb6f7 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.6 2004/05/19 09:44:31 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 c7f333c60eb6a..5c1e261a809b7 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 6e493e88b7fd2..a88883d5e2520 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.2 2003/10/12 22:04:22 emax Exp $
 
 PROG=		rfcomm_sppd
 MAN=		rfcomm_sppd.1
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
index 5873071533338..51a4f60df70a5 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 d4810ef846ebf..3045151a9a377 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.4.2.1 2004/10/03 16:14:43 emax 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 40ad502ff6b61..fc4f2b9143c06 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.5.2.1 2004/10/03 16:14:43 emax Exp $
  */
 
 #include <sys/stat.h>
diff --git a/usr.bin/brandelf/Makefile b/usr.bin/brandelf/Makefile
index 2c4859fcd959d..6fc3996d8fc5b 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 bc6b1772958b2..be8b417e723e1 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.14 2001/07/10 14:15:54 ru Exp $
 .\"
 .Dd February 6, 1997
 .Dt BRANDELF 1
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 681f0a23bdbd9..6b39ba3eba416 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.23 2002/06/02 20:05:57 schweikh Exp $");
 
 #include <sys/types.h>
 #include <sys/elf_common.h>
diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile
index 8d5343c0361a1..13b58f6f5c351 100644
--- a/usr.bin/bzip2/Makefile
+++ b/usr.bin/bzip2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bzip2/Makefile,v 1.7 2003/11/17 05:19:37 obrien Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/usr.bin/bzip2/doc/Makefile b/usr.bin/bzip2/doc/Makefile
index 1da51edc5ceae..a887262c9f4a0 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.2 2002/02/01 16:33:40 sobomax Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/bzip2
 
diff --git a/usr.bin/bzip2/doc/manual.texi.diff b/usr.bin/bzip2/doc/manual.texi.diff
index 0c14f6307b581..fa0091a82609b 100644
--- a/usr.bin/bzip2/doc/manual.texi.diff
+++ b/usr.bin/bzip2/doc/manual.texi.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/bzip2/doc/manual.texi.diff,v 1.1 2002/02/01 16:33:40 sobomax Exp $
 
 --- manual.texi	2002/02/01 16:00:45	1.1
 +++ manual.texi	2002/02/01 16:01:11
diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile
index d8c412ad4e76a..c4ef12461f0f8 100644
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bzip2recover/Makefile,v 1.2 2003/06/14 19:32:52 obrien Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile
index f398af60308b8..cc7cd83e33abf 100644
--- a/usr.bin/c89/Makefile
+++ b/usr.bin/c89/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/c89/Makefile,v 1.6 2002/02/08 22:31:36 markm Exp $
 
 PROG=	c89
 MAN=	c89.1
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 1d75d30b65f92..1ad478e5ba9a7 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.9 2004/07/02 22:22:22 ru Exp $
 .\" "
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index 82d64275ed846..61de6a71e1b68 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.4 2001/12/10 21:13:02 dwmalone Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/c99/Makefile b/usr.bin/c99/Makefile
index 580065ff15c69..99921ef4ab789 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 c1d902ba3caf4..894d766ffd961 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.3 2004/03/04 20:29:27 josef Exp $
 .\"
 .Dd October 7, 2002
 .Os
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index db74cd73f09f3..27272b6e075d5 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.2 2002/10/08 02:19:54 tjr Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 06eea06820f65..b2e84551ad787 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 9faa3865830ca..b14905a3e903c 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.36 2004/07/03 00:24:39 ru Exp $
 .\"
 .Dd June 13, 2002
 .Dt CALENDAR 1
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index aae5f2a708483..7a150b6c401ae 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 fdda4b59a7ccd..4c94500cec7cf 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 0e6d710bd8d31..2432d7bd62e6c 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 c8896e9293a54..d95a237cf6771 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.5 2003/10/26 00:03:49 grog Exp $
  */
 
 #ifndef _calendar_australia_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 473e3af65bb9f..e738b8f85e870 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.28 2004/06/01 09:43:22 tanimura Exp $
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index affe3f8144b31..5b728c2504905 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 b153349a049d0..a57ff07379668 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 443122744d3f7..61d74937863e7 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 da1748f793ac6..1c8d7681881c7 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.139 2004/08/16 20:00:08 pav Exp $
  */
 
 #ifndef _calendar_freebsd_
diff --git a/usr.bin/calendar/calendars/calendar.french b/usr.bin/calendar/calendars/calendar.french
index 18b4d8ae8a949..a9af6f16607f9 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 635aef1d5735a..d84e2604fd5ef 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 dd9b16b5ebf4e..32025234fa485 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 2003/12/06 22:49:30 grog Exp $
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 1d61ac722394c..5e4239a025f40 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 2004/04/04 07:31:35 jmg Exp $
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.hungarian b/usr.bin/calendar/calendars/calendar.hungarian
index 1b29dfaf2f46a..0fd3dd41e7d33 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 395f56e319e82..3d6f4ebd7c00c 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 2450e363400bc..e4d3e26d91c72 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 c3c1a17bcaf44..77776ec251e1c 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.16 2003/10/09 00:37:20 grog Exp $
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.newzealand b/usr.bin/calendar/calendars/calendar.newzealand
index fc5afd674cdd4..64d994c8a6861 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.1 2001/11/15 02:35:14 grog Exp $
  */
 
 #ifndef _calendar_newzealand_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index 07018766a8325..489d21fa444f7 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 ae683b0bd358e..5ff50136a322a 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 d96189cdd703d..f8e8ef703bc6d 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 2b65f1af748f6..7f6b8734d6822 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 751c001982caf..ddac0f6e1b65a 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 f2a33cc563b26..1274934a85ddc 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 14ae4872abce1..5b4610a12a69d 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 84663904ddbcf..18b78f41345fd 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 02640b115bfba..eba0fe33838c0 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 bfa33e66168e8..db1f6bd78002e 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 fd1d86982b227..7beea66034025 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.11 2003/10/09 04:21:44 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 2c7639217df5e..444d05ba19355 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 785512e543d31..9a706c022b00f 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 d492ed7cdbcf9..e5703b7dadfe6 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 18b4d8ae8a949..823aef4c34819 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 d2b3742f37c04..dcac87c54ef6b 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 5a9f0eaf13aa1..40c6414198a71 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 326571a2ae370..835ed470d3d52 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 71e212889d94c..5322ccf8089cb 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 5084dc7295b6e..5165ab309ce17 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 f85c0840d910a..14f7c57d2fb1f 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 dab8ead76abf3..41e619f314cdf 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 b2de01ee8e589..fe1ad0bdc6ed7 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 66b81e64ebe62..b5ea8ed19a94b 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 eae8dac9451a1..6d25e473bcc3d 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 1b4e9c8880f8c..f3a6f33ffb5d6 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 4db9563703d26..ceea6041a5b86 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 ac38458d4a680..da2d0a700b485 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 2fb6bc0726924..7ac2bac5802b3 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 c1da370e9d735..1006b812ae9b1 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.20 2002/06/13 21:20:56 grog Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index df19e8ce3d334..b55f45aeae834 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 f000f7d5311bb..663c322ba7e41 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 3999d31c92bb6..fdad57d835d47 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 cacbd2587acd8..85913f5841008 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 408790c6c0257..4c3a59b626fb2 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 27c2a0c19ec24..d480e16d95c43 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.12 2002/04/19 23:21:39 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt CAP_MKDB 1
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 4b8bf20c66cf9..b155c1f67b331 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.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.c,v 1.12 2002/07/28 14:41:26 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/catman/Makefile b/usr.bin/catman/Makefile
index ab4c01453a1b3..e56d27eba6394 100644
--- a/usr.bin/catman/Makefile
+++ b/usr.bin/catman/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/catman/Makefile,v 1.1 2002/05/18 09:19:07 markm Exp $
 
 PROG=	catman
 
diff --git a/usr.bin/catman/catman.1 b/usr.bin/catman/catman.1
index 7449d4f421bd2..615a562154e6a 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.3 2002/12/13 16:53:51 ru Exp $
 .\"
 .Dd May 11, 2002
 .Dt CATMAN 1
diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c
index 3d4bf8e46eda4..8ae47a83d5cde 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.9 2003/06/10 02:18:00 ache Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 8aa23eb0daf29..fe7c36af98ee8 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 ecc733d1ce7b9..42f466c0234b9 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 c0afeaf53689d..d74b00850f743 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 8a47b5956bef0..5d349f5b8b9f3 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 addbceeaaefd0..871730e6b5c20 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.10 2004/07/02 22:22:23 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt CHECKNR 1
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index 742c74e5de600..ae1f847cf67ad 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 8cf1ef26e8648..222da23b4a830 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chkey/Makefile,v 1.9 2004/08/06 07:27:05 cperciva Exp $
 
 .PATH: ${.CURDIR}/../newkey
 
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index a4467c89449ce..6ef107742e315 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 db0b743fd583d..44eb825ed9557 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 8077152edfe74..a32f7f75d0350 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.28 2002/12/30 09:46:58 obrien 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 62d80e4a707bc..c43452a543bdb 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.37 2004/07/26 19:49:29 charnier Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index ad6b9850370dc..5d84c0272c1b4 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 ed1a58649d592..1d852d4bff877 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 ce82f8ee46447..42fcdcf1a73fe 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 eac5561a8dc2e..c6e140e2bc4d2 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 19f1a99062d89..81511ee2c5f07 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 07d96e227a961..c97f0b4cd7a98 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 828900ac02735..01440d0bc695c 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 27c4c0ba0de90..89087bcc0a341 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.18 2001/08/15 09:09:39 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index b6462d49fafbc..b698cdc49bb37 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 d1f42f2f628cf..92693e8014d68 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 cadbc17b69bb7..fa8f900ece612 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 f2d75def1eabc..e9b594adf2629 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 1cc27646f21cd..4d732d9acee79 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 406b40e2832fa..f3c05ce02ef99 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 c179c6289a2fc..83ca362d3ae0f 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 010ece54555e0..50ecb5601153d 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 2002/02/08 22:31:36 markm Exp $
 
 PROG=	cmp
 SRCS=	cmp.c misc.c regular.c special.c
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 2f82bc395d806..fd7c16228a836 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 2002/12/30 21:18:11 schweikh Exp $
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 0032188f9b482..f617203500a3d 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 2002/07/28 15:13:17 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index 75afb2b215f13..419d13b153405 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 2002/03/22 01:19:27 imp Exp $
  *
  */
 
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 53c6a9bf6dd35..7fc0470b5258a 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 7a27f5e470c42..963cc9b9e7f26 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 bbe3cb10fa819..ab21146505bd0 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 8e3a95948f3f6..e1a26f1e2aaaf 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 116a044a38f4c..89e4ce4c72362 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 ded40233e70c6..7b1be73532748 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.17 2004/08/04 02:55:25 tjr Exp $
 .\"
 .Dd August 4, 2004
 .Dt COL 1
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 7dcebff7deac4..758cbecd1022a 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 87d96cabffa18..7d2b7be0af403 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 33c3e192129e4..cc2df0277c94e 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.13 2004/07/31 06:22:01 tjr Exp $
 .\"
 .Dd July 31, 2004
 .Dt COLCRT 1
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index 2ba4f39bbdae7..2e5570b216e2f 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 6cb213f488982..b3af0663795f8 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 6aa5b3efcea45..f4f875bebf1e5 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.21 2004/05/19 09:45:46 ru Exp $
 .\"
 .Dd January 27, 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/common.h b/usr.bin/colldef/common.h
index 316490d4eb8de..46ec066685441 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 c35ea7ee2c756..70db540fd5a53 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.31 2002/10/16 12:56:22 charnier Exp $");
 
 #include <arpa/inet.h>
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index aeeff1406832a..96a7ef3726367 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 12585762f6263..d616bd3a20bbe 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 126c07d1399ee..6be5f36146817 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.10 2004/08/04 02:51:46 tjr Exp $
 .\"
 .Dd August 4, 2004
 .Dt COLRM 1
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 52dda90086dda..34440736f52f0 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 771723ef31f58..ed0fa5e7304df 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 39d93c6ed0a7e..8075f169ce00a 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.11 2004/07/29 13:22:56 tjr Exp $
 .\"
 .Dd July 29, 2004
 .Os
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 1082f57930a57..b739a154bf55c 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.13 2004/07/29 13:22:56 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 13da76fa2ef66..1c9b5a399de20 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 fb1a11e7470c9..2148f846e41c6 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.12 2004/07/02 22:56:14 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 0e7e029ce7825..06cf4a4e430ee 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 a84460a922209..471e92a398980 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 a586b97fcfcfe..a3b52025a3823 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.7 2002/02/08 22:31:37 markm Exp $
 
 PROG=	compress
 SRCS=	compress.c zopen.c
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index c74f17ac67e6e..b616c13f2a542 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.19 2004/07/05 17:12:53 ru Exp $
 .\"
 .Dd May 17, 2002
 .Dt COMPRESS 1
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 584f283ffb88b..3931ee57c92ef 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 d400c9b485caa..aec6b750e5945 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 2b5f6ba98b231..0828cdfb3a91d 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 57e0337eef7dc..76e82ad9ecee0 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 a1ffbf75d20d7..730a1200df7a6 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 b52c8244639fb..3ec71631e51ec 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.10 2002/07/28 15:32:17 dwmalone 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 a27a4f9b98aa2..8ad5691ff6080 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 3f370c7c4ad31..671233575011a 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 e40981376e3fc..9ec8391812fd0 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.8 2004/07/12 10:17:02 tjr Exp $
 .\"
 .Dd July 12, 2004
 .Dt CSPLIT 1
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index 2dff81fa8a45f..9d2b4e5bc84c9 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 c13e835da3c59..a5a5a092ea676 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 dc639af6e2e86..7c5b1147e5552 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 665a24ead6671..9be2dd7ddaadf 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.16 2003/06/08 13:43:56 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt CTAGS 1
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 2d9e3f36ed011..ac76510e4e942 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 ce4484f2f6bc6..6ae0cdd0a029e 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 ef6c45fee258b..c5016c2d2a613 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 3ac47df76ee56..1416e7596570a 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 a31ff931f7f2e..ae44d2c14ae04 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 6c42f32c79a87..c2c8a8ffad516 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 e0e0daba6687f..eb40786ebbf5c 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 5be029a3d9d15..b0ea0f6e28f25 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 2138d7681b8ce..40883481085fa 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.29 2004/07/07 19:57:15 ru Exp $
 .\"
 .Dd June 28, 2004
 .Dt CUT 1
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 2e334f6e25069..4c36d55b8f0a9 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.29 2004/06/28 06:05:36 tjr Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index d7ec398d1ac83..6ed1f26af29a5 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dig/Makefile,v 1.7.26.2 2004/09/30 23:36:09 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index 15338fd920cc6..45bba4a4bcb5b 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.4 2002/02/08 22:31:38 markm Exp $
 
 PROG=	dirname
 NOMAN=	noman
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index dc18ed29a3de9..c235c74adbda6 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.11 2002/07/28 15:43:56 dwmalone Exp $");
 
 #include <err.h>
 #include <libgen.h>
diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index 12e80b9da3d15..98c73ca7077df 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 7e656f9251766..cf5361a910172 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.28 2004/07/02 22:22:23 ru Exp $
 .\"
 .Dd June 2, 2004
 .Dt DU 1
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index ce2743287014e..6f17ed0953e5c 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.36 2004/07/28 16:03:12 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 3bca6abb4b8c9..bebbc60cf753f 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 8fdc4996fa824..02f6ff5490ba4 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 c3c574fa94043..662f8048f36c5 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.17 2004/07/03 00:24:40 ru Exp $
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index 65ca72de49e41..bf8da27163c2f 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.31 2003/06/30 11:51:21 maxim 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 22e1a847f6e01..5693628dd41ee 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 bbef58572a7bd..a55ba80e68e4e 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 80a99616df6ef..083beab3cf45c 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 ccefcc4b3e62c..eee79bab9bb0e 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 e93ff22dfa59b..b3082d4777518 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 5eb2f50c8667f..c34eb0ca47ebd 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.5 2001/03/27 13:53:08 sobomax 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 99aa34392ac8e..2d5d46fcccec8 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 1556d916742ea..761e07de7cff1 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 24f73f8353e80..ed347092cf325 100644
--- a/usr.bin/elf2aout/Makefile
+++ b/usr.bin/elf2aout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/elf2aout/Makefile,v 1.7 2003/03/29 03:03:42 obrien Exp $
 
 PROG=	elf2aout
 NOMAN=
diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index 3abf8188fcafd..45c152e7e57f0 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 95ce514b3ace0..dd2e9e38303f0 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 c159c7db79486..d11e26bba11c9 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.4 2003/06/28 22:30:46 ru Exp $
 .\"
 .Dd January 15, 2003
 .Dt ELFDUMP 1
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index e9fcb21ae465e..791d6617372fe 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 32a670b07eca8..6e5ad7b3a6df7 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 c1114ec9dd302..f23734ed93f20 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.10 2004/07/02 22:22:23 ru Exp $
 .\" "
 .Dd May 14, 2004
 .Os
diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c
index 25bb4568a20b3..3f2d980ae6091 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 7c74937f61f87..61f2e419163c7 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.5 2003/06/01 06:29:47 tjr Exp $
 
 PROG=	env
 
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 7e25eceef699e..71015887327ba 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.4 2004/05/19 10:44:24 ru Exp $
 .\"
 .Dd May 12, 2003
 .Dt ENV 1
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 26651f4d7487f..8e832b2a68800 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.11 2002/09/04 23:28:59 dwmalone Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile
index c6b339c69fc20..6093c6b5b6cc6 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 c6ffcd15d494a..0c71fe11df84d 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.13 2004/07/02 22:22:24 ru Exp $
 .\"
 .Dd April 21, 2002
 .Dt EXPAND 1
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 6c99db8068563..3ba16b833283d 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 ffae97dc061fc..3dd55e90c0cf9 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 415ec580a3759..24a8ab2812bf2 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 27b2c258cfff5..7a5155755ebd8 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 7b92352453f01..cc2a7ab1e7f6b 100644
--- a/usr.bin/fetch/Makefile
+++ b/usr.bin/fetch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fetch/Makefile,v 1.16 2004/08/06 07:27:06 cperciva Exp $
 
 PROG=		fetch
 CSTD?=		c99
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index f2c7a0b3ea01d..d72fce3a5e113 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.62 2004/07/30 08:43:16 cperciva Exp $
 .\"
 .Dd March 11, 2003
 .Dt FETCH 1
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index 21890fda407dd..a12bf7f5809ab 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.72.2.1 2004/08/31 05:18:33 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index fed320f443711..141bcc85405bc 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Makefile,v 1.29 2004/08/09 11:05:08 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 ad2b5d6cfda52..517ee5758ce82 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.8 2004/08/09 08:49:49 obrien Exp $ */
 
 #include <osreldate.h>
 
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 69af027dc6a6c..0cb9e1ec0e851 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.33 2004/07/02 22:22:24 ru Exp $
 .\" $Id: file.man,v 1.44 2003/02/27 20:47:46 christos Exp $
 .Dd February 27, 2003
 .Dt FILE 1 "Copyright but distributable"
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index f1c71243a695a..78a29f77ce4b2 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.22 2004/07/02 22:22:24 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 e88a3bc346e5b..dd462396f7c64 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file2c/Makefile,v 1.7 2002/02/08 22:31:39 markm Exp $
 
 PROG=	file2c
 
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index e77bdfd9b7d4d..7fc44ce070f8e 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.10 2001/08/13 16:32:56 ru Exp $
 .\"
 .Dd January 28, 1995
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 4338c45681e79..c8f0815380123 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.7 2002/06/30 05:21:18 obrien Exp $");
 
 #include <stdio.h>
 
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index b6aace969977a..2b47b3c5ad362 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.17 2002/04/15 19:27:41 obrien 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 2ee85102688b2..5af20fec3c1fa 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 346e976ca385b..ee295c025aae2 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.70 2004/07/29 03:24:30 tjr Exp $
 .\"
 .Dd July 29, 2004
 .Dt FIND 1
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 0486e8b096b52..562dfc3725589 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 59c70b66640f4..745d116f345bf 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 56d201c5ef70c..53c6d544ef367 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.52 2004/07/29 03:33:55 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y
index b4b15c444e57f..eba2f9a2aded9 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 88e45938cc6d3..b5ca8ae56c072 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 643f1f8cbf3a0..b1f22332658ad 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 fe11e04df0c50..16e08e6d2da06 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.7 2003/06/14 13:00:21 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index c774efa0dc890..f04d12adaffd3 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 718c2cdc3a9e1..9013cb88c05f7 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 983392b7a1e05..aea815eef0435 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 38552094ac7b6..019a089fb3b40 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 1ef35d6e4d810..9d5a9ed4a4894 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 70d4d1ab8872a..cff08cb2ba02a 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.34 2004/03/14 05:50:34 bde 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 58146d5943539..dd5e8b6a052a2 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.4 2000/08/25 22:22:04 brian Exp $
 .\"
 .Dd August 16, 2000
 .Dt FINGER.CONF 5
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 6b18146d4b50d..bf56cd66ba132 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 848bbeeeb3243..695701763bce8 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 2bd35ad00ac22..16572b2c638fe 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 7c9ad19abcb61..160252d411832 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 51a19190b01f6..3dcd69c69488d 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 3ac5a068331cd..324ea4848f53e 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 4665003af9341..240f9fb78123c 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.7 2002/04/28 13:59:42 markm Exp $
 
 PROG=	fmt
 SRCS=	fmt.c
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 162bcab0f9d2a..6480c82efe976 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 33f92b1b82d55..853695fca4e9c 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 d73d0a7cee437..df19735226747 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 3928b88adf52d..b9f206d1b9038 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 59d8fc59adfdd..c0a92b9ce5a60 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 57b966353fdc1..63315d51cee05 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 827d62850ca63..af26bfdbb2fc2 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.14 2002/07/15 06:15:38 keramida Exp $
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 84d0c52b23a3a..51f3222f2532d 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 1be1d7f7a5451..834769ee887f6 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.8 2004/06/29 21:28:09 dwmalone 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 8e4be03af5a59..ddb7cd938f7b9 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.5 2004/06/29 21:28:09 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 01143ab7c6d9c..2ff77aceaf4de 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.23 2004/07/26 19:53:44 charnier Exp $
 .\"
 .Dd March 27, 2002
 .Dt FSTAT 1
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index f8763b085a6ac..4de1721e5d276 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.55 2004/07/21 03:07:50 silby Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index dda8bbf7906b9..66f47260f74a2 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 5bae63e4b5eb0..720a6ebf71a1a 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 c9bc5249ee6f4..f25ebcaa31941 100644
--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fsync/Makefile,v 1.4 2002/02/08 22:31:39 markm Exp $
 
 PROG=	fsync
 
diff --git a/usr.bin/fsync/fsync.1 b/usr.bin/fsync/fsync.1
index 6bae8b2a38686..54df8ddade7bb 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.6 2001/08/01 12:15:18 sheldonh Exp $
 .\"
 .Dd June 15, 2000
 .Dt FSYNC 1
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 95bacfb7c057e..404062e796077 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.4 2002/06/30 05:21:20 obrien Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 25d30d476e995..844548b52148b 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 77dff70747ce1..26dbd6c21712b 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 ff0e7bbf2bd48..c7d4f31f2c190 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.8 2002/09/13 16:33:35 peter Exp $
 
 PROG=	gcore
 SRCS=	elfcore.c gcore.c
diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c
index fac3fb9b91eb0..a0d5994144aab 100644
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.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/aoutcore.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/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index 4a920eb0246f7..8ffd7f28f0237 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 1bd70954794fb..64b2ebe3b9369 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 981e0be3b346a..dfe6d821c9f7a 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 7005e834ff913..b7846d291535c 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 45af07adf8952..282abe58e7387 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gencat/Makefile,v 1.7 2002/02/08 22:31:40 markm Exp $
 
 PROG=	gencat
 SRCS=	gencat.c genlib.c
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index 70c0e9c86795c..3f4b0eb596b94 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.11 2004/07/03 00:24:40 ru Exp $
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index 1d6c41e84401f..0e9161b3ea942 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -31,7 +31,7 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gencat/gencat.c,v 1.9 2002/05/29 14:23:10 tjr Exp $");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/usr.bin/gencat/gencat.h b/usr.bin/gencat/gencat.h
index 6e91cbafa5603..5e7e459e67511 100644
--- a/usr.bin/gencat/gencat.h
+++ b/usr.bin/gencat/gencat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/gencat/gencat.h,v 1.4 2002/03/26 12:39:08 charnier Exp $ */
 
 #ifndef GENCAT_H
 #define GENCAT_H
diff --git a/usr.bin/gencat/genlib.c b/usr.bin/gencat/genlib.c
index d0fcefa0d38bd..afa656614353a 100644
--- a/usr.bin/gencat/genlib.c
+++ b/usr.bin/gencat/genlib.c
@@ -31,7 +31,7 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gencat/genlib.c,v 1.13 2002/12/24 07:40:10 davidxu Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile
index eaaf628aad374..8b035ab4392b9 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 c629987e5caf8..929a8fd1350af 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 96fcd3c9977c2..b3107fe40e02a 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 e0a9e869abe5f..5702f8b942160 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.12 2003/09/08 19:57:21 ru Exp $
 .\"
 .Dd September 18, 2002
 .Dt GETCONF 1
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 0ba45a0e3ce30..2dcb8250b5fbd 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 266a0ff3b0512..3f7e412f9dc75 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 68e0d65e78ff5..ceb93db334715 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 e8b83659d80f4..00a934592a170 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 cfbde6610cdb1..d257c6bf9ee65 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.2 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/sysconf.gperf b/usr.bin/getconf/sysconf.gperf
index ae88464a0b742..945f7ab47284e 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 01dfa87e2935f..7a633ee477eb1 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 1deb0b45f34ef..7f9bf431a2468 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.19 2004/07/07 17:39:16 ru Exp $
 .\"
 .Dd April 3, 1999
 .Dt GETOPT 1
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index 33637604f26f2..a897b4105e7d8 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 a24d9cda6c81f..9fa5a90f7449a 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 823d6562d105b..bf7c5771255c7 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 823d6562d105b..c869875864a82 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 2ccf818f42e01..6afa3c48f7ebc 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 3be00dffbc6aa..10d87a7e706ac 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 823d6562d105b..c7d626d0a22f4 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 0e23a87a22bfe..6658432ceb669 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 b0af431dc5a16..26d5428e80308 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 1481c330cb9bf..d9933f815574b 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.27 2004/07/03 00:24:41 ru Exp $
 .\"
 .Dd June 20, 2004
 .Dt GPROF 1
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index cfb9fab2cc9bd..9b7dab1f572eb 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 5e44307456cc2..41682c9b98f79 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.23 2004/06/20 11:05:25 stefanf Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index 7420cd3a9ca3e..54466a56db57a 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.2 2002/10/16 13:50:09 charnier Exp $");
 
 #include <sys/time.h>
 
diff --git a/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index 823d6562d105b..a6e9bb73aff11 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 823d6562d105b..4fe478b8965ff 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 38cc91e369d20..f729574a8fd1f 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.3 2004/05/24 12:44:00 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index f51da9829f743..4716453f1b54b 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 0dcd78c6af47f..7a9d8ff9211c6 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 4ca539588c736..24e723b8d714d 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 ed68bcc0d3136..1ec8cdb748758 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 823d6562d105b..a4b64254fe135 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 262ad20cd1936..233ea6b790578 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.12 2002/06/10 22:59:51 jmallett Exp $
 .\"
 .Dd June 6, 1993
 .Dt HEAD 1
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index eb20446ec6366..fa39b9c85612a 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 870db2887d7b6..c4c46764ffc06 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 e54d63d7496ff..5d71f528848e2 100644
--- a/usr.bin/hesinfo/hesinfo.1
+++ b/usr.bin/hesinfo/hesinfo.1
@@ -1,5 +1,5 @@
 .\"	$NetBSD: hesinfo.1,v 1.1 1999/01/25 22:45:55 lukem Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.bin/hesinfo/hesinfo.1,v 1.5 2004/07/02 22:22:25 ru Exp $
 .\"
 .\" from: #Id: hesinfo.1,v 1.9 1996/11/07 01:57:12 ghudson Exp #
 .\"
diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c
index fa81864a5d008..503d46c46f868 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 3252fc9af1479..22e1b59f64ce3 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 9668780677b00..d01b97ad066d1 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 db04c49aade5a..6cf3aa80d8e81 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 cddc910d0c5e9..2c90733a2b478 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.21 2004/07/10 13:11:00 tjr Exp $
 .\"
 .Dd July 10, 2004
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 2ed7c4b9df490..78df723fa4361 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 9a1198f45cf5d..a984287869865 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 4d21611f6a3fa..a510db35e9ae7 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 fb9eb7762d8ee..f827f6c2657d1 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.17 2004/07/11 01:11:12 tjr Exp $
 .\"
 .Dd July 11, 2004
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index e0f9283bbc220..c144d2fe55280 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 1231a1519ea5f..0fd67ff955c54 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 ed24435059f6a..a3a2830529656 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/host/Makefile,v 1.7.26.2 2004/09/30 23:36:09 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 715456839582c..44ec4ec05a30d 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 59174426d6dbe..dfd36a0f958eb 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.8 2001/08/15 09:09:41 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index cf53f44309f56..40ca60e85a5a8 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.13 2004/05/18 20:36:54 ru Exp $
 .\"
 .Dd May 3, 2004
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index f8fba74c86e1b..11320cb8c3f6d 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.21 2004/05/19 21:06:36 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/mac.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 4f7cb533291af..bf201d8f3c2fc 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.8 2001/08/15 09:09:41 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt WHOAMI 1
diff --git a/usr.bin/indent/README b/usr.bin/indent/README
index 03d5d3d8d39e8..a796b4614647b 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 eb9396060726b..f6350c039264b 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.14 2004/06/27 10:58:37 schweikh 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 f6ecc62959d61..cba84ff513480 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.22 2004/07/03 00:24:41 ru Exp $
 .\"
 .Dd June 29, 2004
 .Dt INDENT 1
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index f91043f7d3b1c..911080d67658d 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 4c52bf8370e42..ac40f01b04841 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 e1ff294e25765..008bf2b41a9f7 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 010b3a3d67947..781718de9ae4e 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 45eb6c2d5f3ba..f818aed47f634 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 3d30bb337ce55..0c6437076d6a1 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 65d9a6bb8c475..7720ff147acf5 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 9524bf404f190..ad7fe2e7f6077 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 9c0e45c0702cc..c369399219c5d 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 b7e7c841da205..6b3193dd95178 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 8c039aefd01e1..8f93b483bccd2 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 af767776af9ab..9024c6ac35e39 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 5d32d2c2e7210..d66305a19207a 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.20 2004/07/02 22:22:25 ru Exp $
 .\"
 .Dd March 24, 2004
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index ce2a759468b5b..ec9a396b73348 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.23 2004/03/24 04:01:43 bmilekic Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index aa6f73903a9c9..7e60d75df5c06 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.15 2004/07/05 13:20:03 tjr Exp $
 .\"
 .Dd July 5, 2004
 .Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 097ecbe743f9b..0584b51df5d5f 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.18 2004/07/05 13:20:03 tjr Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index 662600eef0a8f..7804b92f282a6 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 09f64296e62a2..52550d3f4ddaa 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.15 2004/07/02 22:22:26 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index f3f74235a966a..b4db20f74e24e 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 060081c2899eb..88e5962452437 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 76ad1c3b25a48..551e0dc6cacde 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.11 2004/05/18 20:42:36 ru Exp $
 .\"
 .Dd December 8, 2003
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 010f862baf67e..bc199291be537 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.25 2004/03/25 12:33:55 phk Exp $");
 
 #define _KERNEL
 extern int errno;
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index cbe7515030093..92f1fd3ef6f1c 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 bf279eb25b22b..776568cb44ab1 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 8a3927dfb65a5..5d55b2443c0a9 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 8e10d957b3ef7..484efb40f8f48 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 1f5feec6e9d0d..07a67120a520b 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 6d643c90d1ad0..485e120790240 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 e4fcf21adbeb1..a7169ce48261b 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 ff772a800aecf..584e6d82b29e2 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 9580d05c09710..9cd9254bb6f90 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.33 2004/07/02 22:22:26 ru Exp $
 .\"
 .Dd January 26, 2004
 .Os
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index 10537e624c1a3..e0e996424b88f 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 c00bb7510459b..542046efc5a07 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 728929649216f..ce22a3ec36394 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.16 2002/04/20 12:15:02 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 4b8379614e64b..13c78fb7d9ffc 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 058fbd7e01ba6..c699fffa3f26a 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 5b8b64d11c89a..4a09525ce7c3d 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.12 2003/02/05 14:25:43 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/ktrdump/Makefile b/usr.bin/ktrdump/Makefile
index 6b5ff127165f0..caacccb32294d 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 5bdd984fc2cc9..cd3fbe705dcff 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.6 2004/07/07 19:57:16 ru Exp $
 .\"
 .Dd May 5, 2004
 .Dt KTRDUMP 8
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index f18772366e5a8..0e7b519583882 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.8 2004/05/22 08:26:10 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/ktr.h>
diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile
index 08b73286dfc48..062e4817e5b8b 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 2d248f61aed41..9986577373bec 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 40cd9453610fb..f82ea026aa76d 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 f7e88115e9b1f..0cfb97b6f8ef1 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 e0cff3e4959c3..0ebdbdfe4e36d 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.16 2003/08/17 10:24:53 tjr Exp $
 .\"
 .Dd July 27, 2003
 .Dt LAST 1
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index d9877b423bb86..2de02d64a046d 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 13f0fe6df6540..f28033a7fbe0b 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 a1f86f40cdbf5..f780d691f700d 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 377de604d038b..5776127308919 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.19 2004/05/20 19:25:27 hmp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index bb04f4550e322..5e3200690d93a 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 4df6759b971db..936f52b2be23f 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 0446aa260d7a2..a7e5159d54345 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 8e5e5d2f2bcfc..6880f36904061 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 e6de90fcae384..c1288f99a6646 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 859c11cbf8453..801501f3e1351 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 6c33367b85ab7..ada7c3f5f5335 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 89c3f52857164..c1db13606cb09 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 22b03bf2b5b99..8c54bc3c83bdf 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/Makefile,v 1.8 2003/03/06 04:35:48 obrien 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 fcc6ccfa1ce3c..8aea191fded1c 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 f173474067ce5..00aa35857b648 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 2cef2c5edb7ac..f95027975825f 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.1 2003/03/06 04:35:48 obrien Exp $
 
 case "$1" in
 	*.Z)	uncompress -c $1	2>/dev/null
diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile
index bfe81d61f9c31..cef4f5c12f5a2 100644
--- a/usr.bin/lessecho/Makefile
+++ b/usr.bin/lessecho/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lessecho/Makefile,v 1.2 2000/06/03 11:39:37 bde Exp $
 
 PROG=	lessecho
 SRCS=	lessecho.c version.c
diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile
index b10bf6d5fa2bf..5d7878ce16af4 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 12e8ec32f61ff..1b076c98eda82 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 6d0ea5b44ec23..20c68474f7dba 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 025a914407ec9..da07f39ecccbd 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 2e0b5b43747bb..f321b12333d7e 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 0853466f9ac2a..1f056284d949f 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 d647142f4054f..60ef676f0fa5f 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 602095095fb27..066f9ab13e34c 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 03651ea965b8e..a1e4f0dceb4bc 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 7ccf4da84a802..cb02ea4e95623 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 a7316ba920371..35398d5860aa2 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 b41de37986a20..fecf68ce6d947 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 0091cc2747bcd..d95f229c292ba 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.7 1999/08/28 01:02:49 peter 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 426eb98985d4e..2927e16ccf759 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 75c669c6ae947..f249e9d540062 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 f6adaa7c41c19..f1f68774da106 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 3eda5793650c6..a9dec4caf83a2 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 4b81284ff2ec1..1be59e5c01568 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 dc71379b3ee24..71c54154cdac2 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 cee8a16d2deff..6ad8669775428 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 077015b78578e..8cecdedfc712e 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 89973f08ba87b..32a3cfa9e608e 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 5dbdf94b67656..a9f3056abef77 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 e90c5d4fee0ac..99e06f9b88f2d 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 013317824db1c..11dea7431ffd1 100644
--- a/usr.bin/limits/Makefile
+++ b/usr.bin/limits/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/limits/Makefile,v 1.4 2002/04/01 10:54:11 dwmalone Exp $
 
 PROG=	limits
 DPADD=	${LIBUTIL}
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 75efca3dff2cc..e84ebc02df7ef 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.28 2004/07/02 22:22:26 ru Exp $
 .\"
 .Dd September 18, 2002
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 8164b5bc3a4ff..1413ce3e9a077 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.13 2002/09/18 16:25:59 green Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/locale/Makefile b/usr.bin/locale/Makefile
index d7f67e1aca814..aead6830b40fe 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 52d997426a12a..f05f9c0f10974 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.5 2004/05/19 10:45:40 ru Exp $
 .\"
 .Dd June 20, 2003
 .Dt LOCALE 1
diff --git a/usr.bin/locale/locale.c b/usr.bin/locale/locale.c
index a4b6b40018399..d0e826dc9fbe4 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 1d495e420eced..362195e082e83 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 48174083d848b..5b2166eae5bfa 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 e0018d89b7fd1..a92d88a0ab236 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.4 1999/08/28 01:02:53 peter Exp $
 
 PROG=	locate.bigram
 NOMAN=	noman
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 137b590697ae9..03b4efc68db05 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.11 1999/08/28 01:02:54 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index fb1fb510e59aa..b1ff0f7d6b62e 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.4 1999/08/28 01:02:55 peter 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 6290c67201ef9..9f7850e16028c 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 9a618da4e8fa7..96320a1d34223 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 156f21a725d22..a236332a8d0d1 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 8e29355857b9d..b76bb0854ae72 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 0d335cf4af462..01657b2fa9ca2 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.27 2004/07/27 21:13:04 cperciva 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 928359951f8d6..1689a9fef1ea6 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 24df8d4002bed..100139de8fdc7 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 57835b363a3c0..b023910085b8f 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 1999/08/28 01:02:59 peter 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 fa48bc8f174e2..6dee6597860ed 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.11 2002/07/14 15:09:08 charnier 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 39d15d7c13cfa..7231ebae97ace 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 b9bf69899ca35..16b5d270b1ddf 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 2002/06/19 19:22:18 eivind 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 944ca88e70383..0a94c9c28702c 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 dc09a87b1b9cb..6c3c968e51be6 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 f74dd9772cb24..d07d69f8bbfb0 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.11 2004/07/02 22:22:27 ru Exp $
 .\"
 .Dd July 10, 2002
 .Dt LOCK 1
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 3b19e35bbe1cb..23c5717ce8e5c 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 7baff7cd7738e..5c90e1f02ddef 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 1b9b6ea8b2841..a014c03b03d7e 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.13 2004/07/02 22:22:27 ru Exp $
 .\"
 .Dd July 7, 1998
 .Os
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 6995d0abfba40..52bc950361315 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 48c52513500de..ad40c192c6a84 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 c5c7dff19763f..f8b449c3ebf37 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.15 2004/07/03 00:24:41 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOGGER 1
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 3832752528b79..827d51fb150f8 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/logger/logger.c,v 1.13 2002/09/04 23:29:03 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index e473aae538bec..5294f62524e65 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.47 2004/02/29 06:39:11 bde Exp $
 
 PROG=	login
 SRCS=	login.c login_fbtab.c
diff --git a/usr.bin/login/README b/usr.bin/login/README
index bc228f766aa61..d3798a8b38d0c 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 ec924ca31d73d..43c6e3326dee0 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.26.2.1 2004/10/16 00:54:51 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 2f2d8f25e40f6..b376554f4220b 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 9c06e437a3f59..55e35d0a8e6c0 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.98 2004/01/26 20:04:47 fjoe Exp $");
 
 /*
  * login [ name ]
diff --git a/usr.bin/login/login.h b/usr.bin/login/login.h
index 6be2539c7bb6d..f39583dbe9f70 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 f6f5745d33517..d404bda02f918 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 c0a4290a46770..6813ffc193091 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 333c2ca280fa3..076d1ea38c86f 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 42840fb28b9ce..2065dd242b0b8 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 fcd12b309b0d5..c62d5e144f8b3 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 abf342e632199..bde8beb2c1d9d 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 875df2c0abf65..b51f85eceb122 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.4 2002/02/08 22:31:41 markm Exp $
 
 PROG=	logname
 
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 2f187e99e46f5..9c80ec130a8e8 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.8 2001/08/15 09:09:42 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 05faf7612416e..474bc75bd5906 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.7 2002/09/04 23:29:03 dwmalone Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 7a9980e597539..691e5cecc7972 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.16 2004/07/19 11:21:34 tjr Exp $
 .\"
 .Dd July 17, 2004
 .Dt LOOK 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 68d6755f64b2b..610e0bf40c409 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 61996824ef93b..e0eea4a1841e1 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 6cced8f8de2c7..11640dd5344f4 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 c908f761a595f..5576bae34570a 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 0c33583257cf4..9e7f1916c8c64 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 c9874d8d870e7..8ef16a5a9a6db 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.12 2004/07/02 22:22:27 ru 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 1e486d7ca4628..ddbc6768939cc 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 46fb32d2aeb18..563cffce041dc 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.6 2002/05/01 21:37:29 jmallett 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 0262af66e2534..b51f6ed9c5e03 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 060ce03661d54..7988957c35e3c 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 2c0284b1a784d..969f99d7a4ea4 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 e96870b585558..cefa6ecac8925 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 8940bb820f775..a1b1be626e5fd 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 bafaa2ad5a43a..805b51f8504fd 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 91fd9da26706a..9bd1ec6a1efe5 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.26 2004/07/03 01:28:20 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 847a37288e0c6..bf4b95af20ecd 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 e3e48e2720011..47ab5fbf96107 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 b5632e820fef6..7718796b116b2 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 94e8164f07ab7..a8a30e0ce650a 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 34939854b97f9..5cd8db0fe302b 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 a42aea0442712..26140bf7269af 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 491d06f97c50b..69090591de824 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/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index 10e707cc3c0c7..011630308e7fe 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 fa820b4a94bd6..d0c6a83bd569f 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 5ec6d7a69e7a2..5eb8f097a2c71 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 15cf04a47b82d..507c29a8964e4 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 c9b7c6ae57aa6..2a0a4d8fc5333 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 b350ccef746e8..adf21f0b39488 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 6a0926336c148..3badff9f2539d 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 3ef4ed0866d16..8b7f8270588be 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 d50c43a73b5f7..0acda60bc2edd 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 7f02a88c2f7f1..74bb78f92cf5e 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 b00f48593ede3..a5fe4c1c0523b 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 58519852aa936..6f65772e63042 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 5f1812a5af620..796231d647685 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 90db9621075bd..40e8eda6d9440 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 7eb11231334ed..e204e45649f92 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 abff92a928c9c..c55849beeee81 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 bf2873bbb0e27..df5b991c4ec89 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 4a00177dc0334..bbe2e68011a2d 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 fc0acdc851ea7..a03fe58417deb 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 57a2a0c005951..f34827589a469 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 b6dc30a39ac5f..42aaa5ce77077 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 4507c59e23b6b..e7d7ece4611dc 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 44bb25ef36943..37303b8287b8f 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 35b4c729522ac..a71d28e37193e 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 d3a816fb081d0..766311e5f0bd7 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 0d7424e94dafa..38d44126970e2 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 6948d042488d9..4bafd7511062b 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 34f9d800aad7c..a6bad0bb16323 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 ab171c159e1e8..5bc00497bf8fc 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 e41c25c08681e..3aa98d28e0f5e 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/Makefile b/usr.bin/make/Makefile
index cbab3c152cd50..19a1350decb8f 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.33.2.1 2004/09/14 03:52:51 jmg Exp $
 
 PROG=	make
 CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/make/Makefile.dist b/usr.bin/make/Makefile.dist
index 76dde9edda69b..31f4ae4b8bd14 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.2 2001/03/01 06:26:32 imp 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 39d8defe2e143..156d34e0e3bb6 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 320d5dfc3c4b9..0701bde181276 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 e79d383c87c11..c782c32e07941 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.33 2002/10/23 23:16:42 jmallett Exp $");
 
 /*-
  * arch.c --
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 49523af4d3cdf..11fb7abe8c417 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/buf.c,v 1.18 2002/10/09 03:42:09 jmallett Exp $");
 
 /*-
  * buf.c --
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 28403ccd761c4..a124d7608d9c9 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.12 2002/09/17 21:29:06 jmallett Exp $
  */
 
 /*-
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 79531ef4387cd..cfb9f59c1af95 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/compat.c,v 1.37 2004/07/29 14:29:23 harti Exp $");
 
 /*-
  * compat.c --
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 194a057a365af..e7d11a8da53be 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.28 2004/07/20 07:42:06 harti Exp $");
 
 /*-
  * cond.c --
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 9dd59fab8be88..f28e4febf779f 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.12 2002/09/17 21:29:06 jmallett Exp $
  */
 
 /*
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 137a21e32cdf6..336176c3481f9 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.32 2003/10/02 21:30:30 ru Exp $");
 
 /*-
  * dir.c --
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 549d531e6fc75..de4686572e95a 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.11 2003/09/14 12:31:33 ru Exp $
  */
 
 /* dir.h --
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 650240179458c..d59b328e4faba 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/for.c,v 1.21 2004/03/10 21:51:06 ru Exp $");
 
 /*-
  * for.c --
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 7d2c64dcc48a4..402d382fe4e58 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.18 2002/10/09 03:42:10 jmallett Exp $");
 
 /* hash.c --
  *
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 8620c43906eac..e7f9a84985474 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.12 2002/09/17 21:29:06 jmallett Exp $
  */
 
 /* hash.h --
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 8f0310bde0c75..0f0e01d160333 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.50 2004/07/29 14:29: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 284b16bdab7b6..98ad293840026 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.21 2003/12/19 11:18:37 scottl Exp $
  */
 
 /*-
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index 382d899d704d6..39deeb96c7028 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)list.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/list.h,v 1.11 2002/09/17 21:29:06 jmallett Exp $
  */
 
 /*
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index da3e71665262e..ecdc11e3703ff 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.15 2002/09/17 21:29:06 jmallett Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index 8f7b4e0cc2598..e28c9f782305f 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAppend.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index bb1355200e73c..8b14c95322396 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAtEnd.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index dfce7ca40dbee..04ca5e9ecc431 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAtFront.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index d76f027b0359a..26f8ec864f928 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstClose.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 83e19318db8c3..a205b918c8f55 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.11 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index 7151739bf90d5..d6552d44b13e9 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDatum.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index cfcf29c5449d1..598067829cb82 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDeQueue.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index 554d976fc0960..bf2b94394ab7c 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDestroy.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index b66e6c4858ba4..84251b92a97a8 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index 8577dbfa8d09f..266895257fff3 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstEnQueue.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index a859a93e548ef..43e19b4f6a260 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFind.c,v 1.11 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 2583c91ce50a3..6ba1e118f787b 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFindFrom.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index 56a602af89354..92f87924374eb 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFirst.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 2df3f9fa74ed9..4f038fb94adfe 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstForEach.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 388692b8a34d1..2808a253ccaa5 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstForEachFrom.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index 03e7c4db6fbb0..b4cd4475b09c2 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstInit.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index aaa9077cdd9ce..ffbad66d025de 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstInsert.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index cc5e8f3d786c6..f30e3bc6dac43 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lstInt.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInt.h,v 1.10 2002/07/15 06:57:25 jmallett Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 8927408113d1d..ff724215413a2 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstIsAtEnd.c,v 1.7 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 6c76188632c85..073d19f85a10b 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstIsEmpty.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index 37f579b662e16..496a5b9d5ba6e 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstLast.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index c8564580c34d0..0e82485ad2a1c 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstMember.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index f2d2066a7a35a..43c61c8523ac0 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstNext.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index 8e0b08723ef43..d7db225bc7478 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstOpen.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index a90807b1a4213..aa7f8ff00beca 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index c71f967d5978f..cca5157e4d73c 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstReplace.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index c4cfcf6127c36..8e59541274fee 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 284cfe2437d2d..f30b93505d958 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.91 2004/08/12 11:49:55 harti Exp $");
 
 /*-
  * main.c --
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 05b76efd1df85..6db1c380a4736 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.78 2004/08/09 16:13:54 harti Exp $
 .\"
 .Dd August 4, 2004
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 762b65a648a6c..2ae39dc68bdfc 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.24 2002/10/23 23:16:43 jmallett Exp $");
 
 /*-
  * make.c --
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 77205aa3c0971..bb6533064854f 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.24 2004/07/20 07:42:06 harti Exp $
  */
 
 /*-
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index f6e07008aaa49..d8af0fc8e4193 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nonints.h	8.4 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/nonints.h,v 1.23 2004/08/12 11:49:55 harti Exp $
  */
 
 /* arch.c */
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 9cbef9929553a..ab11c9041ffd3 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.57 2004/07/22 11:12:01 harti Exp $");
 
 /*-
  * parse.c --
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index d16167cc1f69b..84a2809552d15 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/pathnames.h,v 1.12 2002/05/24 15:51:27 ru Exp $
  */
 
 #ifndef _PATH_OBJDIR
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index 4445a00d30843..bb0ef4a20ba50 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sprite.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/sprite.h,v 1.13 2002/09/17 21:29:06 jmallett Exp $
  */
 
 /*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 1aa54f78477c8..4a139688c476c 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.29 2004/01/25 12:28:36 ru Exp $");
 
 #include "make.h"
 
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index bd02152b5bfbd..90fc0447cb74b 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.29 2004/04/12 20:05:11 ru Exp $");
 
 /*-
  * suff.c --
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index ca8a718e649c2..e7416eae372be 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.26 2002/10/23 23:16:43 jmallett Exp $");
 
 /*-
  * targ.c --
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 55e6c3dc1926b..0f415ad72f67c 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.12 2002/10/10 19:27:48 jmallett Exp $");
 
 /*-
  * util.c --
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index c00353bc4fad6..292083a88e5cd 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/var.c,v 1.48 2004/08/12 11:49:55 harti Exp $");
 
 /*-
  * var.c --
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 7a94f0628687b..35663cc0e78d0 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.1 2002/10/28 23:33:57 jmallett Exp $
  */
 
 typedef struct Var {
diff --git a/usr.bin/make/var_modify.c b/usr.bin/make/var_modify.c
index 06a9cbff5a517..43ba1f337a66c 100644
--- a/usr.bin/make/var_modify.c
+++ b/usr.bin/make/var_modify.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/var_modify.c,v 1.2 2002/10/29 12:11:56 jmallett Exp $");
 
 #include    <ctype.h>
 #include    <sys/types.h>
diff --git a/usr.bin/makewhatis/Makefile b/usr.bin/makewhatis/Makefile
index 4da90ef0f73f9..e28374f2aeec6 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 9e2921f9be974..a5f3bfb32cf86 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.3 2002/05/18 15:39:56 ru Exp $
 .\"
 .Dd May 12, 2002
 .Dt MAKEWHATIS 1
diff --git a/usr.bin/makewhatis/makewhatis.c b/usr.bin/makewhatis/makewhatis.c
index 30f2da8d0ba7d..0b480539108a4 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 dfe252fdd9617..65d4e8e2bf91d 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 8be25300b75dd..b0bb2081468b1 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 47f5a85fccfe7..52da7f0075cd6 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 d62b6bb102329..bee30b6ce1cd0 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.11 2003/06/09 19:32:02 charnier Exp $
 .\"
 .Dd May 5, 2002
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 8b39ec7b3db98..7cfe9ce366f68 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.8 2002/09/04 23:29:04 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index 226ba76179850..3df33e1e49358 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 ddd2b957a6b11..04cd7dd2e7e2c 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 463466ca840a5..f57a148d6b8f3 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 446f5493ae5e7..e2e5e39a756c7 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.15 2004/07/02 22:22:28 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 ec00dcfbdf926..9d983ac4128f3 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 30f013ecea410..060eae52cbca6 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.3 2002/02/08 22:31:42 markm Exp $
 
 PROG=	mkfifo
 
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 6d7a33731ae51..732e5769c4ed5 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.12 2004/07/03 00:24:42 ru Exp $
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 85cd6e145ac91..7cdaed7a54295 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.9 2002/09/04 23:29:04 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 0f0978fa9dba8..54ad5abd24542 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.28 2003/06/17 19:58:33 charnier Exp $
 
 PROG=	mklocale
 WARNS?=	6
diff --git a/usr.bin/mklocale/extern.h b/usr.bin/mklocale/extern.h
index a52c6b5b90154..f2037dd2c6eb8 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 2a253b81a534e..a6e131bf59620 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.3 2003/06/17 19:58:33 charnier Exp $
  */
 
 /*
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 2b3c81fce1528..f60e05d1c5f15 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.8 2003/09/05 16:05:21 tjr Exp $");
 
 #include <ctype.h>
 #include <runetype.h>
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 067047a0d4415..51af1b3cbbfe3 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.22 2004/07/03 00:24:42 ru Exp $
 .\"
 .Dd November 8, 2003
 .Dt MKLOCALE 1
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index da3df02dd4ffe..4a3c94584c22a 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.21 2004/06/23 07:01:44 tjr Exp $");
 
 #include <arpa/inet.h>
 
diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile
index 805c013d4a972..b0c432f5a3155 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 1b83cc0ebf5da..98e0209e994ae 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 ce61c9d7ff9b7..e7957ce8fa8ef 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 76ebee6f360b5..bdb07a32ac842 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 a21d79c5ef92a..5135de75a70e3 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.17 2004/07/02 22:22:28 ru Exp $
 .\"
 .Dd November 20, 1996
 .Dt MKTEMP 1
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index b58ac4b9d055d..132e27b57dcf1 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/msgs/Makefile b/usr.bin/msgs/Makefile
index 21cb15155568f..b5bb3ab1fcdfb 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.8 2002/02/08 22:31:42 markm Exp $
 
 PROG=	msgs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 147f8c9e42329..65b7aa72b84b5 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 c56c3aabe02b1..7acad87c2fc85 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.26 2004/03/11 10:12:05 bde Exp $");
 
 /*
  * msgs - a user bulletin board program
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index 25b4af5b897f5..e9fb2b6196334 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 d94f28d88e41b..fcef58ad8faf7 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.40 2004/07/03 00:24:42 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 95ef836c6cad2..4d52acbc5b8b4 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/ncal/Makefile b/usr.bin/ncal/Makefile
index 16690278dfc63..000110112f711 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncal/Makefile,v 1.5 2004/02/05 22:44:25 ru Exp $
 
 PROG=	ncal
 SRCS=	ncal.c
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index f5734b77c8524..7e135279eb0bc 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.16 2004/07/02 22:22:29 ru Exp $
 .\"
 .Dd December 16, 1997
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 4fa3fd4b82f41..17a1572e7a5d9 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.18 2002/10/02 12:31:10 roam Exp $";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/ncplist/Makefile b/usr.bin/ncplist/Makefile
index 8e6d18991a4fe..b7ae2f59b27f1 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 0f37429fe53f9..dd8a5000d1e11 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 e91f2312e4add..1ff338363eb1c 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 8795f29f3ad18..6e08d251e1cdc 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 f44852687c2a9..bc850b3667f0a 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 7bc2f66267adb..0f08b61c3d735 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 c228de79d22e9..55fe4c0171759 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 a47f735e56eec..ad45272008a74 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.23 2004/03/25 09:07:26 bms 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 517325c7a6457..423319e462a83 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 0a8725b186a0d..db1e265a21918 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 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index ea679f81af7a3..3259ca59b854a 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.67 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 984f525dd536f..ddf42856bd2e9 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 c99d27a2e988b..629d341aeda2d 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 b4f294007436d..5c49fc56d74ad 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -38,7 +38,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.20 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 1474ba3750e3a..2bb8599a08876 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.69 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index feb4871d8f42b..cc35ab7230897 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -38,7 +38,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 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/usr.bin/netstat/mcast.c b/usr.bin/netstat/mcast.c
index 2b2a5cd1bb704..ceab444aa662c 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 e81ca2bd38214..3de3ab4ee7692 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 bc06a3d6c30d1..ba0db9e72d2c9 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 e156989155c5b..6566da1ec7635 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 32edfec3e537b..4a471a3438f55 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 2004/05/31 21:46:06 bmilekic Exp $
 .\"
 .Dd March 25, 2004
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index e2b3f291a6e57..0271121f709fc 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.40 2004/05/31 21:46:06 bmilekic Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 585fd7eecae33..e28883d4eecef 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.75 2004/07/28 18:18:47 glebius Exp $");
 
 #include <sys/param.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index d9256115382a3..7fb84ea8ef691 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 a80ad607a4229..ada1855d9738e 100644
--- a/usr.bin/newgrp/Makefile
+++ b/usr.bin/newgrp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newgrp/Makefile,v 1.1 2002/05/28 05:05:28 tjr Exp $
 
 PROG=	newgrp
 DPADD=	${LIBCRYPT} ${LIBUTIL}
diff --git a/usr.bin/newgrp/newgrp.1 b/usr.bin/newgrp/newgrp.1
index 1b3564c58dfc1..9b51df840e728 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.2 2002/05/30 13:57:35 ru Exp $
 .\"
 .Dd May 23, 2002
 .Dt NEWGRP 1
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index 62d552fa05d3a..aa2ff9147312e 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 6fa5f96973346..dd3ae8e612138 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newkey/Makefile,v 1.12 2004/08/06 07:27:06 cperciva 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 d39baa0fff667..a36dc008c6320 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.3 2002/03/22 01:33:18 imp Exp $
  */
 
 #ifdef YP
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 3572df92f7275..9d0b993a71e37 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 09b00e9f47d37..2ae1e90ef57cd 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 12dc639eb30f3..85d9e595350c4 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.6 2002/04/28 12:09:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index e10acd93a7e53..524708c10b431 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.9 2002/04/28 12:09:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile
index ce4c7c6136fbe..b6aa7473a57fc 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 b5f56ff447d45..8795ac28a7f99 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 dda4bbbaa96db..d1ed9c3396af3 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 0d2733a6d10e6..be49265a996b1 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 b55a9fc938eca..d1a0533f24d78 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.24 2002/12/27 12:15:35 schweikh Exp $
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 93f6a98213a6b..3a34098f97022 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.11 2002/09/04 23:29:05 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/nl/Makefile b/usr.bin/nl/Makefile
index 9b1f292dfbee4..f83d4af1ab860 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 be7fbe1697dce..d433e4b80550a 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.13 2004/07/13 02:18:21 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 662ce268aa946..7b914a69249ef 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.9 2004/07/13 02:18:21 tjr Exp $");
 #endif    
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile
index cd635cefa526e..8e6290f0e9676 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 63f0751b4568a..29482dd10f551 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.12 2002/06/28 09:34:46 tjr Exp $
 .\"
 .Dd July 19, 2001
 .Dt NOHUP 1
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 06f22445771d9..c1f4d17b22149 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 244dc4ee10383..d6ccb165b603e 100644
--- a/usr.bin/nslookup/Makefile
+++ b/usr.bin/nslookup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nslookup/Makefile,v 1.3.2.2 2004/09/30 23:36:10 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/nsupdate/Makefile b/usr.bin/nsupdate/Makefile
index ea0128759a5ad..e1b90f97ef340 100644
--- a/usr.bin/nsupdate/Makefile
+++ b/usr.bin/nsupdate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nsupdate/Makefile,v 1.3.2.2 2004/09/30 23:36:10 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index 714cb48240c78..f96d055d34ae7 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 bdaa8266709a1..37835aa2f5cef 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 f2e9595ddba85..9089d2fe40f88 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 38fa24698bf5c..055bdd5fcc1c6 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opieinfo/Makefile,v 1.10 2002/01/03 21:20:25 ache Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index 215c86b4511e6..00fbb7c6d10a5 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 b25b54a09ad30..d7f1ae7c2f5df 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiepasswd/Makefile,v 1.9 2002/01/03 21:20:29 ache Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index 6ca205d32252e..31978c82c8c2c 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 e4287e18cb0e2..bf987d03be978 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 fd5477b3222ba..8c46ee0f6f990 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 e4c509905201b..98b03d7ec8006 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.45 2002/04/15 03:02:57 des Exp $
 
 PROG	 = passwd
 BINOWN	 = root
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 6b0039a2cb0d3..c1cafcd9a6ef3 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.28 2004/07/03 00:24:43 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index d35458c956a1e..487309e79901e 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 c9a8f845a3379..63ae394d1a91b 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.17 2004/07/07 19:57:16 ru Exp $
 .\"
 .Dd June 25, 2004
 .Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 683b12001eb79..ff598b0db9be1 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 b5bea85270aa1..73ab3e915e3b7 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 d9476526db77d..efe2a05281c10 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.3 2002/12/12 17:26:01 ru Exp $
 .\"
 .Dd May 21, 2002
 .Dt PATHCHK 1
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index 2b31099317dab..5e40939b59159 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.4 2002/12/15 00:40:47 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/pkill/Makefile b/usr.bin/pkill/Makefile
index 758d3b0e74e9f..df1cc723e53e9 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.4 2004/03/26 07:44:49 ru Exp $
 
 PROG=	pkill
 WARNS?=	5
diff --git a/usr.bin/pkill/pkill.1 b/usr.bin/pkill/pkill.1
index d0a29f5cfdea6..0a4dcf88424e1 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.8 2004/08/16 04:49:43 gad 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 3051f95b66daa..724c741cb8b43 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.18 2004/07/15 08:10:26 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 277459ee47a79..46257f47932c6 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 da552c03e8e88..d3a999bfb14ad 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 2634cf0c5890e..d1bd5efe6cd9b 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.20 2004/07/03 01:28:20 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt PR 1
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 947404217bdcf..907c6a160ef72 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 a4346c788dccb..d93fe8c422f87 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 bcb5952eb9eed..f6e4b181e4a96 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 7c058780c6ad9..0ad2475476b69 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.18 2003/06/01 06:29:47 tjr Exp $
 .\"
 .Dd May 12, 2003
 .Dt PRINTENV 1
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 8ad23c7454da5..fbda2718a8812 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 c91c4e3f53c1f..f9f885d9d0224 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.4 2002/02/08 22:31:43 markm Exp $
 
 PROG=	printf
 
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index f1a2eebaf2225..0fdc1a6d2c9ac 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.30 2004/07/03 07:07:11 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt PRINTF 1
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 58d2ccab06a12..d5c1cd172b491 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.28 2004/06/05 09:32:17 das Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile
index 666a3baeaa3a5..3c4eba13151cd 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 3c8565011358a..954d1bd3f9060 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.15 2002/12/12 17:26:01 ru Exp $
 .\"
 .Dd August 8, 2002
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 4decd8b5a6523..4b06b003f6522 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.23 2004/08/07 07:05:38 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile
index d5471379fe1ed..b32dcebacc166 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 4420d8efa7582..d42123879b3ce 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 333f4cd768cea..d82050637479a 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.17 2003/02/26 20:27:24 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile
index 27137ffb4d156..6275448f3e0ea 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 68b00bf89c53f..a1e9eb53eff73 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 87c858712ff86..cc0c386a1bb36 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.7 2004/07/16 06:21:40 tjr Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 2cc2e5cdd0e15..7108d63956dbe 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.26 2002/10/16 16:09:05 markm Exp $
 
 PROG=	rlogin
 SRCS=	rlogin.c
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 7c8bd2903c909..ceb7c2de048da 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.25 2004/07/03 00:24:43 ru Exp $
 .\"
 .Dd September 26, 2003
 .Dt RLOGIN 1
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index e4d2e0e74e0a6..1e9efdc1b12f0 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.37 2003/09/28 08:54:56 tjr Exp $");
 
 /*
  * rlogin - remote login
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index d01e863af93fc..7198a304805d1 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 31f4fbf8228f2..a93d8117adcd9 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -36,7 +36,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.8 2002/07/21 12:55:03 charnier 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 bccc858b606b5..f327966176437 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -36,7 +36,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.10 2002/07/21 12:55:03 charnier 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 ad9baaad07fd4..d063cd9ce6f7f 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -36,7 +36,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.9 2002/07/21 12:55:04 charnier 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 022c4f1b7eeb7..fc6b37ec84951 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -37,7 +37,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.23 2004/05/02 07:07:54 smkelly 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 b2c3312017f82..777f203f5ff43 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -36,7 +36,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.10 2002/07/21 12:55:04 charnier 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 4f3547bc5f80c..3bd8438354fd7 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 b960cd681c145..3104bb73d7f5f 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 1cc41f2433a0a..10e0019e334fe 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -36,7 +36,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.8 2002/07/21 12:55:04 charnier 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 1b887b091f537..8202920ad73ba 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 9e9fb8682c62b..cf87d4b520a3e 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -36,7 +36,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.15 2003/01/16 07:27:30 mbr 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 e23e058bc534f..7b5867e7ba667 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -36,7 +36,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.6 2002/07/21 12:55:04 charnier 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 b6f346418b5fc..d563bd9c99ab7 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -36,7 +36,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.8 2002/07/21 12:55:04 charnier 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 73438272a38e2..900c1d995faef 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 058124dd3da01..71a2041b73be5 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.21 2004/07/02 22:22:30 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 e7283a4f53567..426e9d9aa32e6 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 f4c7fc79868c1..940da8c0e97c9 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 a2e662961adac..d7c8025722f61 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 af056a93c4a9f..5e27815af8b5d 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 98cc3d4d16c29..8bd72f9925480 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.12 2004/07/15 10:26:38 tjr Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index fd4644e26bf71..d0a286f4507e1 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.22 2002/10/16 16:10:46 markm Exp $
 
 PROG=	rsh
 SRCS=	rsh.c
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 73bab2597630d..f9e54f515efaf 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.19 2004/07/03 00:24:43 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 63bc661c259ee..1e05aecb2c77b 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.32 2003/09/07 15:30:42 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 6d329774b7111..9059f0e5e99aa 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 76be6fcea5b6a..0fae9658ea622 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 d2d1f85f8d454..0d8b931554470 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.17 2003/10/26 04:57:31 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index defe832aab440..8cd6121f9cbbe 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.16 2004/07/02 22:22:30 ru Exp $
 .\"
 .Dd March 1, 2003
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 32f85aacfe63b..f03bc9959abf0 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.16 2003/03/01 23:09:26 jmallett Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 21d0ce24a7068..b37c8d0b33052 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 f528bb87e4e44..d08b73686bae0 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 87f46608870b0..9d92ffdb10995 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.16 2004/05/19 21:34:52 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 4e448dbd2ca76..0ca9e4fc40b09 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 2de83d4c27110..e08884699791c 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 d5a1c1d86d94f..d6ed9adfd5873 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.13 2003/10/26 04:57:32 peter 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 756a3eb246588..76134bed8457d 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.9 2001/07/10 14:16:17 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index be82ad36d4dcc..50a17d21d6230 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 50ba12e696af6..1d53d1aa789ba 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 1c93b3e48a15e..8c0dae9250694 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 ad706dcdd350a..1c2a383316ed8 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 9d9886f3688cd..a411bd79f0e5c 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 6a45deaa94c7b..0a724b8feefb6 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 cdd18d6d532b4..c3ecc64434e18 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 801e392561b35..8017a6183ad54 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 0df329f89c939..da8b34453dd31 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.26 2004/08/09 15:29:41 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 495fb07a1b301..187ceb77d3aca 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 9d4b5bdb0cfed..dcbe081e622d0 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 b8ace5aea82ec..0f33591fc8c47 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.34 2004/08/09 15:29:41 dds Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index f3b513784a6ea..2a3789221df37 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 918e22c934148..edcfea5ee1e90 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.38 2004/08/09 15:29:41 dds 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 8e8ef029dbdec..222029140096c 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.38 2004/08/09 15:29:41 dds Exp $
 .\"
 .Dd July 17, 2004
 .Dt SED 1
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 9970eb5c3cef5..fcd79990d17e1 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 09adc5e4c69f5..035b0ced7cdfc 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.10 2004/07/03 00:24:44 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile
index 59199098dda60..444408ca3de3e 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 ac99bdeaff67e..38a38321d4c0b 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.17 2002/12/12 17:26:01 ru Exp $
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 703089b1860e5..07b8c6a4502f4 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.15 2004/07/26 15:04:57 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/smbutil/Makefile b/usr.bin/smbutil/Makefile
index 8db8db7555358..f48503690da60 100644
--- a/usr.bin/smbutil/Makefile
+++ b/usr.bin/smbutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/smbutil/Makefile,v 1.1 2001/12/14 11:41:22 sheldonh 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 f2b82bb91ad7e..1d787b7bd86c6 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sockstat/Makefile,v 1.6 2002/07/31 12:32:03 des Exp $
 
 PROG=		sockstat
 WARNS?=		4
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 257e3a32b03fc..45d51ce787937 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.18.8.1 2004/09/07 07:53:38 roam Exp $
 .\"
 .Dd September 7, 2004
 .Dt SOCKSTAT 1
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index acb918241e452..72c7311735357 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.9.4.1 2004/09/07 07:53:38 roam Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile
index d176fdd7d4570..0fbeb420e207c 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 cbeee6f4a3ec8..d43db4a09c4ac 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.14 2004/07/11 15:04:16 tjr Exp $
 .\"
 .Dd July 12, 2004
 .Dt SPLIT 1
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index ca3847c5c965d..c2ad82dfa9785 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 d33f0bfe634ca..c21e96957a6bb 100644
--- a/usr.bin/stat/Makefile
+++ b/usr.bin/stat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/stat/Makefile,v 1.2 2002/08/13 08:23:49 dougb Exp $
 
 PROG=	stat
 MAN=	stat.1
diff --git a/usr.bin/stat/stat.1 b/usr.bin/stat/stat.1
index 31b77123f06ba..4f4a78428867f 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.6 2003/06/02 11:19:23 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt STAT 1
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index b67627e947160..b9eaf9f8ff4b8 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 90b3123dcc599..0fbc5f042bce7 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.39 2004/02/02 18:01:19 ru Exp $
 
 PROG=	su
 
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 53b04929d3f1c..f52ef984083e1 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.33.2.1 2004/10/15 22:31:56 simon Exp $
 .\"
 .Dd October 3, 2004
 .Dt SU 1
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 57122e213db1a..216045d5bfae3 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -51,7 +51,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.75 2004/06/15 20:23:02 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 3cd09f4b50a40..02e9e5a9461df 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 b15286b580c53..50575dd19538b 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 6b4f77ee7cf1f..c0b827030b115 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 56436132fbe4d..d4a75a7291c06 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 8d5ffeeef260d..239dd565da557 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 d37cf2d5ad984..a9ba440fdf570 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 921700846b231..314ffe3a80108 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 84af89ca55f08..2cf4afbafd107 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 1a22bbeb171f3..94752bd73b8ff 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 487a3ba40f7da..3c6b8db6aa9da 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 c02819ffdd6da..640590f0e89e8 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 68c377e476ad7..ad4c546d69eae 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 26c81ce1413a0..f086a53a36d10 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 0702ea140b502..61bd5c258bf09 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 1462ab102147a..a94f69cb84a88 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 a88c5b48c2e64..931e5d2971701 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 b563266be97f3..96bc702cd27e5 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 833a1884889f0..a26e67e6f9c9d 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 1193a3ea77fbd..0344d70c17c29 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.17 2004/05/31 21:46:06 bmilekic 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 5f64e3ec237ff..53bbb4cd01193 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 9fc0feae96d50..cb6d40cc8474e 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 c78f6feac7d76..e7d7e9aae2d22 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 f802219d71fa6..114dcd57306a0 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.21 2003/12/24 08:54:53 silby 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 4b504ed8a9931..08d043f05c89a 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.19 2004/04/14 09:01:56 bde Exp $");
 
 /*
  * Pigs display from Bill Reeves at Lucasfilm
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index eca672654ea9b..3a3c7e45eaa35 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 23add08a66d20..0bea3a0b9c9c3 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.42 2004/07/03 00:24:44 ru Exp $
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index f37a04ceec5c2..96d067293fe31 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 40311d6face27..baeed87441e9f 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 a4a9269edb3ff..b013c6e67cde6 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.59 2003/10/24 21:23:47 phk 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 4b5d40e0d3024..f35ca4d0057af 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 c0c4f4d2736a4..867ab38996a91 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.6 2002/11/26 17:33:36 ru Exp $
 .\"
 .Dd May 20, 2002
 .Dt TABS 1
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index d03a7413d175f..48a610516d4d9 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 9c55635781e46..d8a48993460cd 100644
--- a/usr.bin/tail/Makefile
+++ b/usr.bin/tail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tail/Makefile,v 1.3 2002/07/15 09:53:34 alfred 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 8ad21ecd8abae..b53d143209c34 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.8 2002/03/22 01:42:32 imp Exp $
  */
 
 #define	WR(p, size) do { \
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 883ea9a3a1450..0e6b06d126e60 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.33 2003/08/14 11:02:03 dg 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 6d0ecdb7501e9..918707499c118 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.7 2001/12/12 00:01:16 markm 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 f904ef0bc74de..4407c436be6ce 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.10 2003/06/10 16:49:14 markm 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 d8c45e99fd243..f6992d6e1f96b 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.16 2002/04/13 20:59:48 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 0791e74334ba0..8c75c40d7e7b9 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.11 2004/07/02 22:22:31 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TAIL 1
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 2a3ee1365e74f..c85169d33ac88 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.15 2002/07/14 18:21:07 alfred Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 94795d775bb37..1011a82966f4f 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 68b229c56e0ab..b4be16800824e 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.9 2004/03/21 08:14:39 cperciva 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 0871febe7361b..06c32b0c0dfa7 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 24851e45fab1b..a495aa4709e25 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 f212a209a0157..b54ed3ba769e6 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 b7f8b1325c1b4..8ed013024b92f 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.9 2003/07/04 20:44:25 luigi Exp $");
 
 /*
  * From:
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index ad6b8235eec19..0f23d35e90b71 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 f391b76a5e0bc..ce24553aef84b 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 a6e98e8900db8..4d73e78a5ff04 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 bcbf53580d06f..f9b306d921c96 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 6c40933f7cbb3..b51b9c1afa252 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.7 2003/09/28 09:45:56 tjr 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 e4a0977396710..6936efaa285f3 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 9f428c62be2c0..801d7ad8123d3 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.18 2004/07/03 01:28:21 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt TALK 1
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 8e3f540055bb2..b58839c30a924 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 2a81a53bca9b6..7f3bcf4c9ec9e 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 c7024826841e9..555a2818b2587 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 21f9f2e1aa47f..44fa4b6a9eb17 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/Makefile,v 1.11 2004/08/08 17:20:23 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 e9dc2f9df0cbf..f01b979f80e25 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.1 2004/08/07 03:24:48 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 98b916266f3e2..176b2081cdeaf 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.20.2.1 2004/09/02 04:09:46 kientzle Exp $
 .\"
 .Dd April 13, 2004
 .Dt BSDTAR 1
diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c
index 52d7bf88c0714..720c00796488b 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.52.2.2 2004/09/02 04:09:46 kientzle Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/tar/bsdtar.h b/usr.bin/tar/bsdtar.h
index 387c04036a0f2..2b721cfa737fa 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.20 2004/08/08 05:50:10 kientzle Exp $
  */
 
 #include <archive.h>
diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h
index d4bf09dba9913..e4dfef8af4033 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.10 2004/08/08 04:36:32 kientzle Exp $
  */
 
 /*
diff --git a/usr.bin/tar/configure.ac.in b/usr.bin/tar/configure.ac.in
index 47e67679c0c12..c3bf7a1ac77bd 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.4 2004/08/08 04:36:32 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/fts.c b/usr.bin/tar/fts.c
index 07bf972ca43e0..bcb05a4ebbea8 100644
--- a/usr.bin/tar/fts.c
+++ b/usr.bin/tar/fts.c
@@ -53,7 +53,7 @@
 static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include "bsdtar_platform.h" /* bsdtar: need platform-specific definitions. */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/fts.c,v 1.2 2004/07/24 22:13:44 kientzle Exp $");
 
 #ifdef linux  /* bsdtar: translate certain system calls to Linux names. */
 #define _open open
diff --git a/usr.bin/tar/fts.h b/usr.bin/tar/fts.h
index f47a3444259c9..cbe54a81cad9b 100644
--- a/usr.bin/tar/fts.h
+++ b/usr.bin/tar/fts.h
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tar/fts.h,v 1.1 2004/05/04 17:21:01 kientzle Exp $
  */
 
 #ifndef	_FTS_H_
diff --git a/usr.bin/tar/matching.c b/usr.bin/tar/matching.c
index ff0daee50bed8..fb6573b9706c5 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.7 2004/07/24 22:13:44 kientzle Exp $");
 
 #include <errno.h>
 #include <fnmatch.h>
diff --git a/usr.bin/tar/read.c b/usr.bin/tar/read.c
index 79d8fafb1f462..b96bed293e02f 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.19.2.1 2004/09/02 04:09:46 kientzle Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/tar/util.c b/usr.bin/tar/util.c
index 5071fe9d1b009..cb7ec77b81785 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.11 2004/08/08 05:50:10 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 e1e0a23d5c3fa..1a09217e15256 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.33.2.1 2004/09/02 04:06:00 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/usr.bin/tcopy/Makefile b/usr.bin/tcopy/Makefile
index 1bae0b2294209..2cc2841ef5eef 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 b305def0ea479..ee0ec84726540 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.16 2004/07/02 22:22:32 ru Exp $
 .\"
 .Dd April 17, 1994
 .Dt TCOPY 1
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 540ac06af7380..7b0b77cba5dcd 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 920dd66059170..c546408ed5746 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 4da4347d17755..34e6e746db878 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.6 2001/08/15 09:09:43 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TEE 1
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 123a2de69ab55..a9741998a3d26 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 687f4907091a5..715312b0a694b 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/telnet/Makefile,v 1.26 2004/08/06 07:27:06 cperciva Exp $
 
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/telnet
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index a51afed997450..6a05f0f5b1b16 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 3956aca95ecc8..fdf3d312e3d4e 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 08a7f1355dcd5..1265aa06bcc16 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 49af5979eca15..3055cf4fe6dcd 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.18 2004/07/02 22:22:32 ru Exp $
 .\"
 .Dd October 1, 2003
 .Dt TFTP 1
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index bac262f9ad7d1..f5fc14bf32b02 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 a3673d83c7219..815db4ae97655 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.5 2002/04/11 17:14:22 ume 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 0c3b42ea991a3..d3eafd9ade8d7 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 0aea7045067cb..54c97e7d3aecd 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.23 2004/07/02 22:22:32 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TIME 1
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index ac154165eaa35..d0390b555cbef 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.26 2003/10/17 07:53:30 seanc Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile
index 532431d13cae4..ee82e8bf7fcb0 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 265f86d1ed55a..651f84c309c45 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 fb9af15741198..ca3a3caa972c8 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 6aace387e541d..559aefee8d033 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 2794ba7105a91..62af65a01763b 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 44b8a62e74c8b..10927bf0edd49 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 598dbab86021c..bcac4bd16be52 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 7d11271491331..1f6ebdff2394b 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 ea78cce4aad90..2b04ba7f9e2c1 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 7784f29368358..20b603a9e4922 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 ec9c3d4f9f813..a4f2c41c2e850 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 df850a5364b3b..81e7bd76a014e 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 5a6268e7aef4a..dc8a6632ebbe9 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 c3b87ae98a07e..385b056ae3bac 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 232a79a7136ea..670be9b5b7d52 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 88d88b96fc6e6..e7cb9a4f7494c 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 33601c2fcc98f..fbca29228ee08 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 5bfd65f34d8c4..021674f5feae8 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 272d70a320a00..18107c39c54a9 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 b2d7e86605fea..91a04d5daab5f 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 7396466e446ef..afa72c488c069 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 2385810d98c28..8dc2ccf11a596 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 bfdb17d8ca1a1..dbd8167494608 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 c885ea73a7d62..80729b16573d0 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 1a5d560e9421f..f18fc8f07a89a 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 24676e13ed454..5b780aac9b5c6 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 2003/09/06 18:36:51 hmp 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 d1ea1ae10ca95..c1c48a607965d 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 f240f156434e6..ce655721315fa 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 e8e380e400bb3..7974944024c0d 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 84312884e4001..9493851cefd83 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 4554c5a2dae8e..47f2b3a481502 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 9e2d7f669f2c3..8084125924704 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 08343da66f8ba..ea0f1ad4ed293 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 b41e4372e3747..5fe87e8426ae2 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.68 2004/08/16 07:51:22 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/top/top.local.1 b/usr.bin/top/top.local.1
index 75489b7c8291a..7839ead5fc98e 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 e44f4f2cfdcc3..6ff2e02413964 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 5612e54c3b046..e15f9a6ad09f4 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.11 2001/09/24 17:42:37 obrien Exp $
 .\"
 .Dd April 28, 1995
 .Dt TOUCH 1
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 30d22ed35b995..1d45fc0029419 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 143dc651e1353..fe8a25990b83c 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 6e5f41e4ab3a0..4e7ff276103c6 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.15 2004/07/02 22:22:32 ru Exp $
 .\"
 .Dd June 15, 2002
 .Dt TPUT 1
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index a74e36af8d347..65b37dd49f2f3 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 00bdd8d5bb7aa..f240ad15c6ac6 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 811040c25e761..1edd9d257b8c0 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 9a81e134678fd..38e3d0e275e8b 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 1b4212949b6cf..6e7c21734b18d 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 ab3eabd3e4390..ae62d1dfa898d 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 2fdbdf33438cf..adc9ec3c0c20d 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 f28b243d2ec58..613e7730213f9 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.23 2004/07/09 02:08:07 tjr 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 fff9ef7241dd7..121a387aaefe6 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.29 2004/07/23 06:06:58 tjr Exp $
 .\"
 .Dd July 23, 2004
 .Dt TR 1
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 49325849cd254..a0847585d2586 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.23 2004/07/09 05:15:46 tjr Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile
index 028a6ca75c9fb..eb1ce72f39c8a 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 58d3a0236878c..251d6235dc02a 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 8e2f2554396a2..5d7a1fb45ecab 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 4752c5cb64e25..1325fe2b62aa5 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 9449939ec67d9..01c5b9cb234cb 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.11 2004/07/22 13:38:10 le Exp $
 .\"
 .Dd July 4, 2000
 .Dt TRUNCATE 1
diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c
index 60119356c9f09..5c1246fec2a20 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.8 2004/07/22 13:38:10 le Exp $";
 #endif
 
 #include <sys/stat.h>
diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index 828e71790f42b..4fee4b38ffa13 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/truss/Makefile,v 1.20 2004/03/23 09:04:06 alfred Exp $
 
 WARNS?=	2
 NO_WERROR=	yes
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 5e7fa9910230c..f63b4518fdb78 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 7fb5d2617ed2c..7de10584988a2 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 ee977fbd8c3f8..081f3a8cd4df2 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.9 2004/07/17 19:19:36 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 45da1cdf3dd46..847a66fd82442 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 01703b5b17e29..20e5732f09f8c 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 7ca6d7fa7336d..f30546168fb71 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 8822d9ed32b31..4193e7e747649 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.38 2004/07/17 19:19:36 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 91cd1cf60cb49..8325ea7fe4336 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.19 2004/01/07 14:29:45 dwmalone 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 375e1fa4e884c..137b58b25862e 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 838dfe270fd83..22c5bbd67a1f2 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 6bae74ef03d85..9beb2f213bbee 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.44 2004/08/08 23:29:36 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index ef459d948372a..d2d3adcdda313 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.15 2002/11/26 17:33:36 ru Exp $
 .\"
 .Dd November 23, 1997
 .Dt TRUSS 1
diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h
index 00df4d6a3d675..e5bbcb117adf0 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 f02d0c50bd56c..bbbcfbf5f2ae0 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 a86d7c47b7c23..888354314ab5c 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.10 2002/05/17 05:11:07 jmallett 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 52358e75a14cb..212e4f9dab2d9 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 85965b38b9911..d090e1a445c0e 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 54a349e05f2b0..008328cf86148 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 e1c727e09fe55..0cdfacc824fad 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.14 2004/07/02 22:22:32 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt TSET 1
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index dc4c333e2f90e..8091c8d414e1c 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 9d149183e2f22..b0703f8928017 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 b0d353e4d8f7e..98dce616d753b 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 9af1a344f4a6d..01a43d43a996f 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 259eb4c4be55e..70bf2ff95460f 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.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.bin/tsort/tsort.c,v 1.16 2003/09/04 20:05:46 dds Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile
index 4dcab3343e44a..635e7426f0cbb 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 357432f2f8497..d192d6c1d1d1c 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.7 2002/04/20 12:17:36 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 4710e169c1bff..806fe4b797daa 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 eb46c1d10402f..2a0bb7095a2c3 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 4256417676f90..7e946338f8c42 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.11 2002/04/20 12:17:38 charnier Exp $
 .\"
 .Dd January 18, 2000
 .Dt UAC 1
diff --git a/usr.bin/uac/uac.c b/usr.bin/uac/uac.c
index a2cd1b2b876fa..f7c87e31e0b10 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 9aaf7754de527..967d2c6fcad81 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 771c3dad983a4..712cb8d3e0edd 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.15 2004/08/04 03:02:14 tjr Exp $
 .\"
 .Dd August 4, 2004
 .Dt UL 1
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index c7006a99195af..50a5c8cf20598 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.13 2004/07/30 10:58:06 tjr Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index b9b93ffea9e1b..b26c70e665950 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.16 2004/07/02 18:00:03 ru Exp $
 .\"
 .Dd April 2, 2003
 .Dt UNAME 1
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 81aef452a74eb..3495a13e7f0e8 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 5a25126e0c069..04debf2bce349 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.3 2001/12/11 23:18:25 markm Exp $
 
 PROG=	unexpand
 NOMAN=	noman
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 10b54eeb26d31..5a56b4096f552 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 b31709aa6e62f..8e39926e2ae3d 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 ff703707bb916..4a6e5bb2af84a 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)unifdef.1	8.2 (Berkeley) 4/1/94
 .\"	$dotat: things/unifdef.1,v 1.43 2003/01/20 11:36:12 fanf2 Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/unifdef/unifdef.1,v 1.20 2003/02/24 22:53:24 ru Exp $
 .\"
 .Dd September 24, 2002
 .Dt UNIFDEF 1
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 1a7285347342b..ad7e5f6ec830b 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -50,7 +50,7 @@ __IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.160 2003/07/01 15:21:25 fanf2 Ex
 #endif
 #endif /* not lint */
 #ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/unifdef/unifdef.c,v 1.18 2003/07/01 15:30:43 fanf Exp $");
 #endif
 
 /*
diff --git a/usr.bin/unifdef/unifdefall.sh b/usr.bin/unifdef/unifdefall.sh
index bcba08c9712b4..be3817d66e41e 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 2bcf18e53703a..e3f296663453c 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 4654104fd5fae..9e15b7a4b9df5 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.18 2004/07/02 23:43:05 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index af91ee353665c..14315fc0e5f8b 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.25 2004/07/02 23:43:05 tjr Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index cb783ab95bb23..4ae052bb58f01 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 974cbe9fee3f0..a4106cdf4a000 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 227dd00b49224..1f65bd8f6d7cd 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 13ed413b155a0..cb580a684aac9 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.16 2004/07/02 22:22:33 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 9ca5cda7f8148..879860ce9a71e 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 bd4502bf98234..e859c9b60ab1f 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 27fea4bad2a36..ad73b3643cbde 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 658bfa323f006..21e3485da6254 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 395c9adaefb07..8e33d1f2f05d6 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 2c43b9d35d530..0dd02941bf3d7 100644
--- a/usr.bin/usbhidaction/Makefile
+++ b/usr.bin/usbhidaction/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/usbhidaction/Makefile,v 1.2 2004/02/05 22:44:25 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 4c0f6a36574e9..4b89833b7c4bd 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 e1f67b00b4db0..57c0ce658c6d7 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 3738b506cea25..45d05dc0b53f6 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 a6c3351e5fac7..1ed0a15df37ca 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 69a836ff2b418..16995ce68048b 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.4 2004/01/04 16:34:16 charnier Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index 3d6524bc7a29f..2ce34fbc9cf68 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 c3454c6784d0b..5d3c5c85d5253 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 c90bfbdc149df..476c954be77a8 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 e40f46c1acdfc..ddde788a7e5f9 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.6 2002/05/19 11:17:15 jmallett Exp $
 
 PROG=	uudecode
 WARNS?=	4
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 093af7d2d4748..8066adcf5896f 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 c795753a10bca..c1cf2b5178099 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 ea0778f1b6b8d..420c8eb6087b8 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.26 2003/03/18 14:24:47 fanf Exp $
 .\"
 .Dd January 27, 2002
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index e4d83b446b16e..cb4fbfe087297 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 34879d1f68cbb..9c9a0e895d4f6 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 370241d3ebdd5..ae90a25a49d48 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 5e974755e0c5f..925b767cd89b0 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.5 2003/05/22 13:10:32 ru Exp $
 .\"
 .Dd May 23, 2002
 .Dt UUIDGEN 1
diff --git a/usr.bin/uuidgen/uuidgen.c b/usr.bin/uuidgen/uuidgen.c
index d5dac4bcacfb3..d2aeb70c3b3e2 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 b7d5584536aad..9378c7ed9bf74 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vacation/Makefile,v 1.13 2003/07/07 03:54:04 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/vacation
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 0a5e8dd49658d..7faf15c31ff3c 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.12 2002/02/08 23:07:36 markm Exp $
 
 PROG=	vfontedpr
 SRCS=	regexp.c vfontedpr.c
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index e1c1c5011ff29..6f3cd25d6d733 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 199f3c6c119d7..2e887d72ce4f1 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 7e2d4646b7c16..bcde248eba581 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 d1bb4d98ea158..078c697f1c444 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 d509517338ee7..d5e5cf6380c47 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.13 2004/07/02 22:22:33 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt VGRIND 1
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index bfc2f1bae5593..88a9404f74c9f 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 b32883fbfb595..4206610328acc 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.11 2004/07/03 00:24:44 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt VGRINDEFS 5
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index c3d771174a2a8..848cb93c55610 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 982f71b7be28f..92df647ec9410 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vi/Makefile,v 1.42 2004/02/05 22:44:25 ru Exp $
 #
 
 SRCDIR=		${.CURDIR}/../../contrib/nvi
diff --git a/usr.bin/vi/config.h b/usr.bin/vi/config.h
index a8bee6775f81d..3b104d1991e46 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 72c8bb3daa45e..202186dcd07f3 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 bdd5faf2cf581..1be5b78b46dc1 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 5ae1d1a9eca60..bc7de9bc3676a 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 6ad82c2dc2f4d..70cba4a08a138 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 64ab754360869..7f7fc1774e9fa 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.11 2004/07/02 22:25:40 ru Exp $
 .\"
 .Dd June 25, 2004
 .Dt VIS 1
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 8a76d24f7d355..b6b685b22be2e 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 da2a08da33eea..70dc7318168a0 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 2004/02/04 10:20:43 ru Exp $
 
 PROG=	vmstat
 MAN=	vmstat.8
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 4fe1758034230..28c80a8e2a0c4 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.30 2004/07/02 22:22:33 ru Exp $
 .\"
 .Dd December 10, 2003
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 1bea1c5adbedc..030e737955f44 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.83 2004/06/30 01:34:26 green Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
index 1515a875ae7e0..dc1e89dc53a4b 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 070d055b06167..b7861865c13d0 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 5ac060de4bcc4..01cba3fa84345 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 8e807d161df25..dfe818466a7ed 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 cc11c7110ce31..c7b6c6a509e2d 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 08b2884159555..bd71f3e394db4 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.18 2002/05/09 11:47:40 joe Exp $
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index ebf2a87096d47..afc923267389f 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.57 2003/09/07 16:31:32 charnier Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 131cf2c403cdb..83bfa408da165 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 31312aa94f55e..625c22d55b13a 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 36151253d1c57..7c92e630d4cf1 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 35d6463cdd913..b1278b98feb4d 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/wc.1 b/usr.bin/wc/wc.1
index 0656a5e715ae7..0e426b4a324e7 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.17 2004/07/03 00:24:44 ru Exp $
 .\"
 .Dd June 13, 2002
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 5afeb17cdc32f..a0c497e8d213f 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.20 2004/04/09 11:17:29 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 8114290f968dd..50d07394a17a9 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 027debf94e9b7..1576673fee1aa 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.16 2004/07/02 22:22:34 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index c226715641108..bb2c88a09f294 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.10 2002/09/04 23:29:09 dwmalone Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile
index 74a79635fc788..409b82e959c0c 100644
--- a/usr.bin/whereis/Makefile
+++ b/usr.bin/whereis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whereis/Makefile,v 1.7 2002/12/30 09:48:40 obrien Exp $
 
 PROG=	whereis
 MAN=	whereis.1
diff --git a/usr.bin/whereis/pathnames.h b/usr.bin/whereis/pathnames.h
index 09084aefa83f7..65f4f4c97da05 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 c5378b9f2b91c..bedbcf8ac1fd8 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 84b0e41eb903d..b8c4275c1cf24 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.13 2004/07/15 08:13:56 tjr Exp $");
 
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index fdc121bb98205..2cda86415881f 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 0b00b84f5569d..be1208aaf3f56 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.23 2002/06/21 06:43:48 ru Exp $
 .\"
 .Dd June 21, 2002
 .Dt WHICH 1
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c
index c3cccfcfc0fda..2201b78cf8704 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.5 2002/06/30 06:02:39 tjr Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index ceb4f2ce1f6f0..333d180d5d349 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.16 2004/07/02 22:22:34 ru Exp $
 .\"
 .Dd May 8, 2002
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 624a4c32a957d..f0f3ba1cc0716 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.20 2003/10/26 05:05:48 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile
index e6f82fd8f276c..4d3f45058cce1 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 28efda1590571..786ad79f6e655 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.32 2004/06/14 17:30:46 bms Exp $
 .\"
 .Dd June 14, 2004
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index def4fdf58c1f2..914dbcbf477eb 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.40.2.1 2004/09/06 00:21:42 mbr Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 8d0daa4d8ad8e..ab90044c1763c 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 8b6aba37b7c52..0058b13f83eed 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 cd9a6ebc89071..3763ff7ab001e 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 c4b957c6f84e9..cfc9a14145f89 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 698930ea44512..3447cf561820d 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 049171d3bbd59..14026ec708aaa 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 9633b7386de7c..188fb2d63a75d 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 27a3173bd018b..362dbf7f84dfc 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 82ed1bd7d5e64..1a724f7951de8 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 60b0244d8622f..e3e4aba9708bb 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 63689aa77c365..034ffec57c16f 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 1039f2617464e..8a11cea449d9a 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 6294b936f4987..7b79c07f6197c 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 78cf892743c40..7daf47fb4a577 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 df82b2707aed9..87e7c5f5c1dac 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 6601e5d955008..4f1155aa1a8d8 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 7e759c14d0479..cd3762f27c383 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 85a54899b6251..77c7c213c7fa1 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 6c58e2d547197..c78c72612f524 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 1e072d6323b24..4dcaf07ad66e7 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 a9972a9dfc963..347f868e7a9eb 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 685e320dc9f2a..fec9b6d7e3ceb 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 844ca7609d789..ea272ce881c39 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 70d41dd79ad88..3c282a645461b 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 3d14ae681cc07..5a678e4eaa7a7 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 30a45037c483b..0846fd9c3310b 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 ac9f9d358fb51..1a6fdcbb4705b 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 75552de9d015f..6a3ac96fa9381 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 bd36d41a47138..4f29c7dac2ee6 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 338bdfb981214..de5ebbe8392fd 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 ddc81366c5c8c..61f48e0d805de 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 785d0a343fa4b..d472369232468 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 557c0beb878cb..224762b02f908 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 57b5fa101b8ae..21c27eb1964f8 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 5e3f72c0ac1e3..25c715021d34b 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 53fe7b3efa4a6..a088819612e2f 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 53f177b002cbf..7bac2b157ebe1 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 ba84e849694e5..9f68c6f52a260 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 e1dab1ecaa2f9..a1654de0418b0 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 54229b5ad334c..58a28096c2440 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 17b5961168df7..4cb574f9735f1 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 1be0fa056fd19..ba8fbfd4916cb 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 5cc82e641ff73..b9a1e2eba9cff 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 86e0d5ae4f383..fc90c18a856c8 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 5e023bac263dc..5e8af0adf8f49 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 37e0194b56f08..d393cda7ab8a0 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 2fd6fb97d84b5..4a0c112d9b8d5 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 0e80711a34601..e4075b216b430 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 b55e210b6ba5a..f9c15088c3104 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 8ef317591ac7d..bea3d8de795fc 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 645d2da4b10d4..b8bb4ddcc551d 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 c5f0e451725ce..2d696b706e0b6 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 17035ad0dd189..c1d98a0356d8e 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.15 2004/07/03 00:24:45 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt WINDOW 1
diff --git a/usr.bin/window/ww.h b/usr.bin/window/ww.h
index d843ef3825362..5effa15181f78 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 0a78f0605faed..44657d9f2542d 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 e02d4e5fa75eb..92ad0b1fb46ad 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 2d63b173982d3..ac5b7c0f241a1 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 3ff46ece40598..7f3243e761fc1 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 ea58edcaa47fd..ea8cbd39d147c 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 bc0055eda7f5b..53bd715e50a7b 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 1b8452bf1d1bd..d69350e131aed 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 5b804c2a25175..1be6d354b301f 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 54062c20e45f2..5653077df1b00 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 ba25cb00d3e90..cdacee2ec00f1 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 ef2912b16995e..5fb6fadba4576 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 dbeb12cd1dd9f..2d81b495110ce 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 7988492de4a23..2251214758e1b 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 e8d62ab857b0b..83a4cc7d852ad 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 f60f7fa0a436a..8cc4d74a0afa3 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 9282b87bcf7e2..fd44b239b7c11 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 414cc4bec8a41..9b2761838e427 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 5cdd7779c5a03..3da79a389e8a8 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 c0a14ea8fffb1..6b5079b0e9882 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 4803672920817..cb3490475fe87 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 a9a8c277eece3..7bd5e11901b4c 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 60e8b054d7203..a82f0f4addda3 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 7803557c16b64..3daa5248eb39f 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 50ecf85791613..df9774c8c28d5 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 945dca4e037d1..91c6537c3cf5b 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 5db6caecf4ecc..06b6cf2903873 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 c6f906d8b7520..57546d506a832 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 1c74981aa775a..1cd1fc4d7eddd 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 d26280baf4c06..c28b33f56c32c 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 8d0780e443d4c..5bf7a3f7b6268 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 dbc2960c00c93..4100c8e68baca 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 66ac69c509621..0146a32d6448d 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 bdc2f7092ebc5..b6a9982fe6e20 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 3332273be4594..8d2a7cf5027bf 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 d0641a1e69c7c..d28d9d1dffbe9 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 443d1f31c5a6e..afca0467aeda4 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 477f920a286c0..4e7dfd39622c8 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 ad3db5aa11067..a8075581b1459 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 0be6590aeaff7..d4acb260d44e2 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 94de13cfbc1c4..beb8318aecdb0 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 7fd6507046ccb..9d2c18ec718d0 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 3c1ade7263e02..b948edcc6f691 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 29b3b73fb54bf..be6f97b4f2327 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 82dcb33bd17ff..a86a6def2ae6d 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 e49b85ededbbb..560a4edc60ede 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 a6f9bed489314..6da49beecd93c 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 f133cc643437b..d27b529496897 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.12 2004/07/17 04:15:27 tjr Exp $
 .\"
 .Dd July 17, 2004
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index ca8210c9b28fc..b5390be8eea48 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.17 2002/09/04 23:29:09 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index 16162a1641e90..b3f046f3ffb6e 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 59ae9dce61589..095b10bd901d2 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.6.10.1 2004/10/21 17:05:08 cperciva Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 57f2c031d4433..bb047541974fc 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.32 2004/08/02 03:07:42 tjr 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 c30934a7f2897..b33f6778d9c53 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.55 2004/07/12 04:18:44 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index e6ff88e90a5ba..317fa53df03ce 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.22 2004/03/17 10:52:12 ru Exp $
 
 PROG=		xinstall
 PROGNAME=	install
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index e8033d0ffc978..07fec6b9cebdd 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.29 2004/07/02 22:22:34 ru Exp $
 .\"
 .Dd May 7, 2001
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 441c108413c67..ffbd5c7cd91dc 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.65 2004/03/17 11:06:40 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/usr.bin/xlint/Makefile b/usr.bin/xlint/Makefile
index 68264f4a7f756..ed1a4cf8c98a0 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 0c1b97a5cdfa3..af488a49429fc 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 7ec1038156f70..be01ed4673f48 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 b7f78c5afb267..4c6cbb0d56608 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 8791a2d3b8ed4..98fb2f4470354 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 69c7cda537750..46ade01bfd4f6 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 3e2bfc6c88ebf..05ad337be554a 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 e62549c63c05b..5c0f5c60bee30 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 5c56638d06371..694864a4891cf 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 68ade02e47522..2c8e41c108f49 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 cf4cbddfa98fb..7cdb45430d5ab 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 4594f185dd268..45975e9a0c450 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 80d548264c9b4..2076c1e636ade 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 9c2584640d870..cf6dc8364983b 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 7a13e7e2afd49..c9722b42acc3c 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 0f9ca6800416f..b381000bf2e29 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 ea5a2c57bdcd4..36994942af13f 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 2a65d80a797d3..1226c403da955 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 63c518fbcb35c..42979b00ff1e9 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.4 2002/03/03 15:12:22 markm Exp $
 
 .PATH:	${.CURDIR}/../lint1
 
diff --git a/usr.bin/xlint/lint2/main2.c b/usr.bin/xlint/lint2/main2.c
index a05ddf4cb74b3..974f83916e478 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 ebc4d139e0925..6e3bcd023ed6a 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 46958283074eb..9840adb2f2e63 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 9f1e3c1568ed5..e22093e1b507b 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 b3f9ca93d0d3b..6488ad567a4f3 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 83b44f24f950e..a6305ca1f22c8 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 5dfdfb314a715..9cc4a048d7ceb 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 869c85dacb2e8..50aedee0b6d4f 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.26 2002/11/26 15:32:04 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 3f7d210530dac..3020935a7853b 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 9dc8df612912a..da7906b8366a3 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 85f4140ef5200..e9b2def04a58d 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.9 2003/06/09 19:35:56 charnier Exp $
 .\"
 .Dd December 30, 1993
 .Dt XSTR 1
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 7ea87832251d5..26a858ef2c3f8 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.9 2004/07/15 04:56:41 tjr Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index e8b1024e82bb5..39c15d0c16290 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 24b1610cd13bb..df5538daf263a 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 cb8b083bff411..b8588b2e1a511 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 9940dbc050c50..031250371aef5 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 95d87de2dc1e7..039538bc7bc04 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 cd8d1a1e624ec..4a8d2af6f1aec 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 474de0b19157a..b486b67b70d92 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 1dde4dda5b0b1..6d009b9f41aeb 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 b0b520a7e30dd..6b3bf7c99a38a 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 7c1132d494d91..2e42a6bbec916 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 f765c912f5c8e..7b5530eeb18e8 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 cb7b0bd45cb0d..6121780125590 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 282eaa3499a9e..c7dd4d063db92 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 46d934dd758d5..5cf57acaebbde 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 87466b5ca9ff5..9bbc6ad5e60a1 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.16 2004/07/02 22:22:35 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 a4d9a31bd1e8f..09cb2ef42ef7a 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 e3e98dac215e1..70f6a28469ad5 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 9b4b37712a6c7..03ecf0d8bf2bd 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 aae13b9a09b5b..edaa9b493c76b 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 58ee6907f07f9..d596daa96a1af 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 8a2565200354b..86a528afa77c6 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 b3225f4f4d9a6..94ffaac26cf8f 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.8 2003/10/26 05:28:01 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index 22e62996937e4..4bdbb64f07bed 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 5f4a4cab278df..ebbbbf714c108 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 76d0f59926fa1..4a0e9d7314ea7 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.11 2003/10/26 05:28:01 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index f28f864ab0970..b6839f121b737 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 25eeb08fb0e37..cf6650228f0ee 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 8bfca24ed1325..ce81a0dbb6bd3 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 6c3bd542e8df9..bc08a2c7b71b1 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 44605ac04bd95..70d306342b010 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 ea61762e00ef4..035856f31b0fa 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 576a6c7adc04b..311a0dd9ff165 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 c2b28a7a0d814..4b607e712c171 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 2c6e664ad44f7..8e44f9d035c0b 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 651a8ae43609f..ed0ce9d1c5288 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 ed7b9889dcff0..a6c56f668dd77 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 4e2af23be053f..459b75f1c2c13 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.11 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/output.c b/usr.sbin/IPXrouted/output.c
index 78922c9f38d03..1d00a30dc7588 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 7fae5363cf02b..ae3b2b5b1e758 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 b4e9dcb6ef517..639983deef00a 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 59281b29cac58..6fa5fa94088ff 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 d1f1a28d41929..a35463464908d 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 e1572d1819579..a6024c56e643b 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 2b9ccfac3658b..e9c01e381bd81 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 3f9693f187f3e..e52fc7e5e9dbb 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 fee39217fab76..bd917177ed343 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 215973094a9a6..b5734c961e06c 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 47a576d314714..b88907c99163a 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 c83a9d1b45726..3916ad19e5dd5 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 6e4d9ef5868cb..ade0e88c68682 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.303.2.2 2004/09/30 23:36:10 dougb Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	ac \
diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
index 4347591cf563a..c2890ac8a3841 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 c45a0d69ff42f..e19362df7a0c8 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 969e612dba51a..8b447cb7085ed 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.19 2004/07/02 23:12:39 ru Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 031099a4b9b80..a3d4f4c6cd228 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 7ea45a7df9295..041cb58274575 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 73c7d2926113d..039b2579d8482 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 c1bb8b6b72c51..1fb83ff46f5ad 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 8190bc7c3037f..c282fff4f9709 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 2fce9209e18d8..520aa219e91a4 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 5f862a2c621ed..3f15d4eac1776 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.4 2001/03/26 14:39:17 ru Exp $
 
 PROG=	acpiconf
 MAN=	acpiconf.8
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index b665daf3669fa..834fa7bf80933 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.13.2.1 2004/08/19 19:08:58 njl 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 4500cbefd5b0d..05c3ae7423a93 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.15.2.1 2004/08/19 19:08:58 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index c70322421b887..4918b19d4adb4 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.5 2004/05/25 02:56:55 njl Exp $
 
 PROG=	acpidb
 SRCS+=	acpidb.c
diff --git a/usr.sbin/acpi/acpidb/acpidb.8 b/usr.sbin/acpi/acpidb/acpidb.8
index 4ed97a6a399cf..afede2c8748c8 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 72ad59c6bf57f..67a853b51eacb 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.1 2003/08/07 16:51:50 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index 21a4140defcc1..0e8e519b4aa7a 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 6b1b2a9155d52..8aa0533c92a4c 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.26.2.2 2004/10/08 18:04:08 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c
index 550420c677ea7..9b80527a9e3f5 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 b876a9d40ac91..35905ee3f58df 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.18.2.2 2004/10/08 18:04:08 njl Exp $
 .\"
 .Dd October 4, 2004
 .Dt ACPIDUMP 8
diff --git a/usr.sbin/acpi/acpidump/acpidump.c b/usr.sbin/acpi/acpidump/acpidump.c
index 33610386456bd..46e08a9ce1b35 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.9.2.1 2004/10/08 18:04:08 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h
index ca56398af2a9b..c1e9f00d6b18a 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.17 2004/08/13 22:59:09 marcel Exp $
  */
 
 #ifndef _ACPIDUMP_H_
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index afe0d81cd5ca4..21772c529deef 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 fa80aa7a84ace..a1c8bea7b671b 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 0ca2dae1e97b6..c22cf3a921927 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 a87e6af5a85e1..c4e8762b4047c 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 c00666d2ed153..230c8bbb60266 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 0014e4c107996..eae87ac101187 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.23.2.2 2004/09/24 14:18:16 roam Exp $
 #
 
 # err msg
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index 913cb5ddf135d..1f088af8b0b2a 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 004da08c11d22..7a88bfd0546de 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.8 2004/02/29 09:54:15 schweikh Exp $
 #
 
 ATJOBDIR="/var/at/jobs"
diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile
index 37e42005884c3..0e8f3b8c1c3c7 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 dd65ed3a8029f..802b39f69f417 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.10 2003/04/04 17:49:12 obrien 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 eb30395a46d2d..a45632b87c482 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.23 2004/02/04 11:59:08 ru Exp $
 #
 
 .PATH: ${.CURDIR}/../../../contrib/amd/amd
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 74fc7492f5245..9dc1b4f79f2bd 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 e9c77073b290e..2432e22082244 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 7f96a456dfe43..42cccc7f5765f 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 9ae55adfa7ac9..24616e8ec9a64 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 5b863dd5adcd9..0df0a8e1c5227 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 d3cf00021203f..bf8a3b4e77f74 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.8 2002/04/11 12:30:20 ru 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 11e0b15280f5f..c5ccf5966d6c3 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 0ee7356085159..f21340dd21b39 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 bfdbfc8d9540d..7d00bd388adda 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.8 2003/08/04 21:31:52 ache Exp $
 # mkconf
 # Generate local configuration parameters for amd
 #
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index 8a5de084210b0..c9206219066fd 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.7 2002/05/13 11:24:02 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 ff792bd570dca..40212b1121dd6 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 c6bb1cc37a0bf..fcd012839062f 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 822b951449168..d72234aa19d5f 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 a07e6902fe768..647f511a3d846 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 b0f66cd15a866..8ea6acf9a5a29 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 f9c67970a0809..b1c0668aa4f3e 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.28 2004/03/05 08:42:15 rse Exp $
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 69c38f8d9912c..5868fb1b5f5d8 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.24 2004/07/30 21:42:39 njl Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 043c3c763aeda..0eb4d0f62edcf 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 255f9b6ba7d43..6b55aadb463c3 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.28 2004/07/02 23:12:39 ru Exp $
 .\"
 .\" use.
 .Dd November 1, 1994
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index c34772fd85b44..4ca02b835a217 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.36 2004/06/30 21:00:07 imp Exp $");
 
 #include <sys/file.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 7e81b35dbc77d..5387261a8d450 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 59a56e33827d5..abaf406d1bb78 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 048bf38b0f57b..4ec7b17d723d1 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.19 2004/07/03 18:35:50 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 79da664098620..012e7a40f4321 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.7 2003/06/22 05:57:34 mdodd Exp $";
 #endif /* not lint */
 
 #include <assert.h>
diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h
index 1be5afa4bd198..7c819539ec151 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 0e5cff30036e6..fc203d1f32931 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 597982bd98958..10d99e70580f4 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 1562c55f0620d..28e61dd2348b4 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 a7b4a146927f7..972e3e49c992a 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.1 2004/06/01 07:38:10 fjoe Exp $
 #
 
 PROG=	arlcontrol
diff --git a/usr.sbin/arlcontrol/arlcontrol.8 b/usr.sbin/arlcontrol/arlcontrol.8
index 54698a36d98ea..cc9bbe6a87961 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.10 2004/06/13 18:03:40 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 dd035814fa355..ba05f288f9be2 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.3 2004/04/13 19:25:26 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile
index 6ca9dd204ffd4..bcd40e933487e 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 ec513a86384b0..364929e3ea420 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 e84aa812e523d..8825a7b620bfd 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 50a8be2ceaf49..25af19edbce0a 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.53 2004/08/07 04:19:37 imp Exp $");
 
 /*
  * arp - display, set, and delete arp table entries
diff --git a/usr.sbin/asf/Makefile b/usr.sbin/asf/Makefile
index b8e7e4b7d6402..2d5d6aa123350 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 229d855f4cc2f..fd21382e997cb 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.6 2004/06/13 18:03:40 ru Exp $
 .\"
 .Dd June 8, 2003
 .Os
diff --git a/usr.sbin/asf/asf.c b/usr.sbin/asf/asf.c
index 704fcac88452b..8fae906c5e55e 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 2003/11/04 06:38:37 green Exp $ */
 
 #define MAXLINE 1024
 #include <ctype.h>
diff --git a/usr.sbin/atm/Makefile b/usr.sbin/atm/Makefile
index 2367085d25b6e..448fe059979e4 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 46723c133d512..8b7d65245ace4 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 1ed613cea6c9f..9917f4f18da2c 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 d6d124e4f1b7a..b34d3706ef32f 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 4f8d212ac98b0..be6b11873ec65 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 6a22217f668b6..adf99e21d9970 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 6987a4b28e911..66c10af7d4d2d 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 c1c6cd95c6d86..0165b045c8ada 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 91a235fc844ac..2436c3230673a 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 351b0c19c6466..ca7d4f969bcac 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.6 2002/07/14 14:42:26 charnier Exp $
 .\"
 .\"
 .Dd August 4, 1998
diff --git a/usr.sbin/atm/atmarpd/atmarpd.c b/usr.sbin/atm/atmarpd/atmarpd.c
index 2cb5f70be8ee4..79d55d2685c8c 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 7130c2bae5c1b..bc914830feaf6 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 05a1e244a9cea..9827439ae7fcd 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 f692069646783..d5376d70df0bb 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 20002b2c2b58b..b64a13e62d029 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 b5c34b96c5652..d525ec9172d1f 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 8010290f8470e..32ddde524feac 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 9d88f0a50e302..47eadfe0f8547 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 844ee2c821356..53c6347650a23 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 2e3fbb0b67685..a2844a7b172f3 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 8b76c3edf35a4..7774ab8fceb16 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 63e0e40a5031a..9d50599b7e32d 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 bedea8aefb3fe..bb0e1094ce3b1 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 c2ea657b84dcc..83968e39deb6a 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 eb9d6f5d870d4..cde820820eba3 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 3cfa294867b7d..77b2d9270f362 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 58a5abfbc007c..56f898523aa5c 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 82e49fc4a3611..68b7cd5d68e81 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 fbbddc74e5e33..14ef9b4f6741b 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 7d535fb13aadc..364b50190cfb5 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.6 2004/07/02 23:12:39 ru Exp $
 .\"
 .\"
 .Dd August 21, 1998
diff --git a/usr.sbin/atm/scspd/scspd.c b/usr.sbin/atm/scspd/scspd.c
index 30d7015d90b35..fad9eeb260163 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 c4bcd63d98a78..d0cd672d38207 100644
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/authpf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/authpf/Makefile,v 1.1 2004/02/28 21:50:50 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 23c03f7b6a367..3c6267d01d336 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 c0e05cfa1da6b..a86a900383ad2 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 e3a235e0d82e6..417d5c0748669 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 e601a76b6354a..7de9f536622ae 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.3 2003/10/12 22:04:22 emax Exp $
 
 PROG=		bcmfw
 MAN=		bcmfw.8
diff --git a/usr.sbin/bluetooth/bcmfw/README b/usr.sbin/bluetooth/bcmfw/README
index 0d769d8e90369..e71f5df17000b 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 a0661c220771c..2b59732a500d4 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.5 2004/08/11 00:22:23 emax 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 cd4679de009d7..84fb9ea976cc9 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 daa0f6546aae3..6bc7f943cd145 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.3 2003/10/12 22:04:22 emax Exp $
 
 PROG=		bt3cfw
 MAN=		bt3cfw.8
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
index 74aa6d7381245..8ae950d3421c4 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.5 2003/10/12 22:04:22 emax 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 aadb6b6b67621..3c395e709891d 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 6c9eafb735c15..4b70802e8cd8a 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 95327df3ac2b4..bd0ab05f1bb7f 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.1 2004/04/10 00:18:00 emax 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 21539e324dc1c..1695640ba5abf 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 50ed2fa1a8307..6e7ae724d74b7 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 78b41050221d0..e7ce8078eb9e9 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 e39c8caae548d..f78fcc15071a1 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 c3bab372d48c8..9dc9a43461fc9 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile
+++ b/usr.sbin/bluetooth/bthidd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2004/02/13 21:46:20 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bthidd/Makefile,v 1.1 2004/04/10 00:18:00 emax 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 6be7c7eaab860..6eab36b905a90 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.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #ifndef _BTHID_CONFIG_H_
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.c b/usr.sbin/bluetooth/bthidd/bthidd.c
index 2a0206bc34f98..1861c98137229 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.4 2004/02/26 21:48:44 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.c,v 1.2 2004/08/05 16:32:40 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 e23dc1252f959..2b8ce8edba672 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.1 2004/04/10 00:18:00 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 d9cd015026003..6bb7c8aad0b20 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.4 2004/02/26 21:44:20 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.h,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #ifndef _BTHIDD_H_
diff --git a/usr.sbin/bluetooth/bthidd/client.c b/usr.sbin/bluetooth/bthidd/client.c
index cc611bdd3b7ea..437be2a6c5c4d 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.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/hid.c b/usr.sbin/bluetooth/bthidd/hid.c
index 5a7ab665d0a58..795e2d090027f 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.3 2004/02/26 21:47:35 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/hid.c,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/consio.h>
diff --git a/usr.sbin/bluetooth/bthidd/lexer.l b/usr.sbin/bluetooth/bthidd/lexer.l
index 93ad39434e593..753d98222675d 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.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/bthidd/parser.y b/usr.sbin/bluetooth/bthidd/parser.y
index f4fd560d34fa2..3ca6df3476d52 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.3 2004/02/13 21:46:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/parser.y,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/server.c b/usr.sbin/bluetooth/bthidd/server.c
index d1887db0071c3..e5b4a76dc6245 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.5 2004/02/26 21:43:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/server.c,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/session.c b/usr.sbin/bluetooth/bthidd/session.c
index 523b9185151ea..bd9124776695a 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.1 2004/02/12 22:46:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/session.c,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile b/usr.sbin/bluetooth/hccontrol/Makefile
index 592247e11ad96..25bf2eefe653b 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 65cc53f011232..0bdd9f778c2fb 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.6 2004/08/05 16:32:41 emax 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 0bf55837e804f..3b4317b31483b 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 4424f7678a5df..47d4a66efbbf3 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 38f77eb9ab639..5cf5e74159c19 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 12b685bc22969..1cffbf75486c2 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 7d01f045610d3..eee9a44e5246f 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.8 2004/08/10 00:38:50 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/link_policy.c b/usr.sbin/bluetooth/hccontrol/link_policy.c
index 67b32d5a0d61b..134fcbea193b6 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 863d5162fd448..b627d20231f70 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 5c2aea9456b26..2c67372bc7f48 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 33645765cbd48..0caf81465add0 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 d4c1687f42797..b6e62450e5709 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 e544ed4e61804..e967f140eadc6 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.3.4.1 2004/09/17 03:45:24 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 b7c2322fbc32b..d4744a27e856f 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.4 2003/12/19 18:15:56 emax 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 a1b72a3b34ae6..2ca2bdecf4610 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 127ce04b74d65..67344bf371e00 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 189ca66606c53..6de5f2603dafd 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 acfc8875a0112..8e1292d2e5957 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 2430d7e2982c0..8669afdd0365c 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 385bff257b3ac..d8ab923183d79 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.3.2.1 2004/09/17 03:45:24 emax Exp $
  */
 
 #include <sys/fcntl.h>
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile b/usr.sbin/bluetooth/hcseriald/Makefile
index f21331b1862b7..8298005688440 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.3 2003/10/12 22:04:23 emax Exp $
 
 PROG=		hcseriald
 MAN=		hcseriald.8
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.8 b/usr.sbin/bluetooth/hcseriald/hcseriald.8
index 2bf9c547c8ded..2fda003bb53b0 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.5 2003/10/12 22:04:23 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 42231b45ad40c..e3e0e054ed558 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.4 2003/11/15 15:26:35 harti Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/l2control/Makefile b/usr.sbin/bluetooth/l2control/Makefile
index 847ff4ba97d69..ca573f71b56c7 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 c23106c3db3fe..cf2697faaff03 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 e98f301df8172..a58ae7c2ef4d9 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.5 2003/10/12 22:04:23 emax 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 585021c98433b..a1641a7506bed 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 43d456164be83..354bf0a101676 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 e62d2afe47a48..c8e7fdb33f785 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.3 2003/10/12 22:04:23 emax Exp $
 
 PROG=		l2ping
 MAN=		l2ping.8
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.8 b/usr.sbin/bluetooth/l2ping/l2ping.8
index da2b22ceeb7cb..69e08abdcc34c 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.7 2004/08/04 20:43:57 emax 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 242f86a344f9d..0e893d1610927 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 2004/08/04 20:43:57 emax Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
index adac64eca14ac..73c0bded3d02d 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 bba4016b677bf..95d9d065d4481 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.7 2004/08/05 16:32:41 emax 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 79c48c1fd1bee..0e8b570890150 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 c0ec8d423f746..245c03a675ba4 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 1f75eead81b22..99d9189f9c263 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.4 2004/08/05 16:32:41 emax 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 fca2015c9c029..fd9657b6efd8d 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 4a1ee76f383d8..513c14bfdb1b8 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 dad65635f3a7a..f8e94b762ba6e 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.3 2004/04/09 23:01:42 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/sdpd/Makefile b/usr.sbin/bluetooth/sdpd/Makefile
index 2b8b495424039..c479ca817e65a 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.1 2004/01/25 21:33:59 emax Exp $
 
 PROG=		sdpd
 MAN=		sdpd.8
diff --git a/usr.sbin/bluetooth/sdpd/bgd.c b/usr.sbin/bluetooth/sdpd/bgd.c
index 70dda891072f5..bcdd1b11adb83 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 e7aeb78d679ea..5fe69313ebe4f 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 bcebfc79807fa..abad5671899f7 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 d28a1205be670..5496e5841929d 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 10dafe0b1ed27..2f8195744183c 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 a5612eda64a7c..2b65f340ad40e 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 b03f7e141d230..4db28b61db454 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 8c9ce778cfdd6..6bcfd3e88916c 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 1df3bf0d5887b..7ccaf3becd4c8 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 36359daa98ef6..1b1efe1889373 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 3ba0159de8db6..bf71459533acb 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 0ca42211de115..a78d180a8763b 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 b0f5347018f86..cd8ca2d914754 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 b48bc8dfe4278..5edd5d32bf113 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 4fc25d92b1188..189ae2268e5b9 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 f6f482d55fbb7..d762fbc8c859d 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 52f6c953bd090..683a831c76225 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 3bd46c80ac9c3..5e9011fde72f2 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.2 2004/06/13 18:03:41 ru 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 14b2041cf220b..2d22b089a1389 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 6f8f08860768d..59e06fcfa88ec 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 31a9585a25e1c..79a1e868f1076 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 a1f3ded863396..4388f9fbb4906 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 d6f50950be500..55507e4c84109 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.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ssr.c b/usr.sbin/bluetooth/sdpd/ssr.c
index 2ba6790d0b360..cd1fe067a43ff 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.2 2004/02/25 22:43:43 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sur.c b/usr.sbin/bluetooth/sdpd/sur.c
index 6d7f778aa51af..e30fde7b679ab 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/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index 3f87438a35a5d..78e182b3d343a 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 2003/04/04 17:49:12 obrien Exp $
 
 PROG=	boot0cfg
 MAN=	boot0cfg.8
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index d545608016857..f6f861065c277 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.25 2004/07/07 19:57:16 ru Exp $
 .\"
 .Dd February 21, 1999
 .Dt BOOT0CFG 8
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 21f0ce7276557..7ff76317c7130 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.17.2.1 2004/10/15 15:59:26 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/usr.sbin/boot98cfg/Makefile b/usr.sbin/boot98cfg/Makefile
index e7ffd9dad0aeb..142d10444ee6c 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 2001/07/20 06:20:27 obrien Exp $
 
 PROG=	boot98cfg
 MAN=	boot98cfg.8
diff --git a/usr.sbin/boot98cfg/boot98cfg.8 b/usr.sbin/boot98cfg/boot98cfg.8
index 5a274439a1192..9c0bc9c2c4877 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.10 2004/07/02 23:12:40 ru Exp $
 .\"
 .Dd July 10, 2000
 .Dt BOOT98CFG 8
diff --git a/usr.sbin/boot98cfg/boot98cfg.c b/usr.sbin/boot98cfg/boot98cfg.c
index c4575c8c697c3..1f909998a0746 100644
--- a/usr.sbin/boot98cfg/boot98cfg.c
+++ b/usr.sbin/boot98cfg/boot98cfg.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/usr.sbin/boot98cfg/boot98cfg.c,v 1.5 2004/03/05 13:58:40 nyan Exp $
  */
 
 /*
diff --git a/usr.sbin/bootparamd/Makefile b/usr.sbin/bootparamd/Makefile
index c4e3361ecfabf..ec5f7b51c0fbb 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 1e4d46f113a51..e55d2e469d6d3 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 11c639048a122..21aa7b6539b1d 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.14 2003/10/26 05:51:51 peter Exp $
 
 PROG=	bootparamd
 MAN=	bootparams.5 bootparamd.8
diff --git a/usr.sbin/bootparamd/bootparamd/README b/usr.sbin/bootparamd/bootparamd/README
index 508ee0f63401f..c32819a81f816 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 fabbe3c1f7901..9d90d1f7a17a3 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.14 2002/07/14 14:42:38 charnier 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 159124e008ad4..eb407c5765433 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.11 2003/10/26 05:51:51 peter Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/bootparamd/bootparamd/bootparams.5 b/usr.sbin/bootparamd/bootparamd/bootparams.5
index c7c6785f47e1c..ef575a90b0b9c 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 4468232e63a09..47984d802daf1 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 8db69eab95293..6c1cff2e55fa0 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.11 2001/07/20 06:19:38 obrien Exp $
 
 PROG=	callbootd
 NOMAN=	#true
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index 5ed460857b549..1fc2523d11bdf 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 4fed3e5d0c97d..86ca6f60641ce 100644
--- a/usr.sbin/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/Makefile,v 1.1 2003/11/10 09:22:40 harti Exp $
 
 SUBDIR=	gensnmptree \
 	bsnmpd
diff --git a/usr.sbin/bsnmpd/Makefile.inc b/usr.sbin/bsnmpd/Makefile.inc
index 265f86d1ed55a..d2fca0e3f5a5c 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 49faf87ce256f..9b00a38bf79e7 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.8.2.1 2004/09/26 03:10:17 des Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile b/usr.sbin/bsnmpd/gensnmptree/Makefile
index dc95258ed9bb4..03d78779ff6a3 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.2 2003/11/10 14:04:34 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 32cf99d5edac7..89bd32fb3e031 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 86f0ede0759cd..0c41bf5678982 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 eee03554a3095..657838742a41a 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.5 2004/07/02 23:12:40 ru Exp $
 .\"
 .Dd September 12, 1998
 .Dt BTXLD 8
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index 6fd7f45ea265e..e6fedebf03104 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.8 2004/06/22 17:05:37 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 2790d5a9d168f..0cae7c5ce2b43 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 a4ab1348ae9b2..89160aec1f516 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 6f032737e9277..7d235c8d9f84c 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 44bec39f04c40..271e8b18a9817 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.32 2004/07/16 08:53:25 keramida Exp $
 .\"
 .Dd October 18, 2002
 .Os
diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c
index 500f0705e8407..ca7460e65e16c 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.39 2004/03/05 08:10:19 markm Exp $
  */
 
 #include <unistd.h>
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
index 40addadc52ef4..b968089a77003 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 dcf297d8472c9..8179a3eb63b16 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.39 2003/11/17 14:02:04 eivind Exp $
 .\"
 .Dd May 8, 2002
 .Dt CDCONTROL 1
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index edebd65056e9f..10f4578894371 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 1c52f4680f83b..683d4f35ba1be 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 e7a16060ca9de..b1e2eb9e4f23f 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.12 2004/01/25 11:39:42 des Exp $
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index f448dae500d6f..cbadcc0526711 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.8 2003/06/06 07:10:39 roam Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 63c5a22f05daf..4d0bb5dc2a3e7 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 f085bff464842..b72554521e2c5 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.16 2004/08/07 04:19:37 imp Exp $
 .\"
 .Dd April 25, 2003
 .Dt CHGRP 1
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index d8abeb4d8b90f..fcd669c918fed 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.23 2004/08/07 04:19:37 imp Exp $
 .\"
 .Dd April 25, 2003
 .Dt CHOWN 8
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index 0918265840e54..4a180b53cd2ad 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 d28de6668e262..681cde1defbb0 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 d847175b32c70..26d55af05922c 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 f33db7a245882..f8b8e41202603 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 23430a8bb1af2..5ee9b32ef9d2d 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 f784a07a5210a..53c9431cc0200 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.8 2004/07/02 23:12:40 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 92bcd0d81a43e..56b2776a903ac 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 6f6ecce21efad..5e4c4dde66c70 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 85345449301fc..7abeb005fc311 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.41 2004/08/07 04:19:37 imp Exp $
 .\"
 .Dd July 4, 2001
 .Dt CONFIG 8
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 691aa3ab7e7b8..b35ae24f7f12e 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.54 2004/08/07 04:19:37 imp Exp $
  */
 
 /*
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index d16982a9617de..8fd87abdd2abe 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.63 2004/05/09 22:29:00 cognet Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index 4e6ccb972ec8e..92d30820722ed 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.32 2004/05/09 22:29:00 cognet Exp $
  */
 #define	CONFIGVERS	500013
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index d9e70ba02d208..ed382afbd86d2 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.37 2004/08/07 04:19:37 imp Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index fce7fc71d15ac..fabea3c839a9b 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.60 2004/08/07 04:19:37 imp Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 2df6a92d8c84d..f48310c17f779 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.29 2004/08/07 04:19:37 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index a95bee22a7e80..4470e6943ba2b 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.80 2004/08/07 04:19:37 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index 3e2dcf71b3ebc..89db272ee044b 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 62f853cd26732..13df35704fd81 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 d7844f561e25d..8fa945edd4a39 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.3 2001/07/20 06:19:42 obrien Exp $
 
 .if exists(${.OBJDIR}/../lib)
 LIBCRON= ${.OBJDIR}/../lib/libcron.a
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index d578da72daa52..dfe6ac7cf4314 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 905c3aaf3bd94..956920f47773a 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 6d77da27580d5..5e7402822ea68 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 31b579f6c714c..b4a90a54262ee 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.22 2004/07/02 23:12:40 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 17c68949269aa..5061b87059194 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 f7b2b7ac48773..1d29821cdb119 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 9ebf75d83999a..e88bcb4e546c9 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 592ca50ebfc60..9299b350debf4 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 6d1b1af6e4748..3b9360d7cd603 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 ba91bfdc61f9b..0af56984c1e5c 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 806676da44290..272bf6a26418c 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 16fd61723a867..7d43eed6b6b54 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 96a4bd6c8b8a1..8163417edf93e 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.12 2001/07/20 06:19:40 obrien Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index afc50ea77b920..f6000c63dd6d0 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.14 2004/06/04 19:23:12 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 0d9f9e7f89eae..3f37adab8799f 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.25 2004/07/02 23:12:40 ru Exp $
 .\"
 .Dd January 24, 1994
 .Dt CRONTAB 5
diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c
index a347a9f69158e..1d1df598ff098 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.19 2002/10/01 22:59:11 dd 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 f30df7d197508..1d679c98bebe6 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 821d1f3a3af2c..76e1b6f081e00 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 7f4c9974da64a..fd49df3cc2850 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 3549e94d575a5..461fa420a7854 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 8df1301c689d3..de40c702e818a 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 eaced9e65d94e..2a5ccd667995f 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 ed14dfc32f7e4..45544e3cf942b 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.6 2002/05/13 11:24:02 ru Exp $
 
 LIB=	cron
 INTERNALLIB= YES
diff --git a/usr.sbin/cron/lib/compat.c b/usr.sbin/cron/lib/compat.c
index 96860128882f0..6bf92fd3d39ff 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 2b886eea15f92..7c462b600d7c9 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.15 2001/08/16 14:23:59 mikeh 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 fd358176b1249..5abeddea42a6a 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 89f15e409ee26..85f3a2546b1dd 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.11 2002/08/04 04:32:27 tjr Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the rest of the log]
diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile
index 6bf600fce66b8..27da39fc6d988 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 f8ffe675db6ef..0b3b5431dcfa4 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 8d0a78b190276..e170394604eca 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 2cf957670113e..49bbe612ed8aa 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 4333866ae1c5c..60a55b55db9ed 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 7984d543921e5..8f3f329e88bbd 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.34 2004/08/09 19:18:19 harti Exp $
  */
 /*
  * ========================================================================
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile
index 945ed5b2f1e4f..810ca5a3d67b8 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 ef9947dae56c5..f5516751e595e 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 f50d3e5075c43..c9c1d1d1a6f62 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 a608c23316664..d78fad7ad18c1 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 5558b1c8088e5..f10a4ba295d6b 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 4200bc3d40225..50eb27d47bc1f 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 5ff5263e55933..54e5a945d2cd7 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.5 2001/07/20 06:19:43 obrien Exp $
 
 CRUNCHED=	fixit
 
diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf
index 1fb93856c7f15..d9c4853acf679 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 3284e868c51b1..f86366bc99b8b 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 f8590ae5f712e..eb2399942dad0 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 630aab0940dd9..a1e600ce8dbca 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 c6c2c5aebdff1..49b7f433b8163 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 94c779afcf85f..2fdf4b734678f 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 c0cf79a64d926..853eeabecd9ef 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 f8ee9d7dcec28..4bd668edc3029 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.27 2004/07/02 23:12:40 ru Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index 10b0304df3562..d20cdc30f1051 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.16 2004/07/02 23:12:40 ru Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index 0ea4895ca4017..ce4bf8ca724d8 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 b733539bbd977..3c8138cf0afea 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 e3ec464030e2a..90d734879ca77 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 32166d311f122..d91a729008994 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 026a3204a44a0..f0de3c1c61045 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 a0b857ab5dc0f..9bc94faf62bac 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 34c6d87c1d53c..2f0d4a51a9752 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 ee3a69c5fbca9..87f9e87dbeecc 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 66389431d7e35..02bd536b74e6f 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 f12ecea39760e..ed53753e8a37f 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.3 2001/07/20 06:19:43 obrien 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 783fd3f4a1a62..bb635b70b5d6a 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 e2052b9228c76..b42349dab1ba4 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 ed3272960927d..3135a8c6ac730 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.29 2004/07/02 23:12:41 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 a46a58aa87348..9ef5b948ff818 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 56d3dc68d5f7d..b755b5d9fb2fb 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 c631b6712ccbd..ed71efb217f85 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 86c1247b6487d..7ba029607b68d 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 c2d0789bef1de..a0fa9e5b2c21e 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.4 2001/07/20 06:19:44 obrien 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 a0dc03c8f59d4..8ca090d10e813 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 6bf5aebce90ed..edb4edce48998 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.6 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	mkctm
 NOMAN=	1
diff --git a/usr.sbin/ctm/mkCTM/dequeue b/usr.sbin/ctm/mkCTM/dequeue
index 697ec0b5be850..e24dd827c1287 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 02b154427e9a2..1bad689b98267 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 d2c73e20809a2..2693a69953183 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 34803934d6234..e3ace45c9b4ef 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 a1048fd787243..1030377c5ccdc 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.5 2004/07/07 19:57:16 ru Exp $
 .\"
 .Dd August 30, 2001
 .Dt DAEMON 8
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index b30a7f40e0b95..223ad4856d890 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 9993eced51321..635d9d95ec7b7 100644
--- a/usr.sbin/dconschat/Makefile
+++ b/usr.sbin/dconschat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dconschat/Makefile,v 1.1 2003/10/24 15:44:10 simokawa Exp $
 
 PROG=	dconschat
 SRCS=	dconschat.c
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index f560740d58c84..e469f2938d475 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.5 2004/06/13 18:03:42 ru Exp $
 .\"
 .\"
 .Dd February 11, 2003
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c
index d343811c6be14..e1f3ee5c4ca5f 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.6 2004/05/26 22:59:54 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile
index 52e4d6d279e29..ffe9f1b413726 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 70976db164417..6db5278fd58ee 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 e1cb4bfd99039..f75f46e3ac65c 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 029dfee11e535..5d314247021d8 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 cc99fd27f3907..aab5468d0bffd 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.6 2002/07/14 14:42:56 charnier Exp $
 .Dd June 20, 2001
 .Dt DIGICTL 8
 .Os
diff --git a/usr.sbin/digictl/digictl.c b/usr.sbin/digictl/digictl.c
index 0aa5f68f2578c..02b8ab7be59d6 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 5ffa27f6f0d83..d7fcec20d295e 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 a89c25da03f82..370911ee2a784 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.4 2004/03/30 07:37:04 ru Exp $
 .\"
 .Dd April 9, 2003
 .Dt DISKINFO 8
diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c
index 5203a7b0b12e8..f1805c7da978a 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.6 2004/05/25 12:11:13 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile
index 3ac90058106de..74afb567c849e 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.2.1 2004/09/26 03:10:17 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 7c4ca65a78cc0..9611cee3780e6 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.2.1 2004/09/26 03:10:18 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 b141bfdc68b54..606393dac4af7 100644
--- a/usr.sbin/editmap/Makefile
+++ b/usr.sbin/editmap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/editmap/Makefile,v 1.2 2003/07/07 03:54:04 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/editmap
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index e5a3b12559aa9..fdac97098acb7 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 857a57fc853f4..ed9a79a7f11ec 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.22 2004/08/07 04:27:50 imp Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index c73e7de061258..f75efd72653d2 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 53bfbfefeb96d..98b5cd6d8ef76 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 fa5f411d44281..7c95129bab3c9 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 c5da65819e90a..d7a3c3dae4571 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.4 2004/08/15 20:17:29 marius Exp $
 .\"
 .Dd August 15, 2004
 .Dt EEPROM 8 sparc64
diff --git a/usr.sbin/eeprom/eeprom.c b/usr.sbin/eeprom/eeprom.c
index ecd9267a03374..c47855b1915a1 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 8bf51ea598031..c5591eff15a94 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 5bc66567e31c3..1ef25c583e261 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 69e362204b93b..dc9fdc597b518 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 d41198cb7a634..523c18639e222 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.11 2002/07/14 14:43:01 charnier Exp $
 .\"
 .Dd July 26, 1999
 .Dt ELF2EXE 8 Alpha
diff --git a/usr.sbin/elf2exe/elf2exe.c b/usr.sbin/elf2exe/elf2exe.c
index d0959eb1400c0..e6f4238a6e974 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 ae349752d6899..49af4b1f0ef81 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 c51fa6d922fed..ca7203bb2e4f8 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 0c65d7b29bce7..f18941ee3d0dd 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 5eb1945d3b945..46cf7e25b73a2 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 32dcbd099df55..a1530971fee5b 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.23 2003/05/14 20:31:06 rwatson 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 103fcd345a92d..7f82daf6af19c 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 e1898ed333a45..f4267113b08bb 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 6628bf63dcbcc..b521d4bfa49f7 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 e50d7b57ef420..e7ac72dbacdb5 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.18 2004/06/04 19:24:35 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt FAITHD 8
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index 3df90a5953703..8858921fb5aa8 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 f4224321ddd0b..58dce6a076574 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 6ceb24dd95269..0f6a3979720cf 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.10 2003/11/14 17:34:08 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/prefix.c b/usr.sbin/faithd/prefix.c
index 138c948927f1c..57678a3abfc01 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 2a2963982ca9c..87e5e38950e52 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 714df9a159c28..ca36e69ea3374 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 682f540db98ac..0ff35630287e2 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 807e4a516c990..33f5d7531edf2 100644
--- a/usr.sbin/fdcontrol/Makefile
+++ b/usr.sbin/fdcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdcontrol/Makefile,v 1.10 2004/03/28 13:42:27 nyan Exp $
 
 .PATH: ${.CURDIR}/../fdread
 
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index 286cb8be4e06c..bbccc2833e829 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 ff0f90bf36e8c..502cb3cccc13f 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.11.2.1 2004/09/18 16:41:29 scottl Exp $");
 
 #include <sys/fdcio.h>
 #include <sys/file.h>
diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile
index 40ca9a707bcf6..d949448ac2a24 100644
--- a/usr.sbin/fdformat/Makefile
+++ b/usr.sbin/fdformat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdformat/Makefile,v 1.12 2004/03/28 13:42:27 nyan Exp $
 
 .PATH: ${.CURDIR}/../fdread
 
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 92dae57887adb..22fa577fbff34 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.28 2002/01/10 17:04:10 ru Exp $
 .\"
 .Dd December 25, 2001
 .Os
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 8e29e40fc8571..c9b8ab61d4249 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.21.2.1 2004/09/18 17:40:51 scottl Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/fdread/Makefile b/usr.sbin/fdread/Makefile
index e99c6205c4c35..4b62547d13b27 100644
--- a/usr.sbin/fdread/Makefile
+++ b/usr.sbin/fdread/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdread/Makefile,v 1.4 2004/03/28 13:42:27 nyan Exp $
 
 PROG=	fdread
 SRCS=	fdread.c fdutil.c
diff --git a/usr.sbin/fdread/fdread.1 b/usr.sbin/fdread/fdread.1
index 090a91dfbd2b8..5cfa80d3368a1 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.6 2004/07/02 23:12:41 ru Exp $
 .\"
 .\"
 .Dd May 14, 2001
diff --git a/usr.sbin/fdread/fdread.c b/usr.sbin/fdread/fdread.c
index 85336c272cfda..edd3918406eae 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.5 2001/07/02 21:21:58 joerg Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/fdread/fdutil.c b/usr.sbin/fdread/fdutil.c
index 0b6c38f3170eb..228b926a1b26f 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.5.2.1 2004/09/18 17:40:51 scottl Exp $
  */
 
 #include <dev/ic/nec765.h>
diff --git a/usr.sbin/fdread/fdutil.h b/usr.sbin/fdread/fdutil.h
index a093228508979..b7cb79a8396f9 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 b97bdd4448213..686e61fa6faa4 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.10 2002/03/25 14:12:28 phk Exp $
 
 PROG=	fdwrite
 
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index cb80dd6af6395..3c848a60df966 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.23 2004/07/02 23:12:41 ru Exp $
 .\"
 .\"
 .Dd September 16, 1993
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index b3ffb6ea6a66a..38c8ea278471f 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.14 2004/05/30 08:59:09 stefanf Exp $
  *
  */
 
diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile
index 54c24c1f4481d..43f98a5cfaad7 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 b57e6964080b0..1d4859e62e3df 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.12 2004/06/04 19:23:39 ru Exp $
 .\"
 .Dd December 30, 2002
 .Dt FWCONTROL 8
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index c2507232fc219..a3f906a885817 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.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/fwcontrol.c,v 1.19 2004/05/26 22:59:55 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c
index 43f5a98ff80e3..d08f5703ca457 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 4e532e62a54c4..03ebc505a119a 100644
--- a/usr.sbin/getfmac/Makefile
+++ b/usr.sbin/getfmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/getfmac/Makefile,v 1.2 2002/12/01 23:10:28 rwatson Exp $
 
 PROG=   getfmac
 MAN=	getfmac.8
diff --git a/usr.sbin/getfmac/getfmac.8 b/usr.sbin/getfmac/getfmac.8
index f8ebb314c3dbd..5f933afdcb572 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 351f43ece84db..10f22d336e92f 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.2 2004/01/22 07:23:35 grehan Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/getpmac/Makefile b/usr.sbin/getpmac/Makefile
index 962a3e77e3885..975e608e6e0f5 100644
--- a/usr.sbin/getpmac/Makefile
+++ b/usr.sbin/getpmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/getpmac/Makefile,v 1.3 2003/01/15 01:43:09 chris Exp $
 
 PROG=   getpmac
 MAN=	getpmac.8
diff --git a/usr.sbin/getpmac/getpmac.8 b/usr.sbin/getpmac/getpmac.8
index 307c9628f8900..0283c2bbaf913 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 ee289e8028d4b..8ca3fdb158b49 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.2 2004/01/22 07:23:36 grehan Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile
index 8cde0d7e28005..d77473eae22c2 100644
--- a/usr.sbin/gstat/Makefile
+++ b/usr.sbin/gstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/gstat/Makefile,v 1.5 2003/04/28 11:54:01 tjr Exp $
 
 PROG=	gstat
 MAN=	gstat.8
diff --git a/usr.sbin/gstat/gstat.8 b/usr.sbin/gstat/gstat.8
index 5d482663800e1..7a6efd58d5218 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.4 2004/06/04 19:23:12 ru Exp $
 .\"
 .Dd March 3, 2003
 .Dt GSTAT 8
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c
index c92f70ea28e27..436927b150e70 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.10 2004/06/04 19:29:09 ru Exp $
  */
 
 
diff --git a/usr.sbin/i4b/Makefile b/usr.sbin/i4b/Makefile
index 01f76421a1fa9..8aeecf77c3055 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 11954191e2eae..ee19662287a43 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 74a9df7cde9db..234a291d6ab8b 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 53f673af6e9c7..f1cf0e90ab503 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 16c68e62e0227..3b8763204c3d7 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 f4e0c07c5763b..22c95db7af3e8 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 f24d6e8d568b5..4572a7f8c17b7 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 c0f30235e1c16..6ff22c40e5acd 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.11 2004/07/02 23:12:42 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 f8087c0469ed7..d9cacbdd10472 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 ce6c51c464e64..2bb3947d32342 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 a775fc9f2803e..859622f88d963 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 a4b05f171bc85..e63c28ef26881 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 16a60c8fb5c68..254b23e63d51f 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 19e7af705649f..d2e5bd8bb097e 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 5ccbd33c1b50b..b1bc74c5c8235 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 0c1254fac56e9..35280e99d03b1 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 e555fa8a9e2d5..cc0b30cb423e1 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 5bf9582cb3948..694e41958c9c4 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 42c01f1794269..21ca43cdd86fb 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.21 2002/07/14 14:43:13 charnier 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 b2db667db7424..546a8e279a955 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 e4a0ffc2d97c9..6e403fbe27398 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 b4542e07591b2..d043aa3aa35a3 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 1c4fd633782ea..c6127a9c594e5 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.34 2004/07/02 23:12:42 ru 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 7876f13c86a8f..8002aaca023ee 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 74e1e6321fc3d..02557f79538ba 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 45952eb251b8b..994c658b78a80 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 2687e480f934a..8ba3f2beb207d 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 44f9c6d9ca413..2e7ab0651bc77 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 99aa089846be7..bf9262682f422 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 f5460438d89ab..f196c28d61694 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 29aaef41789f7..8c21a0e7450fc 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 65047472abd5f..b77423715fe59 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 6427500f90754..8830762524dd4 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 988a4fb7c42bc..381885ad4ac5d 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 337c215b97022..fe76690effdbb 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 34c0c430ab110..d0c90a5f4ae64 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 5a31de9553659..ab80369241d1c 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 0a9f24ca23982..faede48a28236 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 0620b3b4b74f2..52866adaa5346 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 9dbd971b83cb3..83f5f104e93c2 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 83bab000165b6..2827ecac26b78 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 c4502a8daf2b4..50dc338de9f29 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 f4cfe10e25209..ef1bb80fbd28a 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 3027e2dd84b79..f5c353776797c 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.16 2004/07/02 23:12:43 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 c08b628e9a451..e1b0cc988115a 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 1e5398680188d..49ebd2df20c1a 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 12a7633195655..152104218e1c4 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 6fcedd24439d7..23fa645992a00 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 76afab109d479..997a3e0b9a23b 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 610a9609c179d..ac3d0da8513fe 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 2c1c7f403e5b6..d30cbc8f9573e 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 ed241c16afb44..1cf2ca486c0d7 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 1e7eec15b68d1..55e6356455f2d 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 1fb1b70f5cbca..5f79de98134df 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.17 2004/07/02 23:12:44 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 1a0a1e89624b6..c112376ed8d2b 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 4862c4835e3af..a1535398e92e2 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 ec6ec4d04ae15..0644d68687067 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 3527e8cef36da..662046d98f486 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 2dc88d6afc2e7..c7dbc933ea09f 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 18da037afe902..59639ea244585 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 1dff9a16f3f98..6cd987e3ddb2b 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 34719c7272699..8cc0c07604404 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 5ba4782ccd3c9..214907e4cc24b 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 6b8466acae92b..db7f3ea810ba0 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 e3aff090b1966..749143aab5aeb 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 0f4dae712a155..8a07e24d4e1cb 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 813d5bd790959..a82fdc389406d 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 9b5fd694c69bc..a95372f3bd1ef 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 53e6637d51550..bc1662871721d 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 bf05b4237cd2d..dbddaf00b8f63 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 10a171e50dbbe..849189241b701 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.17 2004/07/02 23:12:44 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 6bea966627034..a08e6cd7304e9 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 41b771e9616e1..bd841fafcdfcc 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 b73c4bebc3208..a9ccebfff2303 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.16 2004/07/02 23:12:44 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 3d75663923645..bf8c52d1ce358 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 88b491a8c8c9f..8081a042c9d3b 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 e55d2e34e4e29..10026e9de6266 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.16 2004/07/02 23:12:44 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 2d80e2ed3ebb5..94b1d269cfd81 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 db2bc7177a4a7..4c27aaf33bc05 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 eae0919b299b4..107543402a7a2 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 21a1cdb830b35..48ed5f02512cf 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 92ae2e44c092a..d73f07486dcb8 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.20 2004/07/02 23:12:44 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 b319d7452e34b..062e3a06a54f9 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 67f50deedc857..23ce02b28ddf5 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 57eaf32dc955d..5fd6dd1b7cfc6 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 ea21770ca3b7a..4413d5513d74f 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 e8c14dc67110c..b3df045dead3e 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 d69453eb9f914..e8d88cade1ec6 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 9f82283d39d97..be32b09ef03f2 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 0a0099d3edce3..ce47506caa09e 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 563de3a6a28df..a85a1809cce32 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 2ba1ca59ed5b4..07af98e075c13 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 81fa415f9df24..acb098e06cfe9 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 8967a6a9b037c..b976bca0a6961 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 561e5fe46fd57..67ef6ac0a6ebd 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 f2e031a368bb2..2e3d99f327a85 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 cca62c060536d..18e45fac370dd 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.2 2001/05/25 09:54:38 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 20b42e83edbb1..3beec85592414 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 0322088e09eb4..5640078d28bd5 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 6bbc1faea49b9..26e046e8d0502 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 0cc66f801da3c..c4501f2f9df54 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.15 2002/11/27 15:24:11 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 4eec2b36f029a..a5da5f5f11f39 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.12 2002/11/27 15:24:11 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 3bdfd6e086138..99be3d6be3161 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.12 2002/11/27 15:24:11 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 aaa6044b03494..b38c12b7537f9 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 dcbb05a220a28..7a1eb6ac1d1d3 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.15 2002/12/27 12:15:37 schweikh 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 cbd6a7f44caeb..91583a843ae0b 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 93e5cdfeb7595..db31a26b93ecf 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.3 2002/07/28 18:21:48 hm 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 aa67b4afad029..deea626fb3735 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.7 2002/11/27 15:24:11 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 474dff85818a8..1746276d5268f 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.4 2002/11/27 15:24:11 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 45cf413b0a25f..7d9bde1021520 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.7 2002/11/27 15:24:11 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 73c4f8392ba66..c009a7e8c62f0 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.10 2002/12/27 12:15:37 schweikh 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 01a0148fc0938..9e61979f25c9b 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.19 2002/11/27 15:24:11 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 82544b33142a3..607759932a788 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.4 2004/07/02 23:12:45 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 8f6674a313eb5..555832ebb8343 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.8 2002/11/27 15:24:11 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 4d6cc888fc8a8..8cb9f083418ea 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.7 2003/04/04 17:49:14 obrien Exp $
 
 PROG=	ifmcstat
 MAN=	ifmcstat.8
diff --git a/usr.sbin/ifmcstat/ifmcstat.8 b/usr.sbin/ifmcstat/ifmcstat.8
index cc2a92ea31c53..82d9ff3234040 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.5 2002/07/14 14:43:33 charnier Exp $
 .\"
 .Dd May 21, 1998
 .Dt IFMCSTAT 8
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 21739995f1493..51994bfd4a64d 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.11 2004/05/28 17:44:11 stefanf Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index afe4c51135808..892fb8ba3279f 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 96eeb3357fa48..ffae2d5cac997 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 e44a4041d60e8..d3c17e8c1ca90 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.80 2004/08/07 04:27:50 imp Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 0436f8d675b3d..80ac917ddfc3c 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.127 2004/08/07 04:27:50 imp Exp $");
 
 /*
  * Inetd - Internet super-server
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index 8c05ed9456d99..601a9e08ea7c8 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 d4fd81d12faa6..28e3759941f6b 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 558b09bbd6cca..bb35c2dd1efad 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 b7787133c0f7e..f122448665f46 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.24 2002/12/27 12:15:37 schweikh 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 724756ebe32e1..a3ceeffa1a8f6 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 cd2510eb0e19a..2822bc6176de5 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 018743b95051f..8534b8ee1c449 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.2 2004/06/13 18:03:42 ru Exp $
 .\"
 .Dd September 25, 2001
 .Dt IP6ADDRCTL 8
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c
index 12802b468d6b9..e32b68e0d81a7 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 a2b3759de5f77..4c1cab8c2967c 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/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index fa34970b30f0a..0c7e461a60cfe 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipftest/Makefile,v 1.13 2003/06/06 11:30:49 guido Exp $
 
 MAINTAINER=	darrenr@freebsd.org
 
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index f1b7036b4758c..15ca2789ca4ce 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipresend/Makefile,v 1.11 2003/06/06 11:30:50 guido Exp $
 
 MAINTAINER=	darrenr@freebsd.org
 
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index 8ba53cc3de2a8..7c08c7fc19452 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipsend/Makefile,v 1.15 2003/06/06 11:30:50 guido Exp $
 
 MAINTAINER=	darrenr@freebsd.org
 
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index eb61d2d7e22b6..1c384247e4e98 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/iptest/Makefile,v 1.11 2003/06/06 11:30:50 guido Exp $
 
 MAINTAINER=	darrenr@freebsd.org
 
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 71819285ddf84..b635032fe2268 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jail/Makefile,v 1.9 2003/03/27 12:16:58 maxim Exp $
 
 PROG=	jail
 MAN=	jail.8
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 51eb5f60e9f74..646f55919b160 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.58 2004/08/15 08:21:50 maxim Exp $
 .\"
 .Dd April 8, 2003
 .Dt JAIL 8
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 0f379a7f58b91..13bff395d7300 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.17 2004/08/15 08:21:50 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/jail.h>
diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile
index 87e99262eef9b..97cbc785dbd28 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 a5749c1f3f231..e5632556ebbd3 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 089a896d5c16c..eb28bd8e19b1e 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 3968946ce6429..d0b499b7dde9f 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 4dc68c77ad286..71aa152348c2a 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 0ad36d11f218a..7f3c7934b02f1 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 2003/04/22 13:24:56 mike Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index ca1b6e697bd49..5bd41be7eb8cb 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 533abd6b4ff47..e8271f50604ff 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.34 2004/07/02 23:12:45 ru Exp $
 .\"
 .Dd May 27, 2001
 .Dt KBDCONTROL 1
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index eb72b825b8356..c74f1af2a104e 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 2004/08/09 04:27:58 jmg Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.sbin/kbdcontrol/kbdmap.5 b/usr.sbin/kbdcontrol/kbdmap.5
index 5d9776d9a039b..9646f8007667d 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.6.2.1 2004/08/24 20:43:10 simon Exp $
 .\"
 .Dd September 11, 2000
 .Dt KBDMAP 5
diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h
index 17e10c266f0ec..459da39693edf 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 7d9fd53fa04b6..f2dd9319f361b 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 38d02126e7e05..c85d6c7430989 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdmap/Makefile,v 1.13 2002/07/03 14:56:08 markm Exp $
 
 PROG=	kbdmap
 LINKS=	${BINDIR}/kbdmap ${BINDIR}/vidfont
diff --git a/usr.sbin/kbdmap/TODO b/usr.sbin/kbdmap/TODO
index cef30f79ba1bc..fadc755727b07 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 906d4ddf852fc..3b96591dd8a88 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.32 2004/07/03 18:35:50 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 5f2bffdaffe49..93b912564d733 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.2 2002/10/27 17:44:33 wollman Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/kbdmap/kbdmap.h b/usr.sbin/kbdmap/kbdmap.h
index e57fa8c3c9afe..7761c97438b92 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 7da462b4f3b58..3830f3086cc7a 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 3d6fe02657446..f47b7406ea0e7 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 1ecd5ad794c44..c8ff57662e3d0 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 54075da676381..18a702c353b28 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 45f6f6e9de78d..98518165fa9c2 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 726f91cc00c42..8d42fe4a24c56 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 9a907a7f379a1..8bff879794a45 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 3395f28fb8f25..761c52986f058 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.3 2004/05/16 22:08:15 stefanf Exp $
  */
 extern void setmodulus __P((char *modx));
 
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index 566b1c79834cf..9a0d041169b97 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 964c79b542f6f..6d9565cc1ae82 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.5 2001/07/20 06:19:54 obrien Exp $
 
 PROG=	kgmon
 MAN=	kgmon.8
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index eece2f952fa1a..944ce1dc684dd 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.15 2004/08/07 04:27:50 imp Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 893e693f6f2e0..d918697a88bc5 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.13 2004/08/07 04:27:50 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile
index 013c65fe33c92..b65f7e8979da8 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 27541e6cae11b..be49b15ca799f 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 63c2dff669047..580d73433efe0 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 12b1d5f5b3409..7ff2ac98411bc 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 57333b0ad47cb..c16025aa6cd18 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 3cc8e13d45533..84c45b31bb892 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 0ea4f0e796c16..93e6662e22d97 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.10 2004/06/22 17:05:39 obrien Exp $
  */
 
 #define	_KERNEL
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 3537502c975b4..6ae7410d38f03 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.8 2004/07/02 23:12:46 ru Exp $
 .\"
 .Dd July 19, 1999
 .Dt KGZIP 8
diff --git a/usr.sbin/kgzip/kgzip.c b/usr.sbin/kgzip/kgzip.c
index d6c48f2069e44..b21b35d3ba7b9 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 f04f2a4cf14f9..1377f34b3c12d 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 11a20a5a274e9..be8437b61c235 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 64481ffb6ce58..a3774086f1fa2 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 33337fd8a180e..8617a7189f058 100644
--- a/usr.sbin/kldxref/Makefile
+++ b/usr.sbin/kldxref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kldxref/Makefile,v 1.6.6.1 2004/09/03 18:38:47 iedowse Exp $
 
 PROG=	kldxref
 MAN=	kldxref.8
diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index c6751c9d7a199..d48c760d56147 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.6.6.1 2004/09/03 18:38:47 iedowse Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kldxref/ef.h b/usr.sbin/kldxref/ef.h
index 3843ebebbaef8..9e32f4256e8be 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.3.6.1 2004/09/03 18:38:47 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 445640ae27af8..fcb29f2185508 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.2.1 2004/09/03 18:38:47 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_i386.c b/usr.sbin/kldxref/ef_i386.c
index 0fc726af7ca6b..da213342b171b 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.2.1 2004/09/03 18:38:47 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_nop.c b/usr.sbin/kldxref/ef_nop.c
index cbbd43cc23c9b..b1b9de8a738c3 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.1.6.1 2004/09/03 18:38:47 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index 3ed4e40561b6d..023c7b0a41ab5 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.2.1 2004/09/03 18:38:47 iedowse Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kldxref/ef_sparc64.c b/usr.sbin/kldxref/ef_sparc64.c
index e5133f1d3996b..99317885da694 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.1.6.1 2004/09/03 18:38:47 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/fileformat b/usr.sbin/kldxref/fileformat
index 2eddcca4a14d9..b7be2621695ba 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 a6174b6bd1943..8c6274fdc41d1 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 3beed7acf8291..41831c0792275 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.8.2.1 2004/09/03 18:38:47 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index 017aadf277261..7ddcd72752b4f 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 03a587d0eccca..af9b07bc7692f 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 21c82c3636dd5..0323c5baf666b 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 3cd0eb64643ae..267cf5a9a1dbe 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 13b94c2590766..d9699ef3ca394 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.9 2003/06/11 20:32:52 gad Exp $
 
 CFLAGS+= -DINET6
 
diff --git a/usr.sbin/lpr/SMM.doc/Makefile b/usr.sbin/lpr/SMM.doc/Makefile
index faeb266062d9f..0b0489d5dfaca 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.4 1999/08/28 01:16:46 peter Exp $
 
 BINDIR=	/usr/share/doc
 VOLUME=	smm/07.lpd
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index ffffffbb2bd19..663cbac3f4b92 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 c2524a159c701..f64d61d90ebfd 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 91e8299d5826a..b2889a3162dbd 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 da2828290b8be..2dbc7b62db43d 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 af74b48a5a468..0be910cfa985d 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 352f79c9544c5..1caeadb5dc40c 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.10 2002/07/17 00:51:19 gad 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 d2ffb6a367095..3e1f9532d8fd4 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.33 2003/07/14 20:20:57 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 67cac6bdd5da9..6b2b469c2a392 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.9 2003/07/14 05:15:21 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 95fe572478427..4a1ac9f70370e 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 cdac70ca17eb4..66af6245b7c07 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.25 2003/07/14 20:20:58 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 19b13319fd7f8..f9686d5b5785e 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 fea03b9f7bd23..da3ca063007e3 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.24 2003/07/14 05:15:21 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 6f018b0756a1a..abec49e8f5097 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 eeeb0d428ed93..82fbb21079f87 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.4 2003/07/14 05:15:21 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 6e4b9ffe20058..b67f951f170c0 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 3ae3e9058dc72..b994febc1885c 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.8 2003/07/14 05:15:21 gad 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 0d3644b1b7958..e5ca28840b745 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 b650e5c76c052..e7d2c536eb4d2 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 589117a642441..da670d7b5ccdf 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.20 2003/10/26 03:01:24 peter 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 08c2e6f54cf8a..dcb1c9a9c3a43 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 ee15541fae74e..f8d01950f233d 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 a312e73941ec5..8ab5bc36259f1 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 6895b79517f16..d590617753385 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.3 2003/07/15 07:01:01 gad Exp $
 
 PROG=	koi2855
 NOMAN=	#true
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 8ecc3eff6dae0..9485f25fc2d43 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 1e4e30db14483..54aa5e341ed66 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.3 2003/07/15 07:01:01 gad Exp $
 
 PROG=	koi2alt
 NOMAN=	#true
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
index a7a5b5dc54087..392bfdcd8722e 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 100022dfba5cf..5b14acf6d0f27 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.3 2003/07/15 07:01:01 gad Exp $
 
 BINDIR=	/usr/libexec/lpr
 
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 41879a2ee58d1..4b397a9663b40 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 2fcec43ec80b5..32cd076fef555 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 8ed842d55e57b..feb6f155f3e35 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 e7c06882c0f90..b0e91cf9b9cc0 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 f050857dd0316..761549774789f 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 06ea4b0f7e8b9..b78c694bbf4cc 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 21dc6e1c99034..5ca02f74a82dd 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 fe82d460ade62..8d53150254a49 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 2662ef19216fc..0067e5848792a 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.21 2002/11/27 15:31:08 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 e58911c06097a..35fb9d53ca020 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.28 2003/10/13 07:24:22 tjr Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h
index 73e4cc52764cd..1a56150db1156 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 60c9b38d57089..ea78ffbef51ee 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 9af36556604c0..57ac27660b43c 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 14cb9e1bcffc4..a4ccbd1dfb593 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 5d6e2cd033a97..589d91099501f 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.30 2004/07/02 23:12:46 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 e02839a9def53..fa54f979104d0 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.40 2003/08/13 20:31:33 gad Exp $");
 
 /*
  * lpd -- line printer daemon.
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 5ebaabdbeef8b..3a2349f1f8567 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 8a05212128a33..58a510aaf4c2b 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 9d85f1f37df3e..63ae74158565d 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.61 2003/08/21 03:43:48 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 ac4f9ee270a56..a5359569aa2be 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 4df437e06c326..b0ea2aefd50c4 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 22b235e7f8dfe..f7448c43204a8 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.11 2004/07/03 18:35:50 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 e1809cfe643b2..cffd0fe81ceb1 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 1ff376de4cd4a..63d8e9179008e 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 3850bf597de54..86e3232915aa7 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.20 2004/07/03 18:35:50 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 98e9cea4327a8..3443841e5bb42 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 1ea6fea53ba13..1f1f62515a03f 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 44bc93ac27ecb..63a9fe6277d8f 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 9c170a378742d..429d445312f59 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.13 2004/07/03 18:35:51 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 47f233c4802a7..d88d2713bd046 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 65b1c7c8fef81..348930d1176ae 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 c34934e6a42f6..7f36f09ce893a 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 c73b7962ed89f..4cda0bf861762 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.5 2003/07/15 08:45:06 gad Exp $");
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index bd895a71a3054..e2487a6cd8653 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 1cd482495811f..fd019e3a61574 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.8 2004/07/02 23:12:47 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 34a247f551092..3d21521efafa9 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 76f4f2d4931ee..0a23db1d1a5d5 100644
--- a/usr.sbin/lptcontrol/Makefile
+++ b/usr.sbin/lptcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lptcontrol/Makefile,v 1.6 2001/07/20 06:19:57 obrien Exp $
 
 PROG=	lptcontrol
 MAN=	lptcontrol.8
diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8
index 239de00a87500..fec115f167a44 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.20 2004/07/18 02:22:47 obrien Exp $
 .Dd September 3, 1994
 .Dt LPTCONTROL 8
 .Os
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 5fb97982c7c5a..612f06cc881c7 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.14 2003/05/03 21:06:37 obrien Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index eddfdd96879ae..351840f644d69 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.10 2003/07/07 03:54:04 gshapiro Exp $
 
 SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/mailstats
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index f67e77539c0da..d5bb77b28a208 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mailwrapper/Makefile,v 1.12 2004/01/17 23:58:23 johan Exp $
 
 .if !defined(NO_MAILWRAPPER)
 PROG=	mailwrapper
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 36b5d8960d685..f865298bcc2b6 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 c71bb3000e4d8..152e8f6b63145 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 d8ae498ce0048..bb224646363e3 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 bb7de3ebb5c74..003622e296724 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.11 2003/07/07 03:54:04 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/makemap
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 9e0c12ecb9a9b..1b99f6a3ab3f8 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 b8e001dbc872f..d906f8c544154 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 23e20870ab95f..1f435f18c87d0 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 d465d531a3e97..33fbe9b0d7a1e 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/memcontrol/Makefile,v 1.5 2001/07/20 06:20:00 obrien Exp $
 
 PROG=	memcontrol
 MAN=	memcontrol.8
diff --git a/usr.sbin/memcontrol/memcontrol.8 b/usr.sbin/memcontrol/memcontrol.8
index ad0e5330671b2..9fd6a7be8b301 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 9eb87197eaaa5..19c6459868e30 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.8 2002/09/15 15:07:55 dwmalone Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index 257fbeba4ca47..45e7d7ffbf887 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 699120b5a5c1a..ecfa6d394a7fc 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.29 2004/07/02 23:12:48 ru Exp $
 .\"
 .Dd February 5, 2001
 .Dt MERGEMASTER 8
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 6ec345a5a78ff..f6cffe195b867 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 e86fceec116e6..df0e6884c5d55 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 b9aa2c9e64f68..226206ba4eacd 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.22 2004/07/02 23:12:48 ru Exp $
 .\"
 .Dd January 9, 1997
 .Dt MIXER 8
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index 7abac464e33c6..26d0f022bfd4a 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.21 2004/01/22 07:23:36 grehan Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 7100520ad4d39..66351deecb6e4 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 1f73203433e41..f8c8db5a7f01c 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 cc361d03df103..67e3b6361a1f0 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.5 2002/07/14 14:44:20 charnier Exp $
 .\"
 .Dd May 17, 1998
 .Dt MLD6QUERY 8
diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile
index 95964a5854ffd..ab2985ded66ae 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 a3647676c330f..5b72a5b8ef241 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 a52565840de48..0efcbefc88518 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 5cbf7b609aa49..dfb0e58d00a91 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 76692e1b49d1f..cba74339e283e 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.8 2004/07/02 23:12:48 ru Exp $
 .\"
 .Dd April 10, 2000
 .Dt MLXCONTROL 8
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.h b/usr.sbin/mlxcontrol/mlxcontrol.h
index f0225b5b6f88b..ddc236d570bb6 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.3 2000/05/26 02:08:42 jake Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/mlxcontrol/util.c b/usr.sbin/mlxcontrol/util.c
index 37cd2b7e3143e..96209b6a5d212 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 8fbb9a8c3ba47..ba18c2a8ef916 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 afc68e0146969..88481cb73a693 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.19 2002/08/21 18:11:08 trhodes 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 c784a9a53ae61..c80b4106f1e1f 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 56667f1653dc0..e678e0aaf839e 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.17 2004/02/23 20:21:21 johan Exp $
 
 PROG=	mount_portalfs
 SRCS=	mount_portalfs.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/usr.sbin/mount_portalfs/activate.c b/usr.sbin/mount_portalfs/activate.c
index a6123f18ec4fd..e52cb1db7ca21 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.10 2004/08/07 04:27:50 imp Exp $");
 
 #include <errno.h>
 #include <string.h>
diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c
index 5e0db79c970fd..98c515914db1f 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/mount_portalfs.8 b/usr.sbin/mount_portalfs/mount_portalfs.8
index 99a6d675f4d32..ff50d2eaec951 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.14 2004/08/07 04:27:50 imp Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTALFS 8
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index 49a11d0881cfb..20b6e92e8e9a1 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.22 2004/08/07 04:27:50 imp 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 9373c7d75de1d..5dbf2cf229506 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 53a07a92231c5..abbdf763bb3d3 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.4 1999/08/28 00:13:37 peter 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 ceb1a4657bc91..148df1b052680 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.8 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/mount_portalfs/pt_conf.c b/usr.sbin/mount_portalfs/pt_conf.c
index a89232d6e0d14..3adb21e222eed 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.8 2004/08/07 04:27:50 imp 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 f679b422def90..03f656a0fbc51 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 153c7337ffffa..cbf1415f14a39 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.10 2004/08/07 04:27:50 imp Exp $");
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index 4438a0bc04b07..4a13f28fdf157 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 4463e402e9628..c2d6dbfd5e79f 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 482b95591dab1..ad37dcae84b75 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.4 2004/02/05 22:44:25 ru Exp $
 
 PROG=	mount_smbfs
 SRCS=	mount_smbfs.c getmntopts.c
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index d015160609340..0428c8978af83 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 133f48c0a959f..81b8a2a4507fa 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 0e8e1f4dc7fda..5eb780ab0cf18 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 242a30ecb0717..0ff195782902c 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.77 2004/08/07 04:27:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.sbin/mountd/netgroup.5 b/usr.sbin/mountd/netgroup.5
index ec7577d334d42..1fc18473cd27d 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.13 2004/08/07 04:27:51 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt NETGROUP 5
diff --git a/usr.sbin/mountd/pathnames.h b/usr.sbin/mountd/pathnames.h
index 2b7397799ee4a..41e46e40ed4cc 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 c9c1b313519f2..6ea32039a6a37 100644
--- a/usr.sbin/moused/Makefile
+++ b/usr.sbin/moused/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/moused/Makefile,v 1.6 2001/03/26 14:40:51 ru Exp $
 
 PROG=	moused
 MAN=	moused.8
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 130e2686bbcc4..b0aea4b815de9 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.46 2004/08/03 18:43:45 philip Exp $
 .\"
 .Dd April 1, 2000
 .Dt MOUSED 8
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 2866f0e28eec4..2f361b21edf11 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.67 2004/08/03 18:43:45 philip Exp $");
 
 #include <sys/param.h>
 #include <sys/consio.h>
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index a9221f979c6df..2aa75f873af1a 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 e8ff5ad538a93..3e18da63d9498 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.9 2001/03/22 04:27:46 rwatson Exp $
 .\"
 .Dd April 28, 1997
 .Dt MPTABLE 1
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 36d8089bd25fb..de07fb4c83ffb 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.18 2003/09/30 04:09:21 peter Exp $";
 #endif /* not lint */
 
 #define VMAJOR			2
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 43fe8b10ac705..3e1a3cb781b31 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 63c22100e7020..a2ac0ab866277 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.7 2003/10/30 22:59:41 peter Exp $
 
 CFLAGS+= -DRSRR -Dlog=logit
 
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 8b8ea9c7156af..af52643bae0ce 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 1827f6a011b17..75f3d73325785 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 4a286c6e67c7a..a63a5cd447375 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.7 2002/05/13 11:24:02 ru Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c
index 9ca6f88891e3a..985fcbc89da26 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 267c158c94c65..080858a130607 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.13 2001/07/05 09:28:13 kris 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 2f11872216c01..ee7aa6b83812c 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 f3430355cb157..bc3a77ab07580 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 53aad7c63a944..dabeb77b54244 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 716b4794180ba..ebe7b0c441b5d 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 75589903ebbc9..3cf25ee7b1fe1 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 a6e9e5841c27a..63e14750b33a1 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 f99247b625007..2f874d27449fa 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 8fdbad0687e07..32fef36cde8d2 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 bd9c61f6a7426..946ca45959c29 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.14 2002/12/27 12:15:38 schweikh Exp $
 .\"
 .Dd May 8, 1995
 .Dt MRINFO 8
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index 1df65770eba52..2288b14830023 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 f111aa9816632..13041e8ad5add 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 38d1dfb922830..de038a2190304 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.30 2004/07/03 18:35:51 ru Exp $
 .\"
 .Dd May 8, 1995
 .Dt MROUTED 8
diff --git a/usr.sbin/mrouted/mrouted.conf b/usr.sbin/mrouted/mrouted.conf
index e9cb04c3ed6e5..02fcbdf1fee58 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 afd3af82342d5..7ddb80ae1cb88 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 6226aa111909c..86932757c6b87 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.21 2004/07/02 23:12:49 ru Exp $
 .\"
 .Dd May 8, 1995
 .Dt MTRACE 8
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index 9cb53e3dcc6cd..4d34bbcb5bb9c 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 ee9adb7c7eb56..cce6dc2826cb6 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 d4fb01d18a159..2fee141dda496 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 acefaf921f715..77d77e56e976e 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 375fada1116e0..e5ed6ade7219d 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 b2695395ed921..df7038d94b3e1 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 300202b967dd7..77a4eead80c6f 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 86d6e6eaf438b..87e895b53c164 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 131346d6d3565..20997a71c3bd0 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.5 2001/07/20 06:20:02 obrien Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/testrsrr/testrsrr.c b/usr.sbin/mrouted/testrsrr/testrsrr.c
index 6dfe831b47ef8..d57d6952aeaf5 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 423fa532225ed..e96b4444e8853 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 5be618dea3083..f1d09eb1e2717 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 95bbe12184a6a..9f3d4843de04e 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 4b1f299d4152f..34f9525e3e289 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 f13bf492dfb59..44bf20cc339fa 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 6376ea3af54e0..7934d130fca74 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.26 2003/11/05 22:26:07 phk Exp $
 
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index bf4353c518559..e17ef8f682e11 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.33 2004/01/11 19:25:56 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index fa902e4649c20..cc5df3b9663ce 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.36 2004/01/11 19:38:48 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/mtree/excludes.c
index 21a49b04f7447..3614af54ef698 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 4b6fb3c1839a6..4c7adb2f68f8e 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 cc211f025911e..21561caa25a8b 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.15 2004/01/11 19:25:56 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 124b45f9f3138..2d1d6d422bae9 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.47 2004/08/07 04:27:51 imp Exp $
 .\"
 .Dd January 11, 2004
 .Dt MTREE 8
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index 76f623c23e2de..950f6a2a44869 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 7d899c6f6d03e..ea77b313753ff 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.6 2003/10/21 08:27:05 phk Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 0407f78cfa2d1..9b9b6ec2fb683 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.21 2003/11/19 15:28:21 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/specspec.c b/usr.sbin/mtree/specspec.c
index 59dd937bee74e..89c18d61e8a00 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.5 2004/08/07 10:04:29 simokawa Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/usr.sbin/mtree/test/test00.sh b/usr.sbin/mtree/test/test00.sh
index fce801bcd20ea..a2e4b2806639d 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 e4d3fc302bfed..d056b91288317 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 a7aa9168382c4..450ebb3d397ff 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 e320c4f63ff58..0525024a7ff1a 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.1 2003/11/05 22:26:39 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test04.sh b/usr.sbin/mtree/test/test04.sh
index 38acda2bf469b..453d14667fc29 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 7f2cf8dbe846e..a9d165895ce6f 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 2004/01/11 19:25:56 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile
index 8728b4ad15e90..1b36e4bde9b63 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.3.2.2 2004/09/30 23:36:10 dougb 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 39384e52a2374..344deb3efa3e3 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.2.1 2004/09/26 03:10:18 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 7ea9d06509642..c384f2181ded7 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.8.8.1 2004/09/26 03:10:19 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 64587742350e2..ab92b6ff0730b 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.7.2.1 2004/09/26 03:10:19 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 d1ee3afeda9ab..5fef87cf0cd3b 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.2.26.1 2004/09/26 03:10:19 des Exp $
 #
 
 rndc=/usr/sbin/rndc
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index 4cf8db3045a90..a8dff5e51a710 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile,v 1.35.6.2 2004/09/30 23:36:10 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/ndiscvt/Makefile b/usr.sbin/ndiscvt/Makefile
index c59581826fe99..4feef37ddfe51 100644
--- a/usr.sbin/ndiscvt/Makefile
+++ b/usr.sbin/ndiscvt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndiscvt/Makefile,v 1.5 2004/02/23 20:21:21 johan Exp $
 
 .PATH:	${.CURDIR}/../../sys/compat/ndis
 
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 8a8495671db5c..d838171548176 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 cc1508bba4a2a..4d361041dd3ed 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 de6c34227e9e0..d5e050381c503 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.13 2004/03/07 02:49:06 wpaul Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/ndiscvt/inf.h b/usr.sbin/ndiscvt/inf.h
index 8d0b0c123de4b..6367f3edab78b 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 7c5294db29edc..c1e2be8880635 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.5 2004/08/01 20:04:31 wpaul Exp $
 .\"
 .Dd December 10, 2003
 .Dt NDISCVT 8
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index a24711ea7ad7a..60c5737f88315 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.9 2004/08/02 18:54:01 wpaul Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index c35dfc7f5eaa3..bef37530a5dba 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 c6412965c9db3..5c6b29e3a309e 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 b39625a19edb9..3de3880877903 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.13 2004/06/05 20:21:58 ru Exp $
 .\"	$KAME: ndp.8,v 1.28 2002/07/17 08:46:33 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index de3a80ac1dd91..0c8c4c9796b19 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 9c301a1b9d1d5..3f20a9d9a607e 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 c350226f591a6..51869292a5511 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 5899d7ea1b946..08b84162448cb 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.44 2004/07/02 23:12:50 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 0a28c3f04ff2a..d8fdf2cada53f 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.96 2004/07/04 17:24:12 sobomax Exp $");
 
 #define	OSF
 #ifndef COMPRESS_POSTFIX
diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5
index c6d69d886c315..6f9eea6a99fdb 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.3 2004/06/13 18:03:43 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 3d2c6ff29c8f8..53139db4fa342 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 474c69daba53c..15bed332c7ceb 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 5a7fe974cf8d2..50251d358234e 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.16 2003/04/04 17:49:15 obrien Exp $
 
 PROG=	nfsd
 MAN=	nfsd.8
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index df614e7a9f6af..c36388b847380 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.23 2004/08/07 04:27:52 imp Exp $
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 273e3ecee191f..2839bbd03e167 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.30 2004/08/07 04:27:52 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index 364bbf7b8a7d6..b039cf0b4536c 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 9b4c2b7b9414f..008b0db70c05b 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 460e6b26e3345..b9ea3402768fe 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 fbfce4ee628b3..af3f54ab5db56 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 d5a43f5441ede..734d80f037e71 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 e905d3348721c..5d876ba322e73 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.5 2004/01/27 21:52:52 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index fcd61dfd9ab51..43e67c6f75d86 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.16 2004/01/27 21:52:52 ru 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 621d318ecf40b..eabcb72079c28 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 c71815b5a423a..d92dbb1a212a5 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 3de136034785d..21d9baa9d78f6 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 121c0f17e50ed..b41cd30381378 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.15 2004/07/02 23:12:50 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 1f7826e32a877..21fe1970033e4 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 834cc0c909d9d..f78ec94f86b4d 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 6921ec45f7aac..4361d8da9d5ad 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 d391ba801e587..d67007797ca69 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 8c10a854afb80..b676ac3c3d16a 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 30c5c168c6cab..9ceaab525a034 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 d1bdca09427e2..8b2b32685c0f0 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 73f2df3bf935d..8b060169b2b9f 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 700ca5e1a59d1..391508ac01c2c 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 213cf588382ba..9e9073823d521 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.16 2004/06/05 20:21:17 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 48efba2956ace..c3de198968ac2 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.12 2004/03/13 04:39:45 cperciva Exp $
 
 PROG=	nologin
 MAN=	nologin.5 nologin.8
diff --git a/usr.sbin/nologin/nologin.5 b/usr.sbin/nologin/nologin.5
index 961f5a39b1ed4..69bd38ae2bbe2 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 d03aa33d96b41..04078ff77e243 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 a13c517d0554a..3e0600667adfe 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.4 2004/03/13 04:41:40 cperciva Exp $");
 
 #include <stdio.h>
 #include <syslog.h>
diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile
index 71d130938bf3a..e9050bf912099 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.10 2004/07/22 08:35:41 roberto 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 4b931a878bc9a..029732a915191 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.6 2004/08/06 07:27:06 cperciva 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 207992c2985bd..5a867e7a5e5b0 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.12 2004/07/25 22:02:30 roberto Exp $ */
 
 /* Is adjtime() accurate? */
 /* #undef ADJTIME_IS_ACCURATE */
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index fd6a195012918..7f621fcd8601c 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.10 2004/07/20 15:44:31 roberto Exp $
 
 MAINTAINER=	sheldonh
 
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index 37a61beb85dad..431b98e52658c 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.16 2004/07/03 18:35:51 ru 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 dc9531ce245ef..6b741b92a1b40 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 14457c7bfd7cd..a548f354325b8 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.10 2004/07/03 18:35:51 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 78f69eacbf148..3966bc432ae64 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.7 2002/11/27 15:25:07 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 d371a3271bc5c..024900f957707 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 2004/07/03 18:35:51 ru 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 4c0d7ca9649e0..3eb9e0efabe90 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.16 2004/07/03 18:35:51 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 f130307457f32..3ce0e3627e6f0 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 554a3c0c27c80..687935baf79a3 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 c6b451df8fbc0..6dd579fd56fee 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.9 2004/07/20 15:44:31 roberto 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 10b97965792be..573cba54d65f8 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.6 2003/04/04 17:49:16 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/libparse
 
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index ebb39339e365f..bb221da7a38c8 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.2 2004/07/22 09:10:52 roberto 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 d16dcc1cb061f..bdb1c090fbea8 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.10 2004/07/22 09:10:52 roberto Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd
 
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index eba0fdf7fcfc1..0d791d3e062c1 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.4 2004/07/20 15:44:31 roberto Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate
 
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 94947f5345f4c..133dd2f9e9aed 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.8 2004/07/22 08:14:37 roberto Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc
 
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index a296bffa3fa91..48471af894bf3 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.8 2004/07/22 08:38:14 roberto Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpq
 
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index 9e14c38cb096b..ac7a3997fcde5 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.3 2001/07/20 06:20:05 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/util
 
diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile
index e570a97745b07..8a5a731e4f8be 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.4 2004/07/20 15:44:32 roberto Exp $
 
 .PATH:	${.CURDIR}/../scripts
 
diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver
index d54386d5fd6a2..4f340ee043f4b 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 8a895c4ba0be6..4319623c5f9ef 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 6dbc510db8c21..f457be9a0379c 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 ac8a4350b13aa..e75140d48b28c 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.1 2004/07/20 15:45:04 roberto Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/sntp
 
diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile
index b94ffd1bf59b7..88063a89f72d1 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 71361d452511e..223ef16d10a37 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 af8f01f233b20..3c562bbac7d52 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 995d93704d18f..cc97125175834 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 ea25caa16dafe..15eb85f9a1b12 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 32f5fe624db62..22b65f1125821 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 10b8a4c849c72..10da2adfeeb2f 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 2001/07/20 06:20:07 obrien Exp $
 
 SUBDIR=	pccardc pccardd
 
diff --git a/usr.sbin/pccard/Makefile.inc b/usr.sbin/pccard/Makefile.inc
index 88fdf2cf5eb29..4a0324d747783 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.8 2001/07/20 04:23:10 obrien Exp $
 
 NOSHARED?=	YES
 
diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index d0649a2dc42c5..7dc2727f0ccdb 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 be62c56238a7b..94825ed0e0623 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 d5fc7579933f6..309528754659c 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 6a415ba44e50f..621b264f2ad43 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 11ee0bb882083..5fe2cc1dd9eea 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 b47a19c6506f6..26efbb9427ab1 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 c1f6eced75074..6781a0e3e927f 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 0b1d1764c16d9..818ff6c544b87 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 59d43a57436ad..9622f6151ec47 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 f8a53b3cc8675..8a89c23f224bf 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 3ac81f930ca98..93f7ff8e8ed15 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 a3171487998a3..9d6b7bbc568ba 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 cc3df8ecbee8e..6166a6518c369 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 5fda2a72f24ca..84f6089282224 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 b7fae27df8bca..da0907fe3ff6f 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 c91ecd259d3d8..8d6f59e52f5f5 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 ab7a0e1b4ea72..53925a397b6bb 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 93ad066d2f8b1..8d4cfb915b164 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 4cb8e863454f7..8394d90ab37e7 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.25 2004/07/02 23:12:51 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 34c95aa1178af..26c11a0197bf5 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.31 2004/07/02 23:12:51 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 11d07166b3021..3199358718fbb 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 73b72efb9eafa..c087ab61a6d26 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 8ebd74531fe2f..a0b2e1726246c 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 8c6177eff4c29..2bfc9f6c05568 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 8f9a48df3b7c7..cfdb5ad414da6 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 d892a1282197b..45ac32b856a61 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 719615a478fc0..b5cebb6f1dabe 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 ea41bbad46b97..e95d46fd668c9 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 0ea232aea4089..a1092bdfbd1e4 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.23 2004/08/07 16:36:46 imp Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pcvt/Makefile b/usr.sbin/pcvt/Makefile
index 0dbdf050ca36b..32413b6d3c466 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 2000/03/26 11:20:36 hm Exp $
 
 SUBDIR= 	keycap cursor fontedit fonts kcon loadfont scon \
 		userkeys vttest ispcvt
diff --git a/usr.sbin/pcvt/Makefile.inc b/usr.sbin/pcvt/Makefile.inc
index 7899d9c307d20..e0df0b1eb1fab 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 a6d96604d977f..41d8bee922eb1 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.7 2001/12/17 13:59:35 ru Exp $
 
 NOOBJ=	noobj
 FILES=	Acknowledgements Bibliography CharGen \
diff --git a/usr.sbin/pcvt/Misc/Doc/NotesAndHints b/usr.sbin/pcvt/Misc/Doc/NotesAndHints
index 8accc2f319864..3fe25a5d3a1d3 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 5e1aac5aa040e..f5bff124023f1 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.8 2001/12/17 13:59:35 ru Exp $
 
 NOOBJ=	noobj
 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 cc3b34b2b572b..bffff699bc713 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 6eff974ca3a05..834f0bdf06da4 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.5 2001/12/17 13:59:35 ru Exp $
 
 NOOBJ=	noobj
 FILES=	README.FIRST
diff --git a/usr.sbin/pcvt/Misc/Makefile.inc b/usr.sbin/pcvt/Misc/Makefile.inc
index c7a2ebcc0ca8c..442d60de8b274 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 a2701c7e261ec..235f769b57efc 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 fb068782e417f..48db924977a0f 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 6e31d4b37a509..3fe0eaced0f15 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.10 2001/07/10 15:11:33 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 01bdd102b376a..8fb27134e44fe 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 ee2d1ef3378cc..ba142290af132 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.9 2001/07/20 06:20:08 obrien Exp $
 
 PROG=	playvt
 NOMAN=	#true
diff --git a/usr.sbin/pcvt/demo/chardemo.vt.gz.uu b/usr.sbin/pcvt/demo/chardemo.vt.gz.uu
index f26c6fcd90f06..3782d8f876da2 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 456e6dcf01fbe..f2441503b450d 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 17eeca9fa1a62..f88cd4e28eab4 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 b2f0eef012f1c..ec9acc6565922 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 ac1baa456a4fc..48533cfa0b441 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 1d7e4e6a192ce..166a97ab52f36 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 e5c4df3c1808d..e7b5c44a65664 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.5 2002/04/20 12:26:43 charnier 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 8c226b517de7d..0d8df54d51aee 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 bf488abe51667..41b5596163cee 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 5a0cbc900f4ff..c7574921d67af 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 e4e44ca0cca80..47fdba2fbe229 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 4851169f28def..dc062103a9682 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 d0b751554a24d..561c342f97473 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 b1444c6d77303..82dd8cd3b38fa 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 8af01cc27250d..d19053c0ce402 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 994b4062d2d14..0bc8e50e6ad85 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 b9eee0a86c3a6..98ed64d143785 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.16 2001/07/10 15:11:33 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 40979cac095d5..4489957793b19 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 1bbbdda8bbbe5..853e620a1b566 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.11 2001/07/20 06:20:08 obrien Exp $
 
 PROG=	kbdio
 NOMAN=	#true
diff --git a/usr.sbin/pcvt/kbdio/kbdio.y b/usr.sbin/pcvt/kbdio/kbdio.y
index 9207d26b2943f..7fb3e6c17c55d 100644
--- a/usr.sbin/pcvt/kbdio/kbdio.y
+++ b/usr.sbin/pcvt/kbdio/kbdio.y
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/kbdio/kbdio.y,v 1.7 2002/09/17 17:59:50 mike Exp $"
 
 /*
  * $Log: kbdio.y,v $
diff --git a/usr.sbin/pcvt/kbdio/lex.l b/usr.sbin/pcvt/kbdio/lex.l
index de1a25227180f..6e9803ed71a9a 100644
--- a/usr.sbin/pcvt/kbdio/lex.l
+++ b/usr.sbin/pcvt/kbdio/lex.l
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/kbdio/lex.l,v 1.6 1999/09/06 07:39:30 peter Exp $"
 
 /*
  * $Log: lex.l,v $
diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index 564cd847b4c32..b471f96d7e0e5 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 4e9185a1db575..1aad9b23e1902 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.16 2004/07/02 23:12:52 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 4318bf2ccbf89..2576444261877 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 b4e4350a537a8..bce92f662d7e6 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.15 2002/07/29 09:40:16 ru Exp $
 
 LIB=	keycap
 MAN=	keycap.3
diff --git a/usr.sbin/pcvt/keycap/keycap.3 b/usr.sbin/pcvt/keycap/keycap.3
index 19348d20c4201..3716080a34241 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 9c276a361c4fa..ea756d75bfbb1 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 a991264e2ea05..2ea02bedf3d31 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 7e401837091d6..3ad25a9fd5d73 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.16 2003/01/01 18:49:02 schweikh Exp $
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 5
diff --git a/usr.sbin/pcvt/loadfont/Makefile b/usr.sbin/pcvt/loadfont/Makefile
index 50646a7a7f0c8..ab535a25508ce 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 c579bb8b969ee..a9ccb56c5ecca 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.16 2002/12/27 12:15:38 schweikh 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 acdd013a7976b..16fadb880a5a6 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 dc7d02a06598b..7ddfae036856a 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 fa832d8ce9af0..77d6e8bc1c0f7 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.18 2004/07/02 23:12: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 0d77f11da4cb0..05253696ff360 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 66fe02217239e..4e68b98687dd7 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 3a4e2319596a0..dbedf4dc1f7f4 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.10 2003/01/01 18:49:02 schweikh 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 e3fe90cac9fb8..b0ae42225344d 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 0ac0388a0ef2d..bb6ae0224d5ac 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 e729850e5a911..103351b2e837c 100644
--- a/usr.sbin/pcvt/vgaio/lex.l
+++ b/usr.sbin/pcvt/vgaio/lex.l
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/vgaio/lex.l,v 1.5 1999/09/06 07:39:30 peter Exp $"
 
 /*
  * $Log: lex.l,v $
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index e7f3b246a6152..382e4b4900ef2 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 a73314a0dfa6a..240ef39f935ea 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.y
+++ b/usr.sbin/pcvt/vgaio/vgaio.y
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/vgaio/vgaio.y,v 1.6 2002/09/17 17:59:51 mike Exp $"
 
 /*
  * $Log: vgaio.y,v $
diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile
index f5d6e7b9bb5c2..e58ab33db9490 100644
--- a/usr.sbin/pcvt/vttest/Makefile
+++ b/usr.sbin/pcvt/vttest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/vttest/Makefile,v 1.10 2001/07/27 04:40:04 brooks Exp $
 
 PROG=	vttest
 SRCS=	main.c esc.c
diff --git a/usr.sbin/pcvt/vttest/README b/usr.sbin/pcvt/vttest/README
index ffc2e8bfe0caa..dee52e27567aa 100644
--- a/usr.sbin/pcvt/vttest/README
+++ b/usr.sbin/pcvt/vttest/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pcvt/vttest/README,v 1.4 2001/07/23 12:05:27 kris Exp $
 
 NOTES FROM THE MOD.SOURCES MODERATOR:
 I split the source up into the three separate pieces it now is.
diff --git a/usr.sbin/pcvt/vttest/esc.c b/usr.sbin/pcvt/vttest/esc.c
index 21baa97ced77e..4881a2585d327 100644
--- a/usr.sbin/pcvt/vttest/esc.c
+++ b/usr.sbin/pcvt/vttest/esc.c
@@ -2,7 +2,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pcvt/vttest/esc.c,v 1.6 2001/07/27 04:40:04 brooks Exp $";
 #endif
 
 println(s) char *s; {
diff --git a/usr.sbin/pcvt/vttest/header.h b/usr.sbin/pcvt/vttest/header.h
index ae1ccafe31ab9..a9b4b7734f4d4 100644
--- a/usr.sbin/pcvt/vttest/header.h
+++ b/usr.sbin/pcvt/vttest/header.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pcvt/vttest/header.h,v 1.5 2001/07/27 04:40:04 brooks Exp $ */
 #define VERSION "1.7b 1985-04-19"
 
 /* Choose one of these */
diff --git a/usr.sbin/pcvt/vttest/main.c b/usr.sbin/pcvt/vttest/main.c
index 0a6aa832b63fd..1c45a8dcb1084 100644
--- a/usr.sbin/pcvt/vttest/main.c
+++ b/usr.sbin/pcvt/vttest/main.c
@@ -15,7 +15,7 @@ choice to the address below.
 
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pcvt/vttest/main.c,v 1.7 2003/04/29 19:53:00 kan Exp $ */
 
 #include "header.h"
 
diff --git a/usr.sbin/pcvt/vttest/vttest.1 b/usr.sbin/pcvt/vttest/vttest.1
index 31f73f5f72673..86474aedf63d4 100644
--- a/usr.sbin/pcvt/vttest/vttest.1
+++ b/usr.sbin/pcvt/vttest/vttest.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/vttest/vttest.1,v 1.6 2002/04/20 12:26:52 charnier Exp $
 .\"
 .Dd January 16, 2001
 .Dt VTTEST 1
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 875d078435eaa..61ed4732999fb 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 2753bee04185f..73d9b02c6394b 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.28 2002/07/14 14:44:57 charnier Exp $
 .\"
 .Dd November 28, 2001
 .Os
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index 73e8576581bde..debd5f4c0e0c1 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 ee4019b83749c..21beb645acdbc 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.15 2004/01/17 13:41:16 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 89c2593409444..767d4686c230a 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.11 2004/08/06 07:27:06 cperciva Exp $
 
 .if exists(${.OBJDIR}/../lib)
 LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 89988e78b2201..335ce89fa9f27 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 d27877af5c7fd..29e336fba9b9e 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 86a9805dc2618..cddd81c879100 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.42 2004/07/28 07:19:15 kan 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 e0971408fbe8d..b4d4af18919bf 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 5f1b2379f57b9..b6f0665b938d9 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.59.4.1 2004/10/24 09:41:12 scottl 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 a2225c229b016..d64a6af774b2a 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 2284ac6978d81..c0d032b685c12 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.65 2004/08/11 15:47:13 eik 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 42718c6f9273c..4ce9bb9165127 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 b2a2b4a8e6602..4fa90426533a6 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.24 2004/06/29 19:06:41 eik 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 b0a94152e0e94..aa69c57bf773e 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.35 2004/06/29 18:56:59 eik 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 efbac437f4151..e298eb2ed2987 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.79 2004/07/28 07:19:15 kan 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 43a9fbf338500..644b583d1f204 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.61 2004/07/02 23:12:52 ru 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 52a00821c616e..b7113b3e16371 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 c346ea705d796..077738fd5dc40 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 e0aeca52b1547..cc6d6427353f1 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 c75d73a627a15..5b5d7a460f262 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 2004/06/29 18:54:47 eik 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 1e40db6d2f6a2..2f31fe1746cbf 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 92f22fabedc67..e988ecebaafc4 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.30 2004/07/02 23:12:52 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 675f7ca454acf..4327075381479 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 926ce2e9c52d4..fb9dff192f323 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.27 2004/06/29 18:54:47 eik 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 a7bcfe254b99d..3e409f19db2c6 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.46 2004/06/29 18:59:18 eik 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 960641b5d4d56..623b94ae3d018 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 a212051b533d4..551b0b8ac2b67 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.53 2004/07/03 18:35:52 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 10f846abb914a..a691ee74ace44 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.37 2003/05/26 17:06:05 lioux Exp $");
 
 #include "lib.h"
 #include "info.h"
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
index b8683123f0de3..7f6e745613ad3 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.17 2004/08/12 20:06:00 ru Exp $
 
 LIB=	install
 INTERNALLIB= YES
diff --git a/usr.sbin/pkg_install/lib/deps.c b/usr.sbin/pkg_install/lib/deps.c
index 9df8448d490f9..c2f309747c9a6 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 86285fb22e213..eacee9e7e81e1 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 e406caa89704d..4c5a2d178f739 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 291f48b42552c..5734c2535fc03 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.9 2002/04/01 09:39:07 obrien Exp $");
 
 #include "lib.h"
 
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index c50a944d01568..47e60860ab04d 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.53 2004/06/29 19:06:42 eik 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 06e34cf0727d8..e670e4c6d1e95 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 2004/06/29 19:06:42 eik 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 5b17624016d0e..0ceab99328b61 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 06379b69c7f96..b2a66e4009478 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 cbd15cd7b445c..94783515bfcf6 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 95d9ac4a370c9..ef27c24eea9c5 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.48 2004/07/28 07:19:15 kan 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 0d9e288b75794..c877a32617a2a 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 41017b4c8dea9..5d31c5a5aec0b 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 d9c4fe7e070c7..8b5aab9f3734a 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 35fe7ec83d570..414aa85a3a4ef 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 8e81fcdf052b4..081515b8aff43 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 cfc3bfa17f060..469fe73c57d72 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 ec3235755ee4a..3d4d0f090c574 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 e7c00766f33ff..577236ad36ee6 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 33d9baebc0743..fe582bf0f5082 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 238010fe7709a..b7c97274414e4 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 c5068b77b1d17..9907cc8f368d7 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 99476f2f68114..77020f3424277 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 52b0345b48ac9..0d0f890e76aec 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 78992ff9d2020..173b05e93e76c 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 118d380f47053..c4e45ad6d5c95 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.7 2004/07/02 23:12:53 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 272ae310fb316..15ad9d834760c 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 073ffffed4169..9f5bf11b9a39c 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 703c58db5224a..fc2f0116b6358 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 dbc3d693dbeb3..ddc9e44160494 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 3fd3b3e607d49..670b2ca3e7d17 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 9071155a289de..208993c55da7a 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 71168ee3d23fc..bf4355f727304 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 39ea37facb3db..c8ba2964780b4 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.2 2004/06/29 18:54:47 eik 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 c1e952d61681f..0d375bda2757c 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.10 2004/06/29 19:06:42 eik 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 6ef25ae5b0a7e..760d088d6bfba 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.27 2004/07/02 23:12:53 ru Exp $
 .Dd June 29, 2004
 .Dt PKG_VERSION 1
 .Os
diff --git a/usr.sbin/pkg_install/version/test-pkg_version.sh b/usr.sbin/pkg_install/version/test-pkg_version.sh
index 5c3d98d9c8f88..5837c1e6d9295 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 2004/06/29 18:52:13 eik Exp $
 #
 
 ECHO=echo
diff --git a/usr.sbin/pkg_install/version/version.h b/usr.sbin/pkg_install/version/version.h
index 3f3bcb88c57d2..f9237f7c739f2 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.3 2004/06/29 18:54:47 eik Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index c3702c87f7850..646656cde55c0 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pnpinfo/Makefile,v 1.10 2004/02/05 22:44:25 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/pnpinfo
 
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 07398180840c3..036182707a031 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.101 2004/08/06 07:27:07 cperciva Exp $
 
 PROG=	ppp
 MAN=	ppp.8
diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes
index 5b8a7cd9c8705..900f5825d96e8 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.23 2001/06/04 14:38:28 brian 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 318cd464d8367..a7b27fedeb538 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 9ff240a9f37cd..2336f49e090fc 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 60e2de4b534ac..79a9b807c65ed 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.6 2004/06/30 12:24:56 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/acf.h b/usr.sbin/ppp/acf.h
index e32adbc1661cd..6b0fc6131ccb2 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 2c5135266f80c..11c2857b69289 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.45 2004/01/21 22:00:50 brooks Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h
index ac0a1cae72887..750befe250429 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.11 2001/07/31 15:19:07 brian Exp $
  */
 
 struct sockaddr_dl;
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index b938e6845b8c9..4a6b246f3f8e3 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.28 2004/06/30 12:24:56 brian Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/ppp/async.h b/usr.sbin/ppp/async.h
index 309f597841e6c..460cb80a57d36 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 0d51564d3550a..05530d52f3a95 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.9 2002/06/15 08:03:29 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/atm.h b/usr.sbin/ppp/atm.h
index 3fbc0c5c98e82..bbde8ed24cbac 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.1 2000/09/14 22:02:54 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index 54f0c1ce6a8be..711eca2203e2f 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.56 2003/10/29 20:32:19 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index bbc257c560997..414718872bee0 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.20 2002/05/10 03:11:35 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index be55a6a94e0de..f795393bfab8e 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.133 2002/08/27 20:11:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index d27d3b01bbb08..3400d1896a88e 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.50 2003/06/19 18:55:49 ume Exp $
  */
 
 #define	PHASE_DEAD		0	/* Link is dead */
diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index 674ea70d78ba1..b9ffcc7c3ef14 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.23 2002/06/15 08:03:29 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/cbcp.h b/usr.sbin/ppp/cbcp.h
index 46bf274f21c9d..424085db92b13 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 78ea13ab15d50..038bc451c3f58 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.76 2002/08/27 20:11:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h
index bc867b63ddbb5..2283e102d7fbb 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 305e5c719841b..8a47e7a8815b4 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.85 2003/11/10 21:56:02 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index 617555d82d442..e341ca1c109bd 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 74ac199800160..a94a97f7f94e3 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.19 2002/06/15 08:03:29 brian Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.sbin/ppp/chap_ms.h b/usr.sbin/ppp/chap_ms.h
index 35ee978de2dd4..1bf3011b8676e 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.8 2002/06/15 08:03:29 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 79e41ea1a974d..516092765a1af 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.78 2002/06/15 08:03:29 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h
index b8162bfd33dd9..13385679e640d 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 034a3067f77c0..a8c624f18f4c4 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.300 2004/07/29 05:59:43 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h
index 8eb1e38d243d0..44d6829f1c60c 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 085e9c40108a2..b4b79f12b869f 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.75 2003/03/26 02:03:08 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index 64b3c160c5ca3..1ee85a76d1b47 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.14 2002/03/30 12:30:09 brian Exp $
  */
 
 #define DATALINK_CLOSED  (0)
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index 3e6198d641c27..a6e8973aaa7e1 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.25 2002/06/12 00:33:17 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/deflate.h b/usr.sbin/ppp/deflate.h
index a478b24cb1def..2cdc38e62a145 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 f29eff655ca8d..10c3a95d190da 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.47 2002/05/14 12:55:36 brian Exp $
  */
 
 
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index 2be76867447b2..361c0937ee033 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.66 2002/04/15 00:14:40 brian Exp $
  */
 
 /* Check the following definitions for your machine environment */
diff --git a/usr.sbin/ppp/descriptor.h b/usr.sbin/ppp/descriptor.h
index a3c1b1075406a..460b998247774 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 ce0bfd2db3ad8..9d8e7dd660863 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.28 2004/07/29 05:59:43 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ether.h b/usr.sbin/ppp/ether.h
index 16c9a9e05b9e6..6ff98bf9b0e65 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.2 1999/11/26 22:44:30 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/exec.c b/usr.sbin/ppp/exec.c
index 67d00ac6bf36f..47f6a21a15883 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.28 2002/05/14 12:55:36 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/exec.h b/usr.sbin/ppp/exec.h
index d4b338767fb39..34542c6d4f78f 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 994c09072260c..d02771f4cf3d4 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.51 2002/08/27 20:11:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h
index f994f4b0417db..002caa501a4d7 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.28 2001/08/14 16:05:50 brian Exp $
  */
 
 /* Operations - f_srcop, f_dstop */
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 685e5f107df6b..a91e424dc4e9f 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.69 2002/08/25 13:30:34 charnier Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index 3280ba075843f..ac02add7fcc6a 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.27 2002/05/22 21:17:13 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 81b537da4f9b9..8ba82c598eed7 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.50 2004/06/30 12:24:56 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h
index 839d83cf0152e..42c6137f9906a 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.23 2004/06/30 12:24:56 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/i4b.c b/usr.sbin/ppp/i4b.c
index 5744e89dfadc7..4824d8c2bd905 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.14 2002/05/14 12:55:38 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/i4b.h b/usr.sbin/ppp/i4b.h
index 984535c819590..cd0542777208f 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.4 1999/11/26 22:44:31 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index 440d460e53015..85e9f03f75b37 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 409da49b30084..fe97471c4308b 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.15 2000/08/18 00:01:43 brian Exp $
  */
 
 #ifndef NOSUID
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index 8a23742a25fab..aa184b9379a4f 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.36 2003/04/04 11:09:08 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index 28c3761e59225..1cb714f9178ae 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.7 2001/08/14 16:05:50 brian Exp $
  */
 
 struct ifa_msghdr;
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 9c5a98b5424cc..739516aea5a6c 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.101 2004/05/13 09:03:00 dds Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index a4c417912f9fd..07aeb5fbaa260 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 6b41f8f6653ee..9e32a2027a9e7 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.120 2004/07/17 01:07:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index dc1ed9e193e62..19d6288f91413 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 4ef00e4577361..d1f1e6964abfd 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.9 1999/08/28 01:18:31 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/iplist.h b/usr.sbin/ppp/iplist.h
index 5805a2cfbb77a..7cc8ab8c2fc2c 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 543a75d610831..667a06777a563 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.15 2003/06/19 18:55:49 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ipv6cp.h b/usr.sbin/ppp/ipv6cp.h
index 53f7153157eab..def454a78504f 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 4ee59a10a6f2d..919d8ab0fb9ba 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 bfc7376d9e67c..d77b92cec30be 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.105 2002/08/27 20:11:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index dca86b72d61c2..e37851fea8cb4 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.30 2002/04/16 23:57:09 brian Exp $
  */
 
 /* callback::opmask values */
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index 1667e8a8b6619..286f866685c23 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.20 2004/06/30 12:24:56 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/link.h b/usr.sbin/ppp/link.h
index 822474b789920..e3450ae604480 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 c90720b9724ba..6f4d6ab837afa 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 0da4b8c268482..95f239974fc37 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 073379a0eb85d..c302975a6213d 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.46 2004/06/30 12:24:56 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 13d378ffbe777..91a08eedd32f3 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 7517663240c9d..d31edc34476ff 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.190 2002/08/27 20:11:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index 46e63b1e12740..ec60037aae716 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.12 2001/06/13 21:52:19 brian Exp $
  */
 
 extern void Cleanup(int);
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 0edf1b926458d..f1716e419151e 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.45 2004/04/17 00:29:17 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 34fe6c3224896..d2272d8cc59d9 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.28 2004/06/30 12:24:56 brian Exp $
  */
 
 struct mbuf {
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 3fd9b95c232c2..4bbad4a2a1dfc 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.53 2002/08/27 20:11:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mp.h b/usr.sbin/ppp/mp.h
index 525ee291d7da7..a97bc14bf6fa2 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.11 2001/08/14 16:05:51 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/mppe.c b/usr.sbin/ppp/mppe.c
index 606ad0faf4d75..b3bf221dc1193 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.25 2002/07/02 00:47:24 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mppe.h b/usr.sbin/ppp/mppe.h
index c70a60906ba1d..a31eb5d05e41c 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 8172fd6632067..4fe703d57edac 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.60 2003/09/23 07:41:54 marcus Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/nat_cmd.h b/usr.sbin/ppp/nat_cmd.h
index f4c3655f2c8cc..f267f4c000986 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 e1acafbfc46ba..759a17e49e44e 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.5 2002/08/27 20:11:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ncp.h b/usr.sbin/ppp/ncp.h
index c9c3be53c3bd8..fb0bc3ce2b725 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.1 2001/08/14 16:05:51 brian Exp $
  */
 
 struct port_range {
diff --git a/usr.sbin/ppp/ncpaddr.c b/usr.sbin/ppp/ncpaddr.c
index 112cfbcbd2f3a..34dc75e81a2b1 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.14 2003/06/21 10:14:52 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/ncpaddr.h b/usr.sbin/ppp/ncpaddr.h
index 8c6b886123266..8c3ff77fad02d 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 15ace223e6d1c..dc8dcbe8a1e1f 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.5 2003/11/15 15:26:35 harti Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/netgraph.h b/usr.sbin/ppp/netgraph.h
index ffa012ae9b30c..e0e662329f3f7 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.2 2002/03/30 12:30:09 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 8a1d112d72de8..1cd42d06ed8c6 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.50 2002/06/17 01:12:38 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index 8e8d45734a881..db1b7912c82a4 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 1483b664e02b3..d8deacbb6d29a 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.56 2004/07/29 05:59:43 glebius Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/physical.h b/usr.sbin/ppp/physical.h
index 222c5e6de7f12..2ac15437a8e53 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.27 2004/07/29 05:59:43 glebius Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index e0d27438e47d1..0b6d8bf9b442d 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.312 2004/07/29 05:59:43 glebius Exp $
 .\"
 .Dd July 20, 2004
 .Dt PPP 8
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 2a8138129f83a..b83cdaeee2f0c 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.34 2002/06/12 00:33:17 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h
index 1afb77a9a57fa..d071971a3fb80 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 a33734cb5b166..06970655fab08 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 5a7dce9e20d26..2a92cc0aeface 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 839e65542aa0e..0925c1a537a54 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.30 2003/03/28 18:23:43 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index 0489338257900..6f9c0af5e3417 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 e4719987313a7..c84893b62b8c9 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.6 2000/07/19 02:10:35 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/proto.h b/usr.sbin/ppp/proto.h
index 8c93327698575..4fd0ef60abb94 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 1bd92ae47c9b5..79dacd7077b1c 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.48 2004/07/28 07:20:04 kan Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/radius.h b/usr.sbin/ppp/radius.h
index 2d7d69229aa52..2296d9ab32cf4 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.20 2004/07/17 01:07:53 brian Exp $
  */
 
 #define	MPPE_POLICY_ALLOWED	1
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index 168911c0be573..1ce870e213e3e 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.91 2003/03/25 16:49:08 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h
index edf66045e564a..e83ae4c35ec7a 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 03f7b866d98b0..18c4cbffc73bb 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.42 2002/08/27 20:11:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/server.h b/usr.sbin/ppp/server.h
index 9fdc52c6b8731..f010653622dfe 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 a42194be0c71d..13db583bd0b2c 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 27d264c19370a..f5893fa20dc66 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 bebd599b2bd3b..ff1466a0f877a 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.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/slcompress.c,v 1.37 2002/08/27 20:11:58 brian Exp $
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 223f65948b4e8..b5a5806b8b1c0 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.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/slcompress.h,v 1.16 2000/04/13 00:00:46 brian Exp $
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
diff --git a/usr.sbin/ppp/sync.c b/usr.sbin/ppp/sync.c
index ebace8aa49930..c463f8d72785e 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.7 2004/06/30 12:24:56 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sync.h b/usr.sbin/ppp/sync.h
index 4f5bfee0805f5..0305212033120 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 24f58a50d9040..c95d75bdd93da 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.67 2002/05/14 12:55:39 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h
index 9091e730b1a7c..6ce98d62b383d 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 65679f0be5546..db4edc0b91a49 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.18 2002/07/18 18:50:05 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/tcp.h b/usr.sbin/ppp/tcp.h
index f6a823529e9e4..ad4493547291f 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 b4dc64ed36376..f42779e5a942d 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.7 2004/06/29 07:40:38 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tcpmss.h b/usr.sbin/ppp/tcpmss.h
index ffd7b827963dc..be0224b1da371 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 f6bc9b57d1d3a..595c5e341e755 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 21e5450fa005c..9cb4de806dcd9 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 77b2af7e4f441..2811179ef4343 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 02fcdd1b4bd1f..439f47beb61a6 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 b72ec79d6e605..7d6fd72657097 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.30 2003/11/15 15:26:35 harti Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tty.h b/usr.sbin/ppp/tty.h
index f3f0d530e8e07..ec51f7de68fac 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.6 1999/11/26 22:44:33 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index 883cd5c4052e4..7916e243c40b6 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 1bb07122a1ac4..9167239e9f07b 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 dbd89e5be6184..f3e299f08e86f 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 3a5fe061e7d2a..3c4b0f0e37b6f 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.19 2002/07/18 18:50:05 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/udp.h b/usr.sbin/ppp/udp.h
index 46b8fe63de1af..8cc3bd2c91315 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.4 1999/11/06 22:50:59 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 8bc03dbab2607..387582a484fa1 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.39 2002/05/14 12:55:39 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 2956122fd0616..34457439857c4 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 6cdcc3dc6cfb2..156869082dbd2 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 3d807dc0ed3c5..06066ade1c7bb 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.22 2004/07/02 23:12:54 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 1ff63b31dfe2d..38e466fddd047 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.32 2003/12/07 08:39:29 tjr Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index e2f4bd888c438..58c638b88c4d9 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.28 2004/08/06 07:27:07 cperciva 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 1c1e392266f27..0359edee1374d 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 c98246172a7be..39228aa83b3ce 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 fb265e6d5954e..dc64172364a21 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.4 1999/08/28 01:19:00 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index fb21cfda3587b..360fb5f3cede6 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 a03ac4d4961e2..8405ad345b4d5 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 c3acafbe8392f..711b6808964bf 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 4a4f38383a349..4a7cd9c9a0214 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 c3e1f6ee44d1e..9d3be9d6e2374 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 7c0088308aa67..31f48732d8ca1 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 59c0281e16a0f..e0eb980299d79 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 0c49c7092d868..2af5d807f9b2c 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 7b43b7a08be28..67cb1c4d734fe 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 576b2006ab582..eb9d57d150789 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 2bc795d9a5046..693e16b536b9a 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 bdf24d1193df0..203707d39a93d 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 0890181af7ec9..6e825664b272a 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 74009872011f4..a4d0e29ac5087 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 2a19e2611b59c..139b8d7ec33d5 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 1e13d02dd3719..bc7de4308313a 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 82f65cf55d4e2..39496e6cdcfce 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 c2d0abfbc3c47..d4d4c9087a238 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 d1e679b2aa436..622fb93bc7d46 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 bc49c5879a249..7c9d9c07db846 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 147ae38ab40f4..af7ac9252699b 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 fdca2b51ba728..30ab99a6afc73 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 2004/02/28 21:32:40 maxim Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index 248556d381e87..005a0e754b600 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 3ca43c0cb2ed0..d41d889352f94 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 627c7d03d5dbe..2cda3ac14ea3a 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 2cfd86c8077f6..7d1eaa38e9856 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 0aab78b2d57a3..46cee3bd7f1f0 100644
--- a/usr.sbin/pppstats/Makefile
+++ b/usr.sbin/pppstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppstats/Makefile,v 1.10 2001/07/20 06:20:14 obrien Exp $
 
 #as per policies in handbook
 MAINTAINER=	peter@freebsd.org
diff --git a/usr.sbin/pppstats/pppstats.8 b/usr.sbin/pppstats/pppstats.8
index 5b28ea0a8f8dc..3483b7fc64cce 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 d3b7b3d2ca160..efd30dafcbb00 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 280e164285d89..b31f11829f0a8 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.10 2003/07/07 03:54:04 gshapiro Exp $
 
 SENDMAIL_DIR=	${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/praliases
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index 5cb35e7073711..b9f385273be52 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 1add286472f41..91ed25fc6627d 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 5bd1f21954c6c..8ec932e2a7f4f 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 9d1dffeb2b4f9..12dcb89d05967 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.12 2003/04/04 17:49:17 obrien Exp $
 
 PROG=	pstat
 LINKS=	${BINDIR}/pstat ${BINDIR}/swapinfo
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 22a4f4c2ab7ca..f72dd18a6eb15 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.44 2004/08/07 04:27:52 imp Exp $
 .\"
 .Dd May 23, 2002
 .Dt PSTAT 8
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 0d25894629beb..5037c59bd8b14 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.91 2004/08/07 04:27:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index 8937124f22f4f..605cc9b371f9d 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 bbb153988366d..849946d8ab06d 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 bcfea7e2c8874..01d8551a2f5d4 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 4d6cfe43c18a0..c9328a167c190 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 d8fa42bab61fc..ac8219abbf927 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.6 2000/07/13 23:52:49 davidn Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/edgroup.c b/usr.sbin/pw/edgroup.c
index 1cc46b4bdb487..f17a4226ae210 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 b88f4fa8539f5..59ca3ad18a4d1 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 edff76d1285c8..36201105da182 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 3f4c0105b75b9..c49728c592c66 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 a1e99d4645310..56a74453f5d2f 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 22795014693aa..b4867a26f76b0 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.35 2004/07/02 23:12:54 ru Exp $
 .\"
 .Dd January 11, 2004
 .Dt PW 8
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index 4010e842f670c..1435598b7403f 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 729d45a72003e..fa3ceb0fa6238 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 f541b26e1743c..df3f751033e9f 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.13 2001/07/05 08:01:15 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index 9377239c99069..b65a1b8c5ba34 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 1c63a11722b26..0f2a2f93f6057 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 fc85828b5bbfe..e3a4849009262 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 74a3ed09a7a97..8e570738cfddf 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 5fd36712821f8..9386517570829 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 2004/06/17 14:07:16 robert Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index 473cbb6c0c646..3b36c98769359 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 84226a90b300b..c5b898853979b 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.19 2003/01/23 19:51:48 fjoe Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 728906500f417..0669e924720da 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 4ad590bc1aa25..9a0717daa401e 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 c3aaeb3398d8d..1317452379b35 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 4c3ca7e2b9186..d00af9137f842 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.24 2004/08/07 04:27:52 imp Exp $
 .\"
 .Dd June 6, 1993
 .Dt PWD_MKDB 8
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index ed45d8350e6ba..6f0cb6e050144 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.47 2004/08/07 04:27:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index 07bcc7eff1cf1..6f2466b659097 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 eb4a9a7d3fb64..35732e82a8a91 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.21 2004/07/02 23:12:54 ru Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 75e758b076fdf..d711e4450639b 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.22 2003/05/03 21:06:38 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index 3f88bd9da33cf..ad283168eaf68 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 08e8d11bda25d..e9fed91cc4973 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 4bdf982064919..d409fb019cb7c 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 7f34457697e35..1c0df6b01510a 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 dbe6a1531d15b..3de2ac2fc2bc5 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -1,4 +1,4 @@
-.\" @(#) $FreeBSD$ (LBL)
+.\" @(#) $FreeBSD: src/usr.sbin/rarpd/rarpd.8,v 1.21 2004/08/07 04:28:54 imp Exp $ (LBL)
 .\"
 .\" Copyright (c) 1990, 1991, 1993 The Regents of the University of
 .\" California. All rights reserved.
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index a500dd512a13c..c16aca1b5de0c 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 50e747277f803..d7857a5405c20 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 9cbe5a2edf65f..414daae19d322 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.11 2002/07/14 14:45:22 charnier Exp $
 .\"
 .Dd March 21, 2000
 .Dt RAYCONTROL 8
diff --git a/usr.sbin/raycontrol/raycontrol.c b/usr.sbin/raycontrol/raycontrol.c
index 006fedabbb453..ef9cb2846a662 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 087e890ed3560..ace069b099989 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 745a8b2a25ca5..e4256b14be166 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.11 2004/08/07 04:28:54 imp Exp $
 .\"
 .Dd June 6, 1993
 .Dt REPQUOTA 8
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 72ad8a7f149ce..49b78323f0ced 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.18 2004/08/07 04:28:54 imp Exp $");
 
 /*
  * Quota report
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index 51438a18abc1e..acbd0cce25fbb 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 931aa466db4bc..121f7df73912a 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.6 2002/07/14 14:45:27 charnier Exp $
 .\"
 .Dd October 7, 1999
 .Dt RIP6QUERY 8
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index 90d65aaed65e1..e63661ebf28ad 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.6 2002/04/22 13:44:46 des Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index 579a02bb66890..5fa44ddaf0b77 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 d4f55516cd7cf..45b7c2af04b55 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.15 2004/08/07 04:28:54 imp Exp $
 .\"
 .Dd June 1, 1994
 .Dt RMT 8
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index af4f954e07b93..b06e9cc6e43c6 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 b8a52dd4d57a3..9353f7aad2aed 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.3.2.2 2004/09/30 23:36:11 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
index 2ca76976e5a92..937b66b47e5db 100644
--- a/usr.sbin/rndc/Makefile
+++ b/usr.sbin/rndc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rndc/Makefile,v 1.3.2.2 2004/09/30 23:36:11 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 1bed21a5e1d3b..c486a82312792 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 6ae01f37be04c..4552e72ed4c74 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 bff7e2d5f7f4a..96682b7a5b5ab 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 015e8c7a9c711..f168453e9438c 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/route6d/route6d.8,v 1.8 2002/07/14 14:45:33 charnier Exp $
 .\"	$KAME: route6d.8,v 1.10 2000/11/24 11:57:18 itojun Exp $
 .\"
 .\" Copyright (c) 1996 WIDE Project. All rights reserved.
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index f62c7f1138493..39b80062a51ed 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 49a7d5a93760f..f5152f5eec850 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 961ad17d4bf95..d9881685d76d1 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 6bcbef23257a1..b2b22e8ecf0d8 100644
--- a/usr.sbin/rpc.lockd/kern.c
+++ b/usr.sbin/rpc.lockd/kern.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *      from BSDI kern.c,v 1.2 1998/11/25 22:38:27 don Exp
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.13 2003/10/26 06:10:44 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index c526be188f1cf..a2f4724ffc57a 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.16 2004/07/16 19:30:59 mr 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 440b1a5fdd6df..c7809f4fc7ae1 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 0a8e2e60b6167..b47eb7d03e7ae 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 b67a40c3a5c50..7f4a4373f71f4 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd_lock.c,v 1.5 2000/11/21 03:47:41 enami Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.16 2004/07/16 19:30:59 mr Exp $ */
 
 /*
  * Copyright (c) 2001 Andrew P. Lentvorski, Jr.
diff --git a/usr.sbin/rpc.lockd/lockd_lock.h b/usr.sbin/rpc.lockd/lockd_lock.h
index 62f6981151ed5..e978f9206799d 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 da2ad7426466e..46bdff097f6fa 100644
--- a/usr.sbin/rpc.lockd/rpc.lockd.8
+++ b/usr.sbin/rpc.lockd/rpc.lockd.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: rpc.lockd.8,v 1.5 2000/06/09 18:51:47 cgd Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.14 2002/07/14 14:45:36 charnier Exp $
 .\"
 .\" Copyright (c) 1995 A.R.Gordon, andrew.gordon@net-tel.co.uk
 .\" All rights reserved.
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index a751e5c6f4e4a..b15cf45b09637 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 6d8053c29bedd..ab2f301dcff90 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 991af887e045a..28053466d3950 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 eed7849591527..67fff5ca3a6a1 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 4d035464f2cd7..a1b44a42877f5 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.12 2004/07/02 23:12:55 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 507a027e62664..7eb46d1c87018 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 a82d760f96f27..53032df1c22f7 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 6df15011db3b3..8bf5affa636a3 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 0a829c301cb5d..7544fc42a1c61 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 b81334e1b272c..0e5551b3ea7fb 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 acf6c79683112..5095f8b99af45 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 81cdd48d1c03a..59f6fa0af6064 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.10 2002/12/12 17:26:03 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 0ce1ce29874c2..8f589f886097d 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.12 2003/10/26 06:14:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index bc2269bd9bf4f..080496e516f09 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.20 2003/04/04 17:49:18 obrien 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 7f0dce600b6ef..dcb871b2ce7c1 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.22 2004/07/02 23:12:55 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 a1d6be51f3697..c696de8705bb6 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 db15be228a6dc..d0a9907829fc5 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 ae917bed417d3..41a44d404dfef 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.24 2003/05/03 21:06:39 obrien 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 04adf31ed85f9..49dbab340e7e3 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 a9db8f7e5b6c3..6e7671b6a5502 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 a5780613a3e44..7d70af540cb3c 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.8 2003/04/04 17:49:18 obrien Exp $
 
 .PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr
 
diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index 5cc0d7a56cff6..36d680e303ae8 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 0552aab9d3ea7..62ba0dc5d5f6b 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 225c7cb41dbcd..0ebff36440b8a 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.8 2004/05/24 13:21:24 stefanf Exp $");
 
 #include <sys/fcntl.h>
 
diff --git a/usr.sbin/rpc.ypupdated/ypupdate b/usr.sbin/rpc.ypupdated/ypupdate
index 4a26f4b6d72ba..c779bb70bfe9c 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 2cacb9511e1ff..976c75efd2c79 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 c13af7df43407..adb5057fbbaab 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 c9a50dd36e0c0..99436f8ef60af 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 70729b12e67d0..11dac4f809aa9 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 ad8c5f421b868..37439576705eb 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.14 2002/12/27 12:15:39 schweikh 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 5aba934a6ec44..59d497c844c6f 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 8fa3e2205b439..4407ccb0c12a5 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 5f60712e9fefe..4463379fc0396 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 f597ce2130962..ddfde0882dd26 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 192c9cac62555..fb15e9d7f8252 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 d74b369d180a4..3957d763aa028 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 b10ed508b0bd3..c8080d0f76f69 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 dc3cf05f27f5b..5e7e57615b30e 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 8e2ed102b428e..a47c4b479c724 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 0a72b662e43cc..9c18a3f955005 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 c7c3bd41ecbce..e28d7f8cad575 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.5 2002/11/27 15:33:47 ru Exp $
 .Dd September 14, 1992
 .Dt RPCBIND 8
 .Os
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index ec8dacaefd8e0..0b4d1ba94d569 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.13 2004/08/16 00:20:31 mbr 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 2d52be359469e..594bb20a3f2f2 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 8657247f60ac2..3be6e35cbf9d8 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 4137ce2f003f7..0e7ac5e56f818 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 1962e1c422d7a..fc2260b5f5e4f 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 c85911e09dfc0..b5e244adb7b8d 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 6ad995341670b..8fca588607d42 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 d7c15abeb74f5..e3b92754357a2 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 3ad9a3c3521c7..259c964041e6b 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.7 2002/07/14 14:45:50 charnier Exp $
 .\"
 .Dd September 7, 1998
 .Dt RRENUMD 8
diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c
index 3d08fa89cdf61..5af45403b405f 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.7 2003/10/26 10:30:17 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5
index b0f288793de39..8e935b40a4138 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.16 2004/07/02 23:12:55 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 df0280b2591ed..fa3a9ce660b6a 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 7fa20987e59c2..ed19691ac197d 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 a6c5f80319a44..dea3542e76b9b 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 372387130c422..b746055ec1f7a 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 27bedd7e5f2a8..d298f1e3aa52c 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.23 2003/08/15 19:13:53 ume 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 aeb1c2c9d457f..ae4e86e661aef 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 7b9a2748d6ca4..4c67ff884c018 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 cc3b472e47507..8defe60419985 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 07d9e1f74b2c6..f5a3e96c4af4c 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 07bb6eeb4b970..da7a887f0f140 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 3afee55fcc72a..126c0cdc4d2a1 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 14a8ab9bdcc4c..36e9a93011509 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 ce94015c2dcfd..2109a85eb9452 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 6fa41d6925988..2d49ab0f2e438 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.8,v 1.14 2003/08/15 19:13:53 ume Exp $
 .\"	$KAME: rtadvd.8,v 1.24 2002/05/31 16:16:08 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 8a5092e825f63..6ea9b54c57bd7 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 33ab7f3e46bce..bb0751f772afb 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 d059c0c1f3324..f63c81d818d0c 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.conf.5,v 1.14 2004/07/02 22:50:25 ru Exp $
 .\"	$KAME: rtadvd.conf.5,v 1.49 2003/07/24 21:51:26 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index b1c505dd75aa7..8b6041997c622 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 fb9f299a287c8..6d8247867d541 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.8 2003/08/11 15:51:54 ume 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 d435bde5ab188..4bd30bef5f319 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 ebc7bd1a37cc3..37db3b4b32b8f 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 a8986fb212dc2..9c7c93193c498 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.26 2004/07/02 23:12:55 ru Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index 245f714fe9fe7..1e4dccc804674 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 6ae47e99b1059..dc0f878258c05 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 bdc8ec3b375db..62a0060c49441 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 23e4e6fa02b32..89c9f8724cde8 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 b1cbc7985a41e..ec4bb47330b26 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 09d6774be79bd..8f8f9ff5332fc 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 dd9f4a1c8bddb..0d18668e9e990 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 d7e84a46d133b..f1e2cf6fff523 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.14 2004/07/02 23:12:56 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTSOLD 8
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index f9dca79537ddc..61e5263977dfb 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.19 2004/01/14 17:59:38 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index e25ed955e98f5..7ad09ebc3895f 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 def0e6e145913..c20fd9b4ec8b7 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 8a1a6c009542f..bef2e510cc802 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.21 2004/08/07 04:28:54 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 09d5f8ae79d3f..f46659d0b726a 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.21 2004/08/07 04:28:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 2f9537a076ae7..04c7bfbf83cbd 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sa/Makefile,v 1.9 2003/04/04 17:49:19 obrien Exp $
 
 PROG=	sa
 MAN=	sa.8
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index bc5f199e997e5..f77282b5958f6 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 fe7de23f770a3..c3c6733ab9f02 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.14 2004/01/22 07:23:36 grehan Exp $");
 
 /*
  * sa:	system accounting
diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h
index 7a7edf68caf66..8cb7f44ad8a86 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 e82f973e0b68f..7e0a66cadc31f 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.10 2003/05/03 21:06:40 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acct.h>
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index ac78d24ee1d09..d39b08d930943 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.16 2004/07/02 23:12:56 ru Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index d2f739d7282c6..22d4dc83ce2aa 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.13 2003/05/03 21:06:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 86e7edacade49..fdf92b3d477fe 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.46 2004/08/06 07:27:07 cperciva Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile
index bc3c21ea9d82f..570d07f7495b8 100644
--- a/usr.sbin/setfmac/Makefile
+++ b/usr.sbin/setfmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/setfmac/Makefile,v 1.5 2003/04/04 17:49:19 obrien Exp $
 
 PROG=   setfmac
 LINKS=	${BINDIR}/setfmac ${BINDIR}/setfsmac
diff --git a/usr.sbin/setfmac/setfmac.8 b/usr.sbin/setfmac/setfmac.8
index b541a4afe9e31..25e062bf4df54 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 d5f5a611e88a9..bc1820e6edfb8 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.7 2004/02/18 05:40:15 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/setfmac/setfsmac.8 b/usr.sbin/setfmac/setfsmac.8
index 1951d68e080f6..5d219b860c430 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.5 2004/07/02 23:12:56 ru Exp $
 .\"
 .Dd February 17, 2004
 .Os
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index 91977e02e6303..4bb7728ec6c61 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 d6bb8c4fbd136..45ccd45213d60 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 c534fa10f1c49..3f06fa946ad60 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 a1d8adb207bc6..fd60c8515f4cf 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 91aba5740f189..942028dc54b5e 100644
--- a/usr.sbin/setkey/setkey.8
+++ b/usr.sbin/setkey/setkey.8
@@ -1,5 +1,5 @@
 .\"	$KAME: setkey.8,v 1.89 2003/09/07 22:17:41 itojun Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.31 2004/06/05 20:22:15 ru Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
 .\" All rights reserved.
diff --git a/usr.sbin/setkey/setkey.c b/usr.sbin/setkey/setkey.c
index 5bdd6df113e08..aedfa2e87b761 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 b1fb238c5a412..30b3cad2ee362 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 27cd478fc9391..0c6cfd0cb0a1d 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 74c1e17cbcef3..4fdd46d469e24 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 f3251c7bfed32..16d5e544e3f26 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 08b8b93d0bcc7..22f4ad9835555 100644
--- a/usr.sbin/setpmac/Makefile
+++ b/usr.sbin/setpmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/setpmac/Makefile,v 1.3 2003/01/15 01:17:12 chris Exp $
 
 PROG=   setpmac
 MAN=	setpmac.8
diff --git a/usr.sbin/setpmac/setpmac.8 b/usr.sbin/setpmac/setpmac.8
index e84a8bc632280..76c82484f6772 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 8314a77564558..6f782129844d8 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.1 2002/10/23 03:15:24 rwatson Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/sicontrol/Makefile b/usr.sbin/sicontrol/Makefile
index 2f3a8883ba41e..a3b73663dd225 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 5040d8ad093c6..ef5c9409253e0 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 b67668842d550..12c22ef92f3b6 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.14 2004/08/07 04:28:55 imp Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index 860b9b0993033..10f716257362f 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.7 2001/09/13 06:48:16 ru Exp $
 
 PROG=	sliplogin
 MAN=	sliplogin.8
diff --git a/usr.sbin/sliplogin/pathnames.h b/usr.sbin/sliplogin/pathnames.h
index e318f92a3ed8c..17c154ca3b314 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 e770ca154c104..7e01a82967001 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.23 2004/08/07 04:28:55 imp Exp $
 .\"
 .Dd January 5, 1994
 .Dt SLIPLOGIN 8
diff --git a/usr.sbin/sliplogin/sliplogin.c b/usr.sbin/sliplogin/sliplogin.c
index 45b916b084686..64c7cff7beefa 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.15 2004/08/07 04:28:55 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile
index 650e2216aef05..99afcb44e5300 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 fa03c4df91716..195db10fbf092 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 fbe52cfd09fe7..ca005706702bf 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.18 2003/05/03 21:06:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/smbmsg/Makefile b/usr.sbin/smbmsg/Makefile
index 1fc7d3ea4811a..5f77820a75d58 100644
--- a/usr.sbin/smbmsg/Makefile
+++ b/usr.sbin/smbmsg/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/smbmsg/Makefile,v 1.1.1.1 2004/05/17 10:56:04 joerg Exp $
 
 PROG=	smbmsg
 MAN8=	smbmsg.8
diff --git a/usr.sbin/smbmsg/pathnames.h b/usr.sbin/smbmsg/pathnames.h
index aff7335fac660..f805ae9252b89 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 7bcbf028f4d32..f4cc54a73d652 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.2 2004/07/09 06:16:43 ru Exp $
 .\"
 .Dd May 16, 2004
 .Dt SMBMSG 8
diff --git a/usr.sbin/smbmsg/smbmsg.c b/usr.sbin/smbmsg/smbmsg.c
index 425b782d2d331..31c472d59decc 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 8e9245aa753a7..ebacc4d5b5484 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 58eced5be0dee..750eb06af8510 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 c682b03f43acc..c3bc7ee7006ef 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 c2515e0c117ef..1a5bb10fb788d 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 e10704886771f..c1d95a074844a 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 0e072e20ab279..b294c9c0d3440 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 e11e73e3dc0b3..a375cd34528b2 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.131 2003/11/20 20:43:06 jhb Exp $
 
 .if ${MACHINE_ARCH} != "ia64"
 _wizard=	wizard.c
diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c
index 7d130f14e95d1..5bd75fe6aca07 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.34 2004/03/11 11:58:15 bde Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index b9658d094846a..e3150d8341816 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.53 2002/10/14 13:02:30 nyan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/command.c b/usr.sbin/sysinstall/command.c
index 33ebc352544a4..35938a144cc5a 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 acfde5bf19eab..f5a5586311f23 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.225.2.1 2004/09/02 01:54:59 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index bbc3f79977e4a..a06fdbe8c5ca3 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.156.2.1 2004/09/14 21:22:32 wpaul Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dhcp.c b/usr.sbin/sysinstall/dhcp.c
index fa35580e12359..91ff5706b687f 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 1e35c7b3a11c3..51ab7fe31f34f 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.152.2.1 2004/09/18 16:57:21 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 4896b235c1460..cd86b218aa071 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.46.4.1 2004/09/02 01:54:59 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 72f43d87d9768..1ef635390cc45 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.234.2.1 2004/09/23 18:23:42 jhb Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 08cb302831254..1abf3ac4678ea 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.62 2004/08/10 18:18:42 cperciva Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index d89f8ce2265cd..013aaa6f4dddd 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 5294972f09226..22935d515ece6 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 564e33ff43747..0d812ca913fa9 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 0101bde3ce016..f9b4dc39b9a1f 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 c971b79c05aa1..373759e7639ce 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 892d8528bc8a6..ea59cb209e75a 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 19c826465e080..8d6732d30532a 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 ac9a0baea04bf..1265a25914691 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.102.4.1 2004/11/04 05:04:53 kensmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index bac3bf47d3695..dbc7d703bfe31 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.358.2.1 2004/09/02 01:54:59 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/install.cfg b/usr.sbin/sysinstall/install.cfg
index fb7ad88597953..c000be04406fe 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 aa7ec88a97423..8eb124e8f45b1 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 3c53a0070a173..800230190a4a5 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 c752f736c1a44..d21625354a06f 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 2004/08/07 04:03:18 marcel Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/list.h b/usr.sbin/sysinstall/list.h
index 8300173e0660a..5bb51bea4ec1e 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 695754b074fc7..c2ffe707b0ace 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 cbdc01c04ed40..52b9b64b6ca66 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 79e8b1ca4db03..8ac06e43dead3 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.395.2.2 2004/09/18 07:14:53 bmah Exp $";
 #endif
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c
index 07cbc81751d18..25bd6ebbc3e70 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 859994a26e890..167272418d5ac 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 574fd72359742..83166a7d7c1a2 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 4625ce2f77528..7b38f3b06b5d5 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 c57ad3de90a6b..44dc0e36681be 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 87788eaced6f2..396e78981de31 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 8e3a7d96ac849..57b07e8ff3e0e 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 7f23fc3cfdb76..d515444eadcd8 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 0ddfad8b3d07a..fcdc31d1a33e9 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 eb765a8938854..3a366f0b31c1f 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.64.2.1 2004/09/02 01:54:59 kensmith Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 117c1226fe73f..cc2b89d3b6fe2 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.261.2.1 2004/09/02 01:55:00 kensmith Exp $
  */
 
 #ifndef _SYSINSTALL_H_INCLUDE
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 65c353a41c9e5..e89ebf5ec8fc7 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.123 2004/03/11 11:58:16 bde Exp $
  *
  * Jordan Hubbard
  *
diff --git a/usr.sbin/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c
index fd73da568e852..d52d834a95ccc 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 1d2534fe1c193..be7e43865d328 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.131 2004/03/12 15:28:13 bde 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 1d8e047bc12a2..c26b77324f470 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 0de954cceb39c..c34521dffc857 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 c9515ae82b28c..ce19099332bb5 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 4eedbd555f89e..d7935da97de26 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 ecee440fe7884..c68b8d1fd2535 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 e86104fd100a0..cf745c0f40869 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 98e0a5caf997e..921096c6bdb5c 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 028fda554cbe5..40acd55d4b575 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 24fbc4cfa0add..43dce0e935f99 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 8029be3051eba..85cd33ef5ac55 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.36 2004/08/07 04:28:55 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index b36e1d8e8a58b..549814b271841 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.52 2004/08/07 04:28:55 imp Exp $
 .\"
 .Dd November 24, 2001
 .Dt SYSLOGD 8
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index b91af443b8c20..856b5fa316754 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.131 2004/08/07 04:28:55 imp Exp $");
 
 /*
  *  syslogd -- log system messages
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 57938e14c9d70..74cafdfba05bb 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdchk/Makefile,v 1.10 2003/07/24 19:58:56 markm Exp $
 
 .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
 
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index bea68aa6aa3fc..f6aaef63408a1 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdmatch/Makefile,v 1.8 2003/06/04 15:58:03 markm Exp $
 
 .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
 
diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index c549530613bd3..70549c3c14ef7 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 1e4d46f113a51..500683eb776a9 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 1117f17a04588..73c2152778573 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.39 2004/08/06 07:27:08 cperciva 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 5ab83486fe45c..e72846840296e 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.5 2004/03/31 15:00:44 bms 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 2c444596a8eed..81e4d3ff78635 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 249454e6f0440..125ed61feab72 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 a460ffab2f7ee..bdd3fad81e7b6 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 2efecc743324c..05fc60606781e 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 adca2f547a882..bd01f33f441d2 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 8904352b798ca..bb57a7e0a60d6 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 2f56510bca1c5..aa6668c0d7dcd 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 9afa6c60d4d49..050b9f7326598 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 412399ae41b35..04e47ce25a89d 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 7d52a32220c1e..3d09ba3d4e57c 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 424ead2a514ae..6da2d785e2ae4 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 6f73824fbd74a..1ad93386c90d3 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 8bde7438a556d..1557b8a5f4027 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 038dd56bf8b5f..8e7d842591d18 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 79f1f5ab19fa2..86395de59ff67 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 50a7da27161f8..23c75a60cd85d 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 c7204bd3aef4e..33790660c0188 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 6fe0bd1cc5cf3..6806d92de00ae 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 0713155a3f610..17a4f1abc1269 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 3856a34c6faed..bd5c7b9309d87 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 cbbde581e2a34..42f15156ecf46 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 e5fdcdefb828a..6c8c47409d124 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 74a6f5f92600f..c50faac18da04 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 db4d2dd0be4d2..2e3e796353c5c 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 e368764c85f23..b23807b452603 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 27344a3b9e05f..80087be1afead 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 5262f46d805df..81db242873da0 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 5d30fe3703913..bd1a91a4a51bf 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 8e4c3d5a0767a..92faf1597768a 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 ecba759f77948..7a24af335aad6 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.15 2004/07/02 23:12:58 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 368b460513afc..14d2e06a55ca0 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 f6ee8a6ae74a3..ab048f4021565 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 953c5d4711491..4d5a9e481b886 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.20 2002/07/28 02:27:07 fenner Exp $
 
 TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index ab4e52ce981ad..acc4a410154cd 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 04c800d3f4df2..39dbf8f587aa4 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.13 2004/07/07 19:57:16 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt TRACEROUTE6 8
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index a854bde82523d..8ec4078b33ee5 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 cf1680b2eec33..bb3fe0c742a08 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 64e2c23f2b0f7..4c0486f71a2d2 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.15 2004/08/07 04:28:55 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt TRPT 8
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 2d740baf05ab1..2f5f72411a85b 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 0596967a07e2f..2285920b7e85d 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 09d842f24a456..66a714ba592b4 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.18 2004/07/02 23:12:58 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 6b1caf8b3149d..876410840528e 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 d89bc857f5bfe..9246a7b1c9983 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 9afb591a6e40e..1ddc8a45d7ff4 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.7 2004/07/02 23:12:58 ru Exp $
 .\"
 .Dd February 24, 2004
 .Dt UGIDFW 8
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index 87ed035831d5a..d6592d06115a8 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/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/usr.sbin/ugidfw/ugidfw.c,v 1.2 2004/02/25 03:59:56 rwatson Exp $
  */
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/usr.sbin/usbd/Makefile b/usr.sbin/usbd/Makefile
index aadecee028306..180cccc72aca7 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 d6f9fa0654c0d..02d4cab39ad16 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 5cc2518f0eea1..da47e6013fda0 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.29 2003/10/25 22:03:10 jmg 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 3fbcd6a39a4be..8b94b7cb2f94b 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.14 2004/07/15 07:34:14 roam 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 985bc7a61ab50..a3c9860ac3d40 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 3226dd5bd6589..e9c9955050fab 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 640dd512f7f29..e64e84c15bcce 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 8c8f6bb804b26..888ccefda4dba 100644
--- a/usr.sbin/vidcontrol/Makefile
+++ b/usr.sbin/vidcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vidcontrol/Makefile,v 1.5 2001/07/20 04:23:12 obrien Exp $
 
 PROG=	vidcontrol
 SRCS=	vidcontrol.c decode.c
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index fddc3d56d8021..f7f56fa84d0dc 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.10 2002/06/02 20:05:59 schweikh Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/vidcontrol/decode.h b/usr.sbin/vidcontrol/decode.h
index 1f1cba4a47207..8adff2617dfe0 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 9bf881c2a1bef..b9d79d171a6ce 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.55 2003/03/02 21:04:21 ru Exp $
 .\"
 .Dd May 27, 2002
 .Dt VIDCONTROL 1
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 3ce1f21752c03..b403cc575f18d 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.47 2003/09/18 16:20:32 eivind Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile
index 69a9df9c5ba9e..835ab3b0e432b 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 b2acc904e6548..835a1333ca5b2 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 2004/08/07 04:28:56 imp Exp $
 .\"
 .Dd June 6, 1993
 .Dt VIPW 8
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 4a0a70080dcac..4a3750351384a 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 c7aa34bfb7068..007265af3f098 100644
--- a/usr.sbin/vnconfig/Makefile
+++ b/usr.sbin/vnconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vnconfig/Makefile,v 1.7 2001/07/20 06:20:26 obrien Exp $
 
 PROG=	vnconfig
 NOMAN=	"mdconfig supplies manpage"
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index 294250d4b5a1b..82f1a55f0d4d2 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 e8a8ea6ab6982..9b49766113a1d 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 a5902f2415ca0..59b90ddc0f24c 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.29 2004/07/03 18:35:53 ru Exp $
 .\"
 .Dd November 24, 2001
 .Dt WATCH 8
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 049fc84297d27..2828f0fe369f7 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 2004/08/10 01:49:46 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
diff --git a/usr.sbin/watchdogd/Makefile b/usr.sbin/watchdogd/Makefile
index 68675c76e1542..cd1f1a0713492 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 7813947e36fb6..4a0ee063fc865 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.5 2004/07/07 19:57:16 ru Exp $
 .\"
 .Dd February 28, 2004
 .Dt WATCHDOG 8
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index e20ec56a1f9c4..e399a5648db57 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.4 2004/06/13 18:03:43 ru Exp $
 .\"
 .Dd June 25, 2003
 .Dt WATCHDOGD 8
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 0c1b6258bede0..0e04db429b920 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.9 2004/07/28 22:13:04 green Exp $");
 
 #include <sys/rtprio.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile
index b8ac802a74421..620af9bda2987 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 a0540c9945feb..c6d6fd6b078d7 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.45 2004/06/05 20:20:34 ru Exp $
 .\"
 .Dd March 4, 2003
 .Dt WICONTROL 8
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index b8b1add40f91f..49da6acc4e17b 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.37 2003/09/29 06:32:11 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile
index 8d3d0cc3e7972..cf745f6c40845 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 99a29422f0207..0471bc0f9286c 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 f361b2cb99fb2..2b8c8536f06a4 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/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 973da6ee0559a..66c29f6fa080f 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 f7b8f2242bd35..55617c723c813 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.17 2002/07/14 14:47:01 charnier 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 6c3014bdfc9ca..cd0f130730500 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 915d001be4dc5..7a22134c7b22a 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 1806c3c0f122f..c9e15c5f17b18 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 80e6a78730114..6f820c2b8ef1a 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 4afdb2a687339..aae2e679e34f5 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.22 2004/08/07 04:28:56 imp Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index bec3b9e0c3f1e..e8418d93af8f8 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.39 2003/05/03 21:06:41 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index 63763316ef8cb..1b3c9d67135e5 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 ad90d902e146b..4c09185f2d004 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 e35087c6baaf1..0dff2638071b4 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 7ce1c612e0e0b..100b350c8de2d 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 60db3885fa92f..ef9846469b9a2 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.17 2004/08/07 04:28:56 imp 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 2a4fbccee2c62..32c667d98c897 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 e3ef5481c15bd..520f7de065c86 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.18 2003/05/03 21:06:41 obrien Exp $");
 
 #include <errno.h>
 #include <signal.h>
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index db215237126ee..fdea2bfb6c89e 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.23 2003/04/04 17:49:20 obrien Exp $
 
 RPCDIR=	${.CURDIR}/../../include/rpcsvc
 .PATH: ${RPCDIR}
diff --git a/usr.sbin/ypserv/Makefile.yp b/usr.sbin/ypserv/Makefile.yp
index bd33918ffc475..ce36e3f7102d5 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.35 2003/06/13 16:13:28 ru 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 b9063092c2cc0..b95c563f7fa69 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 61944dc44bbe9..6122981df8cec 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 50270fc7304b7..a010a1d3dc376 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.24 2003/05/03 21:06:42 obrien 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 8d488f3bdb6ab..3a1e549fdd8ef 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 553e296884c6d..7981ee9be095f 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.16 2002/02/06 13:30:30 des Exp $
  */
 
 #include <db.h>
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index d9132748be24b..9baf382865fbd 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.26 2003/05/03 21:06:42 obrien Exp $");
 
 /*
  * ypserv startup function.
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index e6d82d62d7154..9ac11cf204197 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.37 2003/05/03 21:06:42 obrien 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 33d058ef9b879..4680c6af0fad1 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 2533fdae7d75b..ec65d6adb48b7 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 1be7e0e3e1864..a9fa9a55baa02 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 e2e78ed464c2d..0f92001f2c5e6 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.38 2004/07/02 23:13:00 ru Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index 10ed5f88fd780..c93e897491c1d 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 49ad6e0b67aeb..21db3b6f9245f 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 1296f3946fadd..a5ea0c9e97e70 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.14 2004/02/09 00:10:18 iedowse Exp $");
 
 #include <err.h>
 #include <netdb.h>
diff --git a/usr.sbin/zic/Arts.htm b/usr.sbin/zic/Arts.htm
index baa84ed77431b..e8f95394f0d5d 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 2496e821159b2..41f4ee993f8ff 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 b915adff92abc..137bf6a1a2059 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 a069032eda51c..c81ef8b9f5ac0 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 315f33a4a2f1c..47d9cb2b314bb 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 692bf1a07934b..009ef1ec82003 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 3a685fd7ea0d5..065a1d645ce9d 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 e63e943988347..f98d1177dd86a 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 127946f7c4389..68c893b32f8c2 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 aa58a56661bb2..5d00937d759ac 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.17 2004/07/02 23:13:00 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 492cd43cf708e..7bda4bfbfbedb 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.16 2004/06/20 21:41:11 stefanf Exp $";
 #endif /* not lint */
 
 #include "private.h"
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index c98799cf5bbea..cd24fe65004c1 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 8c4a9beb763af..45011a38e53af 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 583d5fd963aef..c70efb7a887c1 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 ef9527bb76b3c..9bd25001bb22f 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