release/4.1.0_cvs

285 files changed, 308 insertions, 308 deletions

diff --git a/sbin/Makefile b/sbin/Makefile
index 30c439ba75a8..ba652ccb9a39 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/Makefile,v 1.77.2.1 2000/03/31 03:24:28 nyan Exp $
 
 # XXX MISSING:		icheck ncheck
 
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 48b89fe813d9..da230c7ccb80 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.18 2000/03/01 11:26:58 sheldonh Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 743782a66f5d..b56eaf005ce9 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -32,7 +32,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.25 1999/08/28 00:12:14 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index f17c173f261a..bea07618f648 100644
--- a/sbin/atm/Makefile
+++ b/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/sbin/atm/Makefile,v 1.2 1999/08/28 00:12:15 peter Exp $
 #
 
 SUBDIR=	atm \
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index 8878187339ca..901cf7ae0582 100644
--- a/sbin/atm/Makefile.inc
+++ b/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/sbin/atm/Makefile.inc,v 1.2 1999/08/28 00:12:15 peter Exp $
 #
 #
 
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index dab4b348ee8e..9896097d5312 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/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/sbin/atm/atm/Makefile,v 1.4 1999/08/28 00:12:16 peter Exp $
 #
 #
 
diff --git a/sbin/atm/atm/atm.8 b/sbin/atm/atm/atm.8
index 67764055e31e..1362ef74add4 100644
--- a/sbin/atm/atm/atm.8
+++ b/sbin/atm/atm/atm.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/atm/atm.8,v 1.3 1999/08/28 00:12:16 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/atm/atm.c b/sbin/atm/atm/atm.c
index 4be5a1125157..e69f8e7b9985 100644
--- a/sbin/atm/atm/atm.c
+++ b/sbin/atm/atm/atm.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/sbin/atm/atm/atm.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -59,7 +59,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h
index 62556806c62b..d733b0a57817 100644
--- a/sbin/atm/atm/atm.h
+++ b/sbin/atm/atm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.4 1999/08/28 00:12:17 peter Exp $
  *
  */
 
diff --git a/sbin/atm/atm/atm_eni.c b/sbin/atm/atm/atm_eni.c
index 0f9f8210b55d..5204c02fd6b0 100644
--- a/sbin/atm/atm/atm_eni.c
+++ b/sbin/atm/atm/atm_eni.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/sbin/atm/atm/atm_eni.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_eni.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index 27dfedb18dd7..b1b63d397cf8 100644
--- a/sbin/atm/atm/atm_fore200.c
+++ b/sbin/atm/atm/atm_fore200.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/sbin/atm/atm/atm_fore200.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -58,7 +58,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_fore200.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_inet.c b/sbin/atm/atm/atm_inet.c
index 78f3c684f1c0..c14e693d4649 100644
--- a/sbin/atm/atm/atm_inet.c
+++ b/sbin/atm/atm/atm_inet.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/sbin/atm/atm/atm_inet.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -55,7 +55,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_inet.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_print.c b/sbin/atm/atm/atm_print.c
index e02e9d14a2b1..94a078d18737 100644
--- a/sbin/atm/atm/atm_print.c
+++ b/sbin/atm/atm/atm_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/sbin/atm/atm/atm_print.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_print.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_set.c b/sbin/atm/atm/atm_set.c
index 2e3a18fef304..ff3d37fe1572 100644
--- a/sbin/atm/atm/atm_set.c
+++ b/sbin/atm/atm/atm_set.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/sbin/atm/atm/atm_set.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_set.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c
index 0e115e18f6ed..8463fe5e9685 100644
--- a/sbin/atm/atm/atm_show.c
+++ b/sbin/atm/atm/atm_show.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/sbin/atm/atm/atm_show.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_show.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_subr.c b/sbin/atm/atm/atm_subr.c
index ee1726b8f3c2..b3cf0601b0ef 100644
--- a/sbin/atm/atm/atm_subr.c
+++ b/sbin/atm/atm/atm_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/sbin/atm/atm/atm_subr.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
  *
  */
 
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_subr.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $");
 #endif
 
 
diff --git a/sbin/atm/fore_dnld/COPYRIGHT b/sbin/atm/fore_dnld/COPYRIGHT
index f934d4293724..771e38e69db8 100644
--- a/sbin/atm/fore_dnld/COPYRIGHT
+++ b/sbin/atm/fore_dnld/COPYRIGHT
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sbin/atm/fore_dnld/COPYRIGHT,v 1.1 2000/02/15 13:20:57 phk Exp $
 
 This copyright applies to the microcode image in the file pca200e.c.
 
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index 75909df2f26a..78e8eb46885b 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/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/sbin/atm/fore_dnld/Makefile,v 1.5 2000/02/15 13:20:57 phk Exp $
 #
 #
 
diff --git a/sbin/atm/fore_dnld/fore_dnld.8 b/sbin/atm/fore_dnld/fore_dnld.8
index 3a9524fc1410..21e0f864f3c4 100644
--- a/sbin/atm/fore_dnld/fore_dnld.8
+++ b/sbin/atm/fore_dnld/fore_dnld.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.4 2000/03/01 11:27:44 sheldonh Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index 1e5b27e6e63f..5115cac93e9d 100644
--- a/sbin/atm/fore_dnld/fore_dnld.c
+++ b/sbin/atm/fore_dnld/fore_dnld.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/sbin/atm/fore_dnld/fore_dnld.c,v 1.6.2.1 2000/07/01 06:06:46 ps Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include <unistd.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.6.2.1 2000/07/01 06:06:46 ps Exp $");
 #endif
 
 extern u_char pca200e_microcode[];
diff --git a/sbin/atm/fore_dnld/pca200e.c b/sbin/atm/fore_dnld/pca200e.c
index 03b71718a510..78c1e04dce02 100644
--- a/sbin/atm/fore_dnld/pca200e.c
+++ b/sbin/atm/fore_dnld/pca200e.c
@@ -35,7 +35,7 @@
  * 
  * This is a binary copy of the PCA200E firmware version 3.0.1
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/fore_dnld/pca200e.c,v 1.1 2000/02/15 13:20:58 phk Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index bdeb248fc397..1adac98b8dc5 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/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/sbin/atm/ilmid/Makefile,v 1.4 1999/08/28 00:12:21 peter Exp $
 #
 #
 
diff --git a/sbin/atm/ilmid/ilmid.8 b/sbin/atm/ilmid/ilmid.8
index 6e71b1f0fb0b..5acb033c11ed 100644
--- a/sbin/atm/ilmid/ilmid.8
+++ b/sbin/atm/ilmid/ilmid.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.3 2000/03/01 11:27:46 sheldonh Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 324c13e36139..adf10c435d7e 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.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/sbin/atm/ilmid/ilmid.c,v 1.6.2.1 2000/07/01 06:11:51 ps Exp $
  *
  */
 
