release/4.1.0_cvs

1208 files changed, 1232 insertions, 1232 deletions

diff --git a/usr.sbin/IPXrouted/IPXrouted.8 b/usr.sbin/IPXrouted/IPXrouted.8
index c9e5946aab7e..d969df4467ef 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.8 2000/03/01 14:07:47 sheldonh Exp $
 .\"
 .Dd Oct 11, 1995
 .Dt IPXROUTED 8
diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile
index 8d5c3557ce68..e9757a494a88 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.4 1999/08/28 01:15:01 peter Exp $
 
 PROG=	IPXrouted
 MAN8=	IPXrouted.8
diff --git a/usr.sbin/IPXrouted/af.c b/usr.sbin/IPXrouted/af.c
index 74455dfe39e9..48102266d3b3 100644
--- a/usr.sbin/IPXrouted/af.c
+++ b/usr.sbin/IPXrouted/af.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/af.c,v 1.6 1999/08/28 01:15:01 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/af.h b/usr.sbin/IPXrouted/af.h
index 576a6c7adc04..311a0dd9ff16 100644
--- a/usr.sbin/IPXrouted/af.h
+++ b/usr.sbin/IPXrouted/af.h
@@ -36,7 +36,7 @@
  *
  *	@(#)af.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/af.h,v 1.4 1999/08/28 01:15:01 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/defs.h b/usr.sbin/IPXrouted/defs.h
index 3a1e6ac803ce..611607cb59b6 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.8 1999/08/28 01:15:01 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/IPXrouted/if.c b/usr.sbin/IPXrouted/if.c
index 7b914e7bd200..93b46a87d76f 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.5 1999/08/28 01:15:02 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/input.c b/usr.sbin/IPXrouted/input.c
index a2e8c261ce67..90d5c11fb332 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.7 1999/08/28 01:15:02 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/interface.h b/usr.sbin/IPXrouted/interface.h
index ed7b9889dcff..a6c56f668dd7 100644
--- a/usr.sbin/IPXrouted/interface.h
+++ b/usr.sbin/IPXrouted/interface.h
@@ -34,7 +34,7 @@
  *
  *	@(#)interface.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/interface.h,v 1.4 1999/08/28 01:15:02 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/main.c b/usr.sbin/IPXrouted/main.c
index 91fe635dbb96..b9e3cf16e55f 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.10 1999/08/28 01:15:03 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/output.c b/usr.sbin/IPXrouted/output.c
index 1e60fc893cdd..b96e8b572689 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.8 1999/08/28 01:15:03 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/protocol.h b/usr.sbin/IPXrouted/protocol.h
index 7fae5363cf02..ae3b2b5b1e75 100644
--- a/usr.sbin/IPXrouted/protocol.h
+++ b/usr.sbin/IPXrouted/protocol.h
@@ -37,7 +37,7 @@
  *
  *	@(#)protocol.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/protocol.h,v 1.5 1999/08/28 01:15:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap.h b/usr.sbin/IPXrouted/sap.h
index b4e9dcb6ef51..639983deef00 100644
--- a/usr.sbin/IPXrouted/sap.h
+++ b/usr.sbin/IPXrouted/sap.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap.h,v 1.7 1999/08/28 01:15:03 peter Exp $
  */
 #ifndef _SAP_H_
 #define _SAP_H_
diff --git a/usr.sbin/IPXrouted/sap_input.c b/usr.sbin/IPXrouted/sap_input.c
index 59281b29cac5..6fa5fa94088f 100644
--- a/usr.sbin/IPXrouted/sap_input.c
+++ b/usr.sbin/IPXrouted/sap_input.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_input.c,v 1.7 1999/08/28 01:15:04 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_output.c b/usr.sbin/IPXrouted/sap_output.c
index 15452c8977d0..80cd3baed525 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.9 1999/08/28 01:15:04 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_tables.c b/usr.sbin/IPXrouted/sap_tables.c
index f2d83e0b3198..f8601c22796b 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.7 1999/08/28 01:15:04 peter Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c
index 1740a8861f21..f633841e0031 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.8.2.1 2000/07/01 10:46:25 ps Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/table.h b/usr.sbin/IPXrouted/table.h
index 3f9693f187f3..e52fc7e5e9db 100644
--- a/usr.sbin/IPXrouted/table.h
+++ b/usr.sbin/IPXrouted/table.h
@@ -36,7 +36,7 @@
  *
  *	@(#)table.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/table.h,v 1.6 1999/08/28 01:15:05 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/tables.c b/usr.sbin/IPXrouted/tables.c
index 8801b111caf8..dc41630fbb47 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.7 1999/08/28 01:15:05 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/timer.c b/usr.sbin/IPXrouted/timer.c
index 8b31c1deb1d6..0e5d2c446e04 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.5 1999/08/28 01:15:06 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/trace.c b/usr.sbin/IPXrouted/trace.c
index b89d9f877afb..84613aa5dc1d 100644
--- a/usr.sbin/IPXrouted/trace.c
+++ b/usr.sbin/IPXrouted/trace.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/trace.c,v 1.6.2.1 2000/07/20 10:35:22 kris Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/trace.h b/usr.sbin/IPXrouted/trace.h
index c83a9d1b4572..3916ad19e5dd 100644
--- a/usr.sbin/IPXrouted/trace.h
+++ b/usr.sbin/IPXrouted/trace.h
@@ -37,7 +37,7 @@
  *
  *	@(#)trace.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/trace.h,v 1.7 1999/08/28 01:15:07 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index e15c4e1cbd7e..72ddf529a4a4 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.183.2.4 2000/07/15 07:36:20 kris Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	IPXrouted \
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index 612b4c29932f..76d621d5ce8e 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ac/Makefile,v 1.4 1999/08/28 01:15:08 peter Exp $
 
 PROG=	ac
 MAN8=	ac.8
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index f78fb8d9c2c5..4fc15176e9f9 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.13 1999/08/28 01:15:09 peter Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 07d5bed1395b..751a11737b2f 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ac/ac.c,v 1.14.2.1 2000/07/01 10:42:33 ps Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/accton/accton.8 b/usr.sbin/accton/accton.8
index 17ee6741ef0c..641717ab63f4 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.6.2.1 2000/07/01 10:41:01 ps Exp $
 .\"
 .Dd May 21, 1993
 .Dt ACCTON 8
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 4e9a9329b1c6..9aff54a03258 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)accton.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/accton/accton.c,v 1.5 1999/08/28 01:15:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index 62e911d7a31b..6ecd2e7ebf1f 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/Makefile,v 1.14 1999/08/28 01:15:10 peter Exp $
 
 MAINTAINER= wosch
 
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 758c5b89407b..c6c860001d5a 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.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/adduser/adduser.8,v 1.30 2000/03/06 09:45:31 sheldonh Exp $
 .\"
 .Dd January 9, 1995
 .Dt ADDUSER 8
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl
index 3ce7b2aa03fd..d2a9d42cb6c0 100644
--- a/usr.sbin/adduser/adduser.perl
+++ b/usr.sbin/adduser/adduser.perl
@@ -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.perl,v 1.44 1999/08/28 01:15:11 peter Exp $
 
 
 # read variables
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index d3b76489b186..accfa667cbc9 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.10 1999/08/28 01:15:11 peter Exp $
 .\"
 .Dd February 23, 1997
 .Dt RMUSER 8
diff --git a/usr.sbin/adduser/rmuser.perl b/usr.sbin/adduser/rmuser.perl
index 8f6d56e260e9..57ef0d299c54 100644
--- a/usr.sbin/adduser/rmuser.perl
+++ b/usr.sbin/adduser/rmuser.perl
@@ -30,7 +30,7 @@
 #
 # Guy Helmer <ghelmer@cs.iastate.edu>, 02/23/97
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/rmuser.perl,v 1.8.2.1 2000/03/20 13:00:36 peter Exp $
 
 sub LOCK_SH {0x01;}
 sub LOCK_EX {0x02;}
diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile
index f9709453bac8..bc737f8fd88f 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.6 1999/08/28 01:15:12 peter Exp $
 #
 
 SUBDIR= 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 629ce427fc0c..5b5ad0f5dbb6 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.5 1999/08/28 01:15:12 peter 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 164179f7bcdb..f41053eba5b5 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.17 1999/08/28 01:15:13 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/amd
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 26bd507677d1..4fe5183702a2 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.12 1999/08/28 01:15:13 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/amq
diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile
index 0d96d8d6636a..e52304cf1117 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.10 1999/08/28 01:15:14 peter Exp $
 
 INFO=	am-utils
 
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 508064eefb5e..df266e34e6ff 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.4 1999/08/28 01:15:14 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/fixmount \
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 36948404df38..c0c021e098cd 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.10 1999/08/28 01:15:15 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/fsinfo
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 8c65de9e22e9..ca9f347be178 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.4 1999/08/28 01:15:15 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/hlfsd
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index 0bf2c8efcf6f..51be83accae5 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.2 1999/08/28 01:15:16 peter Exp $
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index 729656787f47..0ffd6461f774 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.15 1999/11/05 12:34:00 obrien 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 09068b0e3830..48ab71d0ac08 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.3 1999/08/28 01:15:16 peter Exp $
 # mkconf
 # Generate local configuration parameters for amd
 #
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index ae0256533f20..afd9f5180073 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.4 1999/08/28 01:15:17 peter 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 2978087d4133..0c670d3fb693 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.10 1999/08/28 01:15:18 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/mk-amd-map
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index 8c74b99d642b..88153525d988 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.3 1999/08/28 01:15:19 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/amq
diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile
index 130b6bb30f0d..26dc7f6197e2 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.2 1999/08/28 01:15:19 peter Exp $
 
 .PATH:		${.CURDIR}/../../../contrib/amd/scripts
 
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index f6d68c352f2d..fdd943757cb0 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.3 1999/08/28 01:15:20 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/wire-test
diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile
index 06d1b16be1c9..8c74a385371b 100644
--- a/usr.sbin/ancontrol/Makefile
+++ b/usr.sbin/ancontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ancontrol/Makefile,v 1.1 2000/01/14 20:40:57 wpaul Exp $
 
 PROG=	ancontrol
 SRCS=	ancontrol.c
diff --git a/usr.sbin/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8
index eae807fe109d..ae5365c3702a 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.3.2.1 2000/04/23 16:43:17 mpp Exp $
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index e2cea7ff0a5f..5ddbe60e1333 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.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/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.1 2000/06/29 08:14:54 roberto Exp $
  */
 
 #include <sys/types.h>
@@ -56,7 +56,7 @@
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
 static const char rcsid[] =
-  "@(#) $FreeBSD$";
+  "@(#) $FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.1 2000/06/29 08:14:54 roberto Exp $";
 #endif
 
 static void an_getval		__P((char *, struct an_req *));
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 64492474dfbd..3095eafe56dd 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.10 2000/01/25 08:39:15 bde Exp $
 
 PROG=		apm
 LINKS=		${BINDIR}/apm ${BINDIR}/zzz
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index e3d6a2ab0cf6..f4aacb1341a0 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.16 2000/03/01 14:07:50 sheldonh Exp $
 .\"
 .\" use.
 .Dd November 1, 1994
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 9a779bb2ad3e..f1f30e5fd57a 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/apm/apm.c,v 1.22.2.2 2000/07/23 23:48:44 nsayer Exp $";
 #endif /* not lint */
 
 #include <sys/file.h>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 1d27dc0afa3f..791e968b0240 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apmd/Makefile,v 1.2.2.1 2000/07/01 10:38:54 ps Exp $
 
 PROG=	apmd
 SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
diff --git a/usr.sbin/apmd/README b/usr.sbin/apmd/README
index 59a56e33827d..abaf406d1bb7 100644
--- a/usr.sbin/apmd/README
+++ b/usr.sbin/apmd/README
@@ -210,4 +210,4 @@ Created by: iwasaki@FreeBSD.org
 Edited by: jkh@FreeBSD.org
            nick@foobar.org
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/apmd/README,v 1.2 1999/08/28 01:15:24 peter Exp $
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index d7ef98d29687..8d898d8ad6f2 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.7 2000/01/23 13:30:44 asmodai Exp $
 .\"
 .Dd June 28, 1999
 .Dt APMD 8
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 2ebd557204f4..cd719823d991 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.3 1999/09/15 01:49:55 peter Exp $";
 #endif /* not lint */
 
 #include <assert.h>
diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h
index e45b84a2b17c..9314c5e7a5f5 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.2 1999/08/28 01:15:24 peter Exp $
  */
 
 #define APMD_CONFIGFILE		"/etc/apmd.conf"
diff --git a/usr.sbin/apmd/apmdlex.l b/usr.sbin/apmd/apmdlex.l
index 34598bb927b6..f39728e920c5 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.2 1999/08/28 01:15:25 peter Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/apmd/apmdparse.y b/usr.sbin/apmd/apmdparse.y
index ce9c9dcce341..d2f9ece50442 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.2 1999/08/28 01:15:25 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c
index 20b789d7d273..6ad5a216a003 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.2 1999/08/28 05:11:25 peter Exp $ */
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 39c60c5b8e8a..0f8b6270a818 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arp/arp.4,v 1.4 1999/08/28 01:15:26 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt ARP 4
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index 1c6fb6712a37..177d1e40efa1 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)arp.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.8 1999/08/28 01:15:26 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt ARP 8
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 3afd37df8775..9a18370a87a9 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)from: arp.c	8.2 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/arp/arp.c,v 1.22 2000/03/03 13:01:57 shin Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/atm/Makefile b/usr.sbin/atm/Makefile
index 96f3cbfee481..629763915715 100644
--- a/usr.sbin/atm/Makefile
+++ b/usr.sbin/atm/Makefile
@@ -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/Makefile,v 1.2 1999/08/28 01:15:27 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/Makefile.inc b/usr.sbin/atm/Makefile.inc
index 2a0f3f62268d..cdc6218e9352 100644
--- a/usr.sbin/atm/Makefile.inc
+++ b/usr.sbin/atm/Makefile.inc
@@ -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/Makefile.inc,v 1.2 1999/08/28 01:15:27 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile
index ebe4056a27e4..2bc3021b835b 100644
--- a/usr.sbin/atm/atmarpd/Makefile
+++ b/usr.sbin/atm/atmarpd/Makefile
@@ -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/Makefile,v 1.4 1999/08/28 01:15:28 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_config.c b/usr.sbin/atm/atmarpd/atmarp_config.c
index 4f7d62ef0610..1795c7d113c4 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.3 1999/08/28 01:15:29 peter 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.3 1999/08/28 01:15:29 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_log.c b/usr.sbin/atm/atmarpd/atmarp_log.c
index d697747727aa..323deab60ed6 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.3 1999/08/28 01:15:30 peter Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_log.c,v 1.3 1999/08/28 01:15:30 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_scsp.c b/usr.sbin/atm/atmarpd/atmarp_scsp.c
index 0f842e467944..79a6aaf476b6 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.3 1999/08/28 01:15:30 peter 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.3 1999/08/28 01:15:30 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_subr.c b/usr.sbin/atm/atmarpd/atmarp_subr.c
index 8f5db45a2622..d0d4f7e6355b 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.3 1999/08/28 01:15:30 peter 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.3 1999/08/28 01:15:30 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_timer.c b/usr.sbin/atm/atmarpd/atmarp_timer.c
index ad7c987ec9cc..338cfe1b98aa 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.3 1999/08/28 01:15:30 peter 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.3 1999/08/28 01:15:30 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_var.h b/usr.sbin/atm/atmarpd/atmarp_var.h
index f11d98294e1e..4719bbaf245c 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.3 1999/08/28 01:15:31 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/atmarpd/atmarpd.8 b/usr.sbin/atm/atmarpd/atmarpd.8
index 24693f0804a7..194b7ca7c003 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.3 1999/08/28 01:15:31 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/usr.sbin/atm/atmarpd/atmarpd.c b/usr.sbin/atm/atmarpd/atmarpd.c
index 063a30408264..24a121391249 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.3 1999/08/28 01:15:31 peter Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.c,v 1.3 1999/08/28 01:15:31 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index edea7487e298..71cb0f861965 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -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/Makefile,v 1.6 1999/08/28 01:15:32 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/scspd/scsp_cafsm.c b/usr.sbin/atm/scspd/scsp_cafsm.c
index dfb9055c3fb3..a6a530495e8d 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.3 1999/08/28 01:15:32 peter 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.3 1999/08/28 01:15:32 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config.c b/usr.sbin/atm/scspd/scsp_config.c
index 442fbdf28ece..8a353a8fed99 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.3 1999/08/28 01:15:32 peter 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.3 1999/08/28 01:15:32 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config_lex.c b/usr.sbin/atm/scspd/scsp_config_lex.c
index d83357bf8ace..cdc9801c7b26 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.3 1999/08/28 01:15:32 peter 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.3 1999/08/28 01:15:32 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config_parse.y b/usr.sbin/atm/scspd/scsp_config_parse.y
index ad6108f93239..f14d685fb1a6 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.3 1999/08/28 01:15:32 peter 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.3 1999/08/28 01:15:32 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_hfsm.c b/usr.sbin/atm/scspd/scsp_hfsm.c
index d1bec1616013..7232a36b3d11 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.3 1999/08/28 01:15:33 peter 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.3 1999/08/28 01:15:33 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_if.c b/usr.sbin/atm/scspd/scsp_if.c
index 53496b819d8d..736c8ad34f3a 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.3 1999/08/28 01:15:33 peter 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.3 1999/08/28 01:15:33 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_if.h b/usr.sbin/atm/scspd/scsp_if.h
index 844ee2c82135..53c6347650a2 100644
--- a/usr.sbin/atm/scspd/scsp_if.h
+++ b/usr.sbin/atm/scspd/scsp_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.h,v 1.2 1999/08/28 01:15:33 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_input.c b/usr.sbin/atm/scspd/scsp_input.c
index 8f0ccbfc429f..59326de60094 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.3 1999/08/28 01:15:33 peter 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.3 1999/08/28 01:15:33 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_log.c b/usr.sbin/atm/scspd/scsp_log.c
index 8de8d2c026eb..5d1c101f068c 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.3 1999/08/28 01:15:33 peter 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.3 1999/08/28 01:15:33 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_msg.c b/usr.sbin/atm/scspd/scsp_msg.c
index c7329ecaaff7..4f53d3debee0 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.3 1999/08/28 01:15:33 peter 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.3 1999/08/28 01:15:33 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_msg.h b/usr.sbin/atm/scspd/scsp_msg.h
index c70ada7fef56..8add1de92c6c 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.2 1999/08/28 01:15:33 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_output.c b/usr.sbin/atm/scspd/scsp_output.c
index 344f5c0c915e..19426d522980 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.3 1999/08/28 01:15:33 peter 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.3 1999/08/28 01:15:33 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_print.c b/usr.sbin/atm/scspd/scsp_print.c
index 2855564d6db6..4b3e407c4878 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.3 1999/08/28 01:15:34 peter 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.3 1999/08/28 01:15:34 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_socket.c b/usr.sbin/atm/scspd/scsp_socket.c
index 2dd37e221ff0..fb49190b1c67 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.3 1999/08/28 01:15:34 peter 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.3 1999/08/28 01:15:34 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_subr.c b/usr.sbin/atm/scspd/scsp_subr.c
index e1c858116f15..dd8ba0f692a9 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.3 1999/08/28 01:15:34 peter 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.3 1999/08/28 01:15:34 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_timer.c b/usr.sbin/atm/scspd/scsp_timer.c
index 82e49fc4a361..68b7cd5d68e8 100644
--- a/usr.sbin/atm/scspd/scsp_timer.c
+++ b/usr.sbin/atm/scspd/scsp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.3 1999/08/28 01:15:34 peter Exp $
  *
  */
 
@@ -57,7 +57,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.3 1999/08/28 01:15:34 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_var.h b/usr.sbin/atm/scspd/scsp_var.h
index 115ec42c398e..65bf69f5dc21 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.3 1999/08/28 01:15:34 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scspd.8 b/usr.sbin/atm/scspd/scspd.8
index 5c0b1600dcde..80d62ad6437b 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.2 1999/08/28 01:15:34 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/usr.sbin/atm/scspd/scspd.c b/usr.sbin/atm/scspd/scspd.c
index a8a6d89cd0b1..be8f0a708427 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.3 1999/08/28 01:15:34 peter Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.c,v 1.3 1999/08/28 01:15:34 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index 81189f3de741..49ed3841d55d 100644
--- a/usr.sbin/boot0cfg/Makefile
+++ b/usr.sbin/boot0cfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/boot0cfg/Makefile,v 1.2 1999/08/28 01:15:37 peter Exp $
 
 PROG=	boot0cfg
 MAN8=	boot0cfg.8
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index a56356a2801e..f4c7c320654f 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.5 1999/08/28 01:15:38 peter Exp $
 .\"
 .Dd February 21, 1999
 .Dt BOOT0CFG 8
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 77244367f537..3ad2a033ba54 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/boot0cfg/boot0cfg.c,v 1.7.2.1 2000/07/17 21:26:59 jhb Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index 7a702b994c02..e060c59c5629 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.11 1999/08/28 01:15:38 peter Exp $
 
 PROG=	bootparamd
 SRCS=	bootparamd.c main.c ${GENSRCS}
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index 595c3ece068e..641f33afcb40 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.9 2000/03/01 14:09:03 sheldonh Exp $
 .Dd November 8, 1989
 .Dt BOOTPARAMD 8
 .Os
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 80fbe70ff939..933e653b4ba8 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.10 1999/08/28 01:15:39 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 85f4c982cf4b..71ee79e681be 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.9 1999/08/28 01:15:39 peter 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 a3cc0e762024..0d19e459adea 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.9 1999/08/28 01:15:39 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index 92ae2e5b1e2e..66c0fbc653cd 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.10 1999/08/28 01:15:40 peter Exp $
 
 PROG=	callbootd
 SRCS=	callbootd.c ${GENSRCS}
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index 7a09168ac3a9..39db44ac036c 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.8 1999/08/28 01:15:40 peter Exp $";
 #endif /* not lint */
 
 #include "bootparam_prot.h"
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 677518329f6c..75354137e0c1 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/btxld/Makefile,v 1.3 2000/01/04 14:10:34 marcel Exp $
 
 PROG=	btxld
 SRCS=	btxld.c elfh.c
diff --git a/usr.sbin/btxld/btx.h b/usr.sbin/btxld/btx.h
index 86f0ede0759c..0c41bf567898 100644
--- a/usr.sbin/btxld/btx.h
+++ b/usr.sbin/btxld/btx.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/btx.h,v 1.2 1999/08/28 01:15:41 peter Exp $
  */
 
 #ifndef _BTX_H_
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index 1510ba2a1aa6..1174a7cac388 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.2 1999/08/28 01:15:42 peter Exp $
 .\"
 .Dd September 12, 1998
 .Dt BTXLD 8
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index 9e83beb6ad0d..36cc0651edf3 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.4 2000/01/04 14:10:36 marcel Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 0f0928bed3d3..c31a4a6b2f96 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.3 2000/01/04 14:10:36 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/btxld/elfh.h b/usr.sbin/btxld/elfh.h
index a4ab1348ae9b..89160aec1f51 100644
--- a/usr.sbin/btxld/elfh.h
+++ b/usr.sbin/btxld/elfh.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/elfh.h,v 1.3 2000/01/04 14:10:36 marcel Exp $
  */
 
 #include <sys/elf32.h>
diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile
index a4228c749975..6315385030d5 100644
--- a/usr.sbin/burncd/Makefile
+++ b/usr.sbin/burncd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/burncd/Makefile,v 1.2 2000/01/10 21:44:28 archie Exp $
 
 PROG=	burncd
 MAN8=	burncd.8
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index 49071bd91f9f..a9abfbd98a50 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.6.2.1 2000/04/23 17:00:38 mpp Exp $
 .\"
 .Dd January 6, 2000
 .Os
diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c
index 660e28bc215b..47427e0777c2 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.10 2000/03/03 23:17:27 sos Exp $
  */
 
 #include <unistd.h>
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index 20b070439d9c..eadb0e9856d4 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.21.2.2 2000/07/19 00:22:08 joe Exp $
 .\"
 .Dd July 3, 1995
 .Dt CDCONTROL 1
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index d5a754e9ac82..f886dbc3d8b5 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -20,7 +20,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.24.2.3 2000/07/19 00:22:08 joe Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
index 9171b53df1e8..ac2b0c676ec1 100644
--- a/usr.sbin/chkgrp/Makefile
+++ b/usr.sbin/chkgrp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chkgrp/Makefile,v 1.2.2.1 2000/06/13 09:13:43 ru Exp $
 
 PROG=	chkgrp
 MAN8=	chkgrp.8
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 96879f20591b..d2155961ec67 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.7.2.1 2000/06/13 09:13:43 ru Exp $
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index 7d1af60a4b22..6ed32f882799 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/chkgrp/chkgrp.c,v 1.3.2.1 2000/06/13 09:13:43 ru Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index dab5e9ff0b48..03eb7406204d 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.5 2000/01/06 17:51:47 obrien Exp $
 
 PROG=	chown
 CFLAGS+=-DSUPPORT_DOT
diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1
index b4d46b6d1b98..265d4c7dd624 100644
--- a/usr.sbin/chown/chgrp.1
+++ b/usr.sbin/chown/chgrp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chgrp.1	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.9 2000/03/08 16:31:41 obrien Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHGRP 1
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index fcb0464859c6..d1aaccac3e52 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chown/chown.8,v 1.10 2000/03/08 16:31:42 obrien Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHOWN 8
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index 26d307396586..749a55d91fdb 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/chown/chown.c,v 1.15 2000/03/08 16:31:42 obrien Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/chroot/chroot.8 b/usr.sbin/chroot/chroot.8
index b51123e0bd87..f70b03fc88c5 100644
--- a/usr.sbin/chroot/chroot.8
+++ b/usr.sbin/chroot/chroot.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chroot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chroot/chroot.8,v 1.5 1999/08/28 01:15:45 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt CHROOT 8
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index ccd9c493e64d..855ab3af32a3 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/chroot/chroot.c,v 1.4 1999/08/28 01:15:45 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile
index 74c4c5402f74..967b8e8d4328 100644
--- a/usr.sbin/ckdist/Makefile
+++ b/usr.sbin/ckdist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ckdist/Makefile,v 1.2 1999/08/28 01:15:46 peter Exp $
 
 PROG=	ckdist
 
diff --git a/usr.sbin/ckdist/ckdist.1 b/usr.sbin/ckdist/ckdist.1
index 2656f690cab8..df28fb09d927 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.4 1999/08/28 01:15:46 peter 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 3761b7061371..2d74b38ee65d 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.3.2.1 2000/07/01 10:37:21 ps Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index cd47fc4e6815..0c4b819a9d0e 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.26 1999/10/10 17:36:09 peter Exp $
 
 PROG=	config
 CFLAGS+=-I. -I${.CURDIR}
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index fa62fe4222bc..dc8cc51bc4ac 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)config.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/config/config.8,v 1.21 2000/03/01 14:07:54 sheldonh Exp $
 .\"
 .Dd April 19, 1994
 .Dt CONFIG 8
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 5d1ff4834dff..0ed54b793807 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/config.h,v 1.35 2000/01/29 18:14:58 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 018be5b3e7a1..777e3aa7dc70 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -82,7 +82,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.y	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/config.y,v 1.42 2000/01/29 18:14:58 peter Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index fad0cae2f08c..291131d50d0f 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.19 2000/01/23 20:16:21 charnier Exp $
  */
 #define	CONFIGVERS	400018
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 3a512a6fcd34..c02e4b36bc98 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lang.l	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/lang.l,v 1.27 1999/11/09 07:20:22 peter Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index fa6fe9fce67d..1e31f92202d3 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -42,7 +42,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.37 1999/10/30 10:55:48 marcel Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 8bbcfbf269a7..c4eace77b050 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -36,7 +36,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.14 2000/01/08 15:57:21 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 6eabd49d5a08..8c6daeea3d6e 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkioconf.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkioconf.c,v 1.62 2000/01/29 18:14:59 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 0dc5d036a318..cf3b3a6f1838 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -36,7 +36,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.51 2000/01/08 16:48:11 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index d53affd01b3f..40b763926c12 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -37,7 +37,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.17 2000/01/09 12:52:01 bde Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc
index f9208ecffeee..cb0e7de5af4e 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.2 1999/08/28 01:15:48 peter 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 318e781d1aa6..1af44c1a68f7 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.12 1999/08/28 01:15:49 peter Exp $
 
 PROG=	cron
 SRCS=	cron.c database.c do_command.c job.c user.c popen.c
diff --git a/usr.sbin/cron/cron/compat.h b/usr.sbin/cron/cron/compat.h
index 905c3aaf3bd9..956920f47773 100644
--- a/usr.sbin/cron/cron/compat.h
+++ b/usr.sbin/cron/cron/compat.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/compat.h,v 1.5 1999/08/28 01:15:49 peter Exp $
  */
 
 #ifndef __P
diff --git a/usr.sbin/cron/cron/config.h b/usr.sbin/cron/cron/config.h
index 6d77da27580d..5e7402822ea6 100644
--- a/usr.sbin/cron/cron/config.h
+++ b/usr.sbin/cron/cron/config.h
@@ -17,7 +17,7 @@
 
 /* config.h - configurables for Vixie Cron
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/config.h,v 1.8 1999/08/28 01:15:49 peter Exp $
  */
 
 #if !defined(_PATH_SENDMAIL)
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index d43ea58c53a3..2250f834869a 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.7 1999/08/28 01:15:49 peter 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 e8f8557609d1..d05bb28da9c5 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.9 1999/08/28 01:15:49 peter Exp $";
 #endif
 
 #define	MAIN_PROGRAM
diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h
index 1effde41fe77..9e804eabcce6 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.9.2.1 2000/07/13 18:52:16 ache Exp $
  *
  * vix 14nov88 [rest of log is in RCS]
  * vix 14jan87 [0 or 7 can be sunday; thanks, mwm@berkeley]
diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c
index 9ebf75d83999..e88bcb4e546c 100644
--- a/usr.sbin/cron/cron/database.c
+++ b/usr.sbin/cron/cron/database.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/database.c,v 1.8 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the log]
diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c
index cc19f4a774fb..2ee93d50e1c3 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.15.2.4 2000/07/13 18:52:23 ache Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/job.c b/usr.sbin/cron/cron/job.c
index 6d1b1af6e474..3b9360d7cd60 100644
--- a/usr.sbin/cron/cron/job.c
+++ b/usr.sbin/cron/cron/job.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/job.c,v 1.6 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/pathnames.h b/usr.sbin/cron/cron/pathnames.h
index ba91bfdc61f9..0af56984c1e5 100644
--- a/usr.sbin/cron/cron/pathnames.h
+++ b/usr.sbin/cron/cron/pathnames.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/pathnames.h,v 1.5 1999/08/28 01:15:50 peter Exp $
  */
 
 #if (defined(BSD)) && (BSD >= 199103) || defined(__linux) || defined(AIX)
diff --git a/usr.sbin/cron/cron/popen.c b/usr.sbin/cron/cron/popen.c
index 1ac775dd0d50..eda6de382285 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.7.2.2 2000/07/13 18:52:23 ache Exp $";
 #endif /* not lint */
 
 #include "cron.h"
diff --git a/usr.sbin/cron/cron/user.c b/usr.sbin/cron/cron/user.c
index 16fd61723a86..7d43eed6b6b5 100644
--- a/usr.sbin/cron/cron/user.c
+++ b/usr.sbin/cron/cron/user.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/user.c,v 1.8 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 /* vix 26jan87 [log is in RCS file]
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index ce8d5d38aa8b..c1dc3f88ed6c 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.10 1999/08/28 01:15:51 peter Exp $
 
 PROG=	crontab
 CFLAGS+=-I${.CURDIR}/../cron
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index e904d4ded7c4..b3ab0aed6f8b 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.7 1999/08/28 01:15:52 peter 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 01f6207eeb53..e60371efcf5f 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.12.2.2 2000/06/22 12:50:15 sheldonh 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 1ae677704223..98acd44b3591 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.12 1999/08/28 01:15:52 peter 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 8821edd49857..b03378ada3a8 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.4 1999/08/28 01:15:52 peter Exp $
 
 Conversion of BSD 4.[23] crontab files:
 
diff --git a/usr.sbin/cron/doc/FEATURES b/usr.sbin/cron/doc/FEATURES
index 821d1f3a3af2..76e1b6f081e0 100644
--- a/usr.sbin/cron/doc/FEATURES
+++ b/usr.sbin/cron/doc/FEATURES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/FEATURES,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 Features of Vixie's cron relative to BSD 4.[23] and SysV crons:
 
diff --git a/usr.sbin/cron/doc/INSTALL b/usr.sbin/cron/doc/INSTALL
index 7f4c9974da64..fd49df3cc285 100644
--- a/usr.sbin/cron/doc/INSTALL
+++ b/usr.sbin/cron/doc/INSTALL
@@ -15,7 +15,7 @@
  * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
  */
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/INSTALL,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 Read the comments at the top of the Makefile, then edit the area marked
 'configurable stuff'.
diff --git a/usr.sbin/cron/doc/MAIL b/usr.sbin/cron/doc/MAIL
index 3549e94d575a..461fa420a785 100644
--- a/usr.sbin/cron/doc/MAIL
+++ b/usr.sbin/cron/doc/MAIL
@@ -3,7 +3,7 @@
   version of cron.  it is presented here for its entertainment value.
   --vix ]
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/MAIL,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 From ptsfa!lll-crg!ames!acornrc!bob Wed Dec 31 10:07:08 1986
 Date: Wed, 31 Dec 86 08:59:31 pst
diff --git a/usr.sbin/cron/doc/Makefile.vixie b/usr.sbin/cron/doc/Makefile.vixie
index 8df1301c689d..de40c702e818 100644
--- a/usr.sbin/cron/doc/Makefile.vixie
+++ b/usr.sbin/cron/doc/Makefile.vixie
@@ -17,7 +17,7 @@
 
 # Makefile for vixie's cron
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/doc/Makefile.vixie,v 1.5 1999/08/28 01:15:53 peter Exp $
 #
 # vix 03mar88 [moved to RCS, rest of log is in there]
 # vix 30mar87 [goodbye, time.c; hello, getopt]
diff --git a/usr.sbin/cron/doc/README b/usr.sbin/cron/doc/README
index eaced9e65d94..2a5ccd667995 100644
--- a/usr.sbin/cron/doc/README
+++ b/usr.sbin/cron/doc/README
@@ -69,4 +69,4 @@ have to go edit a couple of files... So, here's the checklist:
 	if you like it, change your /etc/{rc,rc.local} to use it instead of
 		the old one.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/README,v 1.4 1999/08/28 01:15:53 peter Exp $