@@ -73,7 +73,7 @@
 #include <unistd.h>
 
 #ifndef	lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.6.2.1 2000/07/01 06:11:51 ps Exp $");
 #endif
 
 
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index a67767b447e2..1687e2d71c59 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.10 2000/03/01 11:26:59 sheldonh Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 7ecf1863735d..d17739093e48 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/badsect/badsect.c,v 1.7 1999/08/28 00:12:28 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index e91c2056bcfa..a4e3040a1fc0 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.3 2000/01/21 23:18:08 mjacob Exp $
 MAINTAINER=ken@FreeBSD.ORG
 
 PROG=   camcontrol
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 6d2c59fbe2e3..56a9f0a751d3 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.19.2.4 2000/07/01 23:44:10 ken Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index fcacca4729df..477070ee7e66 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.21.2.6 2000/07/01 23:47:37 ken Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 4218576a56e6..a15304b01894 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/camcontrol/camcontrol.h,v 1.3 1999/08/28 00:12:29 peter Exp $
  */
 
 #ifndef _CAMCONTROL_H
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 32f5c78688d4..fc84e887c889 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -45,7 +45,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.5 2000/01/21 23:19:30 mjacob Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index f3aaa4eee9ce..d0527f5e78fa 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.9 1999/09/23 10:35:48 dillon Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index c5ccd8f042fc..423dffa1234c 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.16 1999/10/05 21:19:33 n_hibma Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 7f66eccc54f2..2d9a4d1d9f96 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/clri/clri.8,v 1.7 1999/08/28 00:12:31 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 85de80f4ee76..06ef35301ca3 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/clri/clri.c,v 1.4 1999/08/28 00:12:32 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 655ff1a8f399..a4914728423f 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.15.2.1 2000/05/04 16:49:22 phantom Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 671551e07d60..8a135ca59b3d 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.8 1999/08/28 00:12:58 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index b6a73e8c18b1..528ca0790150 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile,v 1.6.2.3 2000/07/22 20:10:52 obrien Exp $
 
 DIST_DIR= ${.CURDIR}/../../contrib/isc-dhcp
 
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 4090fc418d95..05ba076048fb 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/disklabel/Makefile,v 1.3.14.1 2000/05/09 13:47:04 nyan Exp $
 
 PROG=	disklabel
 SRCS=	disklabel.c dkcksum.c
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 3583c5907ecc..c91e08c7d2a7 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.7 2000/01/05 17:34:00 bde Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 52d9b5ff0d6c..a05d3b394173 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15.2.1 2000/07/01 06:47:46 ps Exp $
 .\"
 .Dd July 30, 1999
 .Dt DISKLABEL 8
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 1f396a18f4be..864f0270cba1 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.28.2.3 2000/07/01 06:47:46 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/disklabel/dkcksum.c b/sbin/disklabel/dkcksum.c
index 3a58aa23044b..63448fff4f4f 100644
--- a/sbin/disklabel/dkcksum.c
+++ b/sbin/disklabel/dkcksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dkcksum.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/disklabel/dkcksum.c,v 1.4 1999/08/28 00:12:35 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/disklabel/pathnames.h b/sbin/disklabel/pathnames.h
index c09d4692c94a..9ac4988e04ff 100644
--- a/sbin/disklabel/pathnames.h
+++ b/sbin/disklabel/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/disklabel/pathnames.h,v 1.4 2000/01/11 07:28:46 bde Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index fd9e175c23a4..55652cfa644e 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dmesg.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dmesg/dmesg.8,v 1.5 1999/08/28 00:12:35 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 6071680edd5a..272d74929fc2 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.11 1999/08/28 00:12:36 peter Exp $";
 #endif /* not lint */
 
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index b2e0e08c68f1..ef8b10f5c67b 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dump/Makefile,v 1.12 2000/02/24 21:01:49 markm Exp $
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index fb7b3b4e1e9c..c52d960c1c06 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.27.2.1 2000/07/01 06:47:47 ps Exp $
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index ffc009dfa2c6..fbc0a7790eb5 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.14.2.1 2000/07/01 06:31:52 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 6209dab66feb..1417954d1e9e 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/itime.c,v 1.3 1999/08/28 00:12:38 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index d7783b16aedd..5c679ca83be1 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/main.c,v 1.20.2.1 2000/04/24 14:41:54 dfr Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index bb4c262c8132..50fcd08ee2f4 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/optr.c,v 1.9.2.1 2000/07/01 07:32:37 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index b25875fbea95..7fb37d2d9a11 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/tape.c,v 1.12 1999/08/28 00:12:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index f52413c93896..8afcf2ee5ae8 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.1 2000/07/01 06:31:52 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 4e8e6697c931..3c4d4b09d3d8 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/unctime.c,v 1.3 1999/08/28 00:12:39 peter Exp $";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 8c668c13e9a6..6b6efe3f9e0d 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.5 1999/08/28 00:12:42 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 8e0416e74dea..c2c886fba4e7 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.13 1999/08/28 00:12:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index bd41769b8d2b..98db9f7b3632 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpon/Makefile,v 1.4 1999/08/28 00:12:43 peter Exp $
 
 PROG=	dumpon
 MAN8=	dumpon.8
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 3e9e1bdb2efb..82ac7ca70328 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.11.2.3 2000/07/14 18:09:05 ben Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 51d2e42fac4a..4352935da1c5 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.10.2.1 2000/07/01 06:23:35 ps Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/fsck/dir.c b/sbin/fsck/dir.c
index f5fb6a0ef30a..e36e7db95fda 100644
--- a/sbin/fsck/dir.c
+++ b/sbin/fsck/dir.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/dir.c,v 1.15 1999/08/28 00:12:45 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 59d7fa8d1a47..dcc5499071d1 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck/fsck.8,v 1.14 1999/08/28 00:12:45 peter Exp $
 .\"
 .Dd November 15, 1996
 .Dt FSCK 8
diff --git a/sbin/fsck/fsck.h b/sbin/fsck/fsck.h
index 9d59c8ff2526..c820c78ccc04 100644
--- a/sbin/fsck/fsck.h
+++ b/sbin/fsck/fsck.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck/fsck.h,v 1.12 2000/02/28 20:02:40 mckusick Exp $
  */
 
 #include <unistd.h>
diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c
index dbf86f760f81..7dedc3d10dd8 100644
--- a/sbin/fsck/inode.c
+++ b/sbin/fsck/inode.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/inode.c,v 1.20 2000/02/28 20:02:41 mckusick Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index 6463990b5e6f..3ab8c75808b6 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/main.c,v 1.21 2000/01/10 14:20:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass1.c b/sbin/fsck/pass1.c
index 82ef96038727..0b42b44c92b8 100644
--- a/sbin/fsck/pass1.c
+++ b/sbin/fsck/pass1.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass1.c,v 1.16.2.1 2000/07/15 22:45:39 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass1b.c b/sbin/fsck/pass1b.c
index 7ef662f27364..0c0c9d4d5930 100644
--- a/sbin/fsck/pass1b.c
+++ b/sbin/fsck/pass1b.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass1b.c,v 1.7 1999/08/28 00:12:46 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass2.c b/sbin/fsck/pass2.c
index 088ecffb9817..df69ca7048a9 100644
--- a/sbin/fsck/pass2.c
+++ b/sbin/fsck/pass2.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass2.c,v 1.10 1999/08/28 00:12:46 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass3.c b/sbin/fsck/pass3.c
index 80e38e9cbf4f..06eaba0dba8a 100644
--- a/sbin/fsck/pass3.c
+++ b/sbin/fsck/pass3.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass3.c,v 1.7 1999/08/28 00:12:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass4.c b/sbin/fsck/pass4.c
index 0012c50adc7e..4ce15c3bcf6d 100644
--- a/sbin/fsck/pass4.c
+++ b/sbin/fsck/pass4.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass4.c,v 1.7 1999/08/28 00:12:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass5.c b/sbin/fsck/pass5.c
index d5edaace1690..6d45fba704e5 100644
--- a/sbin/fsck/pass5.c
+++ b/sbin/fsck/pass5.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass5.c,v 1.17 1999/08/28 00:12:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index e43aada8d10d..51943b259843 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/preen.c,v 1.16 1999/12/30 16:32:40 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c
index 49bbc8d99883..a6d1716c0ff6 100644
--- a/sbin/fsck/setup.c
+++ b/sbin/fsck/setup.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/setup.c,v 1.17 2000/02/28 20:02:41 mckusick Exp $";
 #endif /* not lint */
 
 #define DKTYPENAMES
diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c
index 1efdabcd11d0..f81e02b8ee66 100644
--- a/sbin/fsck/utilities.c
+++ b/sbin/fsck/utilities.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/utilities.c,v 1.11 1999/08/28 00:12:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index ef842c9d50b2..a60554bd033f 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsdb/Makefile,v 1.9 1999/08/28 00:12:52 peter Exp $
 
 PROG=	fsdb
 MAN8=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 2ea7d621927d..09d47e5a2740 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.12 2000/01/23 01:30:01 mpp Exp $
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 5d54debe0d6c..78f2115caeca 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdb.c,v 1.13.2.1 2000/07/01 06:23:35 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index a7fd5c41d31d..349256c12eb1 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -27,7 +27,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsdb/fsdb.h,v 1.4 1999/08/28 00:12:54 peter Exp $
  */
 
 extern int bread __P((int fd, char *buf, daddr_t blk, long size));
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index 3846b6bd5ffb..fc7e7ecde407 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.9.2.1 2000/07/01 06:23:35 ps Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 966baaa1b457..485f1a26db43 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -27,7 +27,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: fsirand.8,v 1.6 1997/02/23 03:58:26 millert Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsirand/fsirand.8,v 1.10 2000/01/23 01:30:02 mpp Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 96a5484ed130..55647d6933d6 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsirand/fsirand.c,v 1.7.2.1 2000/07/01 06:23:36 ps Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile
index 3335157b30ee..fb00cb09be6d 100644
--- a/sbin/i386/Makefile
+++ b/sbin/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/Makefile,v 1.9 2000/01/14 16:36:58 peter Exp $
 
 SUBDIR=	fdisk \
 	nextboot
diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc
index b915adff92ab..0b06dd4a3256 100644
--- a/sbin/i386/Makefile.inc
+++ b/sbin/i386/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/Makefile.inc,v 1.4 1999/08/28 00:12:57 peter Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index 066c4e95e9a0..895d47fccd85 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/cxconfig/cxconfig.8,v 1.5 1999/08/28 00:12:59 peter Exp $
 .Dd December 2, 1994
 .Dt CXCONFIG 8
 .Os FreeBSD
diff --git a/sbin/i386/cxconfig/cxconfig.c b/sbin/i386/cxconfig/cxconfig.c
index 3ae000d58f4b..2b08a1722850 100644
--- a/sbin/i386/cxconfig/cxconfig.c
+++ b/sbin/i386/cxconfig/cxconfig.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/cxconfig/cxconfig.c,v 1.4 1999/08/28 00:13:00 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/i386/fdisk/Makefile b/sbin/i386/fdisk/Makefile
index 4a14439057c3..e45580aa3e78 100644
--- a/sbin/i386/fdisk/Makefile
+++ b/sbin/i386/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/fdisk/Makefile,v 1.5 1999/08/28 00:13:00 peter Exp $
 
 PROG=	fdisk
 MAN8=	fdisk.8
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index aa3000829f38..b60ff1ebdb13 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.17.2.1 2000/03/20 12:33:15 peter Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
diff --git a/sbin/i386/fdisk/fdisk.c b/sbin/i386/fdisk/fdisk.c
index ae339aae840a..21830f3763d8 100644
--- a/sbin/i386/fdisk/fdisk.c
+++ b/sbin/i386/fdisk/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/fdisk/fdisk.c,v 1.36.2.4 2000/07/21 20:22:56 jhb Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index bd7348158d60..ea70690ce52a 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.11 2000/03/01 11:27:47 sheldonh Exp $
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/i386/nextboot/nextboot.c b/sbin/i386/nextboot/nextboot.c
index 5893ca38a8a8..4df70c3e3f81 100644
--- a/sbin/i386/nextboot/nextboot.c
+++ b/sbin/i386/nextboot/nextboot.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/nextboot/nextboot.c,v 1.6 1999/08/28 00:13:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index fe7f88c78ffc..bb334c980093 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.14 1999/12/15 05:13:20 shin Exp $
 
 PROG=	ifconfig
 SRCS=	ifconfig.c
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index cd0c6c637b91..1b6707482d2d 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.27.2.1 2000/07/10 09:19:00 obrien Exp $
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index b49ec89bd790..6228bf350a24 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.51.2.1 2000/07/18 22:54:30 archie Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index 88b9503e7cb2..94068c1f1a98 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -31,7 +31,7 @@
  *
  * so there!
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.5 1999/08/28 00:13:08 peter Exp $
  */
 
 extern struct ifreq ifr;
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index 3ab28f87c79c..be83947fa3e8 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.6 1999/08/28 00:13:08 peter Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 3843821781c3..ff90de4b0153 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.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/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $";
 #endif
 static int			__tag = 0;
 static int			__have_tag = 0;
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index f40061e22a8d..edd6796c42ca 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/init/Makefile,v 1.20 2000/02/29 11:40:57 markm Exp $
 
 PROG=	init
 MAN8=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 7c2fc1e23d86..6f4242bf8afa 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/init/init.8,v 1.22 2000/03/01 11:27:06 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index d27b82ac4d47..e9dc8db6b61d 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 7/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/init/init.c,v 1.38.2.2 2000/07/01 06:31:52 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ip6fw/Makefile b/sbin/ip6fw/Makefile
index 975aef5e28b5..395b270e2967 100644
--- a/sbin/ip6fw/Makefile
+++ b/sbin/ip6fw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ip6fw/Makefile,v 1.1 2000/01/29 13:54:43 shin Exp $
 
 PROG=   ip6fw
 MAN8=	ip6fw.8
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index 14176635615c..426ec6995294 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.3.2.1 2000/05/04 17:35:17 phantom Exp $
 .\"
 .Dd March 13, 2000
 .Dt IP6FW 8
diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c
index 9c3a7e5aa096..9593fe593947 100644
--- a/sbin/ip6fw/ip6fw.c
+++ b/sbin/ip6fw/ip6fw.c
@@ -17,7 +17,7 @@
  * NEW command line interface for IP firewall facility
  *
  * $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.1 2000/01/29 13:54:44 shin Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/ip6fw/sample.sh b/sbin/ip6fw/sample.sh
index 00641401f6e7..01679a662f21 100644
--- a/sbin/ip6fw/sample.sh
+++ b/sbin/ip6fw/sample.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $FreeBSD$
+# $FreeBSD: src/sbin/ip6fw/sample.sh,v 1.1.2.1 2000/05/04 17:35:00 phantom Exp $
 
 fwcmd=/sbin/ip6fw
 
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index b21a622e72bf..891a3cb602f3 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipf/Makefile,v 1.4.2.1 2000/07/20 04:57:19 kris Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index a76a2a7642c6..d6462a136095 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.4.2.1 2000/07/20 05:15:19 kris Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 1ee2bebac828..ef71c192bed1 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63.2.2 2000/06/12 09:47:20 ru Exp $
 .\"
 .Dd February 16, 2000
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 12f25c602aad..ff3953177f3d 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -20,7 +20,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ipfw/ipfw.c,v 1.80.2.3 2000/07/20 10:35:13 kris Exp $";
 #endif /* not lint */
 
 