diff --git a/usr.sbin/cron/lib/compat.c b/usr.sbin/cron/lib/compat.c
index 6057b8601f1a..a6da01b1b1b8 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.6 1999/08/28 01:15:54 peter 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 ef05c14c2de3..408d9ecfe5ab 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.9.2.2 2000/07/01 10:35:07 ps 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 71e039816a23..ff072df00adc 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.7.2.1 2000/07/01 10:35:07 ps Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/lib/misc.c b/usr.sbin/cron/lib/misc.c
index f8538ea3f346..899c59713aab 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.8.2.1 2000/07/01 10:35:07 ps Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the rest of the log]
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index b30bc80d6660..1c2d41726e9a 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.11 2000/03/01 14:08:47 sheldonh Exp $
 .\"
 .Dd September 29, 1997
 .Dt CRUNCHGEN 1
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index be250059b212..6ff003ed6ebc 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.12 2000/02/05 10:29:19 luigi Exp $
  */
 /*
  * ========================================================================
diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1
index 3543c29c8533..a3df18fd2d77 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.5 1999/08/28 01:15:56 peter Exp $
 .\"
 .Dd June 14, 1994
 .Dt CRUNCHIDE 1
diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf
index 1fb93856c7f1..d9c4853acf67 100644
--- a/usr.sbin/crunch/examples/filesystem.conf
+++ b/usr.sbin/crunch/examples/filesystem.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/filesystem.conf,v 1.8 1999/08/28 01:15:57 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin
 srcdirs /usr/src/sbin/i386
diff --git a/usr.sbin/crunch/examples/kcopy.conf b/usr.sbin/crunch/examples/kcopy.conf
index 3284e868c51b..f86366bc99b8 100644
--- a/usr.sbin/crunch/examples/kcopy.conf
+++ b/usr.sbin/crunch/examples/kcopy.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/kcopy.conf,v 1.7 1999/08/28 01:15:57 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin
 
diff --git a/usr.sbin/ctm/Makefile b/usr.sbin/ctm/Makefile
index 630aab0940dd..a1e600ce8dbc 100644
--- a/usr.sbin/ctm/Makefile
+++ b/usr.sbin/ctm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile,v 1.7 1999/08/28 01:15:57 peter Exp $
 
 SUBDIR=	ctm ctm_rmail ctm_smail ctm_dequeue
 
diff --git a/usr.sbin/ctm/Makefile.inc b/usr.sbin/ctm/Makefile.inc
index c6c2c5aebdff..49b7f433b816 100644
--- a/usr.sbin/ctm/Makefile.inc
+++ b/usr.sbin/ctm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile.inc,v 1.4 1999/08/28 01:15:58 peter Exp $
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/ctm/README b/usr.sbin/ctm/README
index 1a978dc1e2f8..d3b60b7d518a 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.9 1999/11/29 17:58:58 markm Exp $
 #
 
 What will I not find in this file ?
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
index 5fb80d5a4784..8bf3c60a033b 100644
--- a/usr.sbin/ctm/ctm/Makefile
+++ b/usr.sbin/ctm/ctm/Makefile
@@ -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/Makefile,v 1.13 1999/08/28 01:15:58 peter Exp $
 #
 
 PROG=		ctm
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index 9e82107cbd09..1d3e6ae3040c 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@login.dknet.dk>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.17 2000/01/29 21:44:34 chuckr Exp $
 .\"
 .Dd Mar 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index 590ff5968a11..f71433ab6356 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@login.dknet.dk>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.5,v 1.9 2000/03/07 13:32:11 nik Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index eb7d5f42456a..f9998c15119b 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.19 2000/01/16 21:11:19 kris 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 b4ed57a8b3fd..bc4eb7cf147f 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.14.2.1 2000/07/02 11:34:44 ps Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c
index 975b6b5e4b94..5bca43e87e71 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.10 1999/08/28 01:15:59 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_input.c b/usr.sbin/ctm/ctm/ctm_input.c
index 70192cdd0f4b..2dfe2f4bc578 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.8 1999/08/28 01:15:59 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c
index 90779dec2891..658de9b91fab 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.16 1999/08/28 01:15:59 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c
index be4dbf284b2f..bfd28aac5289 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.18 2000/01/15 19:45:18 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c
index 1d45b159a125..3ec430445ef2 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.19 1999/08/28 01:16:00 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_passb.c b/usr.sbin/ctm/ctm/ctm_passb.c
index ace2ce7065f2..a3be377272d6 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.5 1999/08/28 01:16:00 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c
index 5b7c637ff389..bdaf1a440128 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.10 1999/08/28 01:16:00 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
index 932cd43eea87..52b9890156aa 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.9 1999/08/28 01:16:01 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index df50f30d4f41..52503e69a91c 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.19 2000/01/29 21:44:42 chuckr 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 194394dcf043..0c16f49d0500 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.15 2000/01/09 07:10:04 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/ctm_smail/ctm_smail.c b/usr.sbin/ctm/ctm_smail/ctm_smail.c
index f86d5d045ebe..c13c0ff974ff 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.12 1999/08/28 01:16:02 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/mkCTM/dequeue b/usr.sbin/ctm/mkCTM/dequeue
index 697ec0b5be85..e24dd827c128 100755
--- a/usr.sbin/ctm/mkCTM/dequeue
+++ b/usr.sbin/ctm/mkCTM/dequeue
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/dequeue,v 1.4 1999/08/28 01:16:03 peter Exp $
 
 L=/home/ctm/log.dequeue
 /usr/sbin/ctm_dequeue -n 1 -l $L /home/ctm/queue/ctm-cvs-cur
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.8 b/usr.sbin/dev_mkdb/dev_mkdb.8
index 496b4845d1b0..4b56fdf6d342 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.8
+++ b/usr.sbin/dev_mkdb/dev_mkdb.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)dev_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dev_mkdb/dev_mkdb.8,v 1.5 1999/12/27 08:01:11 peter Exp $
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c
index 0a0e2c1857a8..2c05506ec12d 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr.sbin/dev_mkdb/dev_mkdb.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dev_mkdb.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/dev_mkdb/dev_mkdb.c,v 1.4 1999/08/28 01:16:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/diskpart/diskpart.8 b/usr.sbin/diskpart/diskpart.8
index d4a11a42da69..46f83efab4ba 100644
--- a/usr.sbin/diskpart/diskpart.8
+++ b/usr.sbin/diskpart/diskpart.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)diskpart.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/diskpart/diskpart.8,v 1.5 2000/03/01 10:42:25 nik Exp $
 .\"
 .Dd June 6, 1993
 .Dt DISKPART 8
diff --git a/usr.sbin/diskpart/diskpart.c b/usr.sbin/diskpart/diskpart.c
index 6c4d4ad1d5de..e39b2d10154e 100644
--- a/usr.sbin/diskpart/diskpart.c
+++ b/usr.sbin/diskpart/diskpart.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)diskpart.c	8.3 (Berkeley) 11/30/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/diskpart/diskpart.c,v 1.11 1999/08/28 01:16:04 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/dpt/Makefile b/usr.sbin/dpt/Makefile
index 74313300ffa7..3ecdedaa5cf2 100644
--- a/usr.sbin/dpt/Makefile
+++ b/usr.sbin/dpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/Makefile,v 1.2 1999/08/28 01:16:05 peter Exp $
 
 SUBDIR=	dpt_ctlinfo dpt_ctls dpt_dm dpt_led dpt_sig dpt_softc dpt_sysinfo
 
diff --git a/usr.sbin/dpt/Makefile.inc b/usr.sbin/dpt/Makefile.inc
index 265f86d1ed55..8724c8748a9f 100644
--- a/usr.sbin/dpt/Makefile.inc
+++ b/usr.sbin/dpt/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/Makefile.inc,v 1.3 1999/08/28 01:16:05 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/dpt/dpt_ctlinfo/Makefile b/usr.sbin/dpt/dpt_ctlinfo/Makefile
index ac71bd1305c2..a6ef60993b16 100644
--- a/usr.sbin/dpt/dpt_ctlinfo/Makefile
+++ b/usr.sbin/dpt/dpt_ctlinfo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_ctlinfo/Makefile,v 1.5 1999/08/28 01:16:06 peter Exp $
 
 PROG=	dpt_ctlinfo
 SRCS=	dpt_ctlinfo.c
diff --git a/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.8 b/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.8
index 7233545dd990..f4809517788f 100644
--- a/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.8
+++ b/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997 Simon Shapiro.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.8,v 1.2 1999/08/28 23:20:41 mpp Exp $
 .\"
 .\" There is nothing here yet, but an empty file will not patch
diff --git a/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c b/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c
index ccc984ed4b41..006743e94134 100644
--- a/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c
+++ b/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c
@@ -30,7 +30,7 @@
 
 /* dpt_ctlinfo.c:  Dunp a DPT HBA Information Block */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c,v 1.3 1999/08/28 01:16:06 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_ctls/Makefile b/usr.sbin/dpt/dpt_ctls/Makefile
index e0b0eda2b4ce..ac9b18e80755 100644
--- a/usr.sbin/dpt/dpt_ctls/Makefile
+++ b/usr.sbin/dpt/dpt_ctls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_ctls/Makefile,v 1.4 1999/08/28 01:16:06 peter Exp $
 
 PROG=	dpt_ctls
 SRCS=	dpt_ctls.c
diff --git a/usr.sbin/dpt/dpt_ctls/dpt_ctls.8 b/usr.sbin/dpt/dpt_ctls/dpt_ctls.8
index 7233545dd990..32264543a704 100644
--- a/usr.sbin/dpt/dpt_ctls/dpt_ctls.8
+++ b/usr.sbin/dpt/dpt_ctls/dpt_ctls.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997 Simon Shapiro.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dpt/dpt_ctls/dpt_ctls.8,v 1.2 1999/08/28 23:20:42 mpp Exp $
 .\"
 .\" There is nothing here yet, but an empty file will not patch
diff --git a/usr.sbin/dpt/dpt_ctls/dpt_ctls.c b/usr.sbin/dpt/dpt_ctls/dpt_ctls.c
index 41e3d24f0155..111227adca6b 100644
--- a/usr.sbin/dpt/dpt_ctls/dpt_ctls.c
+++ b/usr.sbin/dpt/dpt_ctls/dpt_ctls.c
@@ -30,7 +30,7 @@
 
 /* dpt_ctls.c:  Dunp a the number of configured DPT HBAs */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_ctls/dpt_ctls.c,v 1.3 1999/08/28 01:16:06 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_dm/Makefile b/usr.sbin/dpt/dpt_dm/Makefile
index d67e5567972a..9a8d44ef9b8a 100644
--- a/usr.sbin/dpt/dpt_dm/Makefile
+++ b/usr.sbin/dpt/dpt_dm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_dm/Makefile,v 1.4 1999/08/28 01:16:07 peter Exp $
 
 PROG=	dpt_dm
 SRCS=	dpt_dm.c
diff --git a/usr.sbin/dpt/dpt_dm/dpt_dm.8 b/usr.sbin/dpt/dpt_dm/dpt_dm.8
index 7233545dd990..f522ef8dc0d9 100644
--- a/usr.sbin/dpt/dpt_dm/dpt_dm.8
+++ b/usr.sbin/dpt/dpt_dm/dpt_dm.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997 Simon Shapiro.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dpt/dpt_dm/dpt_dm.8,v 1.2 1999/08/28 23:20:43 mpp Exp $
 .\"
 .\" There is nothing here yet, but an empty file will not patch
diff --git a/usr.sbin/dpt/dpt_dm/dpt_dm.c b/usr.sbin/dpt/dpt_dm/dpt_dm.c
index 91df80797294..df9dbe955a35 100644
--- a/usr.sbin/dpt/dpt_dm/dpt_dm.c
+++ b/usr.sbin/dpt/dpt_dm/dpt_dm.c
@@ -30,7 +30,7 @@
 
 /* dpt_dm.c: Dump a DPT metrics structure */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_dm/dpt_dm.c,v 1.3 1999/08/28 01:16:07 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_led/Makefile b/usr.sbin/dpt/dpt_led/Makefile
index e449aa5ae9ef..b60732cdf390 100644
--- a/usr.sbin/dpt/dpt_led/Makefile
+++ b/usr.sbin/dpt/dpt_led/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_led/Makefile,v 1.4 1999/08/28 01:16:08 peter Exp $
 
 PROG=	dpt_led
 SRCS=	dpt_led.c
diff --git a/usr.sbin/dpt/dpt_led/dpt_led.8 b/usr.sbin/dpt/dpt_led/dpt_led.8
index 7233545dd990..8f06d0ea5788 100644
--- a/usr.sbin/dpt/dpt_led/dpt_led.8
+++ b/usr.sbin/dpt/dpt_led/dpt_led.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997 Simon Shapiro.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dpt/dpt_led/dpt_led.8,v 1.2 1999/08/28 23:20:43 mpp Exp $
 .\"
 .\" There is nothing here yet, but an empty file will not patch
diff --git a/usr.sbin/dpt/dpt_led/dpt_led.c b/usr.sbin/dpt/dpt_led/dpt_led.c
index 21728fb093ad..cdf6411ab2a9 100644
--- a/usr.sbin/dpt/dpt_led/dpt_led.c
+++ b/usr.sbin/dpt/dpt_led/dpt_led.c
@@ -30,7 +30,7 @@
 
 /* dpt_led.c:  Show the blinking LED array status of a DPT HBAs */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_led/dpt_led.c,v 1.3 1999/08/28 01:16:08 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_sig/Makefile b/usr.sbin/dpt/dpt_sig/Makefile
index c25c11a18848..a44d1c9fddb3 100644
--- a/usr.sbin/dpt/dpt_sig/Makefile
+++ b/usr.sbin/dpt/dpt_sig/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_sig/Makefile,v 1.4 1999/08/28 01:16:08 peter Exp $
 
 PROG=	dpt_sig
 SRCS=	dpt_sig.c
diff --git a/usr.sbin/dpt/dpt_sig/dpt_sig.8 b/usr.sbin/dpt/dpt_sig/dpt_sig.8
index 7233545dd990..032b3a996626 100644
--- a/usr.sbin/dpt/dpt_sig/dpt_sig.8
+++ b/usr.sbin/dpt/dpt_sig/dpt_sig.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997 Simon Shapiro.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dpt/dpt_sig/dpt_sig.8,v 1.2 1999/08/28 23:20:44 mpp Exp $
 .\"
 .\" There is nothing here yet, but an empty file will not patch
diff --git a/usr.sbin/dpt/dpt_sig/dpt_sig.c b/usr.sbin/dpt/dpt_sig/dpt_sig.c
index 0d7727bd0e19..f020bb9826b1 100644
--- a/usr.sbin/dpt/dpt_sig/dpt_sig.c
+++ b/usr.sbin/dpt/dpt_sig/dpt_sig.c
@@ -30,7 +30,7 @@
 
 /* dpt_sig.c:  Dunp a DPT Signature */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_sig/dpt_sig.c,v 1.3 1999/08/28 01:16:09 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_softc/Makefile b/usr.sbin/dpt/dpt_softc/Makefile
index 45c24ddd601d..048be7d6bc9d 100644
--- a/usr.sbin/dpt/dpt_softc/Makefile
+++ b/usr.sbin/dpt/dpt_softc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_softc/Makefile,v 1.4 1999/08/28 01:16:09 peter Exp $
 
 PROG=	dpt_softc
 SRCS=	dpt_softc.c
diff --git a/usr.sbin/dpt/dpt_softc/dpt_softc.8 b/usr.sbin/dpt/dpt_softc/dpt_softc.8
index aa38b552959e..6514f19ff143 100644
--- a/usr.sbin/dpt/dpt_softc/dpt_softc.8
+++ b/usr.sbin/dpt/dpt_softc/dpt_softc.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1997 Simon Shapiro.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dpt/dpt_softc/dpt_softc.8,v 1.3 1999/08/28 01:16:10 peter Exp $
 .\"
 .\" There is nothing here yet, but an empty file will not patch
 
diff --git a/usr.sbin/dpt/dpt_softc/dpt_softc.c b/usr.sbin/dpt/dpt_softc/dpt_softc.c
index 8b913d915d22..e29ec852ea43 100644
--- a/usr.sbin/dpt/dpt_softc/dpt_softc.c
+++ b/usr.sbin/dpt/dpt_softc/dpt_softc.c
@@ -30,7 +30,7 @@
 
 /* dpt_softc.c:  Dunp a DPT control structure */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_softc/dpt_softc.c,v 1.3 1999/08/28 01:16:10 peter Exp $"
 
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/usr.sbin/dpt/dpt_sysinfo/Makefile b/usr.sbin/dpt/dpt_sysinfo/Makefile
index d9a61f3c697d..62cfc820e702 100644
--- a/usr.sbin/dpt/dpt_sysinfo/Makefile
+++ b/usr.sbin/dpt/dpt_sysinfo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_sysinfo/Makefile,v 1.4 1999/08/28 01:16:10 peter Exp $
 
 PROG=	dpt_sysinfo
 SRCS=	dpt_sysinfo.c
diff --git a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.8 b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.8
index 7233545dd990..9133ff5ccba8 100644
--- a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.8
+++ b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997 Simon Shapiro.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.8,v 1.2 1999/08/28 23:20:45 mpp Exp $
 .\"
 .\" There is nothing here yet, but an empty file will not patch
diff --git a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c
index edd90fa17318..f874fbf77717 100644
--- a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c
+++ b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c
@@ -30,7 +30,7 @@
 
 /* dpt_ctlinfo.c:  Dunp a DPT HBA Information Block */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c,v 1.3 1999/08/28 01:16:10 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index dc07d19a1489..14a135a1ba80 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.9 1999/08/28 01:16:11 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index ef3b2ed4b0c5..2fa0a8c862da 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)edquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.9 1999/08/28 01:16:11 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/elf2exe/Makefile b/usr.sbin/elf2exe/Makefile
index aaf16c2ffcda..f95fd471c088 100644
--- a/usr.sbin/elf2exe/Makefile
+++ b/usr.sbin/elf2exe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/elf2exe/Makefile,v 1.3 1999/12/17 15:27:21 marcel Exp $
 
 PROG=	elf2exe
 SRCS=	elf2exe.c
diff --git a/usr.sbin/elf2exe/elf2exe.8 b/usr.sbin/elf2exe/elf2exe.8
index dadd6dd93310..ad8a70c7a171 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.3 1999/08/28 01:16:12 peter Exp $
 .\"
 .Dd July 26, 1999
 .Dt ELF2EXE 8
diff --git a/usr.sbin/elf2exe/elf2exe.c b/usr.sbin/elf2exe/elf2exe.c
index d0959eb1400c..72fa83cf50ab 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.6.2.1 2000/07/20 10:35:23 kris Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile
index 8defe63d7cfd..710607ff8c27 100644
--- a/usr.sbin/faithd/Makefile
+++ b/usr.sbin/faithd/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/faithd/Makefile,v 1.1.2.1 2000/07/15 07:36:21 kris Exp $
 
 PROG=	faithd
 SRCS=	faithd.c tcp.c ftp.c rsh.c
diff --git a/usr.sbin/faithd/README b/usr.sbin/faithd/README
index 4808b4af2544..58900a06e809 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.4 2000/05/31 03:16:14 itojun Exp $
-$FreeBSD$
+$FreeBSD: src/usr.sbin/faithd/README,v 1.2.2.1 2000/07/15 07:36:21 kris Exp $
 
 Introduction
 ============
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index 6e42f27bd445..3bb2d6eeb11c 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.2.2.2 2000/07/15 07:36:21 kris Exp $
 .\"
 .Dd May 17, 1998
 .Dt FAITHD 8
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index c314b74bea49..851ae4ae6d0e 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.2.2.2 2000/07/15 07:36:21 kris Exp $
  */
 
 /*
diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h
index b882aad9bb71..dd84eace4c6e 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.1.2.1 2000/07/15 07:36:22 kris Exp $
  */
 
 extern char logname[];
diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c
index 53f94f120382..b76fda74e2d4 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.2.2.1 2000/07/15 07:36:22 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/rsh.c b/usr.sbin/faithd/rsh.c
index 735f01e8812e..ec61a2019319 100644
--- a/usr.sbin/faithd/rsh.c
+++ b/usr.sbin/faithd/rsh.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/rsh.c,v 1.2.2.1 2000/07/15 07:36:22 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c
index 004686fe9781..1f8b00234a29 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.1.2.1 2000/07/15 07:36:22 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/test/faithd.rb b/usr.sbin/faithd/test/faithd.rb
index 683b5041adc1..acd3c427b880 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.1.1 1999/08/08 23:29:31 itojun Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/faithd/test/faithd.rb,v 1.1 2000/01/27 09:28:38 shin Exp $
 
 require "socket"
 require "thread"
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index ab7adab270b4..4d9c02e8eeb3 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.9 2000/03/01 14:07:55 sheldonh Exp $
 .\"
 .Dd May 22, 1994
 .Os
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index 2d9511ea15a9..d53949fe4f78 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.c,v 1.6 1999/08/28 01:16:13 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 306e5752bed3..bf38f694a4a1 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.17.2.1 2000/07/03 06:15:14 ps Exp $
 .\"
 .Dd September 16, 1993
 .Os
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 53db6684ea80..3f842490b2c5 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.11.2.1 2000/07/03 06:15:14 ps Exp $
  */
 
 /*
diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile
index 8eac7b0ebc00..5093ddfa320c 100644
--- a/usr.sbin/fdwrite/Makefile
+++ b/usr.sbin/fdwrite/Makefile
@@ -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/Makefile,v 1.5 1999/08/28 01:16:14 peter Exp $
 #
 #
 
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 245818bc8bf9..27d58d74f929 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.12.2.1 2000/06/29 23:49:29 ps Exp $
 .\"
 .\"
 .Dd September 16, 1993
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index 4ab858e22901..1ef6f2161adc 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.8.2.1 2000/06/29 23:49:29 ps Exp $
  *
  */
 
diff --git a/usr.sbin/gifconfig/Makefile b/usr.sbin/gifconfig/Makefile
index b562390e8d90..327649750f22 100644
--- a/usr.sbin/gifconfig/Makefile
+++ b/usr.sbin/gifconfig/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/gifconfig/Makefile,v 1.1 1999/12/28 02:37:03 shin Exp $
 
 PROG=	gifconfig
 MAN8=	gifconfig.8
diff --git a/usr.sbin/gifconfig/gifconfig.8 b/usr.sbin/gifconfig/gifconfig.8
index 6a4e491fd4ce..71f78600de7c 100644
--- a/usr.sbin/gifconfig/gifconfig.8
+++ b/usr.sbin/gifconfig/gifconfig.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/gifconfig/gifconfig.8,v 1.1.2.3 2000/07/15 07:36:25 kris Exp $
 .\"	$KAME: gifconfig.8,v 1.5 2000/05/13 07:48:10 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/usr.sbin/gifconfig/gifconfig.c b/usr.sbin/gifconfig/gifconfig.c