diff --git a/sbin/ipmon/Makefile b/sbin/ipmon/Makefile
index 9a078897b4ea..5f2591a15349 100644
--- a/sbin/ipmon/Makefile
+++ b/sbin/ipmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipmon/Makefile,v 1.6 2000/02/09 21:01:35 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 639327bf989f..a8d48ccd4c0a 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipnat/Makefile,v 1.4.2.1 2000/07/20 05:46:06 kris Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/kget/Makefile b/sbin/kget/Makefile
index d4bce5dbca70..d5706224b271 100644
--- a/sbin/kget/Makefile
+++ b/sbin/kget/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/kget/Makefile,v 1.3 1999/08/28 00:13:13 peter Exp $
 #
 PROG=	kget
 CFLAGS+= -I${.CURDIR}/../../sys/i386
diff --git a/sbin/kget/kget.8 b/sbin/kget/kget.8
index 7fea15fd9cc7..9c99d2725f55 100644
--- a/sbin/kget/kget.8
+++ b/sbin/kget/kget.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kget/kget.8,v 1.3 1999/08/28 00:13:13 peter Exp $
 .\"
 .Dd Feb 20, 1999
 .Dt KGET 8
diff --git a/sbin/kget/kget.c b/sbin/kget/kget.c
index a5572c85b465..75b8b890c082 100644
--- a/sbin/kget/kget.c
+++ b/sbin/kget/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/kget/kget.c,v 1.4.2.1 2000/07/14 10:21:34 jhb Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index 6b044f52630d..0245499671e3 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldload/Makefile,v 1.4 1999/08/28 00:13:15 peter Exp $
 #
 
 PROG=	kldload
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 39b42f0691c1..84311f4dc101 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldload/kldload.8,v 1.7 1999/09/03 16:40:10 chris Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 875c7aaa808b..5eaa02777c02 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/kldload/kldload.c,v 1.6 1999/08/28 00:13:16 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index 64d7c1247cba..2a1145298e60 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldstat/Makefile,v 1.4 1999/08/28 00:13:17 peter Exp $
 #
 
 PROG=	kldstat
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index f12d5039d8cb..64077d12201f 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldstat/kldstat.8,v 1.7.2.2 2000/07/01 07:56:00 ps Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 58c5388e5312..5b734942939c 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/kldstat/kldstat.c,v 1.7.2.2 2000/07/01 07:56:00 ps Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index b87d87275a03..865aaf4c8ec0 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldunload/Makefile,v 1.4 1999/08/28 00:13:18 peter Exp $
 #
 
 PROG=	kldunload
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 6cbb60bb9861..088db32ecd64 100644
--- a/sbin/kldunload/kldunload.8
+++ b/sbin/kldunload/kldunload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.9 1999/09/06 08:30:25 n_hibma Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index b54bade92e4e..ceaf682e9dbb 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.10 1999/09/08 05:46:47 bde Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 0b9792fab953..aff005d1e515 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ldconfig/Makefile,v 1.15 1999/08/28 00:13:20 peter Exp $
 
 PROG=	ldconfig
 SRCS=	elfhints.c ldconfig.c shlib.c support.c
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 6af39b655d2f..1a7866eb6839 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/elfhints.c,v 1.3 2000/01/21 02:15:27 jdp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 8f4f801b32ee..5c5d6e6d5f21 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.19.2.1 2000/07/18 02:24:33 jdp Exp $
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 76f8299cfa43..5d4a185aab10 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.31.2.1 2000/07/18 02:24:33 jdp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 1ea712c8eb44..f9d7925830e6 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/ldconfig.h,v 1.2 1999/08/28 00:13:21 peter Exp $
  */
 
 #ifndef LDCONFIG_H
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index c485184cc440..15da05177f41 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/md5/md5.1,v 1.10 1999/12/04 01:29:43 obrien Exp $
 .Dd February 14, 1994
 .Dt MD5 1
 .Os
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 9a764b120bee..f4840e31f3dd 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -19,7 +19,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/md5/md5.c,v 1.20 1999/12/04 01:29:43 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 22e60a99ad01..6e0f133b3e18 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.11.2.1 2000/04/23 16:59:28 mpp Exp $
 .\"
 .Dd December 11, 1993
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 98c0612a4295..eeb66ec6bdd7 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mknod/mknod.c,v 1.13 2000/01/06 17:51:46 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 96c996db24fe..e591b47fc8b1 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount/Makefile,v 1.9 1999/08/28 00:13:24 peter Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index bc11a037ecfd..8bdc545263e6 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/extern.h,v 1.3 1999/08/28 00:13:24 peter Exp $
  */
 
 /* vfslist.c */
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index 84ad24f598a7..6868ad7c7cf5 100644
--- a/sbin/mount/getmntopts.3
+++ b/sbin/mount/getmntopts.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount/getmntopts.3,v 1.6 1999/08/28 00:13:25 peter Exp $
 .\"
 .Dd March 30, 1995
 .Dt GETMNTOPTS 3
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index ffc18bfac219..c5da85de57d3 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/getmntopts.c,v 1.9 1999/10/09 11:54:06 phk Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 73c3c15a838f..60540f4dd401 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/mntopts.h,v 1.16 1999/10/09 11:54:07 phk Exp $
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 93c8e3e822ba..ba8346530f56 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.31.2.1 2000/07/01 07:39:53 ps Exp $
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 65bcb5d1f0c6..808817f87f41 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/mount.c,v 1.39 2000/01/15 14:28:13 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index 3c0b6fcb711f..34fb80b9163e 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/mount_ufs.c,v 1.16 1999/08/28 00:13:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index d8201882eb33..4af5ab3c78f8 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/vfslist.c,v 1.4 1999/08/28 00:13:27 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 7e409fa3c74a..62b2d4c1242d 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.12 1999/11/15 03:13:23 kris Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_CD9660 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 665d22f64787..170986ca894a 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -49,7 +49,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.15 1999/10/09 11:54:08 phk Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 3360b90d91f5..6daa4de7a072 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.8,v 1.6 1999/08/28 00:13:29 peter Exp $
 .\"
 .Dd January 31, 1996
 .Dt MOUNT_EXT2FS 8
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index ded01952a936..f09cb4b9f13a 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.11 1999/10/09 11:54:09 phk Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index a238a28ae5f1..4ad3676fc111 100644
--- a/sbin/mount_hpfs/Makefile
+++ b/sbin/mount_hpfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_hpfs/Makefile,v 1.1 1999/12/09 19:09:14 semenu Exp $
 #
 
 PROG=	mount_hpfs
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index f45272e0e60d..5c4555b3438f 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.8,v 1.1 1999/12/09 19:09:15 semenu Exp $
 .\"
 .Dd May 20, 1999
 .Dt MOUNT_HPFS 8
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index 8ddf5bd56d9f..8d1f0a350dea 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.c,v 1.1 1999/12/09 19:09:15 semenu Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile
index f40994e7af13..393749e490c2 100644
--- a/sbin/mount_msdos/Makefile
+++ b/sbin/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdos/Makefile,v 1.14 2000/01/14 17:39:20 bde Exp $
 #
 
 PROG=	mount_msdos
diff --git a/sbin/mount_msdos/iso22dos b/sbin/mount_msdos/iso22dos
index 1f48193e473e..bf0b6a908ef8 100644
--- a/sbin/mount_msdos/iso22dos
+++ b/sbin/mount_msdos/iso22dos
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdos/iso22dos,v 1.1 2000/01/08 17:17:32 ache Exp $
 #
 # u2w: 16 rows of Latin2 -> Unicode conversion table (upper half)
 #
diff --git a/sbin/mount_msdos/koi2dos b/sbin/mount_msdos/koi2dos
index 4adb4259a26c..ab7f8f5ba85b 100644
--- a/sbin/mount_msdos/koi2dos
+++ b/sbin/mount_msdos/koi2dos
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdos/koi2dos,v 1.2 2000/01/08 16:47:54 ache Exp $
 #
 # u2w: 16 rows of KOI8-R -> Unicode conversion table (upper half)
 #
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index 8083d2f5f8f3..18d1219c911a 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_msdos/mount_msdos.8,v 1.19 2000/03/01 11:27:14 sheldonh Exp $
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 8265826239fb..a59ff9b0e324 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_msdos/mount_msdos.c,v 1.19.2.1 2000/07/20 10:35:13 kris Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 5e36bc8898b1..916f7719b514 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.8 2000/02/24 21:01:51 markm Exp $
 
 PROG=	mount_nfs
 SRCS=	mount_nfs.c getmntopts.c mounttab.c
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 5328beab8f21..9bd7601fee44 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.18.2.1 2000/07/18 17:38:29 sheldonh Exp $
 .\""
 .Dd March 29, 1995
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 41873cace7a7..0ca82e02fb12 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.36.2.1 2000/06/11 05:21:36 dillon Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 6a42178b7518..19a2fb2b2f8c 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ntfs/Makefile,v 1.2 1999/08/28 00:13:32 peter Exp $
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 1a757ec1e646..14c898a264e0 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.6 2000/03/01 11:27:17 sheldonh Exp $
 .\"
 .Dd Jan 3, 1999
 .Dt MOUNT_NTFS 8
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 95b86c22a9cf..2fd720835d11 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.c,v 1.3 1999/10/09 11:54:10 phk Exp $
  *
  */
 
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index 1e56e4f41520..126e90c416c8 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_null/mount_null.8,v 1.11.2.1 2000/05/15 14:56:13 hoek Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index cf6120863bac..19b33283842e 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_null/mount_null.c,v 1.13 1999/10/09 11:54:11 phk Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nwfs/Makefile b/sbin/mount_nwfs/Makefile
index 0c3d478f632a..2e2eb62d98c8 100644
--- a/sbin/mount_nwfs/Makefile
+++ b/sbin/mount_nwfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nwfs/Makefile,v 1.1.2.1 2000/07/01 07:42:36 ps Exp $
 
 PROG=	mount_nwfs
 SRCS=	mount_nwfs.c getmntopts.c
diff --git a/sbin/mount_nwfs/mount_nwfs.8 b/sbin/mount_nwfs/mount_nwfs.8
index b56d26c8e301..6bce4a30f2b8 100644
--- a/sbin/mount_nwfs/mount_nwfs.8
+++ b/sbin/mount_nwfs/mount_nwfs.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nwfs/mount_nwfs.8,v 1.7 2000/03/02 13:14:16 sheldonh Exp $
 .Dd Oct 14, 1999
 .Dt MOUNT_NWFS 8
 .Os FreeBSD 4.0
diff --git a/sbin/mount_nwfs/mount_nwfs.c b/sbin/mount_nwfs/mount_nwfs.c
index 02b45dde47a7..83c3ed1f0373 100644
--- a/sbin/mount_nwfs/mount_nwfs.c
+++ b/sbin/mount_nwfs/mount_nwfs.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_nwfs/mount_nwfs.c,v 1.4.2.1 2000/04/17 08:34:18 bp Exp $
  */
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 23a5bd771be8..a584afbb9188 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_portal/Makefile,v 1.10 1999/08/28 00:13:34 peter Exp $
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portal/activate.c b/sbin/mount_portal/activate.c
index 56464981471c..270b8e1e3411 100644
--- a/sbin/mount_portal/activate.c
+++ b/sbin/mount_portal/activate.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/activate.c,v 1.7 1999/08/28 00:13:35 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c
index d5833e4b2136..9b02ce787328 100644
--- a/sbin/mount_portal/conf.c
+++ b/sbin/mount_portal/conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/conf.c,v 1.8 1999/08/28 00:13:35 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/mount_portal.8 b/sbin/mount_portal/mount_portal.8
index 306a220c8aff..28d0687012ac 100644
--- a/sbin/mount_portal/mount_portal.8
+++ b/sbin/mount_portal/mount_portal.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.8 2000/03/01 11:27:20 sheldonh Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 48cf609df74e..d86eec531edd 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/mount_portal.c,v 1.16 1999/10/09 11:54:11 phk Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/pathnames.h b/sbin/mount_portal/pathnames.h
index 16720853c70a..a417f5b84ae3 100644
--- a/sbin/mount_portal/pathnames.h
+++ b/sbin/mount_portal/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_portal/pathnames.h,v 1.5 2000/01/10 09:33:37 kris Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portal/portal.conf b/sbin/mount_portal/portal.conf
index 53a07a92231c..56dfbd985168 100644
--- a/sbin/mount_portal/portal.conf
+++ b/sbin/mount_portal/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_portal/portal.conf,v 1.4 1999/08/28 00:13:37 peter Exp $
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index 4131834c5575..7ab8646af38c 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_portal/portald.h,v 1.5 1999/08/28 00:13:37 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c
index f158a73dd03d..268de75db26d 100644
--- a/sbin/mount_portal/pt_conf.c
+++ b/sbin/mount_portal/pt_conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_conf.c,v 1.6 1999/08/28 00:13:37 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c
index 359c78e92164..13a8ff26450f 100644
--- a/sbin/mount_portal/pt_exec.c
+++ b/sbin/mount_portal/pt_exec.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_exec.c,v 1.5 1999/08/28 00:13:37 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index f22ebd7d2b51..1733d5825316 100644
--- a/sbin/mount_portal/pt_file.c
+++ b/sbin/mount_portal/pt_file.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_file.c,v 1.8 1999/08/28 00:13:38 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c
index 49056163aae3..6d7c5f8e2252 100644
--- a/sbin/mount_portal/pt_tcp.c
+++ b/sbin/mount_portal/pt_tcp.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_tcp.c,v 1.9 1999/08/28 00:13:38 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 320bbf788096..bd7460b30bd6 100644
--- a/sbin/mount_std/Makefile
+++ b/sbin/mount_std/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/mount_std/Makefile,v 1.4.6.1 2000/03/25 13:43:17 des Exp $
 
 PROG=	mount_std
 SRCS=	mount_std.c getmntopts.c
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 3dc527b2566c..3912004b14e6 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9.2.1 2000/03/25 13:47:45 des Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 2a95764d8542..b1c24e18d1ba 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.10 1999/10/09 11:54:12 phk Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index 4c6abfa3e438..e47b7975e1b4 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_umap.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_umap/mount_umap.8,v 1.10 1999/08/28 00:13:40 peter Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_UMAP 8
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index 0aa7b8c075a3..1a96b6b21fb2 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.5 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_umap/mount_umap.c,v 1.15 1999/10/09 11:54:13 phk Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8
index 08a48044cdce..75fef097d422 100644
--- a/sbin/mount_union/mount_union.8
+++ b/sbin/mount_union/mount_union.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_union/mount_union.8,v 1.6 1999/08/28 00:13:41 peter Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_UNION 8
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index 1d5d3ebc504c..935d04f49982 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_union/mount_union.c,v 1.12 1999/10/09 11:54:14 phk Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index 0312e9b657e2..05cae2499233 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mountd/Makefile,v 1.9 1999/08/28 00:13:43 peter Exp $
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 6506b5b38eab..3abb6adcbd7d 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mountd/exports.5,v 1.10 2000/03/01 11:34:07 sheldonh Exp $
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index fdb62a17907b..6bff75d3fb3d 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mountd/mountd.8,v 1.16.2.1 2000/05/24 13:25:52 mpp Exp $
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index ffb1b6ebb525..004261cfbda6 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mountd.c	8.15 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mountd/mountd.c,v 1.39 1999/12/03 20:23:53 semenu Exp $";
 #endif /*not lint*/
 
 #include <sys/param.h>