index d93d74104daf..6e5d1f030cb9 100644
--- a/usr.sbin/gifconfig/gifconfig.c
+++ b/usr.sbin/gifconfig/gifconfig.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/gifconfig/gifconfig.c,v 1.2.2.1 2000/07/15 07:36:26 kris Exp $	*/
 /*	$KAME: gifconfig.c,v 1.12 2000/05/22 05:50:43 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/i4b/dtmfdecode/Makefile b/usr.sbin/i4b/dtmfdecode/Makefile
index 0623e128e162..07b0cf85db7f 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.6 2000/01/03 12:01:28 marcel 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 6aa183287a42..f4e82e15c152 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.5 1999/12/14 21:07:21 hm 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 1ef49a90bb80..1450acea91f1 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.4 1999/12/14 21:07:22 hm Exp $
  *
  * Extract DTMF signalling from ISDN4BSD A-law coded audio data
  *
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu b/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
index f4e0c07c5763..22c95db7af3e 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
+++ b/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu,v 1.1 1999/12/14 21:07:22 hm Exp $
 begin 666 dtmfsounds.al
 M5555U=74U-564-34UU%5U-?1UM'7UM37U=5555145%545%155%555%555=75
 M5575U=75U-15U5555575U575U=75U=75U=34U-35U-35U=75U=55U=5555%0
diff --git a/usr.sbin/i4b/g711conv/Makefile b/usr.sbin/i4b/g711conv/Makefile
index c02dd5f8ca57..ee5d8b483478 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.3 2000/01/03 12:01:28 marcel 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 43abcfe07e51..5d216226972a 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.4 1999/12/14 21:07:24 hm 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 5c7857d7ee87..45234dc36da8 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.4 1999/12/14 21:07:24 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile
index 8b325b0c3225..51b3b824e535 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.3 1999/08/28 01:16:17 peter Exp $
 
 PROG	=	isdnd
 
diff --git a/usr.sbin/i4b/isdnd/alias.c b/usr.sbin/i4b/isdnd/alias.c
index a775fc9f2803..1e197606ceab 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.6 1999/12/14 21:07:25 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 4a7aa8c2b650..fdccf776d1df 100644
--- a/usr.sbin/i4b/isdnd/config.h
+++ b/usr.sbin/i4b/isdnd/config.h
@@ -29,7 +29,7 @@
  *
  *      $Id: config.h,v 1.8 1999/12/13 21:25:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/config.h,v 1.6 1999/12/14 21:07:25 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:45:27 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/controller.c b/usr.sbin/i4b/isdnd/controller.c
index c3e76843df42..fe8a5e3ed434 100644
--- a/usr.sbin/i4b/isdnd/controller.c
+++ b/usr.sbin/i4b/isdnd/controller.c
@@ -29,7 +29,7 @@
  *
  *	$Id: controller.c,v 1.19 1999/12/13 21:25:24 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/controller.c,v 1.6 1999/12/14 21:07:26 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:45:34 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/curses.c b/usr.sbin/i4b/isdnd/curses.c
index 6e01c08d7e57..6cb5c61d6253 100644
--- a/usr.sbin/i4b/isdnd/curses.c
+++ b/usr.sbin/i4b/isdnd/curses.c
@@ -29,7 +29,7 @@
  *
  *	$Id: curses.c,v 1.29 1999/12/13 21:25:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/curses.c,v 1.6 1999/12/14 21:07:26 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:45:43 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/dial.c b/usr.sbin/i4b/isdnd/dial.c
index dff8787dc5b7..5180ad14c84d 100644
--- a/usr.sbin/i4b/isdnd/dial.c
+++ b/usr.sbin/i4b/isdnd/dial.c
@@ -29,7 +29,7 @@
  *
  *	$Id: dial.c,v 1.8 1999/12/13 21:25:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/dial.c,v 1.6 1999/12/14 21:07:26 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:45:51 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/exec.c b/usr.sbin/i4b/isdnd/exec.c
index c180aadfd30f..4ced3e6aaaca 100644
--- a/usr.sbin/i4b/isdnd/exec.c
+++ b/usr.sbin/i4b/isdnd/exec.c
@@ -29,7 +29,7 @@
  *
  *	$Id: exec.c,v 1.13 1999/12/13 21:25:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/exec.c,v 1.6 1999/12/14 21:07:26 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:45:59 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/fsm.c b/usr.sbin/i4b/isdnd/fsm.c
index 63a6229ee1ec..3610431f8208 100644
--- a/usr.sbin/i4b/isdnd/fsm.c
+++ b/usr.sbin/i4b/isdnd/fsm.c
@@ -29,7 +29,7 @@
  *
  *	$Id: fsm.c,v 1.18 1999/12/13 21:25:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/fsm.c,v 1.6 1999/12/14 21:07:27 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:46:07 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 69f06fac837c..90b827b00e52 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.8,v 1.27 1999/12/13 22:11:55 hm Exp $ 
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.9 2000/03/06 09:45:32 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:57:10 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.acct.5 b/usr.sbin/i4b/isdnd/isdnd.acct.5
index 8813db8a9a00..b8964a35561e 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.9 2000/03/01 14:09:05 sheldonh 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 956591508d0b..81b9b9acfa6e 100644
--- a/usr.sbin/i4b/isdnd/isdnd.h
+++ b/usr.sbin/i4b/isdnd/isdnd.h
@@ -29,7 +29,7 @@
  *
  *	$Id: isdnd.h,v 1.72 1999/12/13 21:25:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.h,v 1.6 1999/12/14 21:07:27 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:46:50 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.rates.5 b/usr.sbin/i4b/isdnd/isdnd.rates.5
index 3ad72d016d9e..1d204c8f04c3 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.9 2000/03/01 14:09:05 sheldonh 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 b52a65ec8b47..3257966fb7a5 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.rc.5,v 1.41 1999/12/13 22:11:55 hm Exp $ 
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.11 2000/03/07 14:05:50 nik Exp $
 .\"
 .\"     last edit-date: [Mon Dec 13 23:00:48 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/log.c b/usr.sbin/i4b/isdnd/log.c
index ddab579bc3ae..c652f6c86332 100644
--- a/usr.sbin/i4b/isdnd/log.c
+++ b/usr.sbin/i4b/isdnd/log.c
@@ -29,7 +29,7 @@
  *
  *	$Id: log.c,v 1.23 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/log.c,v 1.6 1999/12/14 21:07:30 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:47:28 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/main.c b/usr.sbin/i4b/isdnd/main.c
index ca4f78803801..7a0ab667a0d0 100644
--- a/usr.sbin/i4b/isdnd/main.c
+++ b/usr.sbin/i4b/isdnd/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.49 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/main.c,v 1.8 1999/12/14 21:07:30 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:47:35 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/monitor.c b/usr.sbin/i4b/isdnd/monitor.c
index dd6d2cd036d8..83b62e137de9 100644
--- a/usr.sbin/i4b/isdnd/monitor.c
+++ b/usr.sbin/i4b/isdnd/monitor.c
@@ -35,7 +35,7 @@
  *
  *	$Id: monitor.c,v 1.29 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/monitor.c,v 1.6 1999/12/14 21:07:30 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:47:44 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/msghdl.c b/usr.sbin/i4b/isdnd/msghdl.c
index 265eb6eaf4a8..ab9bbcc850d8 100644
--- a/usr.sbin/i4b/isdnd/msghdl.c
+++ b/usr.sbin/i4b/isdnd/msghdl.c
@@ -29,7 +29,7 @@
  *
  *	$Id: msghdl.c,v 1.71 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/msghdl.c,v 1.6 1999/12/14 21:07:30 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:47:54 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/pathnames.h b/usr.sbin/i4b/isdnd/pathnames.h
index eaabf14fdd90..6974d9b5f655 100644
--- a/usr.sbin/i4b/isdnd/pathnames.h
+++ b/usr.sbin/i4b/isdnd/pathnames.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pathnames.h,v 1.10 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pathnames.h,v 1.6 1999/12/14 21:07:30 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:48:01 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/pcause.c b/usr.sbin/i4b/isdnd/pcause.c
index d31c56e8abff..d609586f7246 100644
--- a/usr.sbin/i4b/isdnd/pcause.c
+++ b/usr.sbin/i4b/isdnd/pcause.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause.c,v 1.12 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pcause.c,v 1.6 1999/12/14 21:07:31 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:48:07 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/process.c b/usr.sbin/i4b/isdnd/process.c
index f5460438d89a..99119c8ecbda 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.6 1999/12/14 21:07:31 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 27653734f959..415b30e3835d 100644
--- a/usr.sbin/i4b/isdnd/rates.c
+++ b/usr.sbin/i4b/isdnd/rates.c
@@ -37,7 +37,7 @@
  *
  *	$Id: rates.c,v 1.10 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rates.c,v 1.6 1999/12/14 21:07:31 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 9968d2196418..9c1f5b473764 100644
--- a/usr.sbin/i4b/isdnd/rc_config.c
+++ b/usr.sbin/i4b/isdnd/rc_config.c
@@ -29,7 +29,7 @@
  *
  *	$Id: rc_config.c,v 1.49 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_config.c,v 1.6 1999/12/14 21:07:31 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:48:38 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_parse.y b/usr.sbin/i4b/isdnd/rc_parse.y
index bace84de036a..21fe685d7743 100644
--- a/usr.sbin/i4b/isdnd/rc_parse.y
+++ b/usr.sbin/i4b/isdnd/rc_parse.y
@@ -32,7 +32,7 @@
  *
  *	$Id: rc_parse.y,v 1.24 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_parse.y,v 1.6 1999/12/14 21:07:32 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:48:48 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_scan.l b/usr.sbin/i4b/isdnd/rc_scan.l
index e9d9814747c1..bae46aa08ea4 100644
--- a/usr.sbin/i4b/isdnd/rc_scan.l
+++ b/usr.sbin/i4b/isdnd/rc_scan.l
@@ -32,7 +32,7 @@
  *
  *	$Id: rc_scan.l,v 1.27 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_scan.l,v 1.6 1999/12/14 21:07:32 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:48:57 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/support.c b/usr.sbin/i4b/isdnd/support.c
index 07a40f4ec3e0..ee82565f24c8 100644
--- a/usr.sbin/i4b/isdnd/support.c
+++ b/usr.sbin/i4b/isdnd/support.c
@@ -29,7 +29,7 @@
  *
  *	$Id: support.c,v 1.63 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/support.c,v 1.6 1999/12/14 21:07:32 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:49:05 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/timer.c b/usr.sbin/i4b/isdnd/timer.c
index 34dea3a082f1..c7d413cf89b2 100644
--- a/usr.sbin/i4b/isdnd/timer.c
+++ b/usr.sbin/i4b/isdnd/timer.c
@@ -29,7 +29,7 @@
  *
  *	$Id: timer.c,v 1.19 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/timer.c,v 1.6 1999/12/14 21:07:32 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:49:13 1999]
  *
diff --git a/usr.sbin/i4b/isdndebug/Makefile b/usr.sbin/i4b/isdndebug/Makefile
index b22566d2f091..430e826c6bb3 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.2 1999/12/14 21:07:35 hm Exp $
 PROG	 =	isdndebug
 SRCS	 =	main.c
 MAN8	 = 	isdndebug.8
diff --git a/usr.sbin/i4b/isdndebug/isdndebug.8 b/usr.sbin/i4b/isdndebug/isdndebug.8
index a65080d484b2..e89cdf600e25 100644
--- a/usr.sbin/i4b/isdndebug/isdndebug.8
+++ b/usr.sbin/i4b/isdndebug/isdndebug.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdndebug.8,v 1.10 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.8 2000/03/01 14:09:07 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:01:42 1999]
 .\"
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index dd4974751699..c216dd930495 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.23 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndebug/main.c,v 1.8 1999/12/14 21:07:35 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:49:40 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/Makefile b/usr.sbin/i4b/isdndecode/Makefile
index c6e4671a606d..d0e6f7e312e8 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.2 1999/12/14 21:07:36 hm Exp $
 PROG	 =	isdndecode
 SRCS	 =	main.c layer1.c layer2.c layer3.c \
 		layer3_subr.c facility.c pcause.c 
diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h
index 83bab000165b..92a5b6dd473c 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.6 1999/12/14 21:07:36 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 3bb7b08aadc9..f847d0097729 100644
--- a/usr.sbin/i4b/isdndecode/facility.c
+++ b/usr.sbin/i4b/isdndecode/facility.c
@@ -29,7 +29,7 @@
  *
  *	$Id: facility.c,v 1.4 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.c,v 1.6 1999/12/14 21:07:37 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:49:56 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/facility.h b/usr.sbin/i4b/isdndecode/facility.h
index 2a2832ebd00c..e57513003a12 100644
--- a/usr.sbin/i4b/isdndecode/facility.h
+++ b/usr.sbin/i4b/isdndecode/facility.h
@@ -29,7 +29,7 @@
  *
  *	$Id: facility.h,v 1.4 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.h,v 1.6 1999/12/14 21:07:37 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:50:06 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/isdndecode.8 b/usr.sbin/i4b/isdndecode/isdndecode.8
index 6d9facae8c01..a24b3d9aca56 100644
--- a/usr.sbin/i4b/isdndecode/isdndecode.8
+++ b/usr.sbin/i4b/isdndecode/isdndecode.8
@@ -26,7 +26,7 @@
 .\"
 .\"	last edit-date: [Mon Dec 13 23:03:21 1999]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.9 2000/03/01 14:09:09 sheldonh Exp $
 .\"
 .Dd September 17, 1998
 .Dt ISDNDECODE 8
diff --git a/usr.sbin/i4b/isdndecode/layer1.c b/usr.sbin/i4b/isdndecode/layer1.c
index c08b628e9a45..998dae9e00b7 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.6 1999/12/14 21:07:38 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:50:34 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer2.c b/usr.sbin/i4b/isdndecode/layer2.c
index 1e5398680188..28c36528e3dc 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.6 1999/12/14 21:07:38 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 e1df3c52c828..d577ab40364b 100644
--- a/usr.sbin/i4b/isdndecode/layer3.c
+++ b/usr.sbin/i4b/isdndecode/layer3.c
@@ -29,7 +29,7 @@
  *
  *	$Id: layer3.c,v 1.7 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3.c,v 1.6 1999/12/14 21:07:38 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:50:48 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer3_subr.c b/usr.sbin/i4b/isdndecode/layer3_subr.c
index ce3d5804b808..88de1fbdf499 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.6 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3_subr.c,v 1.6 1999/12/14 21:07:38 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:00 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/main.c b/usr.sbin/i4b/isdndecode/main.c
index 40628712a0b8..ef21ab0e3b71 100644
--- a/usr.sbin/i4b/isdndecode/main.c
+++ b/usr.sbin/i4b/isdndecode/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.12 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/main.c,v 1.8 1999/12/14 21:07:39 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:07 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.c b/usr.sbin/i4b/isdndecode/pcause.c
index 610a9609c179..28ea02b11372 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.6 1999/12/14 21:07:39 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:20 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.h b/usr.sbin/i4b/isdndecode/pcause.h
index 2c1c7f403e5b..63d52352a1e8 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.6 1999/12/14 21:07:39 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 bad57590e796..850b212952f4 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.2.2.1 2000/07/01 10:11:53 ps Exp $
 
 PROG	=	isdnmonitor
 SRCS	=	main.c curses.c
diff --git a/usr.sbin/i4b/isdnmonitor/curses.c b/usr.sbin/i4b/isdnmonitor/curses.c
index 1e7eec15b68d..b48fadecd7f3 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.1 1999/12/14 21:07:41 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 d790133308b5..32bacc8c735f 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.8 2000/03/01 14:09:10 sheldonh 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 1c0b199d8d04..dfa6c509e479 100644
--- a/usr.sbin/i4b/isdnmonitor/main.c
+++ b/usr.sbin/i4b/isdnmonitor/main.c
@@ -35,7 +35,7 @@
  *
  *	$Id: main.c,v 1.34 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/main.c,v 1.7 1999/12/14 21:07:41 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 f5d532f708a7..ee087ea0f03c 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.6 1999/12/14 21:07:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:18 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/monprivate.h b/usr.sbin/i4b/isdnmonitor/monprivate.h
index ec6ec4d04ae1..64c573d1c782 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.1 1999/12/14 21:07:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:25 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/Makefile b/usr.sbin/i4b/isdntel/Makefile
index f1478a5a5dc3..7946c2284201 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.3 1999/08/28 01:16:26 peter Exp $
 
 PROG	 =	isdntel
 SRCS	 =	main.c display.c files.c alias.c
diff --git a/usr.sbin/i4b/isdntel/alias.c b/usr.sbin/i4b/isdntel/alias.c
index 0f4dae712a15..898af7146522 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.6 1999/12/14 21:07:43 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:37 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/alias.h b/usr.sbin/i4b/isdntel/alias.h
index 813d5bd79095..0237902a0113 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.6 1999/12/14 21:07:43 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:44 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h
index 9b5fd694c69b..3d0eacb5ed56 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.6 1999/12/14 21:07:43 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 d1f36fe3694e..183bb6a35c00 100644
--- a/usr.sbin/i4b/isdntel/display.c
+++ b/usr.sbin/i4b/isdntel/display.c
@@ -29,7 +29,7 @@
  *
  *	$Id: display.c,v 1.7 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/display.c,v 1.6 1999/12/14 21:07:44 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:57 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/files.c b/usr.sbin/i4b/isdntel/files.c
index 54b207474583..73f8882dcd37 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.6 1999/12/14 21:07:44 hm 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 997ad71f3651..cc09130a3182 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.9 2000/03/06 09:45:34 sheldonh 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 da5ec820c160..ceb9493ed8f6 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.8 1999/12/14 21:07:44 hm 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 c8971e2b3e2f..10e58a5aefbb 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.2 1999/12/14 21:07:46 hm Exp $
 PROG	 =	isdntelctl
 SRCS	 =	main.c
 MAN8	 = 	isdntelctl.8
diff --git a/usr.sbin/i4b/isdntelctl/isdntelctl.8 b/usr.sbin/i4b/isdntelctl/isdntelctl.8
index cb3f57defa1a..2f277982147e 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.8 2000/03/01 14:09:13 sheldonh 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 4820fbd3fd8d..d8f1d759150f 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.8 1999/12/14 21:07:46 hm 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 7444055116dc..1432e8a39d90 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.2 1999/12/14 21:07:47 hm Exp $
 PROG	 =	isdntest
 SRCS	 =	main.c
 MAN8	 =	isdntest.8
diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8
index 0f5939305a7b..f44f3f8f9b51 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.7 1999/12/14 21:07:47 hm 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 d050613499b8..2a68d5e74dc6 100644
--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.15 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntest/main.c,v 1.7 1999/12/14 21:07:48 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:55:19 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/1tr6.c b/usr.sbin/i4b/isdntrace/1tr6.c
index db2bc7177a4a..24eb6c937e16 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.6 1999/12/14 21:07:48 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 0596e5bf6cf5..3918da44612c 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.2 1999/12/14 21:07:48 hm Exp $
 PROG	 =	isdntrace
 SRCS	 =	q921.c q931.c q931_util.c q932_fac.c 1tr6.c trace.c \
 		pcause_1tr6.c pcause_q850.c 
diff --git a/usr.sbin/i4b/isdntrace/cable.txt b/usr.sbin/i4b/isdntrace/cable.txt
index 21a1cdb830b3..b0a671a847db 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.6 1999/12/14 21:07:49 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 d6eca42c9e95..5f89d07edccb 100644
--- a/usr.sbin/i4b/isdntrace/isdntrace.8
+++ b/usr.sbin/i4b/isdntrace/isdntrace.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntrace.8,v 1.12 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.9 2000/03/02 14:53:42 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:08:17 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.c b/usr.sbin/i4b/isdntrace/pcause_1tr6.c
index b319d7452e34..f7fd4745b38c 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.6 1999/12/14 21:07:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:03 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.h b/usr.sbin/i4b/isdntrace/pcause_1tr6.h
index 67f50deedc85..76cbbe97536d 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.6 1999/12/14 21:07:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:10 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.c b/usr.sbin/i4b/isdntrace/pcause_q850.c
index 57eaf32dc955..706bb617b0cc 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.6 1999/12/14 21:07:50 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:18 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.h b/usr.sbin/i4b/isdntrace/pcause_q850.h
index ea21770ca3b7..c186d9290de2 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.6 1999/12/14 21:07:50 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:25 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q921.c b/usr.sbin/i4b/isdntrace/q921.c
index e8c14dc67110..74c723b36786 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.6 1999/12/14 21:07:50 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 d61ec9a8511b..2446f3dcb633 100644
--- a/usr.sbin/i4b/isdntrace/q931.c
+++ b/usr.sbin/i4b/isdntrace/q931.c
@@ -29,7 +29,7 @@
  *
  *	$Id: q931.c,v 1.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931.c,v 1.6 1999/12/14 21:07:50 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:56:56 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q931_util.c b/usr.sbin/i4b/isdntrace/q931_util.c
index bca17ddbf4a0..d34acac6f2a1 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.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931_util.c,v 1.6 1999/12/14 21:07:51 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:57:03 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.c b/usr.sbin/i4b/isdntrace/q932_fac.c
index dc3194b1e68d..03221c8a8b23 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.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.c,v 1.6 1999/12/14 21:07:51 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:57:11 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.h b/usr.sbin/i4b/isdntrace/q932_fac.h
index a3641cf1f4d3..ddb01fe69064 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.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.h,v 1.6 1999/12/14 21:07:51 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:57:18 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.c b/usr.sbin/i4b/isdntrace/trace.c
index b38127fad3a4..eca6f0776f58 100644
--- a/usr.sbin/i4b/isdntrace/trace.c
+++ b/usr.sbin/i4b/isdntrace/trace.c
@@ -37,7 +37,7 @@
  *
  *	$Id: trace.c,v 1.15 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.c,v 1.8 1999/12/14 21:07:51 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:57:48 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h
index c7cc1650932b..2b158ab91f94 100644
--- a/usr.sbin/i4b/isdntrace/trace.h
+++ b/usr.sbin/i4b/isdntrace/trace.h
@@ -37,7 +37,7 @@
  *
  *	$Id: trace.h,v 1.9 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.h,v 1.6 1999/12/14 21:07:52 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:58:07 1999]
  *
diff --git a/usr.sbin/i4b/man/Makefile b/usr.sbin/i4b/man/Makefile
index 7805718312f0..e6850764e2a9 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.2 1999/12/14 21:07:53 hm Exp $
 MAN4 = i4b.4 i4bctl.4 i4bipr.4 i4bq921.4 i4bq931.4 i4brbch.4 i4btel.4 \
 	i4btrc.4 isic.4 daic.4 i4bisppp.4
 
diff --git a/usr.sbin/i4b/man/daic.4 b/usr.sbin/i4b/man/daic.4
index d455022f3ac4..02914f7e5a3b 100644
--- a/usr.sbin/i4b/man/daic.4
+++ b/usr.sbin/i4b/man/daic.4
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Tue Dec 14 22:13:53 1999]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/daic.4,v 1.8 2000/03/06 09:41:51 sheldonh Exp $
 .\"
 .\"	-mh	writing manual pages
 .\"
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index eab852eabcc6..b5f32d57edc5 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4b.4,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4b.4,v 1.7 1999/12/14 21:07:54 hm Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:09:12 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bctl.4 b/usr.sbin/i4b/man/i4bctl.4
index c059ff20f14b..974bd259b97e 100644
--- a/usr.sbin/i4b/man/i4bctl.4
+++ b/usr.sbin/i4b/man/i4bctl.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4bctl.4,v 1.7 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bctl.4,v 1.7 1999/12/14 21:07:54 hm Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:09:46 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index 847676dd805c..0c46101eaad7 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4bipr.4,v 1.11 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bipr.4,v 1.7 1999/12/14 21:07:54 hm Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:10:25 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index d7cd9f6417cf..f6946beea88f 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4bisppp.4,v 1.12 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bisppp.4,v 1.7 1999/12/14 21:07:55 hm Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:11:15 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4
index 8d56732fa734..fb0ce097a88c 100644
--- a/usr.sbin/i4b/man/i4bq921.4
+++ b/usr.sbin/i4b/man/i4bq921.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4bq921.4,v 1.8 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq921.4,v 1.7 1999/12/14 21:07:55 hm Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:11:55 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4
index a70a942eb64b..a2d88a76fce1 100644
--- a/usr.sbin/i4b/man/i4bq931.4
+++ b/usr.sbin/i4b/man/i4bq931.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4bq931.4,v 1.8 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq931.4,v 1.7 1999/12/14 21:07:55 hm Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:12:33 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4
index c6d9b312a88c..7583bfbd6042 100644
--- a/usr.sbin/i4b/man/i4brbch.4
+++ b/usr.sbin/i4b/man/i4brbch.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4brbch.4,v 1.8 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4brbch.4,v 1.8 2000/03/06 09:41:51 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:13:04 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index 6f6f01029365..0624c1572edd 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4btel.4,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btel.4,v 1.8 2000/03/06 09:41:52 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:13:39 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index 485deb2b5728..2fc7ef3c89e2 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: i4btrc.4,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btrc.4,v 1.7.2.1 2000/05/09 14:12:51 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:14:19 1999]
 .\"
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index 7176506c72a2..ef9964abed0f 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isic.4,v 1.26 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/isic.4,v 1.8 2000/03/02 14:53:43 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:16:08 1999]
 .\"
diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile
index 1cebcca5ac30..fc7d4b92c932 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.1 1999/12/28 02:37:05 shin Exp $
 
 PROG=	ifmcstat
 MAN8=	ifmcstat.8
diff --git a/usr.sbin/ifmcstat/ifmcstat.8 b/usr.sbin/ifmcstat/ifmcstat.8
index 816da4bead8a..da0ff1265828 100644
--- a/usr.sbin/ifmcstat/ifmcstat.8
+++ b/usr.sbin/ifmcstat/ifmcstat.8
@@ -12,7 +12,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.1.2.1 2000/04/20 15:22:16 phantom Exp $
 .\"
 .Dd May 21, 1998
 .Dt IFMCSTAT 8
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 862601ae282c..3037560a1675 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.3.2.1 2000/07/15 07:36:27 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 3a8b424cc75d..d8969af2fdf5 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.18 2000/02/09 09:04:36 luigi Exp $
 
 PROG=	inetd
 SRCS=	inetd.c builtins.c
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index c32a98d3339c..ef6d520961e0 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.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/inetd/builtins.c,v 1.19.2.1 2000/07/18 16:47:17 dwmalone Exp $
  *
  */
 
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index ff37d2712787..54cc3d77442d 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.46.2.1 2000/07/18 16:47:17 dwmalone Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 7669d5f29476..7294c32ae3fd 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: inetd.c	8.4 (Berkeley) 4/13/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/inetd/inetd.c,v 1.80.2.1 2000/07/18 16:47:17 dwmalone Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index f956c1a8669e..48b1c726ca90 100644
--- a/usr.sbin/inetd/inetd.h
+++ b/usr.sbin/inetd/inetd.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/inetd/inetd.h,v 1.4 2000/01/25 14:52:10 shin Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h
index fc4ff5a127bf..187abd3d2f4b 100644
--- a/usr.sbin/inetd/pathnames.h
+++ b/usr.sbin/inetd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/pathnames.h,v 1.6 1999/08/28 01:16:35 peter Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 2e9b3e6dc7c3..5fd6bcc950ef 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.11 2000/01/24 22:08:19 charnier 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 bfcf773bc9a6..ea1661b26de2 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.17.2.1 2000/05/16 08:59:50 asmodai Exp $
  */
 /*
  * Parts of this program are derived from the original FreeBSD iostat
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index 284236a570c0..1157f7a41a64 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipftest/Makefile,v 1.4.2.1 2000/07/20 06:40:45 kris Exp $
 
 .PATH:	${.CURDIR}/../../sys/netinet \
 	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index 1313213e0d61..99d96dd74932 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipresend/Makefile,v 1.4 1999/12/06 20:50:01 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index 4b1b80e2264f..8a1c3e9f8a7e 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipsend/Makefile,v 1.8 1999/12/06 20:50:02 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter/iplang \
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index 9465369a3803..411c59532e5d 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/iptest/Makefile,v 1.4 1999/12/06 20:50:03 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 4a1d6a9c33a8..70d1a76636d9 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jail/Makefile,v 1.4 1999/08/28 01:16:37 peter Exp $
 
 PROG=	jail
 MAN8=	jail.8
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 473f58713c6a..f27e43a5f6c1 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.13.2.2 2000/07/08 14:43:34 dannyboy Exp $
 .\"
 .Dd April 28, 1999
 .Dt JAIL 8
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index fc349908f1df..3c996bccafc1 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.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/jail/jail.c,v 1.5 1999/09/19 08:36:37 phk Exp $
  * 
  */
 
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 1c8b437b4d29..4149c770c397 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.18.2.2 2000/07/19 19:15:09 ben Exp $
 .\"
 .Dd June 30, 1999
 .Dt KBDCONTROL 1
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index efe4c07a7bfd..f3e9dbfa7697 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.c,v 1.30 1999/12/10 04:24:26 yokota Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h
index 251b1c91a43d..213ccf10b117 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.9 1999/12/10 04:24:27 yokota Exp $
  */
 
 #define TNOP		256
diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l
index db376585ff7b..7f8255ab7fa8 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.11 1999/12/10 04:24:27 yokota Exp $
  */
 
 %{
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index 8d867668284a..14e8c42642f6 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for kbdmap / vidfont
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdmap/Makefile,v 1.9 1999/08/28 01:16:38 peter Exp $
 
 MAINTAINER= wosch
 
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index ae8d35eb3417..7ec899550cbc 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.17 2000/03/01 14:07:41 sheldonh Exp $
 
 .Dd Mar 25, 1995
 .Dt KBDMAP 1
diff --git a/usr.sbin/kbdmap/kbdmap.pl b/usr.sbin/kbdmap/kbdmap.pl
index 6c637776edf6..f7f3b7234f79 100644
--- a/usr.sbin/kbdmap/kbdmap.pl
+++ b/usr.sbin/kbdmap/kbdmap.pl
@@ -26,7 +26,7 @@
 #
 # kbdmap/vidfont - front end for syscons
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdmap/kbdmap.pl,v 1.10.2.1 2000/03/14 09:30:45 sheldonh Exp $
 
 
 # simple test if syscons works
diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile
index c7d566304a97..9e19a833785e 100644
--- a/usr.sbin/kernbb/Makefile
+++ b/usr.sbin/kernbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.5 1999/08/28 01:16:39 peter Exp $
 
 PROG=	kernbb
 MAN8=	kernbb.8
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index 087bc444513d..c996a528fe83 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.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/kernbb/kernbb.8,v 1.9 1999/09/20 09:15:21 phantom Exp $
 .\"
 .Dd May 22, 1995
 .Dt KERNBB 8
diff --git a/usr.sbin/kernbb/kernbb.c b/usr.sbin/kernbb/kernbb.c
index 45cd63da9d8e..87cff2250d66 100644
--- a/usr.sbin/kernbb/kernbb.c
+++ b/usr.sbin/kernbb/kernbb.c
@@ -10,7 +10,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.11 1999/08/28 01:16:40 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/keyadmin/keyadmin.8 b/usr.sbin/keyadmin/keyadmin.8
index eed8703bb68f..15ca08ac3af0 100644
--- a/usr.sbin/keyadmin/keyadmin.8
+++ b/usr.sbin/keyadmin/keyadmin.8
@@ -54,7 +54,7 @@
 .\"----------------------------------------------------------------------*/
 .\"
 .\"	$ANA: keyadmin.8,v 1.3 1996/06/13 20:15:57 wollman Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/keyadmin/keyadmin.8,v 1.5 1999/08/28 01:16:40 peter Exp $
 .\"
 .Dd June 13, 1996
 .Dt KEY 8
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 9493e04ec3f3..3c468aa8775b 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/keyserv/Makefile,v 1.5 1999/08/28 01:16:41 peter Exp $
 
 PROG=	keyserv
 SRCS=	keyserv.c setkey.c keyserv_uid.c crypt_svc.c crypt_server.c crypt.h
diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c
index 51024b68b569..f9069b5db47f 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.6 2000/02/24 21:10:25 markm Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv.8 b/usr.sbin/keyserv/keyserv.8
index 9928a53389aa..b1e97cf85b71 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.6 1999/08/28 01:16:41 peter 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 72a334af1d05..3e2d7b60c4d4 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.3 1999/08/28 01:16:41 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv_uid.c b/usr.sbin/keyserv/keyserv_uid.c
index 8a46fd12bbff..4a31a3c6f37c 100644
--- a/usr.sbin/keyserv/keyserv_uid.c
+++ b/usr.sbin/keyserv/keyserv_uid.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/keyserv_uid.c,v 1.3 1999/08/28 01:16:41 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index 566b1c79834c..9a0d041169b9 100644
--- a/usr.sbin/keyserv/setkey.c
+++ b/usr.sbin/keyserv/setkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)setkey.c	1.11	94/04/25 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/setkey.c,v 1.3 1999/08/28 01:16:41 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index d03523821d6f..ccd0634a6fb2 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kgmon.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kgmon/kgmon.8,v 1.7 1999/11/27 16:52:41 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 8ab42274a750..2bca1808d854 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -42,7 +42,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.9 1999/08/28 01:16:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile
index 5a3565a95f1b..f38ce398ab55 100644
--- a/usr.sbin/kgzip/Makefile
+++ b/usr.sbin/kgzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kgzip/Makefile,v 1.2 1999/08/28 01:16:42 peter Exp $
 
 PROG=	kgzip
 SRCS=	kgzip.c elfhdr.c kgzcmp.c kgzld.c xio.c
diff --git a/usr.sbin/kgzip/elfhdr.c b/usr.sbin/kgzip/elfhdr.c
index d3abec77cbf0..0a06e2dfc787 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.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #include <stddef.h>
diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h
index b14b9f10ac65..5b866fcea2d5 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.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #include <elf.h>
diff --git a/usr.sbin/kgzip/kgz.h b/usr.sbin/kgzip/kgz.h
index 3cc8e13d4553..84c45b31bb89 100644
--- a/usr.sbin/kgzip/kgz.h
+++ b/usr.sbin/kgzip/kgz.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgz.h,v 1.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #ifndef _KGZ_H_
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index a10c1678b90e..f0f77fc9ad32 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.2.2.1 2000/07/20 10:35:23 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 97f4ece90ba1..f3d368eab589 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.3 1999/12/20 02:39:50 billf Exp $
 .\"
 .Dd July 19, 1999
 .Dt KGZIP 8
diff --git a/usr.sbin/kgzip/kgzip.c b/usr.sbin/kgzip/kgzip.c
index d65476a82770..c49071fdbca6 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.3 2000/01/16 21:19:04 kris Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgzip.h b/usr.sbin/kgzip/kgzip.h
index 4231c0fee5b8..02d6802d61bb 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.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #include "kgz.h"
diff --git a/usr.sbin/kgzip/kgzld.c b/usr.sbin/kgzip/kgzld.c
index a2b0086b313f..fd9ee81bcb13 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.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/xio.c b/usr.sbin/kgzip/xio.c
index 21c9634398f1..952689bfae45 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.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile
index 4f34ca04e423..aa7e38480a9e 100644
--- a/usr.sbin/lpr/Makefile
+++ b/usr.sbin/lpr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/Makefile,v 1.5 1999/08/28 01:16:45 peter 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 141373e9c290..b779bec81bed 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.5 1999/08/28 01:16:45 peter Exp $
 
 CWARNFLAGS=	-Wall -Wnested-externs -Wmissing-prototypes -Wno-unused -Wredundant-decls -Wstrict-prototypes
 
diff --git a/usr.sbin/lpr/SMM.doc/Makefile b/usr.sbin/lpr/SMM.doc/Makefile
index faeb266062d9..0b0489d5dfac 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 e671ec98a94d..5c64924f02c0 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.7 1999/08/28 01:16:46 peter Exp $
 
 PROG=	chkprintcap
 MAN8=	chkprintcap.8
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index ecf7822cef57..8190f2b1d531 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.3 1999/08/28 01:16:46 peter 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 8b8465651e44..bf4cd74a6ac2 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c
@@ -30,7 +30,7 @@
 static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.c,v 1.3 1999/08/28 01:16:46 peter Exp $";
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index e5c6191fbbe9..2382fc2b8e98 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.5 1999/08/28 01:16:47 peter 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 9a70f80b63e6..0194724fcaec 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)common.c	8.5 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.12.2.1 2000/07/03 06:22:35 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 88f90a60e5cf..467693191677 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)displayq.c	8.4 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.15 1999/08/28 01:16:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index c7a960e8dfe4..d2bd66fca1c8 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.9 1999/08/28 01:16:48 peter Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 4f5c0c5d4c3d..e6edf3445a49 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.3 1999/08/28 01:16:48 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 7b6d1242453a..c5fb24ee31b1 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.6 1999/08/28 01:16:48 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/lpr/common_source/recvjob.c b/usr.sbin/lpr/common_source/recvjob.c
index a2de1a94641f..ff3555e26e2b 100644
--- a/usr.sbin/lpr/common_source/recvjob.c
+++ b/usr.sbin/lpr/common_source/recvjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/recvjob.c,v 1.13 1999/08/28 01:16:48 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c
index e3e43667a11f..b7ef7beef8f4 100644
--- a/usr.sbin/lpr/common_source/request.c
+++ b/usr.sbin/lpr/common_source/request.c
@@ -30,7 +30,7 @@
 static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.2 1999/08/28 01:16:48 peter 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 a3216a8b2133..3c86cab1ec98 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)rmjob.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.12 1999/08/28 01:16:48 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 29866b28c895..de0180ce58fb 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)startdaemon.c	8.2 (Berkeley) 4/17/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.8 1999/08/28 01:16:48 peter Exp $";
 #endif /* not lint */
 
 
diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile
index 0c7be10f3070..db3c7ffb737d 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.5 1999/09/21 20:42:05 ache Exp $
 
 SUBDIR = koi2alt koi2855
 
diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc
index c4a3a7fc878a..1e89f038a8aa 100644
--- a/usr.sbin/lpr/filters.ru/Makefile.inc
+++ b/usr.sbin/lpr/filters.ru/Makefile.inc
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/Makefile.inc,v 1.1 1999/09/21 20:42:05 ache 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 3e83d97eb34e..880191dd8c8d 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.1 1999/09/21 20:42:10 ache Exp $
 
 PROG=koi2855
 NOMAN=	noman
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 67a9bc5b3041..9a0f6f1c5b24 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
+++ b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
@@ -28,7 +28,7 @@
 /*
  * KOI8-R -> CP855 conversion filter (Russian character sets)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/koi2855.c,v 1.1 1999/09/21 20:42:10 ache Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index f980bbfcb82b..bcfcbdff91ab 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.1 1999/09/21 20:42:10 ache Exp $
 
 PROG=koi2alt
 NOMAN=	noman
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 6fef3c4a0310..1ca691311f07 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 static char sccsid[] = "From: @(#)lpf.c	8.1 (Berkeley) 6/6/93";
-static char id[] = "$FreeBSD$";
+static char id[] = "$FreeBSD: src/usr.sbin/lpr/filters/lpf.c,v 1.6 1999/08/28 01:16:49 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index 9522fc3796a6..47473d3efb4d 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.5 1999/08/28 01:16:50 peter Exp $
 
 BINDIR = /usr/bin
 MAN1 = lp.1
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index 86669257e43d..81075d47aac4 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.12 2000/03/08 10:13:50 sheldonh Exp $
 .\"
 .Dd January 22, 1995
 .Dt LP 1
diff --git a/usr.sbin/lpr/lp/lp.sh b/usr.sbin/lpr/lp/lp.sh
index e7c06882c0f9..b0e91cf9b9cc 100644
--- a/usr.sbin/lpr/lp/lp.sh
+++ b/usr.sbin/lpr/lp/lp.sh
@@ -36,7 +36,7 @@
 #
 # Posix 1003.2 compliant print spooler interface.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lp/lp.sh,v 1.7 2000/03/08 10:02:11 sheldonh Exp $
 #
 
 ncopies=""
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 48fd38b2586c..72ba6702dd14 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.7 1999/08/28 01:16:50 peter Exp $
 
 PROG=	lpc
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 1ed69c84a561..b19cbf2ad602 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpc/cmds.c,v 1.14 2000/01/24 23:30:38 dillon Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 8e2b6efba848..fbb69a9c9db0 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpc/cmdtab.c,v 1.3 1999/08/28 01:16:51 peter Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index f0586d726c45..7ac7106f547f 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.8 2000/03/01 14:09:15 sheldonh Exp $
 .\"
 .Dd April 28, 1995
 .Dt LPC 8
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 5bfa85920f5a..50d4a6900ccb 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lpc.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.13.2.1 2000/07/03 06:23:49 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index e107e97f8a87..3a110785ce96 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.10 1999/08/28 01:16:52 peter Exp $
 
 PROG=	lpd
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index 70c536dbc9c9..36022f6299eb 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.5 1999/08/28 01:16:52 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index f882a3167a37..d66c59d56350 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.14.2.1 2000/07/03 06:25:02 ps Exp $
 .\"
 .Dd April 19, 1994
 .Dt LPD 8
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 76846a7d22b8..08f31fad1351 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/lpd.c,v 1.12.2.1 2000/07/03 06:25:02 ps Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index ba39a9f1ed3f..e6ca3c9c8acc 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lpdchar.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/lpdchar.c,v 1.5 1999/08/28 01:16:52 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 4bb2ea0a11d3..f58927045cd1 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/modes.c,v 1.6 1999/08/28 01:16:52 peter Exp $";
 #endif /* not lint */
 
 #include <stddef.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index a33289e9d876..4be52bd003b5 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)printjob.c	8.7 (Berkeley) 5/10/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/printjob.c,v 1.22.2.1 2000/06/24 22:48:15 mpp Exp $";
 #endif /* not lint */
 
 
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index e4cd4e972c16..0ecbdd4ccac9 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/recvjob.c,v 1.14 1999/08/28 01:16:53 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 24afb7ab101a..f13553542990 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.7 1999/08/28 01:16:53 peter Exp $
 
 PROG=	lpq
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index cff76b241448..11bf9f6fae8c 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.5 1999/08/28 01:16:53 peter 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 67de966673fc..91dfac07ae86 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lpq.c	8.3 (Berkeley) 5/10/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpq/lpq.c,v 1.7 1999/08/28 01:16:53 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index e82347cb933e..d34d4db07b3d 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.8 1999/08/28 01:16:54 peter Exp $
 
 PROG=	lpr
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index e05290dd3a9c..39652e39fae4 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.11.2.2 2000/07/03 06:26:10 ps 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 5a65f949f852..d87e11307fee 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -48,7 +48,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: lpr.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpr/lpr.c,v 1.32.2.1 2000/06/27 19:55:40 wollman Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5
index 1ed62069d492..828556978a2c 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.16 1999/08/28 01:16:55 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt PRINTCAP 5
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index abeac25b290e..57d10ab3be4e 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.8 1999/08/28 01:16:55 peter Exp $
 
 PROG=	lprm
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index 1a17ea6b1bd5..355a0753b20b 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.5 1999/08/28 01:16:55 peter 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 ca52f5d8ae06..2693d4472afd 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lprm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lprm/lprm.c,v 1.6 1999/08/28 01:16:55 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lptest/lptest.1 b/usr.sbin/lpr/lptest/lptest.1
index 73f9fe93b3f5..135422321b1a 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.3 1999/08/28 01:16:56 peter Exp $
 .\"
 .Dd December 30, 1993
 .Dt LPTEST 1
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index 2b8d6ed22a06..e40a957eba60 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.7 1999/08/28 01:16:56 peter Exp $
 
 PROG=	pac
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/pac/pac.8 b/usr.sbin/lpr/pac/pac.8
index 0fddaecce75b..58d6bcc3e01f 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.4 1999/08/28 01:16:56 peter 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 08de1145e606..c007391512d8 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pac.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/pac/pac.c,v 1.10 1999/08/28 01:16:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/runqueue/extern.h b/usr.sbin/lpr/runqueue/extern.h
index 8f390fb76636..b1ac26b99cfc 100644
--- a/usr.sbin/lpr/runqueue/extern.h
+++ b/usr.sbin/lpr/runqueue/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      From: @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/runqueue/extern.h,v 1.4 1999/08/28 01:16:57 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/lpr/runqueue/lpdchar.c b/usr.sbin/lpr/runqueue/lpdchar.c
index ba39a9f1ed3f..f0b5f1c846cc 100644
--- a/usr.sbin/lpr/runqueue/lpdchar.c
+++ b/usr.sbin/lpr/runqueue/lpdchar.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lpdchar.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/runqueue/lpdchar.c,v 1.5 1999/08/28 01:16:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/runqueue/modes.c b/usr.sbin/lpr/runqueue/modes.c
index 9c22055f46a9..519240316dce 100644
--- a/usr.sbin/lpr/runqueue/modes.c
+++ b/usr.sbin/lpr/runqueue/modes.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/runqueue/modes.c,v 1.5 1999/08/28 01:16:57 peter Exp $";
 #endif /* not lint */
 
 #include <stddef.h>
diff --git a/usr.sbin/lpr/runqueue/printjob.c b/usr.sbin/lpr/runqueue/printjob.c
index c5f7990572bf..dee32006bfa5 100644
--- a/usr.sbin/lpr/runqueue/printjob.c
+++ b/usr.sbin/lpr/runqueue/printjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)printjob.c	8.7 (Berkeley) 5/10/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/runqueue/printjob.c,v 1.19 1999/08/28 01:16:58 peter Exp $";
 #endif /* not lint */
 
 
diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8
index bf9ed5023fa0..79e8c25095aa 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.12 2000/03/01 14:07:58 sheldonh Exp $
 .Dd September 3, 1994
 .Dt LPTCONTROL 8
 .Os FreeBSD 2
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 5b7e40ce6304..d0eb5e8fe4d7 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.c,v 1.9.2.1 2000/07/12 08:27:56 obrien Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 02a189936b2a..6e0aa61deb1d 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mailwrapper/Makefile,v 1.4.2.1 2000/07/01 11:05:40 ps Exp $
 
 PROG=	mailwrapper
 MAN8=	mailwrapper.8
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 3f0c5dd2618b..8e09c551bf5d 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.4.2.2 2000/07/01 10:21:34 ps 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 509496be08bc..86fe70647edd 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -1,6 +1,6 @@
 /*	$OpenBSD: mailwrapper.c,v 1.6 1999/12/17 05:06:28 mickey Exp $	*/
 /*	$NetBSD: mailwrapper.c,v 1.3 1999/05/29 18:18:15 christos Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.4.2.1 2000/07/01 10:21:34 ps Exp $ */
 
 /*
  * Copyright (c) 1998
diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h
index d8ae498ce004..bb224646363e 100644
--- a/usr.sbin/mailwrapper/pathnames.h
+++ b/usr.sbin/mailwrapper/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/mailwrapper/pathnames.h,v 1.3 2000/01/10 03:20:13 imp Exp $ */
 
 /*
  * Copyright (c) 1998
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 187edd313a4b..db3faa489a95 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/manctl/Makefile,v 1.10 1999/08/28 01:16:59 peter Exp $
 
 MAN8=	manctl.8
 
diff --git a/usr.sbin/manctl/manctl.8 b/usr.sbin/manctl/manctl.8
index f2efa2af6327..0700c6d8ecac 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.9 1999/11/27 17:15:51 charnier Exp $
 .Dd January 1, 1996
 .Dt MANCTL 8
 .Os FreeBSD
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index 43a1511f0ff3..cc2728dbc6ef 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.11 1999/08/28 01:16:59 peter Exp $
 #
 # manctl: 
 #	a utility for manipulating manual pages
diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile
index 046bb670eece..275b3347c5e7 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/memcontrol/Makefile,v 1.2 1999/09/29 21:43:31 chris Exp $
 
 PROG=		memcontrol
 MAN8=		memcontrol.8
diff --git a/usr.sbin/memcontrol/memcontrol.8 b/usr.sbin/memcontrol/memcontrol.8
index 2c128abfd20b..c9c559ff9af7 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.3 2000/03/01 14:08:00 sheldonh Exp $
 .\" 
 .Dd September 28, 1999
 .Dt MEMCONTROL 8
diff --git a/usr.sbin/memcontrol/memcontrol.c b/usr.sbin/memcontrol/memcontrol.c
index e66f2a44e3b0..4195036a103f 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.3.4.1 2000/03/20 22:53:25 green Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index c00d18010be7..48aeead3eeb9 100644
--- a/usr.sbin/mergemaster/Makefile
+++ b/usr.sbin/mergemaster/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/Makefile,v 1.3 1999/11/01 04:29:04 chris Exp $
 
 MAINTAINER=	billf@FreeBSD.org
 MAINTAINER+=	doug@gorean.org
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 4f319eca63ae..bc8552a70312 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.5 2000/03/01 14:08:02 sheldonh Exp $
 .\"
 .Dd September 10, 1999
 .Dt MERGEMASTER 8
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 367d53840873..ee14eb67e70f 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -8,7 +8,7 @@
 # Copyright 1998, 1999 Douglas Barton
 # Doug@gorean.org
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.6 2000/02/12 22:14:02 billf Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
 
diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile
index 78f5844209e6..328ee93c9114 100644
--- a/usr.sbin/mixer/Makefile
+++ b/usr.sbin/mixer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mixer/Makefile,v 1.6 1999/08/28 01:17:00 peter Exp $
 
 PROG = mixer
 MAN8=	mixer.8
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index d429528b0904..cf832f774123 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.10.2.1 2000/07/03 06:30:06 ps Exp $
 .\"
 .Dd January 9, 1997
 .Dt MIXER 8
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index 21b35804f486..bb1e1a5a2b97 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.11.2.1 2000/07/03 06:30:06 ps Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 87f9fbf8fa47..bb06f94f9a14 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.1.1.1.2.1 2000/07/15 07:38:52 kris Exp $
 
 PROG=	mld6query
 SRCS=	mld6.c
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index c485c86f30cf..aa657e9af292 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.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/mld6query/mld6.c,v 1.1.1.1.2.1 2000/07/15 07:38:52 kris Exp $
  */
 #include <sys/param.h>
 #include <sys/uio.h>