diff --git a/sbin/mountd/netgroup.5 b/sbin/mountd/netgroup.5
index fb1a8bcd2a57..12cdc832edf9 100644
--- a/sbin/mountd/netgroup.5
+++ b/sbin/mountd/netgroup.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netgroup.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mountd/netgroup.5,v 1.10 2000/03/02 14:53:26 sheldonh Exp $
 .\"
 .Dd December 11, 1993
 .Dt NETGROUP 5
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index 87c165087231..0808d0f190a9 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/Makefile,v 1.4 1999/09/13 18:16:38 ru Exp $
 
 MAINTAINER	= ru@FreeBSD.org
 MAINTAINER     += ari@suutari.iki.fi
diff --git a/sbin/natd/README b/sbin/natd/README
index 8d1209c4fd91..a697e616476f 100644
--- a/sbin/natd/README
+++ b/sbin/natd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/README,v 1.1.4.1 2000/04/02 20:24:48 brian Exp $
 
 	A Network Address Translation Daemon for FreeBSD
 
diff --git a/sbin/natd/icmp.c b/sbin/natd/icmp.c
index 176addeee02d..fa7cfcb0cdd3 100644
--- a/sbin/natd/icmp.c
+++ b/sbin/natd/icmp.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/icmp.c,v 1.6 1999/08/28 00:13:45 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 0220e399414b..1e0b7a8085c1 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.27.2.5 2000/07/17 10:11:03 ru Exp $
 .Dd June 27, 2000
 .Dt NATD 8
 .Os FreeBSD
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index a41d540b4bda..7c8593042cf4 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/natd.c,v 1.25.2.3 2000/07/11 20:00:57 ru Exp $
  */
 
 #define SYSLOG_NAMES
diff --git a/sbin/natd/natd.h b/sbin/natd/natd.h
index ac0dd75de50d..94a65c967789 100644
--- a/sbin/natd/natd.h
+++ b/sbin/natd/natd.h
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/natd.h,v 1.4 1999/08/28 00:13:46 peter Exp $
  */
 
 #define PIDFILE	"/var/run/natd.pid"
diff --git a/sbin/natd/samples/natd.cf.sample b/sbin/natd/samples/natd.cf.sample
index d4dcd714bd92..db33c28aa2c9 100644
--- a/sbin/natd/samples/natd.cf.sample
+++ b/sbin/natd/samples/natd.cf.sample
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/samples/natd.cf.sample,v 1.5 1999/09/13 18:18:33 ru Exp $
 #
 #
 # Configuration file for natd.
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 615b5c2feb47..293ef575a23c 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.29 1999/08/28 00:13:50 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 1e1d3cd7852b..658445fcc94c 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.26 2000/03/01 11:27:24 sheldonh Exp $
 .\"
 .Dd May 3, 1995
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index cc86950a2500..45a83b2be9d8 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs/newfs.c,v 1.30.2.1 2000/07/01 11:33:40 ps Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index cdfd3a86aa0f..b6118665ef61 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs_msdos/Makefile,v 1.2 1999/08/28 00:13:52 peter Exp $
 
 PROG=	newfs_msdos
 MAN8=	newfs_msdos.8
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 36182269d163..0c39e6337655 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.7.2.2 2000/07/01 11:33:40 ps Exp $
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index a51c5cdb79a9..e44b535355ac 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.9.2.2 2000/07/01 08:07:49 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile
index a18aad017aa8..5c5934ee1a6b 100644
--- a/sbin/nfsd/Makefile
+++ b/sbin/nfsd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/nfsd/Makefile,v 1.10 2000/02/24 21:01:52 markm Exp $
 
 PROG=	nfsd
 CFLAGS+=-DNFS
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index f5d0efbff063..42802ff33a70 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nfsd/nfsd.8,v 1.12 2000/03/01 11:27:27 sheldonh Exp $
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index 9ff9d987cffe..07d46ca1d696 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nfsd/nfsd.c,v 1.15 1999/11/11 17:35:36 dillon Exp $";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 6ff15bfe2afb..29f0d592f05a 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nfsiod/nfsiod.8,v 1.9 2000/01/13 21:47:21 dillon Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 65ded3544c70..f9e38d3cfa2d 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.9 1999/08/28 00:13:55 peter Exp $";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sbin/nologin/nologin.5 b/sbin/nologin/nologin.5
index 8ce22a264715..61b7b73608c2 100644
--- a/sbin/nologin/nologin.5
+++ b/sbin/nologin/nologin.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nologin/nologin.5,v 1.7 1999/08/28 00:13:56 peter Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8
index d5f4cb7a5f0b..77c15bc0bc68 100644
--- a/sbin/nologin/nologin.8
+++ b/sbin/nologin/nologin.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nologin/nologin.8,v 1.4 1999/08/28 00:13:56 peter Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/sbin/nologin/nologin.sh b/sbin/nologin/nologin.sh
index 52279c19ea9a..001f6df37e9d 100644
--- a/sbin/nologin/nologin.sh
+++ b/sbin/nologin/nologin.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nologin.sh	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/nologin/nologin.sh,v 1.4 1999/08/28 00:13:57 peter Exp $
 #
 
 echo 'This account is currently not available.'
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index f6f74eefc128..05608aaae302 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.6 2000/03/01 11:27:29 sheldonh Exp $
 .\" 
 .Dd April 11, 1998
 .Dt NOS-TUN 8
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index ceed05fd6a7a..d011c7510ab3 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -57,7 +57,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nos-tun/nos-tun.c,v 1.6.2.1 2000/07/01 08:09:45 ps Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/sbin/pc98/Makefile b/sbin/pc98/Makefile
index 139ae4312544..ad8e047cce8d 100644
--- a/sbin/pc98/Makefile
+++ b/sbin/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pc98/Makefile,v 1.1.2.1 2000/03/31 03:24:30 nyan Exp $
 
 SUBDIR=	fdisk
 #NOTYET: nextboot
diff --git a/sbin/pc98/Makefile.inc b/sbin/pc98/Makefile.inc
index b915adff92ab..a5606086b50f 100644
--- a/sbin/pc98/Makefile.inc
+++ b/sbin/pc98/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pc98/Makefile.inc,v 1.1.2.1 2000/03/31 03:24:31 nyan Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/sbin/pc98/fdisk/Makefile b/sbin/pc98/fdisk/Makefile
index 481a000783fe..eb7169c292a7 100644
--- a/sbin/pc98/fdisk/Makefile
+++ b/sbin/pc98/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pc98/fdisk/Makefile,v 1.1.2.1 2000/03/31 03:24:33 nyan Exp $
 
 PROG=	fdisk
 MAN8=	fdisk.8
diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8
index 7b9d4140a154..1e99a1c21f7a 100644
--- a/sbin/pc98/fdisk/fdisk.8
+++ b/sbin/pc98/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/pc98/fdisk/fdisk.8,v 1.1.2.1 2000/03/31 03:24:33 nyan Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
diff --git a/sbin/pc98/fdisk/fdisk.c b/sbin/pc98/fdisk/fdisk.c
index 39faadd9cd21..6812e0f52e77 100644
--- a/sbin/pc98/fdisk/fdisk.c
+++ b/sbin/pc98/fdisk/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/pc98/fdisk/fdisk.c,v 1.1.2.2 2000/07/01 11:33:40 ps Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 808898f95541..fe8090eddeee 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping/Makefile,v 1.12 2000/01/07 19:06:54 msmith Exp $
 
 PROG=	ping
 MAN8=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index d0bffd3fd930..ed79cb76cfd0 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ping/ping.8,v 1.25 2000/03/01 11:27:30 sheldonh Exp $
 .\"
 .Dd March 1, 1997
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 39e6bec4f144..ef26dc0c340f 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ping/ping.c,v 1.52.2.1 2000/03/28 18:04:16 shin Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 3f671d7330b5..e95e13eea72a 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping6/Makefile,v 1.1.2.1 2000/07/15 07:24:47 kris Exp $
 
 PROG=	ping6
 MAN8=	ping6.8
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index f2e81f151e94..7df0b15ff127 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/ping6/ping6.8,v 1.3.2.3 2000/07/15 07:24:48 kris Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 06e68398f149..303d34cf6823 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -78,7 +78,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ping6/ping6.c,v 1.4.2.1 2000/07/15 07:24:48 kris Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 5a42e5ab67f8..fdb071fe356a 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.6 2000/03/01 11:27:33 sheldonh Exp $
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index a1e8487b34c1..b43bb0207e60 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.11 1999/08/28 00:14:01 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index c29ba7d08390..0198e0c7c0a4 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -38,7 +38,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.1 2000/05/13 14:43:14 hoek Exp $
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 9d6476386881..925905976704 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/reboot.8,v 1.10 2000/03/01 11:27:35 sheldonh Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index be3c81b04358..f437f6c77ad0 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/reboot/reboot.c,v 1.9 1999/11/21 21:52:40 jdp Exp $";
 #endif /* not lint */
 
 #include <sys/reboot.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 2da8e87cf64c..c1a150a9d084 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/restore/Makefile,v 1.13 2000/02/24 21:01:54 markm Exp $
 
 PROG=	restore
 LINKS=	${BINDIR}/restore ${BINDIR}/rrestore
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index f30eacdc9094..b7613bd90575 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/dirs.c,v 1.14.2.1 2000/07/21 09:00:08 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 05ca7428a45f..471a7002f4ff 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/restore/extern.h,v 1.5 1999/08/28 00:14:05 peter Exp $
  */
 
 struct entry	*addentry __P((char *, ino_t, int));
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index ca0bc842673b..66be5b0a9c08 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/interactive.c,v 1.8 1999/08/28 00:14:05 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index f6a6872c9847..7933f3c4d0c0 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/main.c,v 1.10 1999/08/28 00:14:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index f91184c79eed..ae42d4972a78 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/restore/restore.8,v 1.20.2.1 2000/07/01 08:10:59 ps Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 33496f39adaf..a4632eb91b3f 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/restore.c,v 1.7 1999/08/28 00:14:08 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index c20521373632..2ee8fcd3df3b 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/symtab.c,v 1.7 1999/08/28 00:14:08 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 21ac8b11294f..1b3ba31d893e 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/tape.c,v 1.16.2.1 2000/07/21 09:00:08 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index b51f90c3a8f7..a7b2ce569f41 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utilities.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/utilities.c,v 1.8 1999/08/28 00:14:09 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index f10eff6f8fe2..7147481be460 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/route/Makefile,v 1.11 1999/12/15 05:13:21 shin Exp $
 
 PROG=	route
 MAN8=	route.8
diff --git a/sbin/route/keywords b/sbin/route/keywords
index 00080a797483..877e652256bf 100644
--- a/sbin/route/keywords
+++ b/sbin/route/keywords
@@ -1,5 +1,5 @@
 #	@(#)keywords	8.2 (Berkeley) 3/19/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/route/keywords,v 1.4 1999/12/07 17:38:53 shin Exp $
 
 add
 atalk
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index d8a36b9e0f74..9cb165d3251b 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/route/route.8,v 1.17 1999/12/07 17:38:53 shin Exp $
 .\"
 .Dd March 19, 1994
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index a25ee24cf338..8ee2b6dc890f 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/route/route.c,v 1.40 2000/03/11 20:52:01 shin Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 5ca5f196aa1a..25f0ca1faa44 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` for FreeBSD
-# $FreeBSD$
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/Makefile,v 1.8 1999/09/05 17:49:11 peter Exp $
+# $FreeBSD: src/sbin/routed/Makefile,v 1.8 1999/09/05 17:49:11 peter Exp $
 
 PROG=   routed
 SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index aba95e3a27cd..61d9b8733562 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -32,11 +32,11 @@
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/defs.h,v 1.13 1999/09/05 17:49:11 peter Exp $
  */
 
 #ifdef  sgi
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/defs.h,v 1.13 1999/09/05 17:49:11 peter Exp $"
 #endif
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 2e505b5005cd..df886697c3f0 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/if.c,v 1.6 1999/09/05 17:49:11 peter Exp $
  */
 
 #include "defs.h"
@@ -42,7 +42,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #include <sys/cdefs.h>
 __RCSID("$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/if.c,v 1.6 1999/09/05 17:49:11 peter Exp $"
 
 struct interface *ifnet;		/* all interfaces */
 
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index f1bfa379b59d..cff3932e6375 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/input.c,v 1.7 1999/09/05 17:49:11 peter Exp $
  */
 
 #include "defs.h"
@@ -41,7 +41,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)input.c	8.1 (Berkeley) 6/5/9
 #include <sys/cdefs.h>
 __RCSID("$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/input.c,v 1.7 1999/09/05 17:49:11 peter Exp $"
 
 static void input(struct sockaddr_in *, struct interface *, struct interface *,
 		  struct rip *, int);
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index cf4edba8338e..5716c7503d31 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/main.c,v 1.11 1999/09/05 17:49:11 peter Exp $
  */
 
 #include "defs.h"
@@ -52,7 +52,7 @@ __RCSID("$NetBSD$");
 __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/main.c,v 1.11 1999/09/05 17:49:11 peter Exp $"
 
 
 pid_t	mypid;
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index 0545c342b76e..389cedf10391 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/output.c,v 1.5 1999/09/05 17:49:11 peter Exp $
  */
 
 #include "defs.h"
@@ -40,7 +40,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)output.c	8.1 (Berkeley) 6/5/
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/output.c,v 1.5 1999/09/05 17:49:11 peter Exp $"
 
 
 u_int update_seqno;
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index abea5f6e4ceb..3aded4a95019 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/parms.c,v 1.7 1999/09/05 17:49:11 peter Exp $
  */
 
 #include "defs.h"
@@ -42,7 +42,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/parms.c,v 1.7 1999/09/05 17:49:11 peter Exp $"
 
 
 struct parm *parms;
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index b99bcc24d28e..be7d782cf1ed 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/pathnames.h,v 1.5 1999/08/28 00:14:16 peter Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index edbf2361aeba..fc6c1930b4c6 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -32,7 +32,7 @@
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/radix.c,v 1.5 1999/09/05 17:49:11 peter Exp $
  */
 
 /*
@@ -46,7 +46,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c	8.1 (Berkeley) x/y/9
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/radix.c,v 1.5 1999/09/05 17:49:11 peter Exp $"
 
 #define log(x, msg) syslog(x, msg)
 #define panic(s) {log(LOG_ERR,s); exit(1);}
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index ab3bf620cffa..4c1c6b76e05c 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -32,7 +32,7 @@
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/radix.h,v 1.4 1999/08/28 00:14:17 peter Exp $
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index dd99b8df212f..4cc9b7317abf 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/rdisc.c,v 1.5 1999/09/05 17:49:11 peter Exp $
  */
 
 #include "defs.h"
@@ -43,7 +43,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c	8.1 (Berkeley) x/y/9
 #elif defined(__NetBSD__)
 __RCSID"$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/rdisc.c,v 1.5 1999/09/05 17:49:11 peter Exp $"
 
 /* router advertisement ICMP packet */
 struct icmp_ad {
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 1bf9646d7173..eba853458ce0 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/routed.8,v 1.15 1999/11/15 02:53:31 kris Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/routed.8,v 1.15 1999/11/15 02:53:31 kris Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 3e8049dd6273..6d5c2d947380 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` tools for BSD/OS
 # $Revision: 1.6 $
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/rtquery/Makefile,v 1.7 1999/08/28 00:14:20 peter Exp $
 
 PROG=	rtquery
 MAN8=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index c7dcab7e157d..90015be121cd 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,5 +1,5 @@
 .\" $Revision: 1.10 $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.11 1999/08/28 00:14:20 peter Exp $
 .\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 1441699f1aea..f2bed60c61c0 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/rtquery/rtquery.c,v 1.13 1999/08/28 00:14:21 peter Exp $
  */
 
 char copyright[] =
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 90176e3149ac..81267da0b15a 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/table.c,v 1.9.2.1 2000/03/30 07:14:52 shin Exp $
  */
 
 #include "defs.h"