diff --git a/usr.sbin/mld6query/mld6query.8 b/usr.sbin/mld6query/mld6query.8
index 2df9d78369a5..d73e71b39abb 100644
--- a/usr.sbin/mld6query/mld6query.8
+++ b/usr.sbin/mld6query/mld6query.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: mld6query.8,v 1.3 1999/08/20 10:00:06 itojun Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/mld6query/mld6query.8,v 1.1.1.1.2.1 2000/07/15 07:38:52 kris Exp $
 .\"
 .Dd May 17, 1998
 .Dt MLD6QUERY 8
diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile
index 2c79bfb8a437..00312910486a 100644
--- a/usr.sbin/mlxcontrol/Makefile
+++ b/usr.sbin/mlxcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mlxcontrol/Makefile,v 1.2.2.1 2000/04/24 19:44:46 msmith Exp $
 
 PROG=		mlxcontrol
 SRCS=		command.c config.c interface.c util.c
diff --git a/usr.sbin/mlxcontrol/command.c b/usr.sbin/mlxcontrol/command.c
index a3647676c330..9471c0bcda58 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.2.1 2000/04/24 19:44:46 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/config.c b/usr.sbin/mlxcontrol/config.c
index a52565840de4..ba0918fc91b9 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.2.1 2000/04/24 19:44:46 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/interface.c b/usr.sbin/mlxcontrol/interface.c
index 5cbf7b609aa4..6f66087fa2dc 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.2.1 2000/04/24 19:44:46 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.8 b/usr.sbin/mlxcontrol/mlxcontrol.8
index 044fb947dded..e3162316a1c9 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.3.2.1 2000/04/24 19:44:47 msmith Exp $
 .\"
 .Dd April 10, 2000
 .Dt MLXCONTROL 8
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.h b/usr.sbin/mlxcontrol/mlxcontrol.h
index f0225b5b6f88..076114d2d120 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.1.1.1.2.1 2000/04/24 19:44:47 msmith Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/mlxcontrol/util.c b/usr.sbin/mlxcontrol/util.c
index 37cd2b7e3143..b716ecacaef7 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.2.1 2000/04/24 19:44:47 msmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 45d8485a93be..783e15c50b6b 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.27.2.2 2000/04/21 14:21:12 yokota Exp $
 .\"
 .Dd April 1, 2000
 .Dt MOUSED 8
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 1157bd874730..8506c6e9ace5 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/moused/moused.c,v 1.37.2.6 2000/04/21 14:21:12 yokota Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index 66a4f43cefca..f7b2d588d6c4 100644
--- a/usr.sbin/mptable/Makefile
+++ b/usr.sbin/mptable/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mptable/Makefile,v 1.2 1999/08/28 01:17:02 peter Exp $
 
 PROG = mptable
 MAN1 = mptable.1
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 44bfcdb1b93c..cbba5817428c 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.6 1999/10/30 16:05:26 phantom Exp $
 .\"
 .Dd April 28, 1997
 .Dt MPTABLE 1
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index cd0561e668c1..459ae8615ed4 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.12 1999/08/28 01:17:02 peter Exp $";
 #endif /* not lint */
 
 #define VMAJOR			2
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 43fe8b10ac70..3e1a3cb781b3 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/Makefile,v 1.5 1999/08/28 01:17:02 peter Exp $
 
 SUBDIR=	common mrouted mrinfo map-mbone mtrace testrsrr
 
diff --git a/usr.sbin/mrouted/Makefile.inc b/usr.sbin/mrouted/Makefile.inc
index 767c93a298fc..756031c2b38b 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.4 1999/08/28 01:17:02 peter Exp $
 
 CFLAGS+=	-DRSRR
 
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 8b8ea9c7156a..af52643bae0c 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/callout.c,v 1.12 1999/08/28 01:17:03 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y
index f244d9c2aaf6..7045c7a6d10c 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.10 1999/08/28 01:17:03 peter 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 d3ed61e4f731..d14d39d3ecb3 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.5 1999/08/28 01:17:11 peter Exp $
 
 LIB=		mrouted
 NOPROFILE=	yes
diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c
index 5b436e60b813..c3648a7238b7 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.14 1999/08/28 01:17:03 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 1ec24de04d3f..e56df4ede997 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.12 1999/08/28 01:17:03 peter Exp $
  * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/dvmrp.h b/usr.sbin/mrouted/dvmrp.h
index 2f11872216c0..ee7aa6b83812 100644
--- a/usr.sbin/mrouted/dvmrp.h
+++ b/usr.sbin/mrouted/dvmrp.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/dvmrp.h,v 1.9 1999/08/28 01:17:03 peter Exp $
  * dvmrp.h,v 3.8.4.5 1997/11/18 23:25:57 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index f3430355cb15..bc3a77ab0758 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/igmp.c,v 1.16 1999/08/28 01:17:04 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c
index 53aad7c63a94..dabeb77b5424 100644
--- a/usr.sbin/mrouted/inet.c
+++ b/usr.sbin/mrouted/inet.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/inet.c,v 1.11 1999/08/28 01:17:04 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c
index 716b4794180b..ebe7b0c441b5 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/usr.sbin/mrouted/kern.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/kern.c,v 1.12 1999/08/28 01:17:04 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index b3526d5934dc..02c875ec350e 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.16.2.1 2000/07/01 10:18:01 ps Exp $";
 #endif
 
 #include <err.h>
diff --git a/usr.sbin/mrouted/map-mbone.8 b/usr.sbin/mrouted/map-mbone.8
index d7c693828b17..8396fbb8f13a 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.7 2000/03/01 14:08:07 sheldonh 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 afe6d24ef377..d7397838a46d 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.8 1999/08/28 01:17:12 peter Exp $
 
 PROG=	map-mbone
 
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c
index 0f09835fa87b..c6020eb90a53 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.15 1999/08/28 01:17:05 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/mrouted/mrinfo.8 b/usr.sbin/mrouted/mrinfo.8
index c8b5c01e8b9f..a81743db2b77 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.9 2000/03/01 14:08:08 sheldonh Exp $
 .\"
 .Dd May 8, 1995
 .Dt MRINFO 8
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index a9f9dd9112ea..856e765822bd 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.17 1999/08/28 01:17:05 peter 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 a529cf9b64ee..702c1338c4d6 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.11 1999/08/28 01:17:13 peter Exp $
 
 PROG=	mrinfo
 
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index 1e5645207398..c90af8d0946d 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.16 2000/03/01 14:08:08 sheldonh Exp $
 .\"
 .Dd May 8, 1995
 .Dt MROUTED 8
diff --git a/usr.sbin/mrouted/mrouted.conf b/usr.sbin/mrouted/mrouted.conf
index e9cb04c3ed6e..02fcbdf1fee5 100644
--- a/usr.sbin/mrouted/mrouted.conf
+++ b/usr.sbin/mrouted/mrouted.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mrouted.conf,v 1.9 1999/08/28 01:17:06 peter Exp $
 # mrouted.conf,v 3.8 1995/11/29 22:40:47 fenner Rel
 #
 #   This is the configuration file for "mrouted", an IP multicast router.
diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile
index a7a0fcbe5512..31748d530ccb 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.13 1999/08/28 01:17:15 peter Exp $
 
 PROG=	mrouted
 
diff --git a/usr.sbin/mrouted/mtrace.8 b/usr.sbin/mrouted/mtrace.8
index 2f2a53eb7980..bac27de43eea 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.12 1999/08/28 01:17:06 peter Exp $
 .\"
 .Dd May 8, 1995
 .Dt MTRACE 8
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index 66df8e284d32..c08acd0c21b9 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.17.2.1 2000/07/01 10:18:01 ps Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile
index 6fa62606f2e4..a5d682d47092 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.10 1999/08/28 01:17:15 peter Exp $
 
 PROG=	mtrace
 
diff --git a/usr.sbin/mrouted/pathnames.h b/usr.sbin/mrouted/pathnames.h
index d4fb01d18a15..2fee141dda49 100644
--- a/usr.sbin/mrouted/pathnames.h
+++ b/usr.sbin/mrouted/pathnames.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/pathnames.h,v 1.7 1999/08/28 01:17:07 peter Exp $
  * pathnames.h,v 3.8 1995/11/29 22:36:57 fenner Rel
  */
 
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index 7ffb34b23a7d..53177d5ec2ad 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.17 1999/08/28 01:17:07 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/prune.h b/usr.sbin/mrouted/prune.h
index 375fada1116e..e5ed6ade7219 100644
--- a/usr.sbin/mrouted/prune.h
+++ b/usr.sbin/mrouted/prune.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/prune.h,v 1.10 1999/08/28 01:17:08 peter Exp $
  * prune.h,v 3.8.4.5 1998/02/27 22:45:43 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index b2695395ed92..df7038d94b3e 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/route.c,v 1.12 1999/08/28 01:17:08 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/route.h b/usr.sbin/mrouted/route.h
index 300202b967dd..77a4eead80c6 100644
--- a/usr.sbin/mrouted/route.h
+++ b/usr.sbin/mrouted/route.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/route.h,v 1.9 1999/08/28 01:17:09 peter Exp $
  * route.h,v 3.8.4.6 1997/07/01 23:02:35 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index a74fd6caa2f2..0d6ebcde0cb5 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.8 1999/08/28 01:17:09 peter Exp $";
 #endif /* not lint */
 
 #ifdef RSRR
diff --git a/usr.sbin/mrouted/testrsrr/Makefile b/usr.sbin/mrouted/testrsrr/Makefile
index b1ea5e523689..abcb30298f36 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.4 1999/08/28 01:17:16 peter Exp $
 
 PROG=	testrsrr
 
diff --git a/usr.sbin/mrouted/testrsrr/testrsrr.c b/usr.sbin/mrouted/testrsrr/testrsrr.c
index b18d6b028882..57111b7b872a 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.4 1999/08/28 01:17:17 peter Exp $
  */
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 423fa532225e..e96b4444e885 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/vif.c,v 1.15 1999/08/28 01:17:09 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/vif.h b/usr.sbin/mrouted/vif.h
index 5be618dea308..f1d09eb1e271 100644
--- a/usr.sbin/mrouted/vif.h
+++ b/usr.sbin/mrouted/vif.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/vif.h,v 1.10 1999/08/28 01:17:09 peter Exp $
  * vif.h,v 3.8.4.26 1998/01/14 21:21:19 fenner Exp
  */
 
diff --git a/usr.sbin/mtest/mtest.8 b/usr.sbin/mtest/mtest.8
index cf67915780ff..2ab782a507e3 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.5 1999/08/28 01:17:17 peter Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd December 15, 1996
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 82138547676d..73516e169dd3 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.15.2.2 2000/06/28 02:33:17 joe Exp $
 
 PROG=	mtree
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 416812186cdb..eda7019b47d7 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/compare.c,v 1.15.2.1 2000/06/28 02:33:17 joe Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 6a2d005f0636..2b4f32ae8b95 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/create.c,v 1.18.2.2 2000/06/28 02:33:17 joe Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/mtree/excludes.c
index 47ab298ab1ba..f01b6f1c997a 100644
--- a/usr.sbin/mtree/excludes.c
+++ b/usr.sbin/mtree/excludes.c
@@ -28,7 +28,7 @@
  */
 
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/excludes.c,v 1.1.2.3 2000/05/16 20:55:19 wollman 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 54dafdfc97a7..c91086a7bbfb 100644
--- a/usr.sbin/mtree/extern.h
+++ b/usr.sbin/mtree/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mtree/extern.h,v 1.3.2.2 2000/06/28 02:33:17 joe Exp $
  */
 
 int	 compare __P((char *, NODE *, FTSENT *));
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index 7721ff469dab..b26bda336471 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/misc.c,v 1.8.2.1 2000/06/28 02:33:17 joe Exp $";
 #endif /*not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 4a0893036fe3..8a06367d83a3 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mtree.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.16.2.3 2000/06/30 09:54:06 ps Exp $
 .\"
 .Dd February 26, 1999
 .Dt MTREE 8
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index ee4eb50e5463..e9e6d949cbbd 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/mtree.c,v 1.8.2.1 2000/05/15 20:49:59 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mtree/mtree.h b/usr.sbin/mtree/mtree.h
index 9d8af5da1f46..3398b05f7531 100644
--- a/usr.sbin/mtree/mtree.h
+++ b/usr.sbin/mtree/mtree.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtree.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mtree/mtree.h,v 1.5 1999/12/09 20:38:35 joe Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 4cbf80b90f2f..2b9dfede2c69 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/spec.c,v 1.13.2.1 2000/06/28 02:33:17 joe Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index f182996e9cbd..c5e5b276063c 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/verify.c,v 1.10.2.1 2000/05/15 20:49:59 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile
index f5b7b33a075d..328aaecb1920 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.6 1999/08/28 01:17:23 peter Exp $
 
 .include "${.CURDIR}/../named/Makefile.inc"
 
diff --git a/usr.sbin/named.reload/named.reload.8 b/usr.sbin/named.reload/named.reload.8
index 9d0cb404e1a3..183d43377032 100644
--- a/usr.sbin/named.reload/named.reload.8
+++ b/usr.sbin/named.reload/named.reload.8
@@ -52,7 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/named.reload/named.reload.8,v 1.3 1999/08/28 01:17:23 peter Exp $
 .\"
 .TH @INDOT_U@NAMED.RELOAD @SYS_OPS_EXT_U@ "June 26, 1993"
 .UC 5
diff --git a/usr.sbin/named.reload/named.reload.sh b/usr.sbin/named.reload/named.reload.sh
index 4a657a720ae5..0050e004c4e0 100644
--- a/usr.sbin/named.reload/named.reload.sh
+++ b/usr.sbin/named.reload/named.reload.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	from named.reload	5.2 (Berkeley) 6/27/89
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.reload/named.reload.sh,v 1.2 1999/08/28 01:17:23 peter Exp $
 #
 
 exec %DESTSBIN%/%INDOT%ndc reload
diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile
index e0c4bcb037ba..959d62af3663 100644
--- a/usr.sbin/named.restart/Makefile
+++ b/usr.sbin/named.restart/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.restart/Makefile,v 1.6 1999/08/28 01:17:24 peter Exp $
 
 .include "${.CURDIR}/../named/Makefile.inc"
 
diff --git a/usr.sbin/named.restart/named.restart.8 b/usr.sbin/named.restart/named.restart.8
index 1f276377f417..e13260fa61a5 100644
--- a/usr.sbin/named.restart/named.restart.8
+++ b/usr.sbin/named.restart/named.restart.8
@@ -52,7 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/named.restart/named.restart.8,v 1.3 1999/08/28 01:17:24 peter Exp $
 .\"
 .TH @INDOT_U@NAMED.RESTART @SYS_OPS_EXT_U@ "June 26, 1993"
 .UC 5
diff --git a/usr.sbin/named.restart/named.restart.sh b/usr.sbin/named.restart/named.restart.sh
index 518f6f2d11bc..e6c457a515a9 100644
--- a/usr.sbin/named.restart/named.restart.sh
+++ b/usr.sbin/named.restart/named.restart.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	from named.restart	5.4 (Berkeley) 6/27/89
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.restart/named.restart.sh,v 1.2 1999/08/28 01:17:25 peter Exp $
 #
 
 exec %DESTSBIN%/%INDOT%ndc restart
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index 3f7018a51a63..aecb0d5c37c3 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile,v 1.25 2000/01/10 09:05:30 phantom Exp $
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/Makefile.inc"
diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc
index bd9211e8291c..a30e3b309fcc 100644
--- a/usr.sbin/named/Makefile.inc
+++ b/usr.sbin/named/Makefile.inc
@@ -1,5 +1,5 @@
 # From: Id: Makefile.inc,v 8.4 1996/03/03 17:42:43 vixie Exp
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile.inc,v 1.12 1999/11/30 06:15:34 peter Exp $
 
 .ifndef (Mk.Inc)
 Mk.Inc?=defined
diff --git a/usr.sbin/named/Makefile.maninc b/usr.sbin/named/Makefile.maninc
index b4595b97a23c..1f77fc5b0036 100644
--- a/usr.sbin/named/Makefile.maninc
+++ b/usr.sbin/named/Makefile.maninc
@@ -1,5 +1,5 @@
 # From: Id: Makefile.maninc,v 8.1 1994/12/15 06:23:43 vixie Exp
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile.maninc,v 1.5 1999/08/28 01:17:22 peter Exp $
 
 # (the BIND kit's man page Makefile has gotten bad and crazy over the years.
 #  this file has to be included AFTER bsd.prog.mk (which includes bsd.man.mk))
diff --git a/usr.sbin/ndc/Makefile b/usr.sbin/ndc/Makefile
index 033803c4e952..0a77b2e0b4e2 100644
--- a/usr.sbin/ndc/Makefile
+++ b/usr.sbin/ndc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndc/Makefile,v 1.7 1999/11/30 06:18:09 peter Exp $
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/../named/Makefile.inc"
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index b0ba34841fc8..979151bb4b08 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.1 2000/01/06 12:40:40 shin Exp $
 
 .PATH:	${.CURDIR}/../../contrib/tcpdump
 
diff --git a/usr.sbin/ndp/gnuc.h b/usr.sbin/ndp/gnuc.h
index c6412965c9db..5c6b29e3a309 100644
--- a/usr.sbin/ndp/gnuc.h
+++ b/usr.sbin/ndp/gnuc.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ndp/gnuc.h,v 1.1 2000/01/06 12:40:40 shin Exp $ */
 /* this is dummy to pacify gmt2local.c. */
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index fc99d3696eed..7eb2a5753a1e 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.1.2.2 2000/07/15 07:36:27 kris Exp $
 .\"	$KAME: ndp.8,v 1.12 2000/06/20 21:50:17 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 8010c1906354..7b238ad22dbe 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.2.2.2 2000/07/15 07:36:27 kris Exp $	*/
 /*	$KAME: ndp.c,v 1.41 2000/07/04 12:54:11 jinmei Exp $	*/
 
 /*
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index a7cf621c9811..f63e0da1fa68 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/newsyslog/Makefile,v 1.7 1999/08/28 01:17:27 peter Exp $
 
 PROG=	newsyslog
 
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 7601b5e1eda8..8a5205af8df2 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.23.2.1 2000/05/19 09:21:30 des 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 34dbc87ce03d..40cd5dfe2d9d 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-"$FreeBSD$";
+"$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.25.2.1 2000/05/19 09:21:30 des Exp $";
 #endif	/* not lint */
 
 #define OSF
diff --git a/usr.sbin/newsyslog/pathnames.h b/usr.sbin/newsyslog/pathnames.h
index ff224a8c5431..a301a228b246 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.2 1999/08/28 01:17:28 peter Exp $
 
 */
 
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index 468a17cffe22..bae49e33774f 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.4 1999/11/30 02:45:30 archie Exp $
 # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
 
 PROG=		ngctl
diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c
index 470468a0dff2..eea67239a435 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.2 1999/11/30 02:45:30 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c
index 7b355e5d1fec..0e82ce61d5d3 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.1 1999/10/21 09:06:07 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c
index aeb74fb057ce..fe340e89f73d 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.2 1999/11/30 02:45:30 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index 70080f9680dd..00576fd53c8a 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.4 2000/01/28 00:50:27 archie 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 c5735e13650a..1905121986db 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.1 1999/10/21 09:06:07 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c
index 7a040762d5d0..f0c8cd320335 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.1 1999/11/30 02:45:30 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c
index 85c6eff5d0f0..5cb873574bd0 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.1 1999/10/21 09:06:07 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index b6f0b456dd9d..16496856c569 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.5 2000/03/01 14:08:10 sheldonh 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 1baced784c89..620d9bf2a5da 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.6 2000/01/28 00:50:28 archie Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c
index 4af398e34e5a..8d403d79d402 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.2 1999/11/30 02:45:31 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c
index da51361a6ee7..723e77586403 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.2 1999/11/30 02:45:31 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c
index d391ba801e58..d67007797ca6 100644
--- a/usr.sbin/ngctl/shutdown.c
+++ b/usr.sbin/ngctl/shutdown.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/shutdown.c,v 1.2 1999/11/30 02:45:32 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c
index 75706b3103bb..8861943bb572 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.1 1999/10/21 09:06:09 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c
index 472933eb35de..f184c3a94d84 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.1.4.1 2000/05/05 02:54:16 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile
index 18b07d29a671..953c96b4ec12 100644
--- a/usr.sbin/nghook/Makefile
+++ b/usr.sbin/nghook/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nghook/Makefile,v 1.2 1999/10/28 20:17:13 archie 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 8027dc658c8d..99e5f544b7bb 100644
--- a/usr.sbin/nghook/main.c
+++ b/usr.sbin/nghook/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/nghook/main.c,v 1.4 1999/11/30 02:09:36 archie Exp $
  * $Whistle: main.c,v 1.9 1999/01/20 00:26:26 archie Exp $
  */
 
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index 0a64c87bb78f..c488990f8cac 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.3 1999/12/22 01:25:07 archie Exp $
 .\" $Whistle: nghook.8,v 1.4 1999/01/20 03:19:45 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index c3a51a46625c..bf2644f29e35 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nslookup/Makefile,v 1.10 1999/11/30 06:16:46 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../named/Makefile.inc"
diff --git a/usr.sbin/nsupdate/Makefile b/usr.sbin/nsupdate/Makefile
index c8b2b9b3eb6a..bc916c85003e 100644
--- a/usr.sbin/nsupdate/Makefile
+++ b/usr.sbin/nsupdate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nsupdate/Makefile,v 1.2 1999/11/30 06:16:46 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../named/Makefile.inc"
diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile
index 4c676df5b88f..90b7ddbcc0b5 100644
--- a/usr.sbin/ntp/Makefile
+++ b/usr.sbin/ntp/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ntpd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/Makefile,v 1.2 2000/01/10 09:20:27 phantom Exp $
 #
 MAINTAINER=	roberto
 
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index d815266e3f05..06819ab27fa4 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.1 1999/12/13 14:09:29 roberto Exp $
 #
 MAINTAINER=	roberto
 
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index 9746cdd2fe0a..999af26ac80e 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/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.sbin/ntp/config.h,v 1.4 2000/03/12 13:25:14 dufault Exp $ */
 
 /* Define if on AIX 3.
    System headers sometimes define this.
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 3004b0ac6fe1..41e7db729891 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.5 2000/02/10 13:15:46 sheldonh Exp $
 
 MAINTAINER=	sheldonh
 
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index a48db5a9e21c..e817f9398e10 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.2 2000/02/10 13:15:47 sheldonh 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 b1aebdaaa8d3..f861e8d838e0 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.1 2000/01/13 09:59:44 sheldonh 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 b5f8e583f8e3..3685bdd4daa9 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.4.2.1 2000/06/22 08:47:34 sheldonh Exp $
 .\"
 .Dd January 10, 2000
 .Dt NTPD 8
diff --git a/usr.sbin/ntp/doc/ntpdate.8 b/usr.sbin/ntp/doc/ntpdate.8
index bd218c4740c0..d32aa3de71b6 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.1.2.1 2000/06/22 08:48:03 sheldonh 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 74c544e57e2e..feb9193677eb 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.2.2.2 2000/05/15 11:53:05 sheldonh 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 4bd91ca1c4e7..24700e7a0d0a 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.3.2.2 2000/05/15 11:44:03 sheldonh 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 297831295146..1cee0d2cf29c 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.1 2000/01/12 14:41:00 sheldonh 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 29d33cb2b236..42a937a094f4 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.1.2.1 2000/05/09 13:01:56 sheldonh Exp $
 .\"
 .Dd January 6, 2000
 .Dt NTPTRACE 8
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index 245cc53ae5f2..3a89191e00fd 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/libntp/Makefile,v 1.4 2000/01/28 15:05:58 roberto Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../contrib/ntp/libntp
diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile
index dd0b645a6c0b..6f4fa3da2d00 100644
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/libparse/Makefile,v 1.2 2000/01/01 23:57:58 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/libparse
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index fd1e393308a6..f059c7142b60 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpd/Makefile,v 1.3 2000/01/01 23:57:59 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/ntpd
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index 22c7cf0afbd0..c53f1815f11f 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpdate/Makefile,v 1.2 2000/01/01 23:57:59 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/ntpdate
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 97756af2e821..3e9ac37c93cd 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpdc/Makefile,v 1.3 2000/01/01 23:57:59 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/ntpdc
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 29f16e0200fa..d2edb102a0fe 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpq/Makefile,v 1.2 2000/01/01 23:58:00 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/ntpq
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index 6d57ec251769..1e53c44f7445 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntptime/Makefile,v 1.2 2000/01/01 23:58:00 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/util
diff --git a/usr.sbin/ntp/ntptimeset/Makefile b/usr.sbin/ntp/ntptimeset/Makefile
index 7e2dc934de77..9499c6946af4 100644
--- a/usr.sbin/ntp/ntptimeset/Makefile
+++ b/usr.sbin/ntp/ntptimeset/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntptimeset/Makefile,v 1.2 2000/01/01 23:58:01 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/ntpdate
diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile
index 9bb0bde604d2..e322d14d36d4 100644
--- a/usr.sbin/ntp/ntptrace/Makefile
+++ b/usr.sbin/ntp/ntptrace/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntptrace/Makefile,v 1.2 2000/01/01 23:58:01 roberto Exp $
 #
 
 .PATH:	${.CURDIR}/../../../contrib/ntp/ntptrace
diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver
index 20996b85ff9d..7f9088a7dacf 100755
--- a/usr.sbin/ntp/scripts/mkver
+++ b/usr.sbin/ntp/scripts/mkver
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/mkver,v 1.4 2000/02/01 04:23:35 ache Exp $
 PROG=${1-UNKNOWN}
 
 ConfStr="$PROG"
diff --git a/usr.sbin/ntp/scripts/ntpver b/usr.sbin/ntp/scripts/ntpver
index 6dbc510db8c2..f457be9a0379 100755
--- a/usr.sbin/ntp/scripts/ntpver
+++ b/usr.sbin/ntp/scripts/ntpver
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/ntpver,v 1.1 1999/12/13 14:09:56 roberto Exp $
 # print version string of NTP daemon
 # Copyright (c) 1997 by Ulrich Windl
 # Modified 970318: Harlan Stenn: rewritten...
diff --git a/usr.sbin/pccard/Makefile b/usr.sbin/pccard/Makefile
index 06516bf40815..e967b05ce7e8 100644
--- a/usr.sbin/pccard/Makefile
+++ b/usr.sbin/pccard/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for pccardc/pccardd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/Makefile,v 1.5 1999/08/28 01:17:30 peter Exp $
 #
 SUBDIR= pccardc pccardd
 
diff --git a/usr.sbin/pccard/Makefile.inc b/usr.sbin/pccard/Makefile.inc
index 6503c10dcf9a..5711f2915d5e 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.4 2000/01/03 12:01:29 marcel Exp $
 
 CFLAGS+= -Wall -static
 BINDIR?= /usr/sbin
diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index 679b47d1a00d..0ad5138e096a 100644
--- a/usr.sbin/pccard/pccardc/Makefile
+++ b/usr.sbin/pccard/pccardc/Makefile
@@ -1,7 +1,7 @@
 #
 #	pccardc Makefile
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/pccardc/Makefile,v 1.11 1999/12/02 05:52:57 imp Exp $
 #
 PROG=	pccardc
 SRCS=	beep.c dumpcis.c enabler.c pccardc.c pccardmem.c power.c printcis.c \
diff --git a/usr.sbin/pccard/pccardc/beep.c b/usr.sbin/pccard/pccardc/beep.c
index dda2e1c42807..093ccac70595 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.2 1999/08/28 01:17:31 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pccard/pccardc/dumpcis.c b/usr.sbin/pccard/pccardc/dumpcis.c
index d5fc7579933f..309528754659 100644
--- a/usr.sbin/pccard/pccardc/dumpcis.c
+++ b/usr.sbin/pccard/pccardc/dumpcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/dumpcis.c,v 1.12 1999/08/28 01:17:31 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/enabler.c b/usr.sbin/pccard/pccardc/enabler.c
index ae9fc1853a6c..f6669d3868a8 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.13 1999/08/28 01:17:32 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardc.8 b/usr.sbin/pccard/pccardc/pccardc.8
index c790d2df1d4f..a11266eb2a16 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.7 2000/03/01 14:09:18 sheldonh 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 743493b4e318..b053f6676a89 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.10 1999/12/02 05:52:58 imp Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardmem.c b/usr.sbin/pccard/pccardc/pccardmem.c
index 2b79e581e85e..57ba3f9e18b8 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.12 1999/08/28 01:17:32 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/power.c b/usr.sbin/pccard/pccardc/power.c
index 45a82f5b5022..757dc1252cae 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.2 1999/12/02 05:56:36 imp Exp $ */
 
 /*
  * Code cleanup, bug-fix and extension
diff --git a/usr.sbin/pccard/pccardc/printcis.c b/usr.sbin/pccard/pccardc/printcis.c
index 70626d41ee5d..51fd7faec2e6 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.11.2.1 2000/06/05 14:58:55 iwasaki Exp $";
 #endif /* not lint */
 
 /* 
diff --git a/usr.sbin/pccard/pccardc/rdmap.c b/usr.sbin/pccard/pccardc/rdmap.c
index 3ac81f930ca9..93f7ff8e8ed1 100644
--- a/usr.sbin/pccard/pccardc/rdmap.c
+++ b/usr.sbin/pccard/pccardc/rdmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdmap.c,v 1.12 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/rdreg.c b/usr.sbin/pccard/pccardc/rdreg.c
index a3171487998a..9d6b7bbc568b 100644
--- a/usr.sbin/pccard/pccardc/rdreg.c
+++ b/usr.sbin/pccard/pccardc/rdreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdreg.c,v 1.12 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrattr.c b/usr.sbin/pccard/pccardc/wrattr.c
index cc3df8ecbee8..6166a6518c36 100644
--- a/usr.sbin/pccard/pccardc/wrattr.c
+++ b/usr.sbin/pccard/pccardc/wrattr.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrattr.c,v 1.13 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrreg.c b/usr.sbin/pccard/pccardc/wrreg.c
index 5fda2a72f24c..84f608928222 100644
--- a/usr.sbin/pccard/pccardc/wrreg.c
+++ b/usr.sbin/pccard/pccardc/wrreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrreg.c,v 1.12 1999/08/28 01:17:34 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardd/cardd.c b/usr.sbin/pccard/pccardd/cardd.c
index 0f654601bc5c..6ebf3d21437f 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.46.2.4 2000/07/18 04:59:39 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 b6dde103aaba..92a926c92b35 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.18.2.3 2000/07/18 04:59:39 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 ec3010cd71ba..61b33e7c70aa 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.24.2.4 2000/07/18 04:59:39 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 684091247253..0996d0352c29 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.12.2.4 2000/07/18 18:29:27 imp 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 9214a0460e2a..fab7eb56f963 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.17.2.1 2000/04/15 10:56:21 iwasaki 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 16157b27525a..0033d2a0b883 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.6.2.2 2000/06/29 08:23:26 roberto Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.sbin/pccard/pccardd/readcis.c b/usr.sbin/pccard/pccardd/readcis.c
index d8857fbed324..5cd4b80c3360 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.17.2.3 2000/06/29 08:23:26 roberto Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pccard/pccardd/readcis.h b/usr.sbin/pccard/pccardd/readcis.h
index ba77a52360a9..f1f1ec3ae9d8 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.11.2.2 2000/06/05 14:59:03 iwasaki Exp $
  */
 
 struct tuple {
diff --git a/usr.sbin/pccard/pccardd/util.c b/usr.sbin/pccard/pccardd/util.c
index aa443641b0e4..18fccdc3bdef 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.13.2.2 2000/07/18 18:29:27 imp Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8
index 08088065ad5a..256c8f454b7d 100644
--- a/usr.sbin/pciconf/pciconf.8
+++ b/usr.sbin/pciconf/pciconf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.8 2000/03/01 14:08:12 sheldonh Exp $
 .\" Copyright (c) 1997
 .\"	Stefan Esser <se@freebsd.org>. All rights reserved.
 .\"
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index 5def83972a22..e11d9a893618 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.11 1999/12/08 17:43:20 ken Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pcvt/Makefile.inc b/usr.sbin/pcvt/Makefile.inc
index 20f7cc0632e9..27e47bbce1f9 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.7 1999/08/28 01:17:40 peter Exp $
 
 FONTDIR	=	/usr/share/misc/pcvtfonts
 
diff --git a/usr.sbin/pcvt/Misc/Etc/Makefile b/usr.sbin/pcvt/Misc/Etc/Makefile
index c72a02544f95..2f1873203ca1 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.5 1999/08/28 01:17:41 peter Exp $
 
 FILES=	Termcap Terminfo pcvt.el rc.local uemacs.tar.Z.uu xmodmap-german
 
diff --git a/usr.sbin/pcvt/cursor/cursor.1 b/usr.sbin/pcvt/cursor/cursor.1
index 88cb223e31e4..18320ba4091b 100644
--- a/usr.sbin/pcvt/cursor/cursor.1
+++ b/usr.sbin/pcvt/cursor/cursor.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)cursor.1, 3.20, Last Edit-Date: [Mon Dec 19 20:30:40 1994]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.6 2000/03/01 14:08:51 sheldonh Exp $
 .\"
 .Dd December 19, 1994
 .Dt CURSOR 1
diff --git a/usr.sbin/pcvt/fontedit/fontedit.1 b/usr.sbin/pcvt/fontedit/fontedit.1
index b3e1c20ae640..a85482c8722c 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.4 1999/08/28 23:20:49 mpp Exp $
 .\"
 .TH FONTEDIT 1 LOCAL
 .SH NAME
diff --git a/usr.sbin/pcvt/fonts/Makefile b/usr.sbin/pcvt/fonts/Makefile
index 51c7908446e4..621f574b0fd9 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.10 1999/08/28 01:17:42 peter Exp $
 
 .SUFFIXES: .uu
 .uu:
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.8 b/usr.sbin/pcvt/ispcvt/ispcvt.8
index d98c20694f84..022741d66638 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.8
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.8
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)ispcvt.1, 3.20, Last Edit-Date: [Tue Apr  4 12:35:54 1995]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.9 2000/03/01 14:09:21 sheldonh Exp $
 .\"
 .Dd April 4, 1995
 .Dt ISPCVT 8
diff --git a/usr.sbin/pcvt/kbdio/kbdio.y b/usr.sbin/pcvt/kbdio/kbdio.y
index 55bf231a894f..ec3c5983e135 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.6 1999/09/06 07:39:30 peter Exp $"
 
 /*
  * $Log: kbdio.y,v $
diff --git a/usr.sbin/pcvt/kbdio/lex.l b/usr.sbin/pcvt/kbdio/lex.l
index de1a25227180..6e9803ed71a9 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/kcon.1 b/usr.sbin/pcvt/kcon/kcon.1
index 6f60a40bcac2..39070838653e 100644
--- a/usr.sbin/pcvt/kcon/kcon.1
+++ b/usr.sbin/pcvt/kcon/kcon.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)kcon.1, 3.20, Last Edit-Date: [Wed Jan 25 16:34:56 1995]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.7 2000/03/01 14:08:52 sheldonh Exp $
 .\"
 .Dd January 25, 1995
 .Dt KCON 1
diff --git a/usr.sbin/pcvt/keycap/keycap.3 b/usr.sbin/pcvt/keycap/keycap.3
index ac4efd299484..7010740b97bd 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.8 1999/12/16 02:16:54 nik Exp $
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 3
diff --git a/usr.sbin/pcvt/keycap/man5/keycap.5 b/usr.sbin/pcvt/keycap/man5/keycap.5
index cb4dfbb80b5f..5921f63627c7 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.9 2000/03/01 14:09:25 sheldonh Exp $
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 5
diff --git a/usr.sbin/pcvt/loadfont/loadfont.1 b/usr.sbin/pcvt/loadfont/loadfont.1
index 04e82a74d31a..d7e226972c32 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.1
+++ b/usr.sbin/pcvt/loadfont/loadfont.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)loadfont.1, 3.20, Last Edit-Date: [Tue Apr  4 13:06:00 1995]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.9 2000/03/01 14:08:54 sheldonh Exp $
 .\"
 .Dd April 4, 1995
 .Dt LOADFONT 1
diff --git a/usr.sbin/pcvt/mcon/mcon.1 b/usr.sbin/pcvt/mcon/mcon.1
index 11134ce52a1b..c29fbf3b4bba 100644
--- a/usr.sbin/pcvt/mcon/mcon.1
+++ b/usr.sbin/pcvt/mcon/mcon.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)mcon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:28:22 1994]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/mcon/mcon.1,v 1.8 2000/03/01 14:08:55 sheldonh Exp $
 .\"
 .Dd January 3, 1994
 .Dt MCON 1
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index d2511dec62ce..64bdcc3cec31 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -29,7 +29,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)scon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:30:48 1994]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.8 2000/03/01 14:08:57 sheldonh Exp $
 .\"
 .Dd December 31, 1993
 .Dt SCON 1
diff --git a/usr.sbin/pcvt/set2061/ICD2061Aalt.c b/usr.sbin/pcvt/set2061/ICD2061Aalt.c
index c65ebc4e9cee..3958190f6374 100644
--- a/usr.sbin/pcvt/set2061/ICD2061Aalt.c
+++ b/usr.sbin/pcvt/set2061/ICD2061Aalt.c
@@ -1,7 +1,7 @@
 /*
  * This code is derived from code available from the STB bulletin board
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/set2061/ICD2061Aalt.c,v 1.5 1999/12/29 05:07:54 peter Exp $
  */
 
 /* $XFree86: mit/server/ddx/x386/common_hw/ICD2061Aalt.c,v 2.6 1994/04/15 05:10:30 dawes Exp $ */
diff --git a/usr.sbin/pcvt/set2061/compiler.h b/usr.sbin/pcvt/set2061/compiler.h
index 57d1cd32e060..76651e2fe77d 100644
--- a/usr.sbin/pcvt/set2061/compiler.h
+++ b/usr.sbin/pcvt/set2061/compiler.h
@@ -20,7 +20,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/set2061/compiler.h,v 1.5 1999/08/28 05:11:28 peter Exp $
  */
 
 
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.1 b/usr.sbin/pcvt/userkeys/vt220keys.1
index d4df9aaa2e9d..75dbde40dbbc 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.7 2000/03/01 14:08:59 sheldonh Exp $
 .\"
 .TH VT220KEYS 1 
 .UC 4
diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile
index 73753efbfe3e..c460076540da 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.12 1999/08/28 01:17:50 peter Exp $
 
 .if !exists(${.CURDIR}/../Makefile.inc)
 error:
diff --git a/usr.sbin/pcvt/vgaio/lex.l b/usr.sbin/pcvt/vgaio/lex.l
index e729850e5a91..103351b2e837 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 d5d32858cfcc..bc7814019416 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.6 2000/03/01 14:09:23 sheldonh 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 7d5c05a00325..07a4f25e9f98 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.5 1999/09/06 07:39:30 peter Exp $"
 
 /*
  * $Log: vgaio.y,v $
diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile
index 440962e60eed..a917b614ce2a 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.6 1999/10/03 10:35:03 marcel Exp $
 
 PROG=		vttest
 CFLAGS+=	-traditional -DUSEMYSTTY
diff --git a/usr.sbin/pcvt/vttest/vttest.1 b/usr.sbin/pcvt/vttest/vttest.1
index 9e3cd2311c68..6618e18cf46e 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.4 1999/08/28 23:20:51 mpp Exp $
 .\"
 .TH VTTEST 1 "LOCAL"
 .SH NAME
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 48a128688c94..e8f2242749db 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,6 +1,6 @@
 # Makefile for periodic(8)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/periodic/Makefile,v 1.2 1999/08/28 01:17:51 peter Exp $
 
 MAN8=	periodic.8
 
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 97957ac3c8d9..746662875941 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.11 1999/08/28 01:17:52 peter Exp $
 .\"
 .Dd 13 August 1997
 .Os FreeBSD 3.0
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index 479228b4a6f5..17f921ce7af2 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.9.2.2 2000/05/28 19:17:20 asmodai Exp $
 #
 # Run nightly periodic scripts
 #
diff --git a/usr.sbin/pim6dd/LICENSE.mrouted b/usr.sbin/pim6dd/LICENSE.mrouted
index e03eb82afbdf..06fc2d8b22ae 100644
--- a/usr.sbin/pim6dd/LICENSE.mrouted
+++ b/usr.sbin/pim6dd/LICENSE.mrouted
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pim6dd/LICENSE.mrouted,v 1.1 2000/01/28 05:10:15 shin Exp $
 
 The mrouted program is covered by the following license.  Use of the
 mrouted program represents acceptance of these terms and conditions.
diff --git a/usr.sbin/pim6dd/LICENSE.pimd b/usr.sbin/pim6dd/LICENSE.pimd
index d88a4578bd1a..78c52e11c1bd 100644
--- a/usr.sbin/pim6dd/LICENSE.pimd
+++ b/usr.sbin/pim6dd/LICENSE.pimd
@@ -44,5 +44,5 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/LICENSE.pimd,v 1.1.2.1 2000/07/15 07:36:28 kris Exp $
  */
diff --git a/usr.sbin/pim6dd/Makefile b/usr.sbin/pim6dd/Makefile
index a35c7108af40..55096af58b7b 100644
--- a/usr.sbin/pim6dd/Makefile
+++ b/usr.sbin/pim6dd/Makefile
@@ -74,7 +74,7 @@
 #The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
 #Leland Stanford Junior University.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pim6dd/Makefile,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
 
 PROG=	pim6dd
 SRCS=	mld6.c mld6_proto.c\
diff --git a/usr.sbin/pim6dd/VERSION b/usr.sbin/pim6dd/VERSION
index 69e52623a6c0..874129ffa122 100644
--- a/usr.sbin/pim6dd/VERSION
+++ b/usr.sbin/pim6dd/VERSION
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pim6dd/VERSION,v 1.1 2000/01/28 05:10:17 shin Exp $
 0.2.1.0-alpha15
diff --git a/usr.sbin/pim6dd/callout.c b/usr.sbin/pim6dd/callout.c
index 6cf96de05241..3db6fd07ee18 100644
--- a/usr.sbin/pim6dd/callout.c
+++ b/usr.sbin/pim6dd/callout.c
@@ -9,7 +9,7 @@
  *
  * callout.c,v 3.8.4.5 1997/05/16 20:18:25 fenner Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/callout.c,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/config.c b/usr.sbin/pim6dd/config.c
index f241287c430c..940d6004751b 100644
--- a/usr.sbin/pim6dd/config.c
+++ b/usr.sbin/pim6dd/config.c
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/config.c,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/debug.c b/usr.sbin/pim6dd/debug.c
index 392beaae4739..166795f8bea1 100644
--- a/usr.sbin/pim6dd/debug.c
+++ b/usr.sbin/pim6dd/debug.c
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/debug.c,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/debug.h b/usr.sbin/pim6dd/debug.h
index 1d4e294f4ae9..1636eeb0bb77 100644
--- a/usr.sbin/pim6dd/debug.h
+++ b/usr.sbin/pim6dd/debug.h
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/debug.h,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 extern unsigned long	debug;
diff --git a/usr.sbin/pim6dd/defs.h b/usr.sbin/pim6dd/defs.h
index 24e0d242ac6c..b85597923626 100644
--- a/usr.sbin/pim6dd/defs.h
+++ b/usr.sbin/pim6dd/defs.h
@@ -49,7 +49,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/defs.h,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/pim6dd/inet6.c b/usr.sbin/pim6dd/inet6.c
index 3caddfd7020f..a21600cb6166 100644
--- a/usr.sbin/pim6dd/inet6.c
+++ b/usr.sbin/pim6dd/inet6.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/pim6dd/inet6.c,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/kern.c b/usr.sbin/pim6dd/kern.c
index 69118dc8d14c..ad3e4bccac4f 100644
--- a/usr.sbin/pim6dd/kern.c
+++ b/usr.sbin/pim6dd/kern.c
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/kern.c,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/main.c b/usr.sbin/pim6dd/main.c
index 99f708611666..ca60fb4536c1 100644
--- a/usr.sbin/pim6dd/main.c
+++ b/usr.sbin/pim6dd/main.c
@@ -49,7 +49,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/main.c,v 1.1.2.2 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/mld6.c b/usr.sbin/pim6dd/mld6.c
index f3861c269a4d..2c6e2c6e6329 100644
--- a/usr.sbin/pim6dd/mld6.c
+++ b/usr.sbin/pim6dd/mld6.c
@@ -73,7 +73,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/mld6.c,v 1.2.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/mld6.h b/usr.sbin/pim6dd/mld6.h
index 310ebcf09bc1..83c40157c9ba 100644
--- a/usr.sbin/pim6dd/mld6.h
+++ b/usr.sbin/pim6dd/mld6.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/pim6dd/mld6.h,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 /*
diff --git a/usr.sbin/pim6dd/mld6_proto.c b/usr.sbin/pim6dd/mld6_proto.c
index 26d8952e7b3e..16e9beb99f0c 100644
--- a/usr.sbin/pim6dd/mld6_proto.c
+++ b/usr.sbin/pim6dd/mld6_proto.c
@@ -78,7 +78,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/mld6_proto.c,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/mrt.c b/usr.sbin/pim6dd/mrt.c
index df4df3cf7afc..f8aee413d35a 100644
--- a/usr.sbin/pim6dd/mrt.c
+++ b/usr.sbin/pim6dd/mrt.c
@@ -49,7 +49,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/mrt.c,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/mrt.h b/usr.sbin/pim6dd/mrt.h
index daac17088c56..9633fa7d1dd2 100644
--- a/usr.sbin/pim6dd/mrt.h
+++ b/usr.sbin/pim6dd/mrt.h
@@ -49,7 +49,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/mrt.h,v 1.1.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 #define MRTF_SPT                0x0001	/* iif toward source                */
diff --git a/usr.sbin/pim6dd/pathnames.h b/usr.sbin/pim6dd/pathnames.h
index b61173677492..1fadd46eeba4 100644
--- a/usr.sbin/pim6dd/pathnames.h
+++ b/usr.sbin/pim6dd/pathnames.h
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/pathnames.h,v 1.2.2.1 2000/07/15 07:36:29 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6dd/pim6.c b/usr.sbin/pim6dd/pim6.c
index e0a18fe309af..7a4cdecd1e7f 100644
--- a/usr.sbin/pim6dd/pim6.c
+++ b/usr.sbin/pim6dd/pim6.c
@@ -63,7 +63,7 @@
  *  Pavlin Ivanov Radoslavov (pavlin@catarina.usc.edu)
  *
  *  $Id: pim6.c,v 1.6 2000/03/07 02:23:50 jinmei Exp $
- *  $FreeBSD$
+ *  $FreeBSD: src/usr.sbin/pim6dd/pim6.c,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/pim6_proto.c b/usr.sbin/pim6dd/pim6_proto.c
index f4460ba15e0c..18b4d56fc6df 100644
--- a/usr.sbin/pim6dd/pim6_proto.c
+++ b/usr.sbin/pim6dd/pim6_proto.c
@@ -77,7 +77,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/pim6_proto.c,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/pim6dd.8 b/usr.sbin/pim6dd/pim6dd.8
index 409f5f93fdf1..c895649fe24c 100644
--- a/usr.sbin/pim6dd/pim6dd.8
+++ b/usr.sbin/pim6dd/pim6dd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6dd.8,v 1.5 2000/05/18 16:11:46 itojun Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/pim6dd/pim6dd.8,v 1.3.2.3 2000/07/15 07:36:30 kris Exp $
 .\"
 .Dd Nov 17, 1998
 .Dt PIM6DD 8
diff --git a/usr.sbin/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5
index 763635470ca1..d29e113aea18 100644
--- a/usr.sbin/pim6dd/pim6dd.conf.5
+++ b/usr.sbin/pim6dd/pim6dd.conf.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	KAME Id: pim6dd.conf.5,v 1.4 2000/07/09 17:26:52 itojun Exp
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/pim6dd/pim6dd.conf.5,v 1.2.2.4 2000/07/15 07:36:30 kris Exp $
 .\"
 .Dd Nov 17, 1998
 .Dt PIM6DD.CONF 5
diff --git a/usr.sbin/pim6dd/pimdd.h b/usr.sbin/pim6dd/pimdd.h
index 73880f6e05fa..ee6b3c727e34 100644
--- a/usr.sbin/pim6dd/pimdd.h
+++ b/usr.sbin/pim6dd/pimdd.h
@@ -49,7 +49,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/pimdd.h,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 #include <netinet6/pim6.h>
diff --git a/usr.sbin/pim6dd/route.c b/usr.sbin/pim6dd/route.c
index 8a39ae08dcb2..33c56f49e1c4 100644
--- a/usr.sbin/pim6dd/route.c
+++ b/usr.sbin/pim6dd/route.c
@@ -49,7 +49,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/route.c,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/routesock.c b/usr.sbin/pim6dd/routesock.c
index a2065b9674a5..548a88152193 100644
--- a/usr.sbin/pim6dd/routesock.c
+++ b/usr.sbin/pim6dd/routesock.c
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/routesock.c,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/pim6dd/timer.c b/usr.sbin/pim6dd/timer.c
index c1ebf32f7487..81cc565aacca 100644
--- a/usr.sbin/pim6dd/timer.c
+++ b/usr.sbin/pim6dd/timer.c
@@ -49,7 +49,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/timer.c,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/trace.c b/usr.sbin/pim6dd/trace.c
index 7d1f641a7971..aee27134698c 100644
--- a/usr.sbin/pim6dd/trace.c
+++ b/usr.sbin/pim6dd/trace.c
@@ -72,7 +72,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/trace.c,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6dd/trace.h b/usr.sbin/pim6dd/trace.h
index 739c987e16d4..2f3e71aeac6e 100644
--- a/usr.sbin/pim6dd/trace.h
+++ b/usr.sbin/pim6dd/trace.h
@@ -72,7 +72,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/trace.h,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6dd/vers.c b/usr.sbin/pim6dd/vers.c
index 72668aff770a..03a41f6f5d73 100644
--- a/usr.sbin/pim6dd/vers.c
+++ b/usr.sbin/pim6dd/vers.c
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pim6dd/vers.c,v 1.1 2000/01/28 05:10:26 shin Exp $ */
 char todaysversion[]="0.2.1.0-alpha15";
diff --git a/usr.sbin/pim6dd/vif.c b/usr.sbin/pim6dd/vif.c
index 2fa533c64113..127d2f08728a 100644
--- a/usr.sbin/pim6dd/vif.c
+++ b/usr.sbin/pim6dd/vif.c
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/vif.c,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/pim6dd/vif.h b/usr.sbin/pim6dd/vif.h
index 2a068e32dcc0..e8776f609f8c 100644
--- a/usr.sbin/pim6dd/vif.h
+++ b/usr.sbin/pim6dd/vif.h
@@ -44,7 +44,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6dd/vif.h,v 1.1.2.1 2000/07/15 07:36:30 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/BUGS.TODO b/usr.sbin/pim6sd/BUGS.TODO
index 93c330e5aeef..c494719a12f8 100644
--- a/usr.sbin/pim6sd/BUGS.TODO
+++ b/usr.sbin/pim6sd/BUGS.TODO
@@ -1,5 +1,5 @@
   $Id: BUGS.TODO,v 1.1.1.1 1999/08/08 23:30:57 itojun Exp $
-  $FreeBSD$
+  $FreeBSD: src/usr.sbin/pim6sd/BUGS.TODO,v 1.1.2.1 2000/07/15 07:36:34 kris Exp $
 
 THIS LIST IS FAR AWAY FROM BEING COMPLETE, so these are the few things 
 that came up at the right moment to be written down.
diff --git a/usr.sbin/pim6sd/BUGS.V6 b/usr.sbin/pim6sd/BUGS.V6
index 330ffdad3aca..19e3981d9d59 100644
--- a/usr.sbin/pim6sd/BUGS.V6
+++ b/usr.sbin/pim6sd/BUGS.V6
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pim6sd/BUGS.V6,v 1.1.2.1 2000/07/15 07:36:34 kris Exp $
 
 Write your bugs reports here
 
diff --git a/usr.sbin/pim6sd/LICENSE.mrouted b/usr.sbin/pim6sd/LICENSE.mrouted
index e03eb82afbdf..5b686ff0206e 100644
--- a/usr.sbin/pim6sd/LICENSE.mrouted
+++ b/usr.sbin/pim6sd/LICENSE.mrouted
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pim6sd/LICENSE.mrouted,v 1.1.2.1 2000/07/15 07:36:34 kris Exp $
 
 The mrouted program is covered by the following license.  Use of the
 mrouted program represents acceptance of these terms and conditions.
diff --git a/usr.sbin/pim6sd/LICENSE.pim6dd b/usr.sbin/pim6sd/LICENSE.pim6dd
index 764c6fda4c39..226470356b5a 100644
--- a/usr.sbin/pim6sd/LICENSE.pim6dd
+++ b/usr.sbin/pim6sd/LICENSE.pim6dd
@@ -26,6 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/LICENSE.pim6dd,v 1.1.2.1 2000/07/15 07:36:34 kris Exp $
  */
 
diff --git a/usr.sbin/pim6sd/LICENSE.pim6sd b/usr.sbin/pim6sd/LICENSE.pim6sd
index 3f96a5526c99..8c28cf5bcb84 100644
--- a/usr.sbin/pim6sd/LICENSE.pim6sd
+++ b/usr.sbin/pim6sd/LICENSE.pim6sd
@@ -30,7 +30,7 @@
  *  Questions concerning this software should be directed to
  *  Mickael Hoerdt (hoerdt@clarinet.u-strasbg.fr) LSIIT Strasbourg. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/LICENSE.pim6sd,v 1.1.2.1 2000/07/15 07:36:34 kris Exp $
  */
 /*
  * This program has been derived from pim6dd.
diff --git a/usr.sbin/pim6sd/LICENSE.pimd b/usr.sbin/pim6sd/LICENSE.pimd
index 46955e157457..b0dae9139c45 100644
--- a/usr.sbin/pim6sd/LICENSE.pimd
+++ b/usr.sbin/pim6sd/LICENSE.pimd
@@ -44,5 +44,5 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/LICENSE.pimd,v 1.1.2.1 2000/07/15 07:36:34 kris Exp $
  */
diff --git a/usr.sbin/pim6sd/Makefile b/usr.sbin/pim6sd/Makefile
index 905321cb5b46..25a881473712 100644
--- a/usr.sbin/pim6sd/Makefile
+++ b/usr.sbin/pim6sd/Makefile
@@ -73,7 +73,7 @@
 #
 #The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
 #Leland Stanford Junior University.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pim6sd/Makefile,v 1.2.2.3 2000/07/15 07:36:35 kris Exp $
 
 PROG=	pim6sd
 SRCS=	mld6.c mld6_proto.c\
diff --git a/usr.sbin/pim6sd/README b/usr.sbin/pim6sd/README
index 49dfc1770648..198a9d8bd3b4 100644
--- a/usr.sbin/pim6sd/README
+++ b/usr.sbin/pim6sd/README
@@ -1,5 +1,5 @@
   $Id: README,v 1.1.1.1 1999/08/08 23:30:57 itojun Exp $
-  $FreeBSD$
+  $FreeBSD: src/usr.sbin/pim6sd/README,v 1.1 2000/01/28 05:10:32 shin Exp $
 
 WARNING! WARNING! WARNING!
 THIS RELEASE IS VERY ALPHA, SO PLEASE DO NOT REDISTRIBUTE AND
diff --git a/usr.sbin/pim6sd/README.first b/usr.sbin/pim6sd/README.first
index 87a1c3cfef86..163ec243292d 100644
--- a/usr.sbin/pim6sd/README.first
+++ b/usr.sbin/pim6sd/README.first
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pim6sd/README.first,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
 
 WARNING WARNING WARNING:
 
diff --git a/usr.sbin/pim6sd/callout.c b/usr.sbin/pim6sd/callout.c
index d2f9d04b64bb..5749d75ff142 100644
--- a/usr.sbin/pim6sd/callout.c
+++ b/usr.sbin/pim6sd/callout.c
@@ -24,7 +24,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/callout.c,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/callout.h b/usr.sbin/pim6sd/callout.h
index 6d08d3130a52..f33e6d7b91c8 100644
--- a/usr.sbin/pim6sd/callout.h
+++ b/usr.sbin/pim6sd/callout.h
@@ -42,7 +42,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/callout.h,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/cfparse.h b/usr.sbin/pim6sd/cfparse.h
index b4f6758f0853..f99bd575f9a1 100644
--- a/usr.sbin/pim6sd/cfparse.h
+++ b/usr.sbin/pim6sd/cfparse.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/pim6sd/cfparse.h,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 #if defined(YIPS_DEBUG)
 #  define DP(str) YIPSDEBUG(DEBUG_CONF, cfdebug_print(str, yytext, yyleng))