@@ -40,7 +40,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)tables.c	8.1 (Berkeley) 6/5/
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/table.c,v 1.9.2.1 2000/03/30 07:14:52 shin Exp $"
 
 static struct rt_spare *rts_better(struct rt_entry *);
 static struct rt_spare rts_empty = {0,0,0,HOPCNT_INFINITY,0,0,0};
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 886f7ee49722..ef58fe4a74ad 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/trace.c,v 1.5 1999/09/05 17:49:11 peter Exp $
  */
 
 #define	RIPCMDS
@@ -45,7 +45,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)trace.c	8.1 (Berkeley) 6/5/9
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/trace.c,v 1.5 1999/09/05 17:49:11 peter Exp $"
 
 
 #ifdef sgi
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index 4926191fd5ee..3ee756b1a00c 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -11,7 +11,7 @@
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
-# $FreeBSD$
+# $FreeBSD: src/sbin/rtsol/Makefile,v 1.1.2.1 2000/07/15 07:24:48 kris Exp $
 
 SRCDIR=	${.CURDIR}/../../usr.sbin/rtsold
 
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 37e1f7184e07..8a31070afbcf 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.8 1999/08/28 00:14:21 peter Exp $
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index b5b0d4422430..8e6d0bcbbf63 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)savecore.c	8.3 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/savecore/savecore.c,v 1.28.2.3 2000/07/04 01:18:09 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index bf2276b830f4..38295f7c81b8 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.8	8.2 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/shutdown/shutdown.8,v 1.12 1999/08/28 00:14:23 peter Exp $
 .\"
 .Dd Dec 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index cf40b3d0a045..52cbcaca6a0b 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/shutdown/shutdown.c,v 1.21 1999/08/28 00:14:24 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index defa38531c41..3e488a9decb2 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/11/90
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/slattach/Makefile,v 1.9 1999/08/28 00:14:24 peter Exp $
 
 PROG=	slattach
 SRCS=   slattach.c
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index 6bdb275cd2be..e5241ce01633 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/slattach/slattach.8,v 1.16 2000/03/01 11:27:39 sheldonh Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index ba599ba49875..90737c6065b8 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/slattach/slattach.c,v 1.36 1999/08/28 00:14:25 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index d9d8dde88118..128ab9b687a1 100644
--- a/sbin/spppcontrol/spppcontrol.8
+++ b/sbin/spppcontrol/spppcontrol.8
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.6.2.1 2000/05/10 09:53:31 sheldonh Exp $
 .\"
 .Dd October 11, 1997
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index 15af6b40d714..439d88196d31 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.7 1999/08/28 00:14:26 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 285816b5edee..c4ea78c13857 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.16 2000/03/01 11:26:55 sheldonh Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index f273ab3d6553..dfe6898854f4 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)startslip.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/startslip/startslip.c,v 1.31.2.1 2000/05/07 18:26:51 joe Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 8779299ab388..10ecaea48bf3 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.15 2000/02/28 21:29:37 gsutter Exp $
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 23b577ac7643..0f2f5e21c7ee 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/swapon/swapon.c,v 1.8.2.1 2000/07/01 06:31:52 ps Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index bbfa805063c3..3e7118f1e3db 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/sysctl/Makefile,v 1.5 1999/08/28 00:14:29 peter Exp $
 
 PROG=	sysctl
 MAN8=	sysctl.8
diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c
index 73777e37dca0..8fd57665c50f 100644
--- a/sbin/sysctl/pathconf.c
+++ b/sbin/sysctl/pathconf.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pathconf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/sysctl/pathconf.c,v 1.4 1999/08/28 00:14:30 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 8889963a96e0..d83676ca6a4f 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.23.2.1 2000/07/26 08:54:43 sheldonh Exp $
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index ee7ee729ca91..e5a1f4b3b568 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: sysctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.25.2.1 2000/07/19 06:22:20 kbyanc Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index ae86c7b923f0..884e9259e1b7 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.11 2000/03/01 11:27:43 sheldonh Exp $
 .\"
 .Dd December 11, 1993
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 42aa1c1d4cd0..d7b3bba2e1df 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.11.2.1 2000/03/14 09:16:28 sheldonh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 0ffd0f7251f1..fc019532398f 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/umount/Makefile,v 1.6 1999/11/22 04:23:11 dillon Exp $
 
 PROG=	umount
 SRCS=	umount.c vfslist.c mounttab.c
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index d8222da1a304..7a54bae8c1bb 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.7.2.1 2000/07/13 16:41:41 dwmalone Exp $
 .\"
 .Dd May 8, 1995
 .Dt UMOUNT 8
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 93b50c042fa7..9935c3a7150b 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/umount/umount.c,v 1.22 1999/11/22 04:23:11 dillon Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index 7207884456c9..1ffcb782c9e0 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/vinum/Makefile,v 1.12 2000/01/03 12:01:26 marcel Exp $
 
 MAINTAINER  =  grog@FreeBSD.org
 PROG=	vinum
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index 3b87ef316b6d..d6734e4055ec 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -37,7 +37,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: commands.c,v 1.12 2000/03/01 03:03:53 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/commands.c,v 1.31.2.2 2000/06/08 01:53:16 grog Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index 2b1f4aafeee8..80476e0e4ba2 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -40,7 +40,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: list.c,v 1.23 2000/03/01 02:38:55 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/list.c,v 1.25.2.2 2000/06/08 01:53:16 grog Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index 6e392056a5b2..a7f64ecd15f5 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -37,7 +37,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: v.c,v 1.30 2000/05/07 04:20:53 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/v.c,v 1.26.2.2 2000/06/08 01:53:16 grog Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/vinum/vext.h b/sbin/vinum/vext.h
index fa578324aac8..60888cf1675c 100644
--- a/sbin/vinum/vext.h
+++ b/sbin/vinum/vext.h
@@ -36,7 +36,7 @@
 
 /*
  * $Id: vext.h,v 1.17 2000/05/07 04:17:12 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/vext.h,v 1.16.2.2 2000/06/08 01:53:16 grog Exp $
  */
 
 #define MAXARGS 64					    /* maximum number of args on a line */
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index b4dbd8f61402..a5bfbebe6910 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" $Id: vinum.8,v 1.13 2000/01/03 03:12:56 grog Exp grog $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.33.2.3 2000/06/08 07:27:35 grog Exp $
 .\"
 .Dd 13 October 1999
 .Dt vinum 8