diff --git a/usr.sbin/pim6sd/cfparse.y b/usr.sbin/pim6sd/cfparse.y
index e0e358fd18b1..fbd5a9aae949 100644
--- a/usr.sbin/pim6sd/cfparse.y
+++ b/usr.sbin/pim6sd/cfparse.y
@@ -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/pim6sd/cfparse.y,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 %{
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/cftoken.l b/usr.sbin/pim6sd/cftoken.l
index 1a9abde99f7e..6c405ca8fa6e 100644
--- a/usr.sbin/pim6sd/cftoken.l
+++ b/usr.sbin/pim6sd/cftoken.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/pim6sd/cftoken.l,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/config.c b/usr.sbin/pim6sd/config.c
index 7cbd7d86086a..9114c9bf85b4 100644
--- a/usr.sbin/pim6sd/config.c
+++ b/usr.sbin/pim6sd/config.c
@@ -54,7 +54,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/config.c,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/config.h b/usr.sbin/pim6sd/config.h
index 5ce659312e93..102f55be09a0 100644
--- a/usr.sbin/pim6sd/config.h
+++ b/usr.sbin/pim6sd/config.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/config.h,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 #ifndef CONFIG_H
diff --git a/usr.sbin/pim6sd/crc.c b/usr.sbin/pim6sd/crc.c
index ca16b63478b4..9fc335e38ee3 100644
--- a/usr.sbin/pim6sd/crc.c
+++ b/usr.sbin/pim6sd/crc.c
@@ -36,7 +36,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/crc.c,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 /* CRC implantation : stolen from RFC 2083 section 15.*/
 
diff --git a/usr.sbin/pim6sd/crc.h b/usr.sbin/pim6sd/crc.h
index d1c49f8ab7b9..6e5ef7842d87 100644
--- a/usr.sbin/pim6sd/crc.h
+++ b/usr.sbin/pim6sd/crc.h
@@ -36,7 +36,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/crc.h,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 #ifndef CRC_H
diff --git a/usr.sbin/pim6sd/debug.c b/usr.sbin/pim6sd/debug.c
index 03f9d8a7fdcd..3ac61572f778 100644
--- a/usr.sbin/pim6sd/debug.c
+++ b/usr.sbin/pim6sd/debug.c
@@ -54,7 +54,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/debug.c,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/pim6sd/debug.h b/usr.sbin/pim6sd/debug.h
index 683aada509ff..78b27da1a7e6 100644
--- a/usr.sbin/pim6sd/debug.h
+++ b/usr.sbin/pim6sd/debug.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/debug.h,v 1.1.2.1 2000/07/15 07:36:35 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/defs.h b/usr.sbin/pim6sd/defs.h
index 58ffe6b90062..ff646bf2e45d 100644
--- a/usr.sbin/pim6sd/defs.h
+++ b/usr.sbin/pim6sd/defs.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/defs.h,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/inet6.c b/usr.sbin/pim6sd/inet6.c
index 220a443f3253..552d5b192822 100644
--- a/usr.sbin/pim6sd/inet6.c
+++ b/usr.sbin/pim6sd/inet6.c
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/inet6.c,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/inet6.h b/usr.sbin/pim6sd/inet6.h
index c7225f6fa40c..aff868019431 100644
--- a/usr.sbin/pim6sd/inet6.h
+++ b/usr.sbin/pim6sd/inet6.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/inet6.h,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/kern.c b/usr.sbin/pim6sd/kern.c
index 44c415a63267..3959055d6ff6 100644
--- a/usr.sbin/pim6sd/kern.c
+++ b/usr.sbin/pim6sd/kern.c
@@ -45,7 +45,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/kern.c,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/pim6sd/kern.h b/usr.sbin/pim6sd/kern.h
index 13ba8e8c5e85..5f83753ceaaa 100644
--- a/usr.sbin/pim6sd/kern.h
+++ b/usr.sbin/pim6sd/kern.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/kern.h,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/main.c b/usr.sbin/pim6sd/main.c
index 00242860869b..0c575b9e3137 100644
--- a/usr.sbin/pim6sd/main.c
+++ b/usr.sbin/pim6sd/main.c
@@ -54,7 +54,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/main.c,v 1.1.2.2 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/pim6sd/mld6.c b/usr.sbin/pim6sd/mld6.c
index 55ae6e21611e..9710d0db9508 100644
--- a/usr.sbin/pim6sd/mld6.c
+++ b/usr.sbin/pim6sd/mld6.c
@@ -73,7 +73,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/mld6.c,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/mld6.h b/usr.sbin/pim6sd/mld6.h
index 0f970619c9ac..5459617f6bb0 100644
--- a/usr.sbin/pim6sd/mld6.h
+++ b/usr.sbin/pim6sd/mld6.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/mld6.h,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/mld6_proto.c b/usr.sbin/pim6sd/mld6_proto.c
index 400be862166d..fb2afa95ef95 100644
--- a/usr.sbin/pim6sd/mld6_proto.c
+++ b/usr.sbin/pim6sd/mld6_proto.c
@@ -91,7 +91,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/mld6_proto.c,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/pim6sd/mld6_proto.h b/usr.sbin/pim6sd/mld6_proto.h
index e9cb7ebeb8c1..d6fe07c5d8cc 100644
--- a/usr.sbin/pim6sd/mld6_proto.h
+++ b/usr.sbin/pim6sd/mld6_proto.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/mld6_proto.h,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/mrt.c b/usr.sbin/pim6sd/mrt.c
index 02f15dcbae72..976fab80f9e6 100644
--- a/usr.sbin/pim6sd/mrt.c
+++ b/usr.sbin/pim6sd/mrt.c
@@ -45,7 +45,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/mrt.c,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <syslog.h>
diff --git a/usr.sbin/pim6sd/mrt.h b/usr.sbin/pim6sd/mrt.h
index 4aa428e1647a..823eda7d7fda 100644
--- a/usr.sbin/pim6sd/mrt.h
+++ b/usr.sbin/pim6sd/mrt.h
@@ -45,7 +45,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/mrt.h,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/mtrace6/Makefile b/usr.sbin/pim6sd/mtrace6/Makefile
index d59e76fa94af..ee5042972612 100644
--- a/usr.sbin/pim6sd/mtrace6/Makefile
+++ b/usr.sbin/pim6sd/mtrace6/Makefile
@@ -59,7 +59,7 @@
 # Kurt Windisch (kurtw@antc.uoregon.edu)
 #
 # $Id: Makefile,v 1.3 2000/02/25 06:35:42 itojun Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pim6sd/mtrace6/Makefile,v 1.1.2.1 2000/07/15 07:36:46 kris Exp $
 #
 #
 #Part of this program has been derived from PIM sparse-mode pimd.
diff --git a/usr.sbin/pim6sd/mtrace6/mtrace6.8 b/usr.sbin/pim6sd/mtrace6/mtrace6.8
index d6a774106156..b54b8720eb8d 100644
--- a/usr.sbin/pim6sd/mtrace6/mtrace6.8
+++ b/usr.sbin/pim6sd/mtrace6/mtrace6.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: mtrace6.8,v 1.3 1999/09/12 17:03:18 jinmei Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/pim6sd/mtrace6/mtrace6.8,v 1.2.2.3 2000/07/15 07:36:46 kris Exp $
 .\"
 .Dd Sep 12, 1999
 .Dt MTRACE6 8
diff --git a/usr.sbin/pim6sd/mtrace6/mtrace6.c b/usr.sbin/pim6sd/mtrace6/mtrace6.c
index b6c838dff413..d99b8d3fec04 100644
--- a/usr.sbin/pim6sd/mtrace6/mtrace6.c
+++ b/usr.sbin/pim6sd/mtrace6/mtrace6.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/pim6sd/mtrace6/mtrace6.c,v 1.1.2.1 2000/07/15 07:36:46 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/pathnames.h b/usr.sbin/pim6sd/pathnames.h
index 27e871a90c4d..2ebc52c29de4 100644
--- a/usr.sbin/pim6sd/pathnames.h
+++ b/usr.sbin/pim6sd/pathnames.h
@@ -54,7 +54,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/pathnames.h,v 1.2.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #ifndef PATHNAMES_H
diff --git a/usr.sbin/pim6sd/pim6.c b/usr.sbin/pim6sd/pim6.c
index 27416932f95e..5a541d8a9715 100644
--- a/usr.sbin/pim6sd/pim6.c
+++ b/usr.sbin/pim6sd/pim6.c
@@ -69,7 +69,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/pim6.c,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/pim6sd/pim6.h b/usr.sbin/pim6sd/pim6.h
index 4b4356a2e0ca..1bb9c444f0d6 100644
--- a/usr.sbin/pim6sd/pim6.h
+++ b/usr.sbin/pim6sd/pim6.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/pim6.h,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/pim6_proto.c b/usr.sbin/pim6sd/pim6_proto.c
index dd65ed1635ec..28bd02750b92 100644
--- a/usr.sbin/pim6sd/pim6_proto.c
+++ b/usr.sbin/pim6sd/pim6_proto.c
@@ -101,7 +101,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/pim6_proto.c,v 1.1.2.1 2000/07/15 07:36:36 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/pim6_proto.h b/usr.sbin/pim6sd/pim6_proto.h
index 46fad58478a3..1d0cc91e1c31 100644
--- a/usr.sbin/pim6sd/pim6_proto.h
+++ b/usr.sbin/pim6sd/pim6_proto.h
@@ -44,7 +44,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/pim6_proto.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/pim6sd.8 b/usr.sbin/pim6sd/pim6sd.8
index 251e176d5f71..9e41b8fc83a0 100644
--- a/usr.sbin/pim6sd/pim6sd.8
+++ b/usr.sbin/pim6sd/pim6sd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6sd.8,v 1.6 2000/05/18 16:11:46 itojun Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/pim6sd/pim6sd.8,v 1.3.2.3 2000/07/15 07:36:37 kris Exp $
 .\"
 .Dd June 10, 1999
 .Dt PIM6SD 8
diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5
index aac9fd869bbf..a0aacd5aade9 100644
--- a/usr.sbin/pim6sd/pim6sd.conf.5
+++ b/usr.sbin/pim6sd/pim6sd.conf.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	KAME Id: pim6sd.conf.5,v 1.10 2000/07/09 17:28:42 itojun Exp
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/pim6sd/pim6sd.conf.5,v 1.2.2.3 2000/07/15 07:36:37 kris Exp $
 .\"
 .Dd Oct 6, 1999
 .Dt PIM6SD.CONF 5
diff --git a/usr.sbin/pim6sd/pim6sd.conf.sample b/usr.sbin/pim6sd/pim6sd.conf.sample
index 2aabc6bbecca..6bfc318b1a77 100644
--- a/usr.sbin/pim6sd/pim6sd.conf.sample
+++ b/usr.sbin/pim6sd/pim6sd.conf.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pim6sd/pim6sd.conf.sample,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
 #
 #The timer granularity.
 #More this value is small,more pim6sd will be accurate 
diff --git a/usr.sbin/pim6sd/pim6stat b/usr.sbin/pim6sd/pim6stat
index 667ee4ae7ab6..294e0b289be1 100755
--- a/usr.sbin/pim6sd/pim6stat
+++ b/usr.sbin/pim6sd/pim6stat
@@ -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/pim6sd/pim6stat,v 1.1 2000/01/28 05:10:44 shin Exp $
 
 # get options
 while getopts "df:p:sw:" option
diff --git a/usr.sbin/pim6sd/pim6stat.1 b/usr.sbin/pim6sd/pim6stat.1
index 0ebf13275f1f..8ca7257f900b 100644
--- a/usr.sbin/pim6sd/pim6stat.1
+++ b/usr.sbin/pim6sd/pim6stat.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6stat.1,v 1.5 2000/05/05 14:57:14 sumikawa Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/pim6sd/pim6stat.1,v 1.1.2.3 2000/07/15 07:36:37 kris Exp $
 .\"
 .Dd July 28, 1999
 .Dt PIM6STAT 1
diff --git a/usr.sbin/pim6sd/pimd.h b/usr.sbin/pim6sd/pimd.h
index 4ad81a6b71bd..c44be774d6e7 100644
--- a/usr.sbin/pim6sd/pimd.h
+++ b/usr.sbin/pim6sd/pimd.h
@@ -44,7 +44,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/pimd.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/route.c b/usr.sbin/pim6sd/route.c
index 26869f81327a..75afd6b22593 100644
--- a/usr.sbin/pim6sd/route.c
+++ b/usr.sbin/pim6sd/route.c
@@ -45,7 +45,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/route.c,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/route.h b/usr.sbin/pim6sd/route.h
index 9dacf1b10e8b..bb469453cdc1 100644
--- a/usr.sbin/pim6sd/route.h
+++ b/usr.sbin/pim6sd/route.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/route.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/routesock.c b/usr.sbin/pim6sd/routesock.c
index 04fe94859ad0..0c6eb453d276 100644
--- a/usr.sbin/pim6sd/routesock.c
+++ b/usr.sbin/pim6sd/routesock.c
@@ -54,7 +54,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/routesock.c,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/pim6sd/routesock.h b/usr.sbin/pim6sd/routesock.h
index 48f3efc37c4c..05cbc05183eb 100644
--- a/usr.sbin/pim6sd/routesock.h
+++ b/usr.sbin/pim6sd/routesock.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/routesock.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/rp.c b/usr.sbin/pim6sd/rp.c
index e24b71b2f63a..1f9f7e138e4a 100644
--- a/usr.sbin/pim6sd/rp.c
+++ b/usr.sbin/pim6sd/rp.c
@@ -73,7 +73,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/rp.c,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #include <stdlib.h>
diff --git a/usr.sbin/pim6sd/rp.h b/usr.sbin/pim6sd/rp.h
index a45bc1ccfcc6..c925be004f95 100644
--- a/usr.sbin/pim6sd/rp.h
+++ b/usr.sbin/pim6sd/rp.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/rp.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/timer.c b/usr.sbin/pim6sd/timer.c
index 44859f203a0e..0f9eac523f7e 100644
--- a/usr.sbin/pim6sd/timer.c
+++ b/usr.sbin/pim6sd/timer.c
@@ -45,7 +45,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/timer.c,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #include <stdlib.h>
diff --git a/usr.sbin/pim6sd/timer.h b/usr.sbin/pim6sd/timer.h
index 41e6f4407739..4b204214b855 100644
--- a/usr.sbin/pim6sd/timer.h
+++ b/usr.sbin/pim6sd/timer.h
@@ -41,7 +41,7 @@
  * The pimd program is covered by the license in the accompanying file
  * named "LICENSE.pimd".
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/timer.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 
diff --git a/usr.sbin/pim6sd/trace.c b/usr.sbin/pim6sd/trace.c
index f13abae730f7..1d6a256fedea 100644
--- a/usr.sbin/pim6sd/trace.c
+++ b/usr.sbin/pim6sd/trace.c
@@ -72,7 +72,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/trace.c,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pim6sd/trace.h b/usr.sbin/pim6sd/trace.h
index 4a5aa6badd22..64df54650f9c 100644
--- a/usr.sbin/pim6sd/trace.h
+++ b/usr.sbin/pim6sd/trace.h
@@ -72,7 +72,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/trace.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #ifndef TRACE_H
diff --git a/usr.sbin/pim6sd/var.h b/usr.sbin/pim6sd/var.h
index 93556e00f626..838cf454f5ae 100644
--- a/usr.sbin/pim6sd/var.h
+++ b/usr.sbin/pim6sd/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/usr.sbin/pim6sd/var.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 /* YIPS @(#)$Id: var.h,v 1.1 1999/10/29 09:04:54 jinmei Exp $ */
 
diff --git a/usr.sbin/pim6sd/vers.c b/usr.sbin/pim6sd/vers.c
index 5264529ae84b..ca50fb29aa21 100644
--- a/usr.sbin/pim6sd/vers.c
+++ b/usr.sbin/pim6sd/vers.c
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pim6sd/vers.c,v 1.1 2000/01/28 05:10:50 shin Exp $ */
 char todaysversion[]="2.1.0-alpha23";
diff --git a/usr.sbin/pim6sd/vif.c b/usr.sbin/pim6sd/vif.c
index 2664e46571b9..a8b4d89bda78 100644
--- a/usr.sbin/pim6sd/vif.c
+++ b/usr.sbin/pim6sd/vif.c
@@ -54,7 +54,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/vif.c,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/pim6sd/vif.h b/usr.sbin/pim6sd/vif.h
index d81d65794e60..45954726d573 100644
--- a/usr.sbin/pim6sd/vif.h
+++ b/usr.sbin/pim6sd/vif.h
@@ -54,7 +54,7 @@
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pim6sd/vif.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 
 #ifndef VIF_H
diff --git a/usr.sbin/pim6sd/vmbuf.h b/usr.sbin/pim6sd/vmbuf.h
index b6931dddefc1..89dc0e4483b0 100644
--- a/usr.sbin/pim6sd/vmbuf.h
+++ b/usr.sbin/pim6sd/vmbuf.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/pim6sd/vmbuf.h,v 1.1.2.1 2000/07/15 07:36:37 kris Exp $
  */
 /* YIPS @(#)$Id: vmbuf.h,v 1.1 1999/10/29 09:04:55 jinmei Exp $ */
 
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index 5ee77481af84..05f515a45b8e 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.5 1999/11/26 20:31:53 billf Exp $
 
 SUBDIR=lib add create delete info version
 
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index ac13ed56e771..94415df6a22e 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.5 1999/08/28 01:17:53 peter 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 248f21e6c953..62b54f0c017c 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.11.2.1 2000/07/16 01:58:41 des Exp $
 
 PROG= pkg_add
 
diff --git a/usr.sbin/pkg_install/add/add.h b/usr.sbin/pkg_install/add/add.h
index 8ef0555eee31..b3efebe6b6bc 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.9 1999/08/28 01:17:55 peter 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 66391b6d6a73..4b02f14c24be 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/extract.c,v 1.25 1999/08/28 01:17:55 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c
index 075095fe5741..ff17b2c1b5bf 100644
--- a/usr.sbin/pkg_install/add/futil.c
+++ b/usr.sbin/pkg_install/add/futil.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/futil.c,v 1.9 2000/02/19 08:52:52 jkh Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index 59790ce385cf..1e0945874f96 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.29.2.3 2000/07/18 01:50:09 billf Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index a8bb50004576..c48e75d10a02 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/perform.c,v 1.57 2000/01/03 22:59:27 asami Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 9f9051ce7859..3e897e04f359 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.35 2000/03/01 14:08:59 sheldonh Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_ADD 1
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index d39f93a1ee7f..2f72161a7e35 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.11.2.1 2000/07/16 01:58:42 des Exp $
 
 PROG= pkg_create
 
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h
index ff3fc9520596..c6ad74b0d6d8 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.15 1999/08/28 01:17:58 peter 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 403cd93e18f5..79b3f5cb2321 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.21 1999/08/28 01:17:58 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 3fbe9cd16b86..1e01b8c0f76d 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.49 1999/08/28 01:17:58 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 4ecc921ec93c..42d05d67eb63 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.35 2000/03/01 14:09:01 sheldonh 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 1269c81ade16..1254b7e96595 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/create/pl.c,v 1.13 1999/08/28 01:17:59 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index 36b83ba2fafe..a4a990c49a51 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.11.2.1 2000/07/16 01:58:42 des Exp $
 
 PROG= pkg_delete
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
diff --git a/usr.sbin/pkg_install/delete/delete.h b/usr.sbin/pkg_install/delete/delete.h
index cc7a70e8fd14..e9086393542c 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.5 1999/08/28 01:18:00 peter 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 4a75d118a8ef..4854d115674a 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.17.2.1 2000/05/13 12:59:58 hoek Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index f3a963e8b5e0..c15be9d1678d 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/delete/perform.c,v 1.22.2.1 2000/06/04 16:46:33 hoek Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 394b13b8521b..c57bd1c16143 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.16 2000/02/29 15:13:53 jhb Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_DELETE 1
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 5ca61a5ca91c..6b94afad7374 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.11.2.1 2000/07/16 01:58:42 des Exp $
 
 PROG= pkg_info
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h
index d90ba2203523..a0e9a817f342 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.11.2.1 2000/07/18 10:12:30 sobomax 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 01dccc75fb84..1ef4853e7c4d 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.22.2.1 2000/07/18 10:12:30 sobomax Exp $";
 #endif
 
 static char Options[] = "acdDe:fhiIkl:LmpqrRst:v";
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index cbcb3d95b453..47ee017481b6 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/info/perform.c,v 1.29.2.1 2000/07/18 10:12:30 sobomax Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 882732853991..94808ec2c8fe 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.24.2.1 2000/07/18 10:12:30 sobomax Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_INFO 1
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
index 6d638c6a2c4c..a1691a31029b 100644
--- a/usr.sbin/pkg_install/info/show.c
+++ b/usr.sbin/pkg_install/info/show.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/info/show.c,v 1.14.2.1 2000/07/18 10:12:30 sobomax Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
index 4ed452ebfbf5..69299f805218 100644
--- a/usr.sbin/pkg_install/lib/exec.c
+++ b/usr.sbin/pkg_install/lib/exec.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/exec.c,v 1.7 1999/08/28 01:18:05 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index 49db19874c3a..e9a1691a8118 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/file.c,v 1.40.2.2 2000/07/16 01:58:42 des Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c
index aeaa96a2e5a8..e3704d4e5b47 100644
--- a/usr.sbin/pkg_install/lib/global.c
+++ b/usr.sbin/pkg_install/lib/global.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/global.c,v 1.7 1999/08/28 01:18:06 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index 3d5f0ec58648..be949927e803 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.29.2.1 2000/07/16 01:58:42 des Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
index 43dd7e6eb394..1e9f610b41a3 100644
--- a/usr.sbin/pkg_install/lib/msg.c
+++ b/usr.sbin/pkg_install/lib/msg.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/msg.c,v 1.12 1999/08/28 01:18:06 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c
index 9aad6857a85c..6de396d666c4 100644
--- a/usr.sbin/pkg_install/lib/pen.c
+++ b/usr.sbin/pkg_install/lib/pen.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/pen.c,v 1.31 1999/08/28 01:18:07 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 6dfbabce09bd..a606a1871c4c 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.29 1999/08/28 01:18:07 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c
index 815d7c10d6b6..8b99ee1af0a2 100644
--- a/usr.sbin/pkg_install/lib/str.c
+++ b/usr.sbin/pkg_install/lib/str.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/str.c,v 1.6 1999/08/28 01:18:07 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/tkpkg b/usr.sbin/pkg_install/tkpkg
index 9071155a289d..208993c55da7 100755
--- a/usr.sbin/pkg_install/tkpkg
+++ b/usr.sbin/pkg_install/tkpkg
@@ -1,5 +1,5 @@
 #!/usr/local/bin/wish -f
-#$FreeBSD$
+#$FreeBSD: src/usr.sbin/pkg_install/tkpkg,v 1.7 1999/08/29 15:54:49 peter Exp $
 #
 #$Log: tkpkg,v $
 #Revision 1.2  1994/12/06 00:51:21  jkh
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index 276b8dc8fb3e..b8553075f936 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.5 1999/12/03 03:20:59 billf Exp $
 
 MAINTAINER=	billf@FreeBSD.org
 MAINTAINER+=	bmah@CA.Sandia.GOV
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index efb1130ebafe..8d0de2656823 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.5 2000/03/01 14:09:02 sheldonh Exp $
 .Dd July 17, 1998
 .Dt PKG_VERSION 1
 .Os FreeBSD
diff --git a/usr.sbin/pkg_install/version/pkg_version.pl b/usr.sbin/pkg_install/version/pkg_version.pl
index a361af5a84a2..3aa4a26b7613 100755
--- a/usr.sbin/pkg_install/version/pkg_version.pl
+++ b/usr.sbin/pkg_install/version/pkg_version.pl
@@ -28,7 +28,7 @@
 #
 # A package version-checking utility for FreeBSD.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.pl,v 1.4 1999/12/06 03:19:16 jkh Exp $
 #
 
 use Getopt::Std;
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index ca49b4bbc5a0..49ec52e62709 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pnpinfo/Makefile,v 1.4.2.1 2000/05/11 11:10:36 nyan Exp $
 
 PROG=	pnpinfo
 
diff --git a/usr.sbin/portmap/Makefile b/usr.sbin/portmap/Makefile
index b87cf595a9e4..9177a4cb3464 100644
--- a/usr.sbin/portmap/Makefile
+++ b/usr.sbin/portmap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portmap/Makefile,v 1.7 1999/08/28 01:18:09 peter Exp $
 
 PROG=	portmap
 MAN8=	portmap.8
diff --git a/usr.sbin/portmap/from_local.c b/usr.sbin/portmap/from_local.c
index 80948f37d149..fe1194d13ef3 100644
--- a/usr.sbin/portmap/from_local.c
+++ b/usr.sbin/portmap/from_local.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#) from_local.c 1.2 93/11/16 21:50:02";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/from_local.c,v 1.10 2000/01/15 23:08:27 brian Exp $";
 #endif
 
 #ifdef TEST
diff --git a/usr.sbin/portmap/pmap_check.c b/usr.sbin/portmap/pmap_check.c
index 7ad25c9a7743..972999a99a2e 100644
--- a/usr.sbin/portmap/pmap_check.c
+++ b/usr.sbin/portmap/pmap_check.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#) pmap_check.c 1.6 93/11/21 20:58:59";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/pmap_check.c,v 1.6 2000/01/15 23:08:28 brian Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/portmap/pmap_check.h b/usr.sbin/portmap/pmap_check.h
index dc454a59d6d0..095200d64491 100644
--- a/usr.sbin/portmap/pmap_check.h
+++ b/usr.sbin/portmap/pmap_check.h
@@ -25,7 +25,7 @@
  *
  * @(#) pmap_check.h 1.3 93/11/21 16:18:53
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/portmap/pmap_check.h,v 1.3 2000/01/15 23:08:28 brian Exp $
  */
 
 extern int from_local __P((struct sockaddr_in *));
diff --git a/usr.sbin/portmap/pmap_dump/pmap_dump.c b/usr.sbin/portmap/pmap_dump/pmap_dump.c
index 96fb5c2edb99..bb212da12e2a 100644
--- a/usr.sbin/portmap/pmap_dump/pmap_dump.c
+++ b/usr.sbin/portmap/pmap_dump/pmap_dump.c
@@ -10,7 +10,7 @@
 static char sccsid[] = "@(#) pmap_dump.c 1.1 92/06/11 22:53:15";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/pmap_dump/pmap_dump.c,v 1.6 2000/01/15 23:08:30 brian Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/portmap/pmap_set/pmap_set.c b/usr.sbin/portmap/pmap_set/pmap_set.c
index 35a7fbe6e591..492a9a430299 100644
--- a/usr.sbin/portmap/pmap_set/pmap_set.c
+++ b/usr.sbin/portmap/pmap_set/pmap_set.c
@@ -10,7 +10,7 @@
 static char sccsid[] = "@(#) pmap_set.c 1.1 92/06/11 22:53:16";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/pmap_set/pmap_set.c,v 1.6 2000/01/15 23:08:30 brian Exp $";
 #endif
 
 #include <err.h>
diff --git a/usr.sbin/portmap/portmap.8 b/usr.sbin/portmap/portmap.8
index dfde2406234e..14eb5ce0f01a 100644
--- a/usr.sbin/portmap/portmap.8
+++ b/usr.sbin/portmap/portmap.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)portmap.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/portmap/portmap.8,v 1.7 2000/03/02 18:15:46 cwt Exp $
 .\"
 .Dd June 6, 1993
 .Dt PORTMAP 8
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index 658b53cbf872..a6620f9f3293 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)portmap.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/portmap.c,v 1.10 2000/01/15 23:08:29 brian Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index fda3c44bf3c0..f033305fa967 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.73.2.1 2000/03/21 10:22:57 brian Exp $
 
 PROG=	ppp
 SRCS=	acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \
diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes
index ec6d4f981ebf..150112f43a8e 100644
--- a/usr.sbin/ppp/README.changes
+++ b/usr.sbin/ppp/README.changes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/ppp/README.changes,v 1.16.2.2 2000/06/27 16:35:12 ru Exp $
 
 This file summarises changes made to ppp that effect
 its configuration.
diff --git a/usr.sbin/ppp/acf.c b/usr.sbin/ppp/acf.c
index 9e2b63b18732..ceb6efbad460 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.4 1999/12/20 20:29:40 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/acf.h b/usr.sbin/ppp/acf.h
index e32adbc1661c..6b0fc6131ccb 100644
--- a/usr.sbin/ppp/acf.h
+++ b/usr.sbin/ppp/acf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/acf.h,v 1.2 1999/08/28 01:18:14 peter Exp $
  */
 
 struct lcp;
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index 028f523f4cdd..cf40a63f1652 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.37.2.1 2000/03/21 10:22:58 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h
index 3dbace3cc2c3..49caf85d0677 100644
--- a/usr.sbin/ppp/arp.h
+++ b/usr.sbin/ppp/arp.h
@@ -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.h,v 1.9 1999/08/28 01:18:15 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index 6e153a9cadac..dfade319e99a 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.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/async.c,v 1.23 1999/12/20 20:29:40 brian Exp $
  *
  */
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/async.h b/usr.sbin/ppp/async.h
index 33c68a5953f1..c8a808094efb 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.6 1999/08/28 01:18:16 peter Exp $
  */
 
 #define HDLCSIZE	(MAX_MRU*2+6)
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index 62a525f1e4d9..a4ccbdfb132c 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.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/auth.c,v 1.50 1999/12/27 11:43:30 brian Exp $
  *
  *	TODO:
  *		o Implement check against with registered IP addresses.
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index bf395791ebf9..9fa609037366 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/auth.h,v 1.18 1999/08/28 01:18:16 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 36fb9bea34d9..d4d349477d3a 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.84.2.5 2000/07/03 10:23:53 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index 7007d78228b6..47b0f57d78a7 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.33.2.3 2000/06/15 17:08:27 brian Exp $
  */
 
 #define	PHASE_DEAD		0	/* Link is dead */
diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index 02505945ad7f..36bc22ffe81f 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.18.2.1 2000/03/21 10:22:59 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/cbcp.h b/usr.sbin/ppp/cbcp.h
index 46bf274f21c9..424085db92b1 100644
--- a/usr.sbin/ppp/cbcp.h
+++ b/usr.sbin/ppp/cbcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/cbcp.h,v 1.3 1999/08/28 01:18:19 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index 8ea977521eaf..e187f5222298 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.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/ccp.c,v 1.54.2.1 2000/03/21 10:23:00 brian Exp $
  *
  *	TODO:
  *		o Support other compression protocols
diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h
index 72342ddf33f8..27d19c0fd936 100644
--- a/usr.sbin/ppp/ccp.h
+++ b/usr.sbin/ppp/ccp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ccp.h,v 1.22 1999/08/28 01:18:19 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index aee866a42752..2f9b9c42032e 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.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/chap.c,v 1.61.2.1 2000/03/21 10:23:01 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index 7de61b4714da..5df2dc6d95e2 100644
--- a/usr.sbin/ppp/chap.h
+++ b/usr.sbin/ppp/chap.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap.h,v 1.17.2.1 2000/03/21 10:23:02 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c
index 4333aa16d06c..afaf615ab815 100644
--- a/usr.sbin/ppp/chap_ms.c
+++ b/usr.sbin/ppp/chap_ms.c
@@ -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/ppp/chap_ms.c,v 1.9.2.1 2000/03/21 10:23:02 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/chap_ms.h b/usr.sbin/ppp/chap_ms.h
index 5bf0f78fa85b..4d8ffd7174ed 100644
--- a/usr.sbin/ppp/chap_ms.h
+++ b/usr.sbin/ppp/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/ppp/chap_ms.h,v 1.5 1999/08/28 01:18:21 peter Exp $
  */
 
 /* Max # of (Unicode) chars in an NT password */
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 2f19db209013..30112ff7376e 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.70.2.1 2000/03/21 10:23:02 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h
index b8162bfd33dd..268ed9459cf4 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.15.2.1 2000/03/21 10:23:03 brian Exp $
  */
 
 #define CHAT_EXPECT 0
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 04c71ea068cd..9cb3c54c139d 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.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/command.c,v 1.230.2.4 2000/06/27 16:35:12 ru Exp $
  *
  */
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h
index afb41dde3fba..ea70aa68ed14 100644
--- a/usr.sbin/ppp/command.h
+++ b/usr.sbin/ppp/command.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/command.h,v 1.20.2.1 2000/03/21 10:23:04 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index 3d5bc3604f4b..344c1ef99db2 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.57.2.3 2000/06/03 02:53:14 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index dc0765130be0..dca511079c68 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.12.2.1 2000/03/21 10:23:05 brian Exp $
  */
 
 #define DATALINK_CLOSED  (0)
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index 9478fdda47f4..ce2eea82d6b6 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.18 1999/12/20 20:29:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/deflate.h b/usr.sbin/ppp/deflate.h
index a478b24cb1de..2cdc38e62a14 100644
--- a/usr.sbin/ppp/deflate.h
+++ b/usr.sbin/ppp/deflate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/deflate.h,v 1.4 1999/08/28 01:18:23 peter Exp $
  */
 
 extern const struct ccp_algorithm PppdDeflateAlgorithm;
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index c7577c21d89f..2356ae7a0b3b 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.31.2.3 2000/04/13 00:14:39 brian Exp $
  */
 
 
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index 402bd1888d7f..e39a3a66bd37 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/defs.h,v 1.52.2.3 2000/06/15 17:08:28 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/descriptor.h b/usr.sbin/ppp/descriptor.h
index a3c1b1075406..dedfeb844b93 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.7.2.1 2000/03/21 10:23:06 brian Exp $
  */
 
 #define PHYSICAL_DESCRIPTOR (1)
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index 7d80a695244e..97110cd3008d 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.9.2.2 2000/07/03 10:23:53 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ether.h b/usr.sbin/ppp/ether.h
index 16c9a9e05b9e..6ff98bf9b0e6 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 898d143e7042..03c6b10dafa0 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.18.2.3 2000/07/03 10:23:53 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/exec.h b/usr.sbin/ppp/exec.h
index d4b338767fb3..34542c6d4f78 100644
--- a/usr.sbin/ppp/exec.h
+++ b/usr.sbin/ppp/exec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/exec.h,v 1.5 1999/11/06 22:50:53 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index bed986ec8e26..20d526cb62f6 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.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/filter.c,v 1.39.2.2 2000/04/13 00:14:40 brian Exp $
  *
  *	TODO: Should send ICMP error message when we discard packets.
  */
diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h
index 0bfa56035b5d..84d1a3683fb0 100644
--- a/usr.sbin/ppp/filter.h
+++ b/usr.sbin/ppp/filter.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/filter.h,v 1.21.2.1 2000/03/21 10:23:07 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 082f95ced32c..b617c5f452f6 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.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/fsm.c,v 1.52.2.2 2000/06/11 12:22:30 brian Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index 996f2af565df..e0ff721eaef6 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/fsm.h,v 1.23 1999/12/27 11:54:53 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index af39c30e4228..51c5508352a0 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.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/hdlc.c,v 1.46 1999/12/20 20:29:42 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h
index 25398a479846..6f7e4f290711 100644
--- a/usr.sbin/ppp/hdlc.h
+++ b/usr.sbin/ppp/hdlc.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/hdlc.h,v 1.21 1999/12/30 13:27:15 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/i4b.c b/usr.sbin/ppp/i4b.c
index cdaad51c917d..7e178586a830 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.8 1999/11/28 15:50:23 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/i4b.h b/usr.sbin/ppp/i4b.h
index 984535c81959..cd0542777208 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 a1247762ad87..2c8d79e27cf7 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.18 2000/01/07 03:23:38 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/id.h b/usr.sbin/ppp/id.h
index 11cb831a45c2..3c60de902577 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.13 1999/11/21 23:27:23 brian Exp $
  */
 
 struct utmp;
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index 8d95ced007ca..b9cb29762a8f 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.13.2.2 2000/06/19 21:44:17 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index f22883b2fa63..8423b6872cb7 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.3.2.1 2000/03/21 10:23:07 brian Exp $
  */
 
 struct ifa_msghdr;
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 9552ccc3d887..1225a200a0ea 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.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/ip.c,v 1.78.2.3 2000/06/15 17:08:28 brian Exp $
  *
  *	TODO:
  *		o Return ICMP message for filterd packet
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index 4c493cc4314f..7de463c81034 100644
--- a/usr.sbin/ppp/ip.h
+++ b/usr.sbin/ppp/ip.h
@@ -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/ip.h,v 1.14 1999/12/20 20:29:43 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index f7a632a590a4..8ba7c81b15ec 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.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/ipcp.c,v 1.90.2.3 2000/06/15 17:08:28 brian Exp $
  *
  *	TODO:
  *		o Support IPADDRS properly
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index da9bb2fa26e2..1ad5d3347975 100644
--- a/usr.sbin/ppp/ipcp.h
+++ b/usr.sbin/ppp/ipcp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipcp.h,v 1.30.2.2 2000/06/15 17:08:28 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index 4ef00e457736..d1f1e6964abf 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 5805a2cfbb77..7cc8ab8c2fc2 100644
--- a/usr.sbin/ppp/iplist.h
+++ b/usr.sbin/ppp/iplist.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iplist.h,v 1.4 1999/08/28 01:18:31 peter Exp $
  */
 
 struct iplist_cur {
diff --git a/usr.sbin/ppp/layer.h b/usr.sbin/ppp/layer.h
index 4ee59a10a6f2..919d8ab0fb9b 100644
--- a/usr.sbin/ppp/layer.h
+++ b/usr.sbin/ppp/layer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/layer.h,v 1.3 1999/08/28 01:18:31 peter Exp $
  */
 
 #define	LAYER_ASYNC	2
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index a4ebd0782db0..51b8133f8118 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.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/lcp.c,v 1.81.2.2 2000/07/03 10:23:53 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index 06f2ded48daa..a6f6e18bea1a 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lcp.h,v 1.23 1999/08/28 01:18:32 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index e52c31b6e7fb..f031422d1150 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.16 1999/12/20 20:29:44 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/link.h b/usr.sbin/ppp/link.h
index 36dfd503a689..e362a32e30d3 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.9 1999/12/20 20:29:44 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index 97ab8530a2a7..b7f24788c1ac 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.44.2.1 2000/03/21 10:23:10 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 35ccbbb1f7e8..8b62274dc06a 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.26.2.1 2000/03/21 10:23:10 brian Exp $
  */
 
 #define LogMIN		(1)
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index dad0e461cfbe..b10fa5d2ac81 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.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/lqr.c,v 1.40.2.1 2000/06/20 09:14:38 brian Exp $
  *
  *	o LQR based on RFC1333
  *
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 0cc03d970571..319030feb9f5 100644
--- a/usr.sbin/ppp/lqr.h
+++ b/usr.sbin/ppp/lqr.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lqr.h,v 1.16 1999/08/28 01:18:35 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index bd875b385b6a..7e6017132189 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.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/main.c,v 1.167.2.2 2000/04/13 00:14:42 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index f5300a326100..f74fac7ac518 100644
--- a/usr.sbin/ppp/main.h
+++ b/usr.sbin/ppp/main.h
@@ -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/main.h,v 1.11 1999/08/28 01:18:35 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index a08c1674ad8e..2ebaa18400ff 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.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/mbuf.c,v 1.36.2.2 2000/05/07 10:09:24 brian Exp $
  *
  */
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index e89e820b43e2..7b0ff4a2764c 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mbuf.h,v 1.24 2000/01/03 20:09:22 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 109b66af6ab9..4df1454eee1b 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.36.2.3 2000/07/13 00:01:09 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mp.h b/usr.sbin/ppp/mp.h
index 78587eb2cc1a..758ce132d0bf 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.9.2.1 2000/03/21 10:23:12 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index 00610221644f..bce2d9019ac4 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -2,7 +2,7 @@
  * The code in this file was written by Eivind Eklund <perhaps@yes.no>,
  * who places it in the public domain without restriction.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.c,v 1.35.2.6 2000/06/27 16:35:12 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/nat_cmd.h b/usr.sbin/ppp/nat_cmd.h
index 7d329a0d8b40..879eb119dc0d 100644
--- a/usr.sbin/ppp/nat_cmd.h
+++ b/usr.sbin/ppp/nat_cmd.h
@@ -2,7 +2,7 @@
  * The code in this file was written by Eivind Eklund <perhaps@yes.no>,
  * who places it in the public domain without restriction.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.h,v 1.13.4.2 2000/06/27 16:35:12 ru Exp $
  */
 
 struct cmdargs;
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 7a7071d7b232..7df7d9dbc052 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.c,v 1.42 1999/12/27 11:54:57 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index e72b32852b1b..c6ba21db2e1c 100644
--- a/usr.sbin/ppp/pap.h
+++ b/usr.sbin/ppp/pap.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.h,v 1.11 1999/08/28 01:18:37 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index 7e7f64b687ee..6fdc410b1e32 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.34.2.2 2000/06/03 02:53:15 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/physical.h b/usr.sbin/ppp/physical.h
index 74ce890745cd..7495641f3877 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.20.2.1 2000/03/21 10:23:14 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index 636465f8118d..0bff117d640f 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.209.2.8 2000/06/30 09:54:06 ps Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index d21a28f81d44..4994d5db8a8f 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.29 1999/12/20 20:29:46 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h
index 434cf102c403..6ac54091f0d3 100644
--- a/usr.sbin/ppp/pred.h
+++ b/usr.sbin/ppp/pred.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pred.h,v 1.8 1999/08/28 01:18:39 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/probe.c b/usr.sbin/ppp/probe.c
index 0b6b61746695..68e74452b81c 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.3 1999/08/28 01:18:40 peter Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/ppp/probe.h b/usr.sbin/ppp/probe.h
index 2439c4e6cf47..e515b5ad6800 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.2 1999/08/28 01:18:40 peter Exp $
  */
 
 struct probe {
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index debd7ca1483b..06dc6599a921 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.20.2.1 2000/03/21 10:23:15 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index 6e3bc3221da4..c3ad1dccffd3 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.5.2.1 2000/03/21 10:23:15 brian Exp $
  */
 
 #define LOCAL_AUTH	0x01
diff --git a/usr.sbin/ppp/proto.c b/usr.sbin/ppp/proto.c
index 63513b339740..da6a1582f3ee 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.5 1999/12/20 20:29:46 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/proto.h b/usr.sbin/ppp/proto.h
index a479be720df7..15283f08ea92 100644
--- a/usr.sbin/ppp/proto.h
+++ b/usr.sbin/ppp/proto.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/proto.h,v 1.2 1999/08/28 01:18:41 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index c868a6725036..e7538e2a3acc 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.11.2.1 2000/03/21 10:23:16 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/radius.h b/usr.sbin/ppp/radius.h
index f9fdf3b25597..ac976ac64ab3 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.3.2.1 2000/03/21 10:23:16 brian Exp $
  */
 
 struct radius {
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index 6a9b3bac4075..afec55f97cda 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.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/route.c,v 1.60.2.2 2000/07/20 10:38:43 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h
index dc95871ceda3..4056db71bc9f 100644
--- a/usr.sbin/ppp/route.h
+++ b/usr.sbin/ppp/route.h
@@ -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/route.h,v 1.13.2.1 2000/03/21 10:23:17 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 5bd089636a25..55040eb61684 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.28.2.2 2000/06/03 02:53:15 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/server.h b/usr.sbin/ppp/server.h
index 509099d0279d..5ded1801937c 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.6.2.1 2000/03/21 10:23:18 brian Exp $
  */
 
 struct bundle;
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index 59928e5b9e07..ac665cf12074 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.15 1999/08/28 01:18:43 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sig.h b/usr.sbin/ppp/sig.h
index 27d264c19370..f5893fa20dc6 100644
--- a/usr.sbin/ppp/sig.h
+++ b/usr.sbin/ppp/sig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sig.h,v 1.14 1999/08/28 01:18:44 peter Exp $
  */
 
 typedef void (*sig_type)(int);
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index 75b952eae976..36adfaba7699 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.31.2.1 2000/03/21 10:23:18 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 223f65948b4e..976e6f8e3e1b 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.13 1999/08/28 01:18:44 peter 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 9fd782aa33e0..8c2f1253747c 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.6 1999/12/20 20:29:47 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sync.h b/usr.sbin/ppp/sync.h
index 4f5bfee0805f..030521203312 100644
--- a/usr.sbin/ppp/sync.h
+++ b/usr.sbin/ppp/sync.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sync.h,v 1.2 1999/08/28 01:18:45 peter Exp $
  */
 
 extern struct layer synclayer;
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index a51491cbf1bf..c3f34942738e 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.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/systems.c,v 1.58.2.3 2000/04/03 22:58:00 brian Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h
index 969e4ab59933..84246e0f5906 100644
--- a/usr.sbin/ppp/systems.h
+++ b/usr.sbin/ppp/systems.h
@@ -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/systems.h,v 1.14.2.1 2000/03/21 10:23:19 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/tcp.c b/usr.sbin/ppp/tcp.c
index 72d6eb1c0dba..7e36a0c2ab92 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.10.2.1 2000/06/03 02:53:15 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/tcp.h b/usr.sbin/ppp/tcp.h
index f6a823529e9e..ad4493547291 100644
--- a/usr.sbin/ppp/tcp.h
+++ b/usr.sbin/ppp/tcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcp.h,v 1.5 1999/11/06 22:50:58 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index 1704e121c964..ceaae045e9af 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.13 1999/08/28 01:18:46 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/throughput.h b/usr.sbin/ppp/throughput.h
index 21acdbe3cbca..ca6d4b4c1086 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.8 1999/08/28 01:18:47 peter Exp $
  */
 
 #define SAMPLE_PERIOD 5		/* Default sample period */
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 9e69aea6e87b..155ca525bfa0 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.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/timer.c,v 1.38.2.1 2000/03/21 10:23:20 brian Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/timer.h b/usr.sbin/ppp/timer.h
index 9dcb3f369716..f9d16f0f770f 100644
--- a/usr.sbin/ppp/timer.h
+++ b/usr.sbin/ppp/timer.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/timer.h,v 1.9 1999/08/28 01:18:47 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index df6029cdc2ce..334b38a69b08 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.21 1999/12/13 18:45:21 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tty.h b/usr.sbin/ppp/tty.h
index f3f0d530e8e0..ec51f7de68fa 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 c35894a6c207..75706ba940ea 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.20 1999/09/21 19:37:00 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tun.h b/usr.sbin/ppp/tun.h
index f8a8289233e8..a4112ec47bb9 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.8 2000/01/23 01:48:19 brian Exp $
  */
 
 struct tun_data {
diff --git a/usr.sbin/ppp/ua.h b/usr.sbin/ppp/ua.h
index dbd89e5be618..f3e299f08e86 100644
--- a/usr.sbin/ppp/ua.h
+++ b/usr.sbin/ppp/ua.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ua.h,v 1.3 1999/08/28 01:18:49 peter Exp $
  */
 
 #ifdef __i386__		/* Do any other archs not care about alignment ? */
diff --git a/usr.sbin/ppp/udp.c b/usr.sbin/ppp/udp.c
index 9260003ab04c..682fd383f8da 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.10 1999/11/26 22:44:33 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/udp.h b/usr.sbin/ppp/udp.h
index 46b8fe63de1a..8cc3bd2c9131 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 e25762398882..bec63a6abe12 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.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/vjcomp.c,v 1.35 1999/12/20 20:29:51 brian Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 2956122fd061..34457439857c 100644
--- a/usr.sbin/ppp/vjcomp.h
+++ b/usr.sbin/ppp/vjcomp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/vjcomp.h,v 1.8 1999/08/28 01:18:51 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 718d2f764737..46b89eae9061 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppctl/Makefile,v 1.5 1999/08/28 01:18:57 peter Exp $
 
 PROG=	pppctl
 SRCS=	pppctl.c
diff --git a/usr.sbin/pppctl/pppctl.8 b/usr.sbin/pppctl/pppctl.8
index 7e3ebe9ecb64..c15162f9b35d 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.12 1999/08/28 01:18:58 peter Exp $
 .Dd 26 June 1997
 .Os FreeBSD
 .Dt PPPCTL 8
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 7cb649edd0e9..ab53521f1a1c 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.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/pppctl/pppctl.c,v 1.21 1999/09/20 07:22:22 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index 8faf198a92c5..bce838a61829 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.19 2000/03/11 22:34:10 kris Exp $
 
 CFLAGS+= -DHAVE_PATHS_H
 
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 4cc40cbf2991..6aeac76d77e2 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.24 1999/08/28 01:18:59 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index fb265e6d5954..dc64172364a2 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 fb21cfda3587..360fb5f3cede 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ccp.c,v 1.10 1999/08/28 01:19:00 peter Exp $";
 #endif
 
 #include <string.h>
diff --git a/usr.sbin/pppd/ccp.h b/usr.sbin/pppd/ccp.h
index a03ac4d4961e..8405ad345b4d 100644
--- a/usr.sbin/pppd/ccp.h
+++ b/usr.sbin/pppd/ccp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ccp.h,v 1.8 1999/08/28 01:19:00 peter Exp $
  */
 
 typedef struct ccp_options {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index c3acafbe8392..711b6808964b 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap.c,v 1.10 1999/08/28 01:19:01 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h
index 4a4f38383a34..4a7cd9c9a021 100644
--- a/usr.sbin/pppd/chap.h
+++ b/usr.sbin/pppd/chap.h
@@ -30,7 +30,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap.h,v 1.7 1999/08/28 01:19:01 peter Exp $
  */
 
 #ifndef __CHAP_INCLUDE__
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index c3e1f6ee44d1..9d3be9d6e237 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap_ms.c,v 1.8 2000/02/24 21:10:28 markm Exp $";
 #endif
 
 #ifdef CHAPMS
diff --git a/usr.sbin/pppd/chap_ms.h b/usr.sbin/pppd/chap_ms.h
index 7c0088308aa6..31f48732d8ca 100644
--- a/usr.sbin/pppd/chap_ms.h
+++ b/usr.sbin/pppd/chap_ms.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap_ms.h,v 1.5 1999/08/28 01:19:02 peter Exp $
  */
 
 #ifndef __CHAPMS_INCLUDE__
diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c
index 59c0281e16a0..e0eb980299d7 100644
--- a/usr.sbin/pppd/demand.c
+++ b/usr.sbin/pppd/demand.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/demand.c,v 1.5 1999/08/28 01:19:02 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index a1fd948d3617..a766dd3f3927 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.8 1999/08/28 01:19:02 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h
index 7b43b7a08be2..67cb1c4d734f 100644
--- a/usr.sbin/pppd/fsm.h
+++ b/usr.sbin/pppd/fsm.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/fsm.h,v 1.7 1999/08/28 01:19:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 576b2006ab58..eb9d57d15078 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ipcp.c,v 1.12 1999/08/28 01:19:03 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h
index 2bc795d9a504..693e16b536b9 100644
--- a/usr.sbin/pppd/ipcp.h
+++ b/usr.sbin/pppd/ipcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipcp.h,v 1.10 1999/08/28 01:19:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index d035709bb036..97f7dfec79c5 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.5 1999/08/28 01:19:03 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.h b/usr.sbin/pppd/ipxcp.h
index 0890181af7ec..6e825664b272 100644
--- a/usr.sbin/pppd/ipxcp.h
+++ b/usr.sbin/pppd/ipxcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipxcp.h,v 1.4 1999/08/28 01:19:04 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index 21ff02eea62c..9b641d4f616b 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.9 1999/08/28 01:19:04 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h
index 2a19e2611b59..139b8d7ec33d 100644
--- a/usr.sbin/pppd/lcp.h
+++ b/usr.sbin/pppd/lcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/lcp.h,v 1.7 1999/08/28 01:19:05 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c
index 1e13d02dd371..bc7de4308313 100644
--- a/usr.sbin/pppd/magic.c
+++ b/usr.sbin/pppd/magic.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/magic.c,v 1.8 1999/08/28 01:19:05 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h
index 82f65cf55d4e..39496e6cdcfc 100644
--- a/usr.sbin/pppd/magic.h
+++ b/usr.sbin/pppd/magic.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/magic.h,v 1.7 1999/08/28 01:19:05 peter Exp $
  */
 
 void magic_init __P((void));	/* Initialize the magic number generator */
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index ba9c25488bf0..4f819d58d235 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.19 1999/08/28 01:19:06 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 663d5e0bd4f3..d9ae59cdb4e7 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.20 1999/08/28 01:19:07 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/pppd/patchlevel.h b/usr.sbin/pppd/patchlevel.h
index bc49c5879a24..7c9d9c07db84 100644
--- a/usr.sbin/pppd/patchlevel.h
+++ b/usr.sbin/pppd/patchlevel.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pppd/patchlevel.h,v 1.10 1999/08/28 01:19:07 peter Exp $ */
 #define	PATCHLEVEL	5
 
 #define VERSION		"2.3"
diff --git a/usr.sbin/pppd/pathnames.h b/usr.sbin/pppd/pathnames.h
index 3bc2e8396867..6ec8f55b5969 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.9 1999/08/28 01:19:07 peter Exp $
  */
 
 #ifdef HAVE_PATHS_H
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index 7d19962867c5..0de977b45238 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.20 2000/03/03 09:11:26 sheldonh Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index 248556d381e8..005a0e754b60 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/pppd.h,v 1.13 1999/08/28 01:19:08 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index a5dcd161feca..b113e6ab2871 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.17 1999/08/28 01:19:08 peter Exp $";
 #endif
 /*	$NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $	*/
 
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 627c7d03d5db..2cda3ac14ea3 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/upap.c,v 1.8 1999/08/28 01:19:08 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h
index 2cfd86c8077f..7d1eaa38e985 100644
--- a/usr.sbin/pppd/upap.h
+++ b/usr.sbin/pppd/upap.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/upap.h,v 1.7 1999/08/28 01:19:09 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile
index adf70a339520..85a1c3309450 100644
--- a/usr.sbin/pppstats/Makefile
+++ b/usr.sbin/pppstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppstats/Makefile,v 1.7 1999/08/28 01:19:11 peter Exp $
 
 PROG=	pppstats
 SRCS=	pppstats.c
diff --git a/usr.sbin/pppstats/pppstats.8 b/usr.sbin/pppstats/pppstats.8
index 5b28ea0a8f8d..3483b7fc64cc 100644
--- a/usr.sbin/pppstats/pppstats.8
+++ b/usr.sbin/pppstats/pppstats.8
@@ -1,4 +1,4 @@
-.\"	@(#) $FreeBSD$
+.\"	@(#) $FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.10 2000/03/03 09:11:28 sheldonh Exp $
 .TH PPPSTATS 8 "26 June 1995"
 .SH NAME
 pppstats \- print PPP statistics
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index 1c7c744f9119..698f8944fcf4 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.13 1999/08/28 01:19:11 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/prefix/Makefile b/usr.sbin/prefix/Makefile
index 323d6d3e1478..88064823850b 100644
--- a/usr.sbin/prefix/Makefile
+++ b/usr.sbin/prefix/Makefile
@@ -1,6 +1,6 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
 #	$Id: Makefile,v 1.1.1.1 1999/08/08 23:31:13 itojun Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/usr.sbin/prefix/Makefile,v 1.1 1999/12/28 02:37:06 shin Exp $
 
 PROG=	prefix
 SRCS=	prefix.c
diff --git a/usr.sbin/prefix/prefix.8 b/usr.sbin/prefix/prefix.8
index 70a1e9ea1051..d28930136958 100644
--- a/usr.sbin/prefix/prefix.8
+++ b/usr.sbin/prefix/prefix.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: prefix.8,v 1.4 2000/05/31 17:00:08 itojun Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/prefix/prefix.8,v 1.2.2.2 2000/07/15 07:36:48 kris Exp $
 .\"
 .Dd October 10, 1998
 .Dt PREFIX 8
diff --git a/usr.sbin/prefix/prefix.c b/usr.sbin/prefix/prefix.c
index 84fbf26d2c4c..9004f23a4ca1 100644
--- a/usr.sbin/prefix/prefix.c
+++ b/usr.sbin/prefix/prefix.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/prefix/prefix.c,v 1.2.2.1 2000/07/15 07:36:49 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index 09e70cac7ba3..6835884baac3 100644
--- a/usr.sbin/procctl/Makefile
+++ b/usr.sbin/procctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/procctl/Makefile,v 1.4 1999/08/28 01:19:12 peter Exp $
 
 PROG=	procctl
 MAN8=	procctl.8
diff --git a/usr.sbin/procctl/procctl.8 b/usr.sbin/procctl/procctl.8
index 4220b34716de..3e08c97163eb 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.7 2000/02/21 11:05:56 ru Exp $
 .Dd Nov 23, 1997
 .Dt PROCCTL 8
 .Os FreeBSD
diff --git a/usr.sbin/procctl/procctl.c b/usr.sbin/procctl/procctl.c
index 574523f908b4..28b2bd1fe454 100644
--- a/usr.sbin/procctl/procctl.c
+++ b/usr.sbin/procctl/procctl.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/procctl/procctl.c,v 1.6 2000/02/21 10:22:39 ru Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 939d9228283b..333ada28542f 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pstat.8	8.5 (Berkeley) 5/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pstat/pstat.8,v 1.19 1999/11/27 17:03:06 charnier Exp $
 .\"
 .Dd May 13, 1994
 .Dt PSTAT 8
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 2ab1649a60e6..681a613da28a 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pstat.c	8.16 (Berkeley) 5/9/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.49 2000/01/29 16:45:28 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index bee05ccd5502..59545c49409a 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pw/Makefile,v 1.11 2000/01/15 00:20:19 davidn Exp $
 
 PROG=	pw
 SRCS=	pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \
diff --git a/usr.sbin/pw/README b/usr.sbin/pw/README
index e5abd8f99c37..8c8244bf1cba 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.5 1999/08/28 01:19:15 peter Exp $
 
diff --git a/usr.sbin/pw/bitmap.c b/usr.sbin/pw/bitmap.c
index bcfea7e2c887..01d8551a2f5d 100644
--- a/usr.sbin/pw/bitmap.c
+++ b/usr.sbin/pw/bitmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/bitmap.c,v 1.5 1999/08/28 01:19:15 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.sbin/pw/bitmap.h b/usr.sbin/pw/bitmap.h
index 94bd059dc399..6b601ef60f27 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.4 1999/08/28 01:19:16 peter Exp $
  */
 
 #ifndef _BITMAP_H_
diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index 6d59401469c5..debcfa88af74 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.5 1999/08/28 01:19:16 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/edgroup.c b/usr.sbin/pw/edgroup.c
index 40313d29a5c8..d5f2dfb5fc3a 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.8 1999/08/28 01:19:16 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/fileupd.c b/usr.sbin/pw/fileupd.c
index a846513dbea3..ee6681892165 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.9 1999/10/26 04:27:13 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index edff76d1285c..33c6f48c970b 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.8 1999/10/26 04:27:14 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index f97253b40a86..8374f2de8351 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.6.2.1 2000/06/28 19:19:04 ache Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.h b/usr.sbin/pw/psdate.h
index 137427f1f0f0..fa17194feed9 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.4 1999/08/28 01:19:17 peter Exp $
  */
 
 #ifndef _PSDATE_H_
diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8
index 76ebf53f90f8..f7af7f3a2fd8 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.19 2000/03/02 14:53:37 sheldonh Exp $
 .\"
 .Dd December 9, 1996
 .Dt PW 8
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index d854c923a098..4539afd8b227 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.18.2.2 2000/06/28 19:19:04 ache Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/pw.conf.5 b/usr.sbin/pw/pw.conf.5
index 7c91dd304988..0fbd505cc19d 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.10 2000/03/01 14:08:17 sheldonh Exp $
 .\"
 .Dd December 9, 1996
 .Dt PW.CONF 5
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index aa437ec3cd9a..4af26b679aa3 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.10.2.1 2000/06/28 19:19:04 ache Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index 7fbf51b14e85..7d7632dfb9f2 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.10.2.1 2000/07/16 01:48:12 davidn Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index c9af998da2a2..e046f3422a08 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.12.2.1 2000/06/28 19:19:04 ache Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index fc85828b5bbf..122a31902d63 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.5.2.1 2000/06/28 19:19:04 ache Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 74a3ed09a7a9..8e570738cfdd 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_nis.c,v 1.6 1999/08/28 01:19:20 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index c9119a283a0d..2cd25bdf56bb 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.34.2.5 2000/07/20 04:44:27 davidn Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index bc5713e82d32..4ee98636427a 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.3 2000/01/15 00:20:21 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index fef3662667e9..c9d6704a4e1d 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.12.2.3 2000/06/28 19:19:04 ache Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 8da036dbdf92..bda4841485cf 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.7 2000/01/15 00:20:22 davidn Exp $
  */
 
 #ifndef _PWUPD_H_
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c
index 2af9a4efca9e..109aaf9ea87d 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.5 1999/08/28 01:19:22 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pwd_mkdb/pw_scan.c b/usr.sbin/pwd_mkdb/pw_scan.c
index d0fb5f17d035..df17776855af 100644
--- a/usr.sbin/pwd_mkdb/pw_scan.c
+++ b/usr.sbin/pwd_mkdb/pw_scan.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pwd_mkdb/pw_scan.c,v 1.14 2000/03/09 18:11:15 paul Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pwd_mkdb/pw_scan.h b/usr.sbin/pwd_mkdb/pw_scan.h
index 2519bd45db01..b729263e8984 100644
--- a/usr.sbin/pwd_mkdb/pw_scan.h
+++ b/usr.sbin/pwd_mkdb/pw_scan.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/pwd_mkdb/pw_scan.h,v 1.2 1999/11/15 16:45:37 sheldonh Exp $
  */
 
 extern int	pw_big_ids_warning;
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index 5d3e0e869b97..ca68ac820372 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.15 2000/03/01 14:08:18 sheldonh 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 9d77b279e507..31660c6aa7e7 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.35 2000/03/09 18:11:16 paul Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index 6754d6a66af3..79684bc318e9 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/quot/Makefile,v 1.5 1999/08/28 01:19:25 peter Exp $
 
 PROG=	quot
 MAN8=	quot.8
diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8
index b0214f612baa..3a94cd46bccd 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.12 2000/01/23 02:09:57 mpp Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index ceef657064a6..3d6332bb9942 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/quot/quot.c,v 1.11.2.1 2000/06/29 23:49:30 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/quotaon/quotaon.8 b/usr.sbin/quotaon/quotaon.8
index 4738dd7d7aeb..94e633bbdcc2 100644
--- a/usr.sbin/quotaon/quotaon.8
+++ b/usr.sbin/quotaon/quotaon.8
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotaon.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/quotaon/quotaon.8,v 1.4 1999/08/28 01:19:27 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt QUOTAON 8
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 6235c1f2058f..c241f44f1cd0 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)quotaon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.4 1999/08/28 01:19:27 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index f5825a24f409..609717f758f9 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.7 1999/08/28 01:19:28 peter Exp $
 
 PROG=	rarpd
 MAN8=	rarpd.8
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 465a16f137cc..112bd567dfa9 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.9 1999/11/27 17:06:39 charnier 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 8e50090907c0..83155625cb41 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -27,7 +27,7 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rarpd/rarpd.c,v 1.23 1999/11/27 17:06:40 charnier Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/repquota/repquota.8 b/usr.sbin/repquota/repquota.8
index fb62286d5670..a301b546fd5a 100644
--- a/usr.sbin/repquota/repquota.8
+++ b/usr.sbin/repquota/repquota.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)repquota.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/repquota/repquota.8,v 1.4 1999/08/28 01:19:30 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt REPQUOTA 8
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 3c9aca3424ca..d5ac6852d1ba 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)repquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.9 1999/11/01 04:46:09 julian Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index 4257e98b9777..8a80f1b93c19 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.7 1995/03/18 14:56:21 cgd Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$FreeBSD: src/usr.sbin/rip6query/Makefile,v 1.1.2.1 2000/07/15 07:36:50 kris Exp $
 
 PROG=	rip6query
 MAN8=	rip6query.8
diff --git a/usr.sbin/rip6query/rip6query.8 b/usr.sbin/rip6query/rip6query.8
index d77e6d0d11fb..9444812623b2 100644
--- a/usr.sbin/rip6query/rip6query.8
+++ b/usr.sbin/rip6query/rip6query.8
@@ -27,7 +27,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.1.2.1 2000/07/15 07:36:50 kris Exp $
 .\"
 .Dd Oct 7, 1999
 .Dt RIP6QUERY 8
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index ed0f6f98765c..39c79ba83d9b 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.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/rip6query/rip6query.c,v 1.3.2.1 2000/07/15 07:36:50 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index ffb690b373e5..22667bf1b5e7 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rmt.8	8.3 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rmt/rmt.8,v 1.5 1999/11/27 17:07:59 charnier Exp $
 .\"
 .Dd June 1, 1994
 .Dt RMT 8
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index accebc674c6d..89e32f84618a 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rmt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rmt/rmt.c,v 1.7 2000/02/12 01:14:33 mjacob Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rndcontrol/random.4 b/usr.sbin/rndcontrol/random.4
index 7ce2a245bb96..fafdc8896940 100644
--- a/usr.sbin/rndcontrol/random.4
+++ b/usr.sbin/rndcontrol/random.4
@@ -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/usr.sbin/rndcontrol/random.4,v 1.9 2000/03/06 09:41:54 sheldonh Exp $
 .\"
 .Dd October 21, 1995
 .Dt RANDOM 4 i386
diff --git a/usr.sbin/rndcontrol/rndcontrol.8 b/usr.sbin/rndcontrol/rndcontrol.8
index f35848457e88..80c2a9494374 100644
--- a/usr.sbin/rndcontrol/rndcontrol.8
+++ b/usr.sbin/rndcontrol/rndcontrol.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/rndcontrol/rndcontrol.8,v 1.13 2000/03/01 14:08:20 sheldonh Exp $
 .\"
 .Dd October 20, 1995
 .Dt RNDCONTROL 8
diff --git a/usr.sbin/rndcontrol/rndcontrol.c b/usr.sbin/rndcontrol/rndcontrol.c
index d80f6801eed6..9ee4e8d845a5 100644
--- a/usr.sbin/rndcontrol/rndcontrol.c
+++ b/usr.sbin/rndcontrol/rndcontrol.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.c,v 1.11.2.1 2000/05/10 02:04:44 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/random.h>
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 02b1900dde55..2723968da27a 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.2.2.1 2000/07/15 07:36:51 kris Exp $
 
 PROG=	route6d
 MAN8=	route6d.8
diff --git a/usr.sbin/route6d/misc/chkrt b/usr.sbin/route6d/misc/chkrt
index f57a376d378c..71962cbb2aec 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.1 1999/12/28 02:37:10 shin Exp $
 #
 $dump="/var/tmp/route6d_dump";
 $pidfile="/var/run/route6d.pid";
diff --git a/usr.sbin/route6d/misc/cksum.c b/usr.sbin/route6d/misc/cksum.c
index bff7e2d5f7f4..96682b7a5b5a 100644
--- a/usr.sbin/route6d/misc/cksum.c
+++ b/usr.sbin/route6d/misc/cksum.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/route6d/misc/cksum.c,v 1.1 1999/12/28 02:37:10 shin Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 1457878f3696..cabef7f44087 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.1.2.1 2000/07/15 07:36:51 kris Exp $
 .\"	$KAME: route6d.8,v 1.8 2000/05/31 17:00:09 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 40788f6ffb16..f76027469d13 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.2.2.2 2000/07/15 07:36:52 kris Exp $	*/
 /*	$KAME: route6d.c,v 1.30 2000/06/04 06:48:03 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/route6d/route6d.h b/usr.sbin/route6d/route6d.h
index b3a353f59e72..d3ebdb7dc0ff 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.1.2.1 2000/07/15 07:36:52 kris Exp $	*/
 /*	$KAME: route6d.h,v 1.3 2000/02/25 06:15:06 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 19a6565a4048..aa0461928a08 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.lockd/Makefile,v 1.8 1999/08/28 01:19:34 peter Exp $
 
 PROG =	rpc.lockd
 SRCS =	nlm_prot_svc.c nlm_prot.h lockd.c procs.c
diff --git a/usr.sbin/rpc.lockd/handles.c b/usr.sbin/rpc.lockd/handles.c
index d2d104551969..45da12433ed8 100644
--- a/usr.sbin/rpc.lockd/handles.c
+++ b/usr.sbin/rpc.lockd/handles.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/handles.c,v 1.4 1999/08/28 01:19:35 peter Exp $";
 #endif /* not lint */
 
 #include "nlm_prot.h"
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index ac328569126e..46180268ab4a 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.5 1999/08/28 01:19:35 peter Exp $";
 #endif /* not lint */
 
 /* main() function for NFS lock daemon.  Most of the code in this	*/
diff --git a/usr.sbin/rpc.lockd/procs.c b/usr.sbin/rpc.lockd/procs.c
index 56270022c3d0..73a28565d151 100644
--- a/usr.sbin/rpc.lockd/procs.c
+++ b/usr.sbin/rpc.lockd/procs.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/procs.c,v 1.4.2.1 2000/07/20 10:35:23 kris Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.sbin/rpc.lockd/rpc.lockd.8 b/usr.sbin/rpc.lockd/rpc.lockd.8
index b51e35daa4b6..00f475bc9544 100644
--- a/usr.sbin/rpc.lockd/rpc.lockd.8
+++ b/usr.sbin/rpc.lockd/rpc.lockd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.8 1999/08/28 01:19:35 peter Exp $
 .\"
 .Dd September 24, 1995
 .Dt RPC.LOCKD 8
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index 0dd8eaefa09e..1fc35cd474f5 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -4,7 +4,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";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/test.c,v 1.4 1999/08/28 01:19:36 peter Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index 112cc138bbe9..f95b9cd2b68c 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.9 1999/08/28 01:19:37 peter Exp $
 
 PROG =	rpc.statd
 SRCS =	file.c sm_inter_svc.c sm_inter.h statd.c procs.c
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index 3f27e582197b..4779290b8f62 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.4 1999/08/28 01:19:37 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 03bb44577047..a1a444c017ed 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.7 1999/08/28 01:19:38 peter 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 3b47dfe041bb..3236c85cb31b 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/statd.c,v 1.6 1999/10/05 14:40:38 marcel Exp $";
 #endif /* not lint */
 
 /* main() function for status monitor daemon.  Some of the code in this	*/
diff --git a/usr.sbin/rpc.statd/test.c b/usr.sbin/rpc.statd/test.c
index 6df15011db3b..8bf5affa636a 100644
--- a/usr.sbin/rpc.statd/test.c
+++ b/usr.sbin/rpc.statd/test.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/test.c,v 1.3 1999/08/28 01:19:39 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile
index 207bfc956225..139c8b6f0460 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.1 1999/11/21 08:05:59 dillon Exp $
 
 PROG=	rpc.umntall
 SRCS=	rpc.umntall.c mounttab.c
diff --git a/usr.sbin/rpc.umntall/mounttab.c b/usr.sbin/rpc.umntall/mounttab.c
index d15b42ae1549..a37fa4845851 100644
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.umntall/mounttab.c,v 1.2 2000/01/15 14:28:14 green Exp $";
 #endif /* not lint */
 
 #include <sys/syslog.h>
diff --git a/usr.sbin/rpc.umntall/mounttab.h b/usr.sbin/rpc.umntall/mounttab.h
index 21d789aa77a3..4e26c09c4c7f 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.1 1999/11/21 08:06:00 dillon 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 38ea9a675411..0a99ad29aff3 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.6 2000/03/06 09:45:35 sheldonh 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 c59c77606ffd..c108a5e29f49 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.3 2000/01/15 14:28:14 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 772b5fbc7fa2..1221c9bb9b1e 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.13 1999/12/18 13:55:17 peter Exp $
 
 PROG=	rpc.yppasswdd
 SRCS=	pw_copy.c pw_util.c util.c yp_access.c yp_dblookup.c yp_dbwrite.c \
diff --git a/usr.sbin/rpc.yppasswdd/pw_copy.c b/usr.sbin/rpc.yppasswdd/pw_copy.c
index 73265d76e4fd..ea121085601d 100644
--- a/usr.sbin/rpc.yppasswdd/pw_copy.c
+++ b/usr.sbin/rpc.yppasswdd/pw_copy.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pw_copy.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/pw_copy.c,v 1.4.2.1 2000/07/12 11:09:40 davidn Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.yppasswdd/pw_util.c b/usr.sbin/rpc.yppasswdd/pw_util.c
index 3f783c155057..08c23c78c66b 100644
--- a/usr.sbin/rpc.yppasswdd/pw_util.c
+++ b/usr.sbin/rpc.yppasswdd/pw_util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/pw_util.c,v 1.4 1999/08/28 01:19:40 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index bde673a1864b..682bb6ee29bf 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.12 2000/03/02 14:53:37 sheldonh 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 f2921e80b0cf..37ec1302563a 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x
+++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
@@ -33,7 +33,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %static const char rcsid[] =
-%	"$FreeBSD$";
+%	"$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswd_private.x,v 1.6 1999/08/28 01:19:41 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
index 8bc79a52ca13..8aac693d06b7 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.9 1999/08/28 01:19:41 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index 03b48250dbda..ff127dba55cf 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_main.c,v 1.14.2.1 2000/05/16 08:55:16 asmodai Exp $";
 #endif /* not lint */
 
 #include "yppasswd.h"
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index c27cf8c51fe7..9493234d07a6 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c,v 1.16 1999/08/28 01:19:41 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppwupdate b/usr.sbin/rpc.yppasswdd/yppwupdate
index a9db8f7e5b6c..6e7671b6a550 100644
--- a/usr.sbin/rpc.yppasswdd/yppwupdate
+++ b/usr.sbin/rpc.yppasswdd/yppwupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppwupdate,v 1.7 1999/08/28 01:19:42 peter Exp $
 #
 
 PATH=/bin:/usr/bin; export PATH
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index 5b245758b7f4..864749f71621 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.6 1999/08/28 01:19:43 peter Exp $
 
 PROG=	rpc.ypupdated
 SRCS=	ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \
diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index 996347b429de..d3ec3ce03d51 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.4 1999/08/28 01:19:43 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index f66b9741e85e..571a43e53641 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbdelete.c,v 1.3 1999/08/28 01:19:43 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index c906deceefea..b06b944ddd42 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbupdate.c,v 1.3 1999/08/28 01:19:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/fcntl.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdate b/usr.sbin/rpc.ypupdated/ypupdate
index 4a26f4b6d72b..c779bb70bfe9 100755
--- a/usr.sbin/rpc.ypupdated/ypupdate
+++ b/usr.sbin/rpc.ypupdated/ypupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdate,v 1.2 1999/08/28 01:19:44 peter Exp $
 #
 
 LOG=yes
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 4d3f1260b3a9..115cb2d737f3 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_main.c,v 1.4.2.2 2000/07/20 10:35:24 kris Exp $";
 #endif /* not lint */
 
 #include "ypupdate_prot.h"
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index f0c5bff89af5..0c812ad37a46 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_server.c,v 1.3 1999/08/28 01:19:45 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index fffa5eafe060..b05a97fe17ae 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.8 1999/08/28 01:19:46 peter Exp $
 
 PROG=	rpc.ypxfrd
 SRCS=	ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index 0543b757488a..d77028b4e1be 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.9 2000/03/01 14:08:25 sheldonh 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 4fb51ec253de..a38d82a6becf 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.4 1999/08/28 01:19:46 peter Exp $
  */
 
 #ifndef MAX_CHILDREN
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 50a5793ac8ba..7b829f0fd976 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_main.c,v 1.8.2.1 2000/07/20 10:35:24 kris Exp $";
 #endif /* not lint */
 
 #include "ypxfrd.h"
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index 1a4b2e503a42..346ba99ff846 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_server.c,v 1.8 1999/08/28 01:19:47 peter Exp $";
 #endif /* not lint */
 
 #include "ypxfrd.h"
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index 42a0195e9ead..2ff5b65dcdd4 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/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/rrenumd/Makefile,v 1.1.2.1 2000/07/15 07:36:53 kris Exp $
 
 PROG=	rrenumd
 SRCS=	rrenumd.c  parser.y lexer.l
diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l
index d906b0c6acf9..670585cf83b8 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.1.2.1 2000/07/15 07:36:54 kris Exp $
  */
 
 %{
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index 15ca06dd2f44..4b66eb9d29c8 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.1.2.1 2000/07/15 07:36:54 kris Exp $
  */
 
 %{
diff --git a/usr.sbin/rrenumd/rrenumd.8 b/usr.sbin/rrenumd/rrenumd.8
index 6268bdc5af5a..7bd12680f3d7 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.2.2.1 2000/07/15 07:36:54 kris Exp $
 .\"
 .Dd Sep 7, 1998
 .Dt RRENUMD 8
diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c
index 9d150ac6f81e..c159750e7dea 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.1.2.1 2000/07/15 07:36:54 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5
index c5aec2f1401a..49e0dfd69567 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.4.2.1 2000/07/15 07:36:54 kris Exp $
 .\"
 .Dd Nov 5, 1998
 .Dt RRENUMD.CONF 5
diff --git a/usr.sbin/rrenumd/rrenumd.h b/usr.sbin/rrenumd/rrenumd.h
index 4854cb48b1e7..174ceb60fde1 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.1.2.1 2000/07/15 07:36:55 kris Exp $
  */
 
 struct dst_list {
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index 32e64252308f..708f3be9e4d0 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/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/rtadvd/Makefile,v 1.1.2.1 2000/07/15 07:36:56 kris Exp $
 
 PROG=	rtadvd
 SRCS=	rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index 868066df957c..14b3dab55b77 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.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/rtadvd/advcap.c,v 1.1.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 /*
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 40ed46aae4fb..3a94126e5b0a 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.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/rtadvd/advcap.h,v 1.1.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 /* Based on Id: termcap.h,v 1.8 1996/09/10 12:42:10 peter Exp */
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 422011246b9c..17343699e678 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.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/rtadvd/config.c,v 1.3.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index 76f42a0495ae..94a38fd3a478 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.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/rtadvd/config.h,v 1.1.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 extern void getconfig __P((char *));
diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c
index 8c070f8991cd..a7f816a76def 100644
--- a/usr.sbin/rtadvd/dump.c
+++ b/usr.sbin/rtadvd/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/rtadvd/dump.c,v 1.1.2.1 2000/07/15 07:36:56 kris Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h
index b973d0adbd4b..8e4fef8e5a7e 100644
--- a/usr.sbin/rtadvd/dump.h
+++ b/usr.sbin/rtadvd/dump.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/rtadvd/dump.h,v 1.1.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 extern void rtadvd_dump_file __P((char *));
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 99eec64b51e1..3538054d70d2 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/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/rtadvd/if.c,v 1.2.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 8d74557b4ba3..603bad812d7d 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.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/rtadvd/if.h,v 1.1.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 #define RTADV_TYPE2BITMASK(type) (0x1 << type)
diff --git a/usr.sbin/rtadvd/pathnames.h b/usr.sbin/rtadvd/pathnames.h
index 85ca33c11da4..e934831c6c70 100644
--- a/usr.sbin/rtadvd/pathnames.h
+++ b/usr.sbin/rtadvd/pathnames.h
@@ -1,4 +1,4 @@
 /*	$KAME$	*/
-/* 	$FreeBSD$ */
+/* 	$FreeBSD: src/usr.sbin/rtadvd/pathnames.h,v 1.2.2.1 2000/07/15 07:36:56 kris Exp $ */
 
 #define _PATH_RTADVDCONF "/etc/rtadvd.conf"
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index f64ebc3c0546..ca4e32fe56ff 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.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/rtadvd/rrenum.c,v 1.2.2.1 2000/07/15 07:36:56 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index 729b96fece3d..f6112fb410c7 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.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/rtadvd/rrenum.h,v 1.1.2.1 2000/07/15 07:36:57 kris Exp $
  */
 
 void rr_input __P((int len, struct icmp6_router_renum *rr,
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index 5f1f91b08916..c52e02277645 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.8,v 1.3.2.1 2000/07/15 07:36:57 kris Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTADVD 8
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 1cd602eb788c..c48c13ccfd8c 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.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/rtadvd/rtadvd.c,v 1.3.2.1 2000/07/15 07:36:57 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtadvd/rtadvd.conf b/usr.sbin/rtadvd/rtadvd.conf
index bdac4f104027..b820e7cc82b8 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.1.2.1 2000/07/15 07:36:57 kris Exp $
 
 #
 # common definitions.
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index cc0b63d9e8ce..caf420de5e14 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.conf.5,v 1.1.2.1 2000/07/15 07:36:57 kris Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTADVD.CONF 5
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index 40beb1d87f97..3980a1242842 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.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/rtadvd/rtadvd.h,v 1.1.2.1 2000/07/15 07:36:57 kris Exp $
  */
 
 #define ALLNODES "ff02::1"
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index d03eddd53eb1..7c76e7fef0aa 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.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/rtadvd/timer.c,v 1.1.2.1 2000/07/15 07:36:57 kris Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index 9a97c91c3bbb..5418285efff9 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.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/rtadvd/timer.h,v 1.1.2.1 2000/07/15 07:36:57 kris Exp $
  */
 
 /* a < b */
diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile
index 4c0e0cdc3212..3f7a0f8cf2cb 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.6 1999/08/28 01:19:48 peter Exp $
 
 BINDIR=/usr/sbin
 PROG=	rtprio
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index 0b7c4d7e01f1..1d7c7d4a8ec5 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.19 2000/03/01 14:07:43 sheldonh Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index 9c650a60104e..08a7028adadd 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rtprio/rtprio.c,v 1.8 1999/08/28 01:19:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 2790059e80e9..7e9e1ea07114 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/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/rtsold/Makefile,v 1.1.2.1 2000/07/15 07:37:00 kris Exp $
 
 PROG=	rtsold
 SRCS=	rtsold.c rtsol.c if.c probe.c dump.c
diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index 43badd5e1722..83a63b721293 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.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/rtsold/dump.c,v 1.1.2.1 2000/07/15 07:37:01 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index 6bf81052c4bd..70f228e966f5 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/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/usr.sbin/rtsold/if.c,v 1.2.2.1 2000/07/15 07:37:01 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index 64eabcf814e0..675226e15d6f 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.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/rtsold/probe.c,v 1.2.2.1 2000/07/15 07:37:01 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c
index 41003ca70804..8a5bbd289163 100644
--- a/usr.sbin/rtsold/rtsol.c
+++ b/usr.sbin/rtsold/rtsol.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/rtsold/rtsol.c,v 1.1.2.1 2000/07/15 07:37:01 kris Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index d1a50b1b6512..3fb4146b3d20 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: rtsold.8,v 1.9 2000/07/04 14:44:38 jinmei Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/rtsold/rtsold.8,v 1.1.2.1 2000/07/15 07:37:01 kris Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTSOLD 8
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 7259c20436ae..da5c56845d0f 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.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/rtsold/rtsold.c,v 1.1.2.1 2000/07/15 07:37:01 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index f5c722bfbafe..76b25f321068 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.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/rtsold/rtsold.h,v 1.1.2.1 2000/07/15 07:37:02 kris Exp $
  */
 
 struct ifinfo {
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index de54ed70a9b8..d50f7deb0d9f 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwhod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.13 2000/01/29 01:54:58 chris Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 138d3c4a624e..c8e98caab346 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rwhod/rwhod.c,v 1.13.2.1 2000/07/20 10:35:27 kris Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index db82867e720d..1241d8208c78 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sa/Makefile,v 1.5 1999/08/28 01:19:51 peter Exp $
 
 PROG=	sa
 MAN8=	sa.8
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index 5804aa27a5e6..1005dfd0bcb4 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.4 1999/08/28 01:19:52 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index de8439659dea..391b3a4c7444 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -36,7 +36,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sa/main.c,v 1.8 1999/08/28 01:19:52 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h
index 7a7edf68caf6..8cb7f44ad8a8 100644
--- a/usr.sbin/sa/pathnames.h
+++ b/usr.sbin/sa/pathnames.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sa/pathnames.h,v 1.4 1999/08/28 01:19:52 peter Exp $
  */
 
 #define	_PATH_ACCT	"/var/account/acct"
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index eafdf59e985f..959ea220dbba 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sa/pdb.c,v 1.7 1999/08/28 01:19:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index c226eb99d6ed..90f8e37cff65 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.11 2000/01/29 01:54:59 chris Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 0c7cb2746d46..62e600747077 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sa/usrdb.c,v 1.8.2.1 2000/07/01 10:06:41 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index a1ea19470526..7c22bbc79a84 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.15 1999/12/29 18:56:55 peter Exp $
 
 SMDIR=	${.CURDIR}/../../contrib/sendmail/src
 .PATH:	${SMDIR}
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index 8feb0a66e6b5..09cb593c7839 100644
--- a/usr.sbin/setkey/Makefile
+++ b/usr.sbin/setkey/Makefile
@@ -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/usr.sbin/setkey/Makefile,v 1.1.2.2 2000/07/15 07:37:03 kris Exp $
 
 PROG=	setkey
 SRCS=	setkey.c parse.y token.l
diff --git a/usr.sbin/setkey/parse.y b/usr.sbin/setkey/parse.y
index 0eea4c1faaf2..6af11f084226 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.1.2.1 2000/07/15 07:37:03 kris Exp $	*/
 /*	$KAME: parse.y,v 1.29 2000/06/10 14:17:44 sakane Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/sample.cf b/usr.sbin/setkey/sample.cf
index 978289d34a13..54dd7caf6a3e 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.1.2.1 2000/07/15 07:37:03 kris 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 aa365449517f..d179eb117ae1 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.1.2.1 2000/07/15 07:37:04 kris 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 4736657c8356..1ab36016b9a6 100644
--- a/usr.sbin/setkey/setkey.8
+++ b/usr.sbin/setkey/setkey.8
@@ -1,4 +1,4 @@
-.\"     $FreeBSD$
+.\"     $FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.4.2.4 2000/07/15 07:37:04 kris Exp $
 .\"     $KAME: setkey.8,v 1.28 2000/06/16 12:03:46 sakane Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
diff --git a/usr.sbin/setkey/setkey.c b/usr.sbin/setkey/setkey.c
index b1e1c1e3094b..127e3d90d188 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.1.2.1 2000/07/15 07:37:04 kris Exp $	*/
 /*	$KAME: setkey.c,v 1.14 2000/06/10 06:47:09 sakane Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/test-pfkey.c b/usr.sbin/setkey/test-pfkey.c
index b1fb238c5a41..5b4a987c5718 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.1.2.1 2000/07/15 07:37:04 kris Exp $	*/
 /*	$KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/test-policy.c b/usr.sbin/setkey/test-policy.c
index 27cd478fc939..0c6cfd0cb0a1 100644
--- a/usr.sbin/setkey/test-policy.c
+++ b/usr.sbin/setkey/test-policy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/setkey/test-policy.c,v 1.1 2000/01/06 12:40:53 shin Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/setkey/token.l b/usr.sbin/setkey/token.l
index 8916fdd79ee8..33223359cd72 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.2.2.1 2000/07/15 07:37:04 kris Exp $	*/
 /*	$KAME: token.l,v 1.13 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/vchar.h b/usr.sbin/setkey/vchar.h
index f3251c7bfed3..a3f852d54fea 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.1.2.1 2000/07/15 07:37:04 kris Exp $	*/
 /*	$KAME: vchar.h,v 1.2 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/sgsc/Makefile b/usr.sbin/sgsc/Makefile
index 5f14a66b9bba..dac4190ea957 100644
--- a/usr.sbin/sgsc/Makefile
+++ b/usr.sbin/sgsc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sgsc/Makefile,v 1.4 1999/08/28 01:19:56 peter Exp $
 
 PROG=	sgsc
 
diff --git a/usr.sbin/sgsc/sgsc.1 b/usr.sbin/sgsc/sgsc.1
index 4df3295b9820..8d47589f9d19 100644
--- a/usr.sbin/sgsc/sgsc.1
+++ b/usr.sbin/sgsc/sgsc.1
@@ -27,7 +27,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sgsc/sgsc.1,v 1.8 2000/03/01 14:07:44 sheldonh Exp $
 .\"
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .Dd January 6, 1995
diff --git a/usr.sbin/sgsc/sgsc.c b/usr.sbin/sgsc/sgsc.c
index 94960a30b322..f05bed1698d6 100644
--- a/usr.sbin/sgsc/sgsc.c
+++ b/usr.sbin/sgsc/sgsc.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sgsc/sgsc.c,v 1.5 1999/08/28 01:19:57 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/sicontrol/Makefile b/usr.sbin/sicontrol/Makefile
index 139e8d6999a8..6cb68abe051d 100644
--- a/usr.sbin/sicontrol/Makefile
+++ b/usr.sbin/sicontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sicontrol/Makefile,v 1.3 2000/01/24 09:14:47 peter Exp $
 
 PROG=	sicontrol
 SRCS=	sicontrol.c
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index d4f36a95275b..33d70de794cf 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.11 2000/03/01 14:08:29 sheldonh Exp $
 .\"
 .Dd September 26,1995
 .Dt SICONTROL 8
diff --git a/usr.sbin/sicontrol/sicontrol.c b/usr.sbin/sicontrol/sicontrol.c
index 88e1770807a7..6c51bd5cd317 100644
--- a/usr.sbin/sicontrol/sicontrol.c
+++ b/usr.sbin/sicontrol/sicontrol.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sicontrol/sicontrol.c,v 1.12 2000/01/24 09:14:47 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index c927477ed388..918a169e4073 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sliplogin.8	8.2 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.12 2000/03/01 14:08:32 sheldonh Exp $
 .\"
 .Dd January 5, 1994
 .Dt SLIPLOGIN 8
diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile
index 601612578129..921b3ce6748e 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.7 1999/08/28 01:19:59 peter Exp $
 
 PROG=	slstat
 MAN8=	slstat.8
diff --git a/usr.sbin/slstat/slstat.8 b/usr.sbin/slstat/slstat.8
index 92ba8a1db49c..6d3a803ba487 100644
--- a/usr.sbin/slstat/slstat.8
+++ b/usr.sbin/slstat/slstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)slstat.8	6.8 (Berkeley) 6/20/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.14 2000/03/01 14:08:34 sheldonh Exp $
 .\"
 .Dd October 11, 1996
 .Dt SLSTAT 8
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c
index e3004f309ad7..93b2662d5d6c 100644
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/slstat/slstat.c,v 1.14 1999/08/28 01:20:00 peter Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile
index 93baab8b4d7f..aa4f8269ecb7 100644
--- a/usr.sbin/spkrtest/Makefile
+++ b/usr.sbin/spkrtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spkrtest/Makefile,v 1.8 1999/08/28 01:20:01 peter Exp $
 
 MAINTAINER= wosch
 
diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8
index 7febb8538bfc..a0f8c1df37a4 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.8 1999/08/28 01:20:01 peter Exp $
 
 .Dd July 23, 1995
 .Dt SPKRTEST 8
diff --git a/usr.sbin/spkrtest/spkrtest.pl b/usr.sbin/spkrtest/spkrtest.pl
index ccb1631fd865..c57980802291 100644
--- a/usr.sbin/spkrtest/spkrtest.pl
+++ b/usr.sbin/spkrtest/spkrtest.pl
@@ -32,7 +32,7 @@
 #
 # NOTE for iso-* (latin1) fonts: use TERM=cons25-iso8859-1
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spkrtest/spkrtest.pl,v 1.7 1999/08/28 01:20:02 peter Exp $
 
 $title = qq{
 reveille   -- Reveille
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index 4a0cbab20514..1d5b52168144 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spray/Makefile,v 1.5 1999/08/28 01:20:03 peter Exp $
 
 PROG=	spray
 MAN8=	spray.8
diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8
index edfa11153082..8f2ea8e92114 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.5 1999/08/28 01:20:03 peter Exp $
 .\"
 .Dd July 10, 1995
 .Dt SPRAY 8
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index fd08e2d812a5..103baba5c8a7 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.5.2.1 2000/07/01 08:32:48 ps Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/stallion/Makefile b/usr.sbin/stallion/Makefile
index 4b017fca1192..ee283a4e2129 100644
--- a/usr.sbin/stallion/Makefile
+++ b/usr.sbin/stallion/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/Makefile,v 1.4 1999/08/28 01:20:04 peter Exp $
 
 SUBDIR=	bootcode stlload stlstats
 
diff --git a/usr.sbin/stallion/Makefile.inc b/usr.sbin/stallion/Makefile.inc
index 314a85b6dab4..4fdc2ab2670d 100644
--- a/usr.sbin/stallion/Makefile.inc
+++ b/usr.sbin/stallion/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/Makefile.inc,v 1.4 1999/08/28 01:20:05 peter Exp $
 
 BOOTDIR=	/usr/libdata/stallion
 
diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile
index e9a7143c3486..249054534534 100644
--- a/usr.sbin/stallion/bootcode/Makefile
+++ b/usr.sbin/stallion/bootcode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/bootcode/Makefile,v 1.9 1999/08/28 01:20:05 peter Exp $
 
 .SUFFIXES: .uu
 .uu:
diff --git a/usr.sbin/stallion/bootcode/stl.4 b/usr.sbin/stallion/bootcode/stl.4
index 11f427cf30ad..a63bb855465d 100644
--- a/usr.sbin/stallion/bootcode/stl.4
+++ b/usr.sbin/stallion/bootcode/stl.4
@@ -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/stallion/bootcode/stl.4,v 1.8 2000/03/06 09:41:55 sheldonh Exp $
 .\"
 .Dd December 2, 1996
 .Os FreeBSD
diff --git a/usr.sbin/stallion/stlload/Makefile b/usr.sbin/stallion/stlload/Makefile
index ece45d380e2f..ffac02db902a 100644
--- a/usr.sbin/stallion/stlload/Makefile
+++ b/usr.sbin/stallion/stlload/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/stlload/Makefile,v 1.5 1999/08/28 01:20:07 peter Exp $
 
 PROG=	stlload
 MAN8=	stlload.8
diff --git a/usr.sbin/stallion/stlload/stlload.8 b/usr.sbin/stallion/stlload/stlload.8
index a8556d19a310..47a2d30c1a3e 100644
--- a/usr.sbin/stallion/stlload/stlload.8
+++ b/usr.sbin/stallion/stlload/stlload.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/stallion/stlload/stlload.8,v 1.5 1999/08/28 01:20:07 peter Exp $
 .\"
 .Dd December 2, 1996
 .Os FreeBSD
diff --git a/usr.sbin/stallion/stlload/stlload.c b/usr.sbin/stallion/stlload/stlload.c
index 163f4ff99cf3..eb4768fd261c 100644
--- a/usr.sbin/stallion/stlload/stlload.c
+++ b/usr.sbin/stallion/stlload/stlload.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/stallion/stlload/stlload.c,v 1.10 1999/09/15 01:54:06 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/stallion/stlstats/Makefile b/usr.sbin/stallion/stlstats/Makefile
index e0eda1aeb94d..de1336a9d0dd 100644
--- a/usr.sbin/stallion/stlstats/Makefile
+++ b/usr.sbin/stallion/stlstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/stlstats/Makefile,v 1.6 1999/08/28 01:20:08 peter Exp $
 
 PROG=	stlstats
 MAN8=	stlstats.8
diff --git a/usr.sbin/stallion/stlstats/stlstats.8 b/usr.sbin/stallion/stlstats/stlstats.8
index 2d0917a31068..1d30c96ede7f 100644
--- a/usr.sbin/stallion/stlstats/stlstats.8
+++ b/usr.sbin/stallion/stlstats/stlstats.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/stallion/stlstats/stlstats.8,v 1.5 1999/08/28 01:20:08 peter Exp $
 .\"
 .Dd December 2, 1996
 .Os FreeBSD
diff --git a/usr.sbin/stallion/stlstats/stlstats.c b/usr.sbin/stallion/stlstats/stlstats.c
index 59fedbd89be8..532c3190c1e7 100644
--- a/usr.sbin/stallion/stlstats/stlstats.c
+++ b/usr.sbin/stallion/stlstats/stlstats.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/stallion/stlstats/stlstats.c,v 1.9 1999/09/15 01:54:06 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index 4e493d22dee4..1166e19102e2 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.16 2000/03/01 14:08:36 sheldonh Exp $
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index 78de545e9590..c0606df9dd7a 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.22 2000/03/01 14:08:36 sheldonh Exp $
 .\"
 .Dd October 12, 1995
 .Dt SYSLOGD 8
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 6182c014c6f0..87efc72f2d06 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/syslogd/syslogd.c,v 1.59.2.1 2000/07/01 08:30:37 ps Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 3393011498fe..14c7875f2889 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdchk/Makefile,v 1.3.2.1 2000/07/18 08:34:57 ume Exp $
 #
 
 MAINTAINER=markm@FreeBSD.org
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index e69c050f6964..148c74347db5 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdmatch/Makefile,v 1.2.2.1 2000/07/18 08:34:57 ume Exp $
 #
 
 MAINTAINER=markm@FreeBSD.org
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 8b9423e6c7b8..5ffff5aa4b77 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.25.2.1 2000/03/16 08:47:03 kris Exp $
 
 PROG=	tcpdump
 CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}
diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h
index 12eabbb04c35..c40eca6192e3 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.1 2000/01/30 01:05:24 fenner Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
index 249454e6f044..125ed61feab7 100644
--- a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
+++ b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
@@ -20,7 +20,7 @@
  */
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#)$FreeBSD$ (LBL)";
+    "@(#)$FreeBSD: src/usr.sbin/tcpdump/tcpslice/gwtm2secs.c,v 1.4 1999/08/28 05:11:32 peter Exp $ (LBL)";
 #endif
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/search.c b/usr.sbin/tcpdump/tcpslice/search.c
index a460ffab2f7e..bdd3fad81e7b 100644
--- a/usr.sbin/tcpdump/tcpslice/search.c
+++ b/usr.sbin/tcpdump/tcpslice/search.c
@@ -20,7 +20,7 @@
  */
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#)$FreeBSD$ (LBL)";
+    "@(#)$FreeBSD: src/usr.sbin/tcpdump/tcpslice/search.c,v 1.4 1999/08/28 05:11:32 peter Exp $ (LBL)";
 #endif
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1
index 52329647edb9..df0ea4fe96d8 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.7.2.1 2000/05/09 14:12:49 sheldonh 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 3ee5d5010773..9b5e1576b785 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.9.2.1 2000/07/01 01:34:11 ps Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/util.c b/usr.sbin/tcpdump/tcpslice/util.c
index 8904352b798c..bb57a7e0a60d 100644
--- a/usr.sbin/tcpdump/tcpslice/util.c
+++ b/usr.sbin/tcpdump/tcpslice/util.c
@@ -21,7 +21,7 @@
 
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#) $FreeBSD$ (LBL)";
+    "@(#) $FreeBSD: src/usr.sbin/tcpdump/tcpslice/util.c,v 1.3 1999/08/28 05:11:32 peter Exp $ (LBL)";
 #endif
 
 #include "tcpslice.h"
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 8bde7438a556..1557b8a5f402 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acksend.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/acksend.c,v 1.4 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 038dd56bf8b5..8e7d842591d1 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)byteorder.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/byteorder.c,v 1.4 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index 79f1f5ab19fa..86395de59ff6 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)candidate.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/candidate.c,v 1.5 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 50a7da27161f..23c75a60cd85 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cksum.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/cksum.c,v 1.3 1999/08/28 01:20:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index 1e136545e148..3c1242c3c66e 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.4 1999/08/28 01:20:17 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/globals.h b/usr.sbin/timed/timed/globals.h
index 1d621f98ccdb..b35d0e95962c 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.5 2000/03/03 13:01:56 shin Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index ac4ff457cd4f..d34a9f5b466d 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.6 1999/08/28 01:20:17 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index 2c4cd148c049..2464e29d7b1a 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.6 1999/08/28 01:20:17 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index cbbde581e2a3..c2eb20411af7 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.3.2.1 2000/07/01 01:28:10 ps Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 93366a60b102..ec4a42758b96 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.5 1999/08/28 01:20:18 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index 4029ee856d88..44dab8c9dcc1 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.7 1999/08/28 01:20:18 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index 9ec651c8fa3c..a548a6053f38 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.7.2.1 2000/03/14 10:54:57 sheldonh 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 d376bcaa5db5..1c6b36172de5 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)timed.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/timed.c,v 1.9 1999/08/28 01:20:19 peter Exp $";
 #endif /* not lint */
 
 #define TSPTYPES
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 51613d150c5b..466c77f0b32e 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/cmds.c,v 1.6 1999/08/28 01:20:21 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index 8e4c3d5a0767..92faf1597768 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/cmdtab.c,v 1.3 1999/08/28 01:20:21 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 7ebef13213d7..1812ed46ab78 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.6 1999/08/28 01:20:21 peter 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 71ac9b340005..c39c85734c98 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.3 1999/08/28 01:20:21 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index 89ed6b4c4c48..deec8cd29883 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.11.2.1 2000/07/03 06:41:38 ps Exp $
 
 PROG=	traceroute
 MAN8=	traceroute.8
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index d2f6de1e04ce..67430709b411 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.2 2000/01/06 12:40:26 shin Exp $
 
 PROG=	traceroute6
 
diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index 38d171482d60..2cc9904e1bbe 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.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/traceroute6/traceroute6.8,v 1.1.2.4 2000/07/15 07:37:05 kris Exp $
 .\"
 .Dd May 17, 1998
 .Dt TRACEROUTE6 8
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 163cf0c9259d..e503e6916a73 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.4.2.1 2000/07/15 07:37:06 kris Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile
index 8445d133e83e..7d634725ebb0 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.3 2000/01/09 19:17:23 shin Exp $
 
 PROG=	trpt
 MAN8=	trpt.8
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 07d986bef2ea..e42f2d2b38a3 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)trpt.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/trpt/trpt.8,v 1.8 2000/01/23 20:23:38 charnier Exp $
 .\"
 .Dd December 11, 1993
 .Dt TRPT 8
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 9258af76df64..586b975a3cf2 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)trpt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/trpt/trpt.c,v 1.12 2000/01/29 11:49:07 shin Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 1e037a9ea7a1..9bc1dc12466e 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tzsetup/Makefile,v 1.10 1999/09/01 23:36:21 chris Exp $
 
 PROG=	tzsetup
 MAN8=	tzsetup.8
diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8
index 4bdfed2c0b93..c63ced443d1a 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.11 2000/01/23 20:25:01 charnier Exp $
 .Dd January 24, 1996
 .Dt TZSETUP 8
 .Os FreeBSD
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index a513870c5251..0bbb5f56dab0 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.16 2000/01/23 20:25:01 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/usbd/Makefile b/usr.sbin/usbd/Makefile
index e71bcd393114..6ec39e1e502e 100644
--- a/usr.sbin/usbd/Makefile
+++ b/usr.sbin/usbd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/usbd/Makefile,v 1.4 1999/11/21 17:44:42 n_hibma Exp $
 
 PROG=	usbd
 MAN8=	usbd.8
diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8
index e617c2d8778a..1e547b5f8345 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.9.2.1 2000/04/02 21:14:13 n_hibma Exp $
 .\"
 .Dd July 12, 1998
 .Dt USBD 8
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index 06e7637bf853..349a8762c555 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.10.2.2 2000/07/03 09:14:15 n_hibma 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 51328354261b..bcc994873f2f 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.6.2.1 2000/07/03 09:14:17 n_hibma 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 556655ddcac9..852a597b08d1 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.5 1999/08/28 01:20:28 peter Exp $
 
 PROG=	usbdevs
 SRCS=	usbdevs.c
diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index bf91d1980e7c..5544fa1dc1ff 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -1,5 +1,5 @@
 .\" $NetBSD: usbdevs.8,v 1.3 1998/07/23 13:57:51 augustss Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/usbdevs/usbdevs.8,v 1.5 1999/08/28 01:20:28 peter Exp $
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
@@ -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/usr.sbin/usbdevs/usbdevs.8,v 1.5 1999/08/28 01:20:28 peter Exp $
 .\"
 .Dd July 12, 1998
 .Dt USBDEVS 8
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 09c754b420f3..d3b0c7c42b8e 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdevs.c,v 1.4 1998/07/23 13:57:51 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/usbdevs/usbdevs.c,v 1.5 1999/11/23 01:16:10 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index 19905958f4cb..e598e8307112 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.8 1999/08/28 01:20:29 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index 511f8e11edf0..e54a66ba090e 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.24 2000/03/01 14:07:45 sheldonh Exp $
 .\"
 .Dd June 30, 1999
 .Dt VIDCONTROL 1
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 1e81cf5c2452..1f20694edf9c 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.32 2000/01/12 12:30:33 yokota Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c
index fe99d7171b34..d8c36532841d 100644
--- a/usr.sbin/vipw/pw_util.c
+++ b/usr.sbin/vipw/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/usr.sbin/vipw/pw_util.c,v 1.17.2.1 2000/07/20 10:35:27 kris Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index fe09a9f436c1..98f8cb9e89a0 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vipw/vipw.8,v 1.7 2000/03/01 14:08:38 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt VIPW 8
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 8986ab3bc1bd..90ad5717d6a6 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vipw.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vipw/vipw.c,v 1.11 1999/10/25 09:46:57 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/vnconfig/Makefile b/usr.sbin/vnconfig/Makefile
index 72e5627188f6..cf50bd5997aa 100644
--- a/usr.sbin/vnconfig/Makefile
+++ b/usr.sbin/vnconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vnconfig/Makefile,v 1.5 1999/08/28 01:20:33 peter Exp $
 
 PROG=		vnconfig
 MAN8=		vnconfig.8
diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8
index 23f5c38ac91a..7c6af083d981 100644
--- a/usr.sbin/vnconfig/vnconfig.8
+++ b/usr.sbin/vnconfig/vnconfig.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14.2.1 2000/06/29 23:49:34 ps Exp $
 .\"
 .Dd July 8, 1993
 .Dt VNCONFIG 8
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index ad7e39ec60c6..31a45bb6d93c 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)vnconfig.c	8.1 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vnconfig/vnconfig.c,v 1.13.2.2 2000/07/20 10:35:27 kris Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile
index 4d8d9f166cff..730b7f6ebb92 100644
--- a/usr.sbin/watch/Makefile
+++ b/usr.sbin/watch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/watch/Makefile,v 1.8 1999/08/28 01:20:35 peter Exp $
 
 PROG=	watch
 MAN8=   watch.8
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index 1b42685245fc..6d2be6c3eac1 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -1,6 +1,6 @@
 .\"
 .\" @(#)watch.8		1.1 (FreeBSD) 2/17/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watch/watch.8,v 1.18 2000/01/23 20:27:32 charnier Exp $
 .\"
 .Dd February 17, 1995
 .Dt WATCH 8
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 817f7fc8c03b..e67dc5f97423 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/watch/watch.c,v 1.18 2000/01/23 20:27:32 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile
index f68ae34746b1..ebf4009e2706 100644
--- a/usr.sbin/wicontrol/Makefile
+++ b/usr.sbin/wicontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wicontrol/Makefile,v 1.3 1999/11/25 20:45:49 wpaul Exp $
 PROG=	wicontrol
 SRCS=	wicontrol.c
 
diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index dbd193ab81a6..b63012d5d1b2 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.14 2000/03/02 14:53:39 sheldonh Exp $
 .\"
 .Dd April 21, 1999
 .Dt WICONTROL 8
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index 676668ac4089..22a701680365 100644
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.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/usr.sbin/wicontrol/wicontrol.c,v 1.9.2.1 2000/06/29 08:18:38 roberto Exp $
  */
 
 #include <sys/types.h>
@@ -56,7 +56,7 @@
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
 static const char rcsid[] =
-	"@(#) $FreeBSD$";
+	"@(#) $FreeBSD: src/usr.sbin/wicontrol/wicontrol.c,v 1.9.2.1 2000/06/29 08:18:38 roberto Exp $";
 #endif
 
 static void wi_getval		__P((char *, struct wi_req *));
diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile
index 0ebb7b4e174b..0032161119bd 100644
--- a/usr.sbin/wlconfig/Makefile
+++ b/usr.sbin/wlconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wlconfig/Makefile,v 1.3 1999/08/28 01:20:38 peter Exp $
 PROG=	wlconfig
 SRCS=	wlconfig.c
 CFLAGS+= -Wall
diff --git a/usr.sbin/wlconfig/wlconfig.8 b/usr.sbin/wlconfig/wlconfig.8
index df049907c98e..cd27fe4fd8e5 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.7 2000/01/23 20:28:41 charnier Exp $
 .\"
 .Dd December 26 1996
 .Os
diff --git a/usr.sbin/wlconfig/wlconfig.c b/usr.sbin/wlconfig/wlconfig.c
index a70e4eb97b4d..71d411e4499d 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.8.2.1 2000/07/19 16:33:02 archie Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/wormcontrol/wormcontrol.8 b/usr.sbin/wormcontrol/wormcontrol.8
index 52423c3ec5bb..bd743a6a17af 100644
--- a/usr.sbin/wormcontrol/wormcontrol.8
+++ b/usr.sbin/wormcontrol/wormcontrol.8
@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wormcontrol/wormcontrol.8,v 1.14 2000/01/23 20:29:46 charnier Exp $
 .\"
 .\" arrgh, hilit19 needs this" :-(
 .Dd January 27, 1996
diff --git a/usr.sbin/wormcontrol/wormcontrol.c b/usr.sbin/wormcontrol/wormcontrol.c
index de793df2d509..f8264de821a5 100644
--- a/usr.sbin/wormcontrol/wormcontrol.c
+++ b/usr.sbin/wormcontrol/wormcontrol.c
@@ -35,7 +35,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/wormcontrol/wormcontrol.c,v 1.11 1999/10/01 14:12:46 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/xten/Makefile b/usr.sbin/xten/Makefile
index a86f58632a12..18a87324cc68 100644
--- a/usr.sbin/xten/Makefile
+++ b/usr.sbin/xten/Makefile
@@ -1,5 +1,5 @@
 #	Makefile for xten (Stark) 10/30/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xten/Makefile,v 1.8 1999/08/28 01:21:01 peter Exp $
 
 PROG=	xten
 CFLAGS+= -I${.CURDIR}/../../libexec/xtend
diff --git a/usr.sbin/xten/xten.1 b/usr.sbin/xten/xten.1
index 51a9170aab38..f14764360f84 100644
--- a/usr.sbin/xten/xten.1
+++ b/usr.sbin/xten/xten.1
@@ -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/xten/xten.1,v 1.9 1999/08/28 01:21:02 peter Exp $
 .\"
 .Dd October 30, 1993
 .Dt XTEN 1
diff --git a/usr.sbin/xten/xten.c b/usr.sbin/xten/xten.c
index 1157ab877ae0..d3dd98c8acc6 100644
--- a/usr.sbin/xten/xten.c
+++ b/usr.sbin/xten/xten.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/xten/xten.c,v 1.4 1999/08/28 01:21:02 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 18f79b4cabb2..1fdd8a62d855 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.5 1999/08/28 01:21:03 peter Exp $
 
 PROG=	yp_mkdb
 SRCS=	yp_mkdb.c yp_dblookup.c yp_dbwrite.c
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 599aceb5f594..0fa96489b6c3 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.12 2000/03/01 14:08:41 sheldonh 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 a5fed00631db..a44f6985e883 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.c,v 1.12 1999/09/01 12:42:00 sheldonh Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index 2f0ff5fe82de..b82a96ba7553 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.6 1999/08/28 01:21:04 peter Exp $
 
 SRCS=	ypbind.c yp_ping.c
 PROG=	ypbind
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index a88d8ff1c15d..8890fc392d2a 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -72,7 +72,7 @@ static char *sccsid = "@(#)from: clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)from: clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypbind/yp_ping.c,v 1.6 1999/12/29 05:07:58 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 2e5637133974..630b72034903 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.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/ypbind/ypbind.8,v 1.15 2000/03/01 14:08:43 sheldonh Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 7e2fa2cd5d62..66f8f394c129 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypbind/ypbind.c,v 1.30 1999/08/28 01:21:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index e099f4d6f317..48d1dcffb313 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.5 1999/08/28 01:21:07 peter Exp $
 
 PROG=	yppoll
 MAN8=	yppoll.8
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index 88d07deed89b..17a1b2328588 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.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/usr.sbin/yppoll/yppoll.8,v 1.4 1999/08/28 01:21:07 peter Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPPOLL 8
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index a6fac5dda2df..5e226c328b20 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/yppoll/yppoll.c,v 1.5 1999/08/28 01:21:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index abaa5784d640..cec8604b42fd 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yppush/Makefile,v 1.6 1999/08/28 01:21:08 peter Exp $
 
 PROG=	yppush
 SRCS=	ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index 595a74db8160..61b22ded2245 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.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/yppush/yppush.8,v 1.12 2000/03/01 14:08:44 sheldonh 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 86ca7a26faed..a7ef8e1ec35c 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.4 1999/08/28 01:21:09 peter Exp $
  */
 
 /* Privately defined error codes. */
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index 39b5bdf43d76..004c7da17214 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.11 1999/08/28 01:21:09 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index 851cc228ada3..5ac3f79da1c1 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.17 1999/08/28 01:21:10 peter Exp $
 
 PROG=	ypserv
 SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
diff --git a/usr.sbin/ypserv/Makefile.yp b/usr.sbin/ypserv/Makefile.yp
index 296395b54833..c8516c6b7d84 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.28.2.2 2000/07/03 06:58:43 ps 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 d6089fe10327..429d4bc01c8e 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_access.c,v 1.17 1999/08/28 01:21:11 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index f558b0534683..3cbcb834b5c5 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_dblookup.c,v 1.17 1999/08/28 01:21:11 peter Exp $";
 #endif /* not lint */
 
 #include <db.h>
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index 3a62694033ae..a22efc284b83 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_dnslookup.c,v 1.16 1999/08/28 01:21:12 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index d1ffd40ef4fb..e6cfe0ccfbad 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_error.c,v 1.7 1999/08/28 01:21:12 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index cefab07b2b0b..dcac01b5fa6f 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.14 1999/08/28 01:21:12 peter Exp $
  */
 
 #include <db.h>
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index 07b20890cd01..473456eb75b0 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_main.c,v 1.21.2.2 2000/07/20 10:35:28 kris Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index aa95bba1bc62..2af8d434a581 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_server.c,v 1.31 1999/08/28 01:21:13 peter Exp $";
 #endif /* not lint */
 
 #include "yp.h"
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index 40ee4736a622..87aabf71d97a 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_svc_udp.c,v 1.5 1999/08/28 01:21:14 peter Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index dc4565ced93d..510ce8b17d24 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.7 2000/03/01 14:08:45 sheldonh Exp $
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
diff --git a/usr.sbin/ypserv/ypinit.sh b/usr.sbin/ypserv/ypinit.sh
index 8d1871b404f1..6aac64cbe9b1 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.3 1999/08/28 01:21:15 peter Exp $
 #
 # ypinit.sh - setup an 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 a5807edd2713..e14062ddc5b2 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.22.2.1 2000/06/30 08:43:45 ps Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index 0e5b4bf46bd2..6e316fba2c78 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.7 1999/08/28 01:21:16 peter Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPSET 8
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 578138d9162f..2b7f4ef4e500 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypset/ypset.c,v 1.5 1999/08/28 01:21:16 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/zic/Arts.htm b/usr.sbin/zic/Arts.htm
index baa84ed77431..68199710a90d 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.1.1.1.2.1 2000/06/30 08:43:45 ps Exp $ -->
 <HTML>
 <HEAD>
 <TITLE>Time and the Arts</TITLE>
diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile
index f4697a65e113..b2c9b3148ec5 100644
--- a/usr.sbin/zic/Makefile
+++ b/usr.sbin/zic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile,v 1.5 1999/08/28 01:21:17 peter Exp $
 SUBDIR=	zic zdump
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/zic/Makefile.inc b/usr.sbin/zic/Makefile.inc
index b915adff92ab..137bf6a1a205 100644
--- a/usr.sbin/zic/Makefile.inc
+++ b/usr.sbin/zic/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile.inc,v 1.4 1999/08/28 01:21:18 peter Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/zic/ialloc.c b/usr.sbin/zic/ialloc.c
index 0d8f1f20ff44..4b7fd17ded04 100644
--- a/usr.sbin/zic/ialloc.c
+++ b/usr.sbin/zic/ialloc.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)ialloc.c	8.29";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/ialloc.c,v 1.5 1999/08/28 01:21:18 peter Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/private.h b/usr.sbin/zic/private.h
index 2d0552d4f9d4..13216e09288e 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.3 1999/08/28 01:21:18 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/zic/scheck.c b/usr.sbin/zic/scheck.c
index d895cba40ca4..6d6cc5777c2e 100644
--- a/usr.sbin/zic/scheck.c
+++ b/usr.sbin/zic/scheck.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)scheck.c	8.15";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/scheck.c,v 1.4 1999/08/28 01:21:19 peter Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/zdump.8 b/usr.sbin/zic/zdump.8
index 881001c27d46..84ba21a2832b 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.7 2000/01/23 20:36:27 charnier Exp $
 .\"
 .Dd September 13, 1994
 .Dt ZDUMP 8
diff --git a/usr.sbin/zic/zdump.c b/usr.sbin/zic/zdump.c
index 97cb68b1f885..782fa3382e41 100644
--- a/usr.sbin/zic/zdump.c
+++ b/usr.sbin/zic/zdump.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)zdump.c	7.28";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.7 1999/08/28 01:21:19 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile
index ca10ac2c3375..b445ed574807 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.4 1999/08/28 01:21:21 peter Exp $
 
 .PATH:	${.CURDIR}/..
 
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index f2df2233d7c2..daeca450f8d4 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.11 2000/01/23 20:36:27 charnier Exp $
 .Dd
 .Dt ZIC 8
 .Os
diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c
index 60ff1725d7bb..69d72e41c13c 100644
--- a/usr.sbin/zic/zic.c
+++ b/usr.sbin/zic/zic.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)zic.c	7.96";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zic.c,v 1.11 1999/08/28 01:21:20 peter Exp $";
 #endif /* not lint */
 
 #include "private.h"
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index f8ad4db11253..8be6fe145623 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.5 1999/08/28 01:21:22 peter Exp $
 
 .PATH:	${.CURDIR}/..