release/5.2.1_cvs

author: cvs2svn <cvs2svn@FreeBSD.org> 2004-02-23 15:32:56 +0000
committer: cvs2svn <cvs2svn@FreeBSD.org> 2004-02-23 15:32:56 +0000
commit: 84a7b99b4e02a260bf7ff9b540032f4cb7bc612a (patch)
tree: 85059f7e88bcf124efae7c17bd99cfa18627a8c4 /sbin
parent: a28c3ad292f6f6cbe1c4ff05efb3d53eb45f17ff (diff)
423 files changed, 445 insertions, 445 deletions
diff --git a/sbin/Makefile b/sbin/Makefile
index 58b004b377e6..97b1af3e59fa 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.130.2.1 2004/01/10 04:11:22 scottl Exp $
 
 # XXX MISSING:		icheck ncheck
 
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index b6450e7f49a2..d50c5939d5fa 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/Makefile.inc,v 1.12 2003/11/19 16:59:00 marcel Exp $
 
 BINDIR?=	/sbin
 WARNS?=	2
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index 27c128916f9b..cd38438b55d6 100644
--- a/sbin/adjkerntz/Makefile
+++ b/sbin/adjkerntz/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/adjkerntz/Makefile,v 1.6 2001/12/04 02:19:43 obrien Exp $
 
 PROG=   adjkerntz
 MAN=	adjkerntz.8
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 84e84914aad6..174662dc8f59 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.27 2002/08/21 18:09:45 trhodes Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 40669c206408..ac70e238eecc 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -32,7 +32,7 @@ static const char copyright[] =
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.28 2003/05/03 18:41:55 obrien Exp $");
 
 /*
  * Andrey A. Chernov   <ache@astral.msk.su>    Dec 20 1993
diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 73b916080d42..6cf21e7317ba 100644
--- a/sbin/atacontrol/Makefile
+++ b/sbin/atacontrol/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sbin/atacontrol/Makefile,v 1.8 2003/11/05 19:20:41 johan Exp $
 
 PROG=	atacontrol
 MAN=	atacontrol.8
diff --git a/sbin/atacontrol/atacontrol.8 b/sbin/atacontrol/atacontrol.8
index 2f6945721943..f0784d4e6dcd 100644
--- a/sbin/atacontrol/atacontrol.8
+++ b/sbin/atacontrol/atacontrol.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.23 2003/05/02 12:42:31 sos Exp $
 .\"
 .Dd May 17, 2001
 .Dt ATACONTROL 8
diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c
index d5440d613e27..a64b693a0276 100644
--- a/sbin/atacontrol/atacontrol.c
+++ b/sbin/atacontrol/atacontrol.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.28 2003/11/05 21:56:21 johan Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index ed7ca1a849a7..76d5a00fa59a 100644
--- a/sbin/atm/Makefile
+++ b/sbin/atm/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/Makefile,v 1.5 2003/08/18 15:32:16 obrien Exp $
 
 SUBDIR=	atm \
 	atmconfig \
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index 3d5738afdbc4..29cdbeba00cb 100644
--- a/sbin/atm/Makefile.inc
+++ b/sbin/atm/Makefile.inc
@@ -21,6 +21,6 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile.inc,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/Makefile.inc,v 1.5 2003/08/18 15:32:16 obrien Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index a29e54dd9d82..a075bd6000a1 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/atm/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atm/Makefile,v 1.10 2003/08/18 15:32:16 obrien Exp $
 
 PROG=	atm
 SRCS=	atm.c atm_fore200.c atm_eni.c atm_inet.c atm_print.c \
diff --git a/sbin/atm/atm/atm.8 b/sbin/atm/atm/atm.8
index 25c4b75d1718..d1b6afa6245f 100644
--- a/sbin/atm/atm/atm.8
+++ b/sbin/atm/atm/atm.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/atm/atm.8,v 1.6 2003/07/28 15:27:12 harti Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/atm/atm.c b/sbin/atm/atm/atm.c
index 356098e85d3e..837da6d2af51 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.9 2003/08/11 07:14:10 harti Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.9 2003/08/11 07:14:10 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h
index 7ecae34a4b3f..330bedef93c1 100644
--- a/sbin/atm/atm/atm.h
+++ b/sbin/atm/atm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.8 2003/07/29 13:37:04 harti Exp $
  *
  */
 
diff --git a/sbin/atm/atm/atm_eni.c b/sbin/atm/atm/atm_eni.c
index 8907aa4513ef..95d041377885 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.7 2003/07/29 13:37:04 harti Exp $
  *
  */
 
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_eni.c,v 1.7 2003/07/29 13:37:04 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index 6c178bfebade..78e7ad16fc7d 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.7 2003/07/29 13:37:04 harti Exp $
  *
  */
 
@@ -59,7 +59,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_fore200.c,v 1.7 2003/07/29 13:37:04 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_inet.c b/sbin/atm/atm/atm_inet.c
index b0e6be8e1fd5..1a1343c962d0 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.7 2003/07/29 13:37:04 harti Exp $
  *
  */
 
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_inet.c,v 1.7 2003/07/29 13:37:04 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_print.c b/sbin/atm/atm/atm_print.c
index 727422ce2c41..33bf7eb14fde 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.7 2003/07/28 08:14:27 harti Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_print.c,v 1.7 2003/07/28 08:14:27 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_set.c b/sbin/atm/atm/atm_set.c
index dc87df94df56..bb2e60f6bc88 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.7 2003/07/29 13:37:04 harti Exp $
  *
  */
 
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_set.c,v 1.7 2003/07/29 13:37:04 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c
index 5daf214c2c65..3aa1113a36ad 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.8 2003/07/29 13:37:04 harti Exp $
  *
  */
 
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_show.c,v 1.8 2003/07/29 13:37:04 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_subr.c b/sbin/atm/atm/atm_subr.c
index 6f03435b7a91..019938c838da 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.8 2003/07/29 13:37:04 harti Exp $
  *
  */
 
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_subr.c,v 1.8 2003/07/29 13:37:04 harti Exp $");
 #endif
 
 
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index 1146737a49bf..ae86554b3abd 100644
--- a/sbin/atm/atmconfig/Makefile
+++ b/sbin/atm/atmconfig/Makefile
@@ -3,7 +3,7 @@
 #	All rights reserved.
 # Author: Harti Brandt <brandt@fokus.gmd.de>
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/Makefile,v 1.2 2003/08/18 15:35:18 obrien Exp $
 
 PROG=	atmconfig
 SRCS=	main.c diag.c natm.c
diff --git a/sbin/atm/atmconfig/atmconfig.8 b/sbin/atm/atmconfig/atmconfig.8
index a28baf99e635..79b281d1bae4 100644
--- a/sbin/atm/atmconfig/atmconfig.8
+++ b/sbin/atm/atmconfig/atmconfig.8
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@freebsd.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atm/atmconfig/atmconfig.8,v 1.1 2003/08/12 14:25:56 harti Exp $
 .\"
 .Dd August 11, 2003
 .Dt ATMCONFIG 8
diff --git a/sbin/atm/atmconfig/atmconfig.h b/sbin/atm/atmconfig/atmconfig.h
index bbc7a1cc9293..7a65e98e0934 100644
--- a/sbin/atm/atmconfig/atmconfig.h
+++ b/sbin/atm/atmconfig/atmconfig.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/atmconfig.h,v 1.1 2003/08/12 14:25:56 harti Exp $
  */
 #ifndef _ATMCONFIG_H
 #define	_ATMCONFIG_H
diff --git a/sbin/atm/atmconfig/atmconfig.help b/sbin/atm/atmconfig/atmconfig.help
index f0384bf113e3..1f8a340e4cbc 100644
--- a/sbin/atm/atmconfig/atmconfig.help
+++ b/sbin/atm/atmconfig/atmconfig.help
@@ -1,7 +1,7 @@
 #
 # Help file for the atmconfig utility
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/atmconfig.help,v 1.1 2003/08/12 14:25:56 harti Exp $
 #
 ^0 intro
 ATM configuration utility.
diff --git a/sbin/atm/atmconfig/diag.c b/sbin/atm/atmconfig/diag.c
index acd83bb6fb06..b7d73a59acd9 100644
--- a/sbin/atm/atmconfig/diag.c
+++ b/sbin/atm/atmconfig/diag.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/diag.c,v 1.2 2003/10/29 13:14:39 harti Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/atm/atmconfig/diag.h b/sbin/atm/atmconfig/diag.h
index 2ed4f39df28e..66c130d01fa1 100644
--- a/sbin/atm/atmconfig/diag.h
+++ b/sbin/atm/atmconfig/diag.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/diag.h,v 1.1 2003/08/12 14:25:57 harti Exp $
  */
 
 struct diagif {
diff --git a/sbin/atm/atmconfig/main.c b/sbin/atm/atmconfig/main.c
index fcdcd069754d..35b4a2a9f732 100644
--- a/sbin/atm/atmconfig/main.c
+++ b/sbin/atm/atmconfig/main.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/main.c,v 1.2 2003/08/20 08:25:36 harti Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/atm/atmconfig/natm.c b/sbin/atm/atmconfig/natm.c
index a383f8fbf924..acf617d77067 100644
--- a/sbin/atm/atmconfig/natm.c
+++ b/sbin/atm/atmconfig/natm.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/natm.c,v 1.1 2003/08/12 14:25:57 harti Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/atm/atmconfig/private.h b/sbin/atm/atmconfig/private.h
index 4b1606044154..9e3a49d8ea4e 100644
--- a/sbin/atm/atmconfig/private.h
+++ b/sbin/atm/atmconfig/private.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/private.h,v 1.1 2003/08/12 14:25:57 harti Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sbin/atm/fore_dnld/COPYRIGHT b/sbin/atm/fore_dnld/COPYRIGHT
index f934d4293724..771e38e69db8 100644
--- a/sbin/atm/fore_dnld/COPYRIGHT
+++ b/sbin/atm/fore_dnld/COPYRIGHT
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sbin/atm/fore_dnld/COPYRIGHT,v 1.1 2000/02/15 13:20:57 phk Exp $
 
 This copyright applies to the microcode image in the file pca200e.c.
 
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index abcec31b2363..f7484775d2dd 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/fore_dnld/Makefile,v 1.11 2003/08/18 15:32:16 obrien Exp $
 
 PROG=	fore_dnld
 MAN=	fore_dnld.8
diff --git a/sbin/atm/fore_dnld/fore_dnld.8 b/sbin/atm/fore_dnld/fore_dnld.8
index a152e216426d..637a0cfc2ffa 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.7 2003/07/31 14:26:07 harti Exp $
 .\"
 .\"
 .Dd December 3, 1996
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index bc3cde94eb78..ea16af8bcf9a 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.15 2003/07/31 14:26:07 harti Exp $
  *
  */
 
@@ -65,7 +65,7 @@
 #include <unistd.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.15 2003/07/31 14:26:07 harti Exp $");
 #endif
 
 extern u_char pca200e_microcode_3[];
diff --git a/sbin/atm/fore_dnld/pca200e.c b/sbin/atm/fore_dnld/pca200e.c
index c208a4ddf3a1..4b7b87bca864 100644
--- a/sbin/atm/fore_dnld/pca200e.c
+++ b/sbin/atm/fore_dnld/pca200e.c
@@ -36,7 +36,7 @@
  * This are binary copies of the PCA200E firmware versions 3.0.1 and
  * 4.1.12
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/fore_dnld/pca200e.c,v 1.2 2003/07/31 14:26:07 harti Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index cfd0270b141a..ec592243c2a4 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/ilmid/Makefile,v 1.11 2003/08/18 15:32:16 obrien Exp $
 
 PROG=	ilmid
 MAN=	ilmid.8
diff --git a/sbin/atm/ilmid/ilmid.8 b/sbin/atm/ilmid/ilmid.8
index a3b526577e7c..ca2d9b76700a 100644
--- a/sbin/atm/ilmid/ilmid.8
+++ b/sbin/atm/ilmid/ilmid.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.5 2002/07/06 19:32:30 charnier Exp $
 .\"
 .\"
 .Dd September 14, 1998
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 257f1a056f50..cebaaa818f4a 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.31 2003/07/25 08:15:09 harti Exp $
  *
  */
 
@@ -75,7 +75,7 @@
 #include <ctype.h>
 
 #ifndef	lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.31 2003/07/25 08:15:09 harti Exp $");
 #endif
 
 
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index a39227716b77..57bdd837b4f5 100644
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/badsect/Makefile,v 1.8 2003/02/22 21:33:42 johan Exp $
 
 PROG=	badsect
 DPADD=	${LIBUFS}
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index f5b6901cec0f..a532eea44c52 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.19 2003/06/08 12:40:50 charnier Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 3dd25989fffb..a47ce124e3de 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -43,7 +43,7 @@ static const char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/badsect/badsect.c,v 1.19 2003/05/03 18:41:56 obrien Exp $");
 
 /*
  * badsect
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index 92250ae06e0f..1d926bf6501d 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.18 2003/05/23 06:08:28 peter Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index e74c603d86af..10c9056f7817 100644
--- a/sbin/bsdlabel/bsdlabel.5
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.16 2003/09/10 19:24:34 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 7ee0065a244c..74baff50f589 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.55 2003/09/08 19:57:18 ru Exp $
 .\"
 .Dd March 15, 2003
 .Dt BSDLABEL 8
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 094e84a38430..b98d9869e667 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.103 2003/10/18 19:32:35 phk Exp $");
 
 #include <sys/param.h>
 #include <stdint.h>
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index c09d4692c94a..1117dd1b8618 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/bsdlabel/pathnames.h,v 1.4 2000/01/11 07:28:46 bde Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/bsdlabel/runtest.sh b/sbin/bsdlabel/runtest.sh
index 9d561f39ab82..7513dce3512c 100644
--- a/sbin/bsdlabel/runtest.sh
+++ b/sbin/bsdlabel/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/bsdlabel/runtest.sh,v 1.5 2003/06/07 09:09:39 phk Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index ebc56dd74a11..c8987ac4b9d0 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.15 2003/08/05 09:19:07 johan Exp $
 
 PROG=	camcontrol
 SRCS=	camcontrol.c util.c
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 84c3bf9a48e3..475a5bcf6d28 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.36 2002/12/17 06:05:21 njl Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 3b4889e8c361..5951b1492913 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.51 2003/08/05 09:19:07 johan Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index eebbe8553ed5..55b757870fa6 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/camcontrol/camcontrol.h,v 1.4 2000/08/08 06:24:15 kbyanc Exp $
  */
 
 #ifndef _CAMCONTROL_H
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 1702f1990e72..9e43511c3328 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.16 2003/08/22 01:56:17 imp Exp $");
 
 #include <sys/queue.h>
 #include <sys/types.h>
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 67f4e4f0cd15..57a9b195c530 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -44,7 +44,7 @@
  * from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/util.c,v 1.10 2003/08/05 09:19:07 johan Exp $");
 
 #include <sys/stdint.h>
 #include <sys/types.h>
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index ac7558409ed6..66bbcb0ef7e7 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.10 2003/08/07 19:10:35 johan Exp $
 
 PROG=	ccdconfig
 WARNS?=	6
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index fb8167c8b048..143952de9684 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.25 2003/02/23 01:47:49 ru Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index c7baa9826c82..fff0c86a72b7 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.34 2003/08/07 19:10:35 johan Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 538cfeda096d..b762105f8788 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ccdconfig/pathnames.h,v 1.2 2003/01/17 14:53:53 phk Exp $
  */
 
 #define _PATH_CCDCONF		"/etc/ccd.conf"
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index c68c312f269b..e89723640f7f 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/clri/Makefile,v 1.6 2001/12/04 02:19:44 obrien Exp $
 
 PROG=	clri
 MAN=	clri.8
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 1e42d47fd48a..65927a69a6a1 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.13 2002/10/18 01:05:46 keramida Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 95f63ff8e0c2..c6c3c78cab92 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/clri/clri.c,v 1.13 2003/05/03 18:41:56 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index a7720d81b41e..ca636f9d70ce 100644
--- a/sbin/comcontrol/Makefile
+++ b/sbin/comcontrol/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.4 (Berkeley) 6/5/91
-# $FreeBSD$
+# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.7 2003/08/08 19:51:01 johan Exp $
 
 PROG=	comcontrol
 MAN=	comcontrol.8
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 2d34eb104248..066cf22d9edd 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.25 2002/07/06 19:32:40 charnier Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 753ded36d1a9..a974a064003d 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.14 2003/08/08 19:51:01 johan Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile
index ddd2434e6cc5..609206b5a594 100644
--- a/sbin/conscontrol/Makefile
+++ b/sbin/conscontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/conscontrol/Makefile,v 1.5 2001/12/04 02:19:44 obrien Exp $
 
 PROG=	conscontrol
 MAN=	conscontrol.8
diff --git a/sbin/conscontrol/conscontrol.8 b/sbin/conscontrol/conscontrol.8
index 6a8010dc29db..aba3cddf4a45 100644
--- a/sbin/conscontrol/conscontrol.8
+++ b/sbin/conscontrol/conscontrol.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/conscontrol/conscontrol.8,v 1.4 2002/07/06 19:32:42 charnier Exp $
 .\"
 .Dd October 23, 2001
 .Dt CONSCONTROL 8
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index 329a54b6fa13..22a0504b2080 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/conscontrol/conscontrol.c,v 1.2 2001/10/25 16:41:38 jlemon Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 8e1122eaf3cb..0b8b433875a9 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devd/Makefile,v 1.5 2003/08/17 08:40:49 gordon Exp $
 
 PROG_CXX=devd
 SRCS=	devd.cc token.l parse.y y.tab.h
diff --git a/sbin/devd/devd.8 b/sbin/devd/devd.8
index e8fecfeeb99f..fc10037195f8 100644
--- a/sbin/devd/devd.8
+++ b/sbin/devd/devd.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devd/devd.8,v 1.10 2003/09/26 12:24:16 rse Exp $
 .\"
 .Dd October 17, 2002
 .Dt DEVD 8
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 71a0f29aa6cc..bad50954b0f3 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -34,7 +34,7 @@
 //	  - devd.conf needs more details on the supported statements.
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.17 2003/10/24 22:02:29 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index 1452eca524f2..638a8f07dd5e 100644
--- a/sbin/devd/devd.conf.5
+++ b/sbin/devd/devd.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.8 2003/03/03 11:51:30 ru Exp $
 .\"
 .\" The section on comments was taken from named.conf.5, which has the
 .\" following copyright:
diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h
index 8a032e4d4db2..80639b4b013b 100644
--- a/sbin/devd/devd.h
+++ b/sbin/devd/devd.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/devd.h,v 1.4 2003/10/24 22:02:29 imp Exp $
  */
 
 #ifndef DEVD_H
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index 4730267c938e..e67bed7265ce 100644
--- a/sbin/devd/devd.hh
+++ b/sbin/devd/devd.hh
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/devd.hh,v 1.2 2003/10/24 22:02:29 imp Exp $
  */
 
 #ifndef DEVD_HH
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 9269ef27800c..b2489f0f90b7 100644
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/parse.y,v 1.4 2003/10/24 22:02:29 imp Exp $
  */
 
 #include "devd.h"
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 0aa8cb6df5dd..e39fc4138f94 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/token.l,v 1.5 2003/10/24 22:02:29 imp Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index 95d2540272e6..a176a641d477 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devfs/Makefile,v 1.2 2002/07/28 06:52:47 dd Exp $
 
 PROG=	devfs
 SRCS=	devfs.c rule.c
diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index 1d7d44259545..9ef415b8e2c6 100644
--- a/sbin/devfs/devfs.8
+++ b/sbin/devfs/devfs.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.8 2003/09/14 13:41:57 ru Exp $
 .\"
 .Dd July 1, 2002
 .Dt DEVFS 8
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 92d1c0f3a323..46a85a402e98 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devfs/devfs.c,v 1.4 2002/07/29 17:09:21 mike Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h
index d2c38ac90948..41fdf8b58b8a 100644
--- a/sbin/devfs/extern.h
+++ b/sbin/devfs/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devfs/extern.h,v 1.2 2002/07/28 06:45:30 dd Exp $
  */
 
 #ifndef __DEVFS_H__
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index f1fd908753e3..50dbc2987181 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devfs/rule.c,v 1.4 2002/07/28 06:59:40 dd Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 372adfdfd47a..7a9d6b1655ef 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ISC DHCP client.
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile,v 1.20 2003/06/29 18:46:17 gordon Exp $
 
 SUBDIR= common dst minires omapip dhcpctl client omshell
 
diff --git a/sbin/dhclient/Makefile.inc b/sbin/dhclient/Makefile.inc
index d6b80609e40c..261b1a021d21 100644
--- a/sbin/dhclient/Makefile.inc
+++ b/sbin/dhclient/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile.inc,v 1.7 2003/11/30 21:09:58 murray Exp $
 
 MAINTAINER=     mbr
 
diff --git a/sbin/dhclient/client/Makefile b/sbin/dhclient/client/Makefile
index c82c9122b34e..eea8cbde88e4 100644
--- a/sbin/dhclient/client/Makefile
+++ b/sbin/dhclient/client/Makefile
@@ -1,5 +1,5 @@
 # client
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/client/Makefile,v 1.3 2003/06/29 18:46:18 gordon Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/common/Makefile b/sbin/dhclient/common/Makefile
index 5d4bb92f6e83..1031809481bc 100644
--- a/sbin/dhclient/common/Makefile
+++ b/sbin/dhclient/common/Makefile
@@ -1,5 +1,5 @@
 # common
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/common/Makefile,v 1.3 2002/05/13 11:09:05 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/dhclient-script.sh b/sbin/dhclient/dhclient-script.sh
index d35eafeff193..b1ba4cc754d2 100644
--- a/sbin/dhclient/dhclient-script.sh
+++ b/sbin/dhclient/dhclient-script.sh
@@ -35,7 +35,7 @@
 #############################################################################
 # $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $
 # $MindStep_Tag: CONTRIB_19991207 $
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhclient-script.sh,v 1.2 2002/02/01 18:46:58 alfred Exp $
 #############################################################################
 
 
diff --git a/sbin/dhclient/dhcpctl/Makefile b/sbin/dhclient/dhcpctl/Makefile
index 1f3ecbd07164..94db9910b3ac 100644
--- a/sbin/dhclient/dhcpctl/Makefile
+++ b/sbin/dhclient/dhcpctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhcpctl/Makefile,v 1.1 2003/03/25 03:16:52 mdodd Exp $
 
 DIST_DIR=	${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/dst/Makefile b/sbin/dhclient/dst/Makefile
index b501a2e8f6ea..191708409801 100644
--- a/sbin/dhclient/dst/Makefile
+++ b/sbin/dhclient/dst/Makefile
@@ -1,5 +1,5 @@
 # dst
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dst/Makefile,v 1.3 2002/05/13 11:09:05 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/minires/Makefile b/sbin/dhclient/minires/Makefile
index e0013b47737c..81ebd5d15013 100644
--- a/sbin/dhclient/minires/Makefile
+++ b/sbin/dhclient/minires/Makefile
@@ -1,5 +1,5 @@
 # minires
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/minires/Makefile,v 1.5 2002/05/13 11:09:05 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/omapip/Makefile b/sbin/dhclient/omapip/Makefile
index f2b5fbda968e..70f3d7cf89a1 100644
--- a/sbin/dhclient/omapip/Makefile
+++ b/sbin/dhclient/omapip/Makefile
@@ -1,5 +1,5 @@
 # omapip
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/omapip/Makefile,v 1.3 2002/05/13 11:09:06 ru Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/dhclient/omshell/Makefile b/sbin/dhclient/omshell/Makefile
index 4bc5e7065cf5..f09cca5a783d 100644
--- a/sbin/dhclient/omshell/Makefile
+++ b/sbin/dhclient/omshell/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/omshell/Makefile,v 1.1 2003/03/25 03:16:53 mdodd Exp $
 
 DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 9884d552d415..6eff6e4a413b 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.10 2002/04/08 06:26:46 phk Exp $
 
 PROG=	disklabel
 SRCS=	disklabel.c
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index e74c603d86af..e67e1d783703 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.16 2003/09/10 19:24:34 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 00dc6d3c2c8f..8bdfc1f336d8 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.53 2003/09/08 19:57:18 ru Exp $
 .\"
 .Dd March 15, 2003
 .Dt DISKLABEL 8
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 3d393ac2e3d6..23e54edb88e9 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.81 2003/05/03 18:41:56 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/file.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/Makefile b/sbin/dmesg/Makefile
index 777956357ae0..999caf250779 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dmesg/Makefile,v 1.7 2003/02/23 13:25:02 johan Exp $
 
 PROG=	dmesg
 MAN=	dmesg.8
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index 45b605f3ea81..45d128372a2c 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.17 2002/08/21 18:09:55 trhodes Exp $
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 063e4b82cb80..bb19ed50edb1 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -43,7 +43,7 @@ static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.20 2003/06/22 02:18:31 iedowse Exp $");
 
 #include <sys/types.h>
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 608162aa570e..e8eaa5705790 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dump/Makefile,v 1.24 2003/11/14 13:07:38 johan Exp $
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/cache.c b/sbin/dump/cache.c
index 906ac2716959..2a6ac95ab71d 100644
--- a/sbin/dump/cache.c
+++ b/sbin/dump/cache.c
@@ -3,7 +3,7 @@
  *
  *	Block cache for dump
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/cache.c,v 1.2 2003/01/25 19:06:30 dillon Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index efe7a76ca631..08d2fffd1a10 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.61 2003/11/18 00:36:40 mckusick Exp $
 .\"
 .Dd March 1, 2002
 .Dt DUMP 8
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 2d4038c6000b..fb17b1cbdf5a 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -32,7 +32,7 @@
  *
  *	@(#)dump.h	8.2 (Berkeley) 4/28/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/dump.h,v 1.24 2003/11/04 12:27:18 iedowse Exp $
  */
 
 /*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 4b01beba9f98..b8801d8a291e 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.20 2003/11/14 13:07:38 johan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 55af65cbb96c..c349bf252f50 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.14 2002/09/25 04:06:35 mike Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 432d185b2141..0816ac0998d7 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.55 2003/11/16 08:01:58 mckusick Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index d039a95078ce..fbf3a3226281 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.27 2003/09/21 22:14:49 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index 10defb2a213c..0c23bcc80493 100644
--- a/sbin/dump/pathnames.h
+++ b/sbin/dump/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/pathnames.h,v 1.8 2002/05/17 11:47:10 jmallett Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 00bb5c39d174..7f40ed78a60e 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.24 2002/09/25 04:06:35 mike Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index d05319a18f45..f432c680ac45 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.33 2003/11/04 14:20:14 iedowse Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index f61f2f3014be..eae58accd8bf 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.5 2002/03/20 22:49:39 imp Exp $";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 99faa77ad725..ee8b003fa3c7 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9 2003/11/14 13:13:23 johan Exp $
 
 PROG=	dumpfs
 DPADD=	${LIBUFS}
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 5259a3b5c219..3a493946d8d8 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.12 2003/02/23 01:47:49 ru Exp $
 .\"
 .Dd January 19, 2003
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 88007e76d324..5340c7494dde 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -51,7 +51,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.41 2003/12/01 00:33:57 truckman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index 12fced525c5f..ef3bf0c5a2d1 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpon/Makefile,v 1.8 2002/03/31 22:24:24 phk Exp $
 
 PROG=	dumpon
 WARNS=	4
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 0401112e7930..260d38780c6b 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.28 2003/05/07 19:37:51 hmp Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index d2fb38dc6283..0c856bfdbe8d 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -43,7 +43,7 @@ static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.18 2003/05/03 18:41:56 obrien Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 8f0d8e925096..c1470939ac5b 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/Makefile,v 1.10 2003/04/13 21:34:16 phk Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_mbr_enc.c
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 7eda677f793e..4be9e6bfab60 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.35 2003/10/11 08:24:07 blackend Exp $
 .\"
 .Dd April 18, 2002
 .Dt FDISK 8
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 2ecc4f598ba5..90cbbe957d9e 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.72 2003/11/13 21:13:43 des Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/fdisk/runtest.sh b/sbin/fdisk/runtest.sh
index f25f4272bb0f..3acca05045f2 100644
--- a/sbin/fdisk/runtest.sh
+++ b/sbin/fdisk/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/runtest.sh,v 1.2 2003/04/13 21:57:08 phk Exp $
 
 set -e
 MD=`mdconfig -a -t malloc -s 4m -x 63 -y 16`
diff --git a/sbin/fdisk_pc98/Makefile b/sbin/fdisk_pc98/Makefile
index eeb3446b8d5f..f0da299c62ec 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk_pc98/Makefile,v 1.5 2003/05/01 13:53:41 nyan Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_pc98_enc.c
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index ba15116fce04..27612d274120 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fdisk_pc98/fdisk.8,v 1.14 2002/12/23 15:36:04 ru Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
diff --git a/sbin/fdisk_pc98/fdisk.c b/sbin/fdisk_pc98/fdisk.c
index 8b8ce19f6782..d0effed997b2 100644
--- a/sbin/fdisk_pc98/fdisk.c
+++ b/sbin/fdisk_pc98/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.13 2003/05/01 14:30:59 nyan Exp $";
 #endif /* not lint */
 
 #include <sys/disk.h>
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index 47c1d704c3f5..e270af68a1b4 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -1,7 +1,7 @@
 # @(#)Makefile    8.8 (Berkeley) 6/21/2000
 #
 # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.6 2003/08/14 18:55:31 rwatson Exp $
 #
 
 MAINTAINER=	tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index 6d70564471b1..80e9847a86d5 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.13 2003/08/14 18:55:31 rwatson Exp $
 .\"
 .Dd September 8, 2000
 .Dt FSINFO 8
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index c5595acd6968..bd34e3e5c1ad 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -48,7 +48,7 @@ All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.6 2003/08/14 18:55:31 rwatson Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index bc445fda26f7..f27f719f04b7 100644
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.14 1996/09/27 22:38:37 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck/Makefile,v 1.11 2003/10/29 16:10:17 trhodes Exp $
 
 PROG=	fsck
 SRCS=	fsck.c fsutil.c preen.c
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 6caa47dd92ce..be52e5572c4c 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: fsck.8,v 1.19 1999/03/10 00:08:33 erh Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck/fsck.8,v 1.33 2003/07/26 12:57:56 simon Exp $
 .\"
 .\" Copyright (c) 1996 Christos Zoulas.  All rights reserved.
 .\"
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 291cd3780224..0870c2edf5a3 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck/fsck.c,v 1.17 2003/10/29 16:09:17 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index f9fed44e0ccb..f7be87477c9b 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -37,7 +37,7 @@
 #ifndef lint
 __RCSID("$NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $");
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck/fsutil.c,v 1.5 2002/03/24 15:06:48 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index bad9a1db8a90..c815d5b2da62 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck/fsutil.h,v 1.5 2003/10/29 16:09:17 trhodes Exp $
  */
 
 void errexit(const char *, ...)
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 068154c48fa9..aaab7174b056 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck/preen.c,v 1.27 2002/12/17 19:33:44 phk Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index d5e504c25870..752559d40319 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.12 2002/09/16 11:27:47 phk Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/27/95
 
 PROG=	fsck_ffs
diff --git a/sbin/fsck_ffs/SMM.doc/0.t b/sbin/fsck_ffs/SMM.doc/0.t
index 1fb25ee66923..72d11284d74b 100644
--- a/sbin/fsck_ffs/SMM.doc/0.t
+++ b/sbin/fsck_ffs/SMM.doc/0.t
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/0.t,v 1.5 2002/08/21 18:10:31 trhodes Exp $
 .\"	@(#)0.t	8.1 (Berkeley) 6/8/93
 .\"
 .if n .ND
diff --git a/sbin/fsck_ffs/SMM.doc/1.t b/sbin/fsck_ffs/SMM.doc/1.t
index 19301021c84d..920a03b2cf6d 100644
--- a/sbin/fsck_ffs/SMM.doc/1.t
+++ b/sbin/fsck_ffs/SMM.doc/1.t
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/1.t,v 1.4 2002/08/21 18:10:31 trhodes Exp $
 .\"	@(#)1.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Introduction
diff --git a/sbin/fsck_ffs/SMM.doc/2.t b/sbin/fsck_ffs/SMM.doc/2.t
index c6a8e4be119d..39cce7215b85 100644
--- a/sbin/fsck_ffs/SMM.doc/2.t
+++ b/sbin/fsck_ffs/SMM.doc/2.t
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/2.t,v 1.4 2002/08/21 18:10:31 trhodes Exp $
 .\"	@(#)2.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Overview of the file system
diff --git a/sbin/fsck_ffs/SMM.doc/3.t b/sbin/fsck_ffs/SMM.doc/3.t
index 66c3281ff153..529ab728b2ef 100644
--- a/sbin/fsck_ffs/SMM.doc/3.t
+++ b/sbin/fsck_ffs/SMM.doc/3.t
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/3.t,v 1.6 2002/08/21 18:10:31 trhodes Exp $
 .\"	@(#)3.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Fixing corrupted file systems
diff --git a/sbin/fsck_ffs/SMM.doc/4.t b/sbin/fsck_ffs/SMM.doc/4.t
index 5c23dcce99c9..7c9de3dce6c3 100644
--- a/sbin/fsck_ffs/SMM.doc/4.t
+++ b/sbin/fsck_ffs/SMM.doc/4.t
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/4.t,v 1.4 2002/08/21 18:10:31 trhodes Exp $
 .\"	@(#)4.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Appendix A \- Fsck_ffs Error Conditions
diff --git a/sbin/fsck_ffs/SMM.doc/Makefile b/sbin/fsck_ffs/SMM.doc/Makefile
index 9ddc06f097ae..18b9ffd00477 100644
--- a/sbin/fsck_ffs/SMM.doc/Makefile
+++ b/sbin/fsck_ffs/SMM.doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/SMM.doc/Makefile,v 1.2 2000/10/09 08:26:35 adrian Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 DIR=	smm/03.fsck_ffs
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 5a918748d380..646f7c1e0e99 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/dir.c,v 1.27 2003/10/19 21:49:44 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index 2cdf71e3ebeb..02e69064e0ca 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/ea.c,v 1.2 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index fb30c365e8f2..9a45c933ddd9 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.29 2003/02/14 21:05:35 mckusick Exp $
  */
 
 #include <unistd.h>
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 7cb3d7b4e670..cec3ea9bf389 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.29 2002/12/12 17:25:55 ru Exp $
 .\"
 .Dd April 24, 2001
 .Dt FSCK_FFS 8
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 8c543abb1c2d..6fe41ec471e6 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.22 2003/08/01 11:31:19 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index b7152befc3ee..70461f92e02b 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.34 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 06b4540b557a..782526a5e8e8 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.39 2003/10/08 02:14:03 mckusick Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 272b5f143312..4a5ee8450c3f 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.38 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index d30295243a67..9b95fcc3145b 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1b.c,v 1.12 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 470f9867022e..8429bc2bb1ac 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.22 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 0ae326751b20..6d624672524c 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass3.c,v 1.12 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 847dd97d6b25..e7e548d47f92 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass4.c,v 1.12 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 6dbde11755f8..3d04f3b7c3b0 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.36 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index f6e541d3e186..bc6e24f03a91 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.45 2003/11/16 07:10:55 wes Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 441fd931e8df..ac0b40194b80 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/utilities.c,v 1.21 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/fsck_msdosfs/Makefile b/sbin/fsck_msdosfs/Makefile
index 715afe436af4..07bf2e476b67 100644
--- a/sbin/fsck_msdosfs/Makefile
+++ b/sbin/fsck_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.6 1997/05/08 21:11:11 gwr Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_msdosfs/Makefile,v 1.3 2001/12/04 02:19:47 obrien Exp $
 
 FSCK=	${.CURDIR}/../fsck
 .PATH: ${FSCK}
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 0f6a61b92d8c..4824530251c1 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: boot.c,v 1.5 1997/10/17 11:19:23 ws Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/boot.c,v 1.2 2002/08/21 18:10:33 trhodes Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 28b1588e7aa6..9d7c046f5e32 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: check.c,v 1.10 2000/04/25 23:02:51 jdolecek Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/check.c,v 1.4 2003/10/30 09:08:09 trhodes Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index b87a916c17ff..9ff3ccf9de79 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -37,7 +37,7 @@
 #ifndef lint
 __RCSID("$NetBSD: dir.c,v 1.14 1998/08/25 19:18:15 ross Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/dir.c,v 1.2 2002/03/20 22:57:10 imp Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index 3a5d4394c506..12f9e5592805 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.h
@@ -31,7 +31,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *	$NetBSD: dosfs.h,v 1.4 1997/01/03 14:32:48 ws Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_msdosfs/dosfs.h,v 1.2 2002/08/21 18:10:33 trhodes Exp $
  */
 
 #ifndef DOSFS_H
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index ce677927e94e..fbf3587feeb6 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *	$NetBSD: ext.h,v 1.6 2000/04/25 23:02:51 jdolecek Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_msdosfs/ext.h,v 1.5 2003/10/30 09:08:09 trhodes Exp $
  */
 
 #ifndef EXT_H
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index 9e0aef97b3c3..04d6fb0a42aa 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: fat.c,v 1.12 2000/10/10 20:24:52 is Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/fat.c,v 1.3 2002/08/21 18:10:33 trhodes Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/fsck_msdosfs.8 b/sbin/fsck_msdosfs/fsck_msdosfs.8
index 7b2985dcfbac..6f103f2f42a4 100644
--- a/sbin/fsck_msdosfs/fsck_msdosfs.8
+++ b/sbin/fsck_msdosfs/fsck_msdosfs.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: fsck_msdos.8,v 1.9 1997/10/17 11:19:58 ws Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck_msdosfs/fsck_msdosfs.8,v 1.9 2003/06/08 12:53:07 charnier Exp $
 .\"
 .\" Copyright (C) 1995 Wolfgang Solfrank
 .\" Copyright (c) 1995 Martin Husemann
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index cbfe6da7128b..471d57c05af1 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/main.c,v 1.8 2002/08/27 00:49:22 trhodes Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 5e1591b22ce9..344505ee4757 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.16 2003/11/13 19:08:43 johan Exp $
 
 PROG=	fsdb
 MAN=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 21b4b70d189b..db04adbe68c1 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.25 2003/08/30 07:49:42 brueffer Exp $
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index f60f50c9852c..05c7114c67f9 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdb.c,v 1.28 2003/11/13 19:08:43 johan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index a739c47f1a0a..59773d655a2c 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -27,7 +27,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsdb/fsdb.h,v 1.10 2002/07/30 13:01:25 phk Exp $
  */
 
 extern int bread(int fd, char *buf, ufs2_daddr_t blk, long size);
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index b00061941e00..4cd8311c9b03 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.18 2003/11/13 19:08:43 johan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 948ee929c053..b86ca619540f 100644
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsirand/Makefile,v 1.5 2001/12/04 02:19:47 obrien Exp $
 
 PROG=	fsirand
 WARNS=	0
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 1d7e56e0d13b..bcc71ae04a50 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.16 2002/08/21 18:10:37 trhodes Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 7b6274fb64e7..7230fe9e49f6 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.12 2002/11/27 02:18:57 mckusick Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index 87058028533e..3c26f5b9542a 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/Makefile,v 1.11 2003/10/17 19:52:07 phk Exp $
 
 PROG=	gbde
 SRCS=	gbde.c template.c
diff --git a/sbin/gbde/gbde.8 b/sbin/gbde/gbde.8
index 00533042363b..c80ba5449ea3 100644
--- a/sbin/gbde/gbde.8
+++ b/sbin/gbde/gbde.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/gbde/gbde.8,v 1.10 2003/11/27 20:54:51 phk Exp $
 .\"
 .Dd October 19, 2002
 .Dt GBDE 8
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 6acd0f1c15ec..c6d2020e0831 100644
--- a/sbin/gbde/gbde.c
+++ b/sbin/gbde/gbde.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gbde/gbde.c,v 1.18 2003/10/13 20:14:02 phk Exp $
  *
  * XXX: Future stuff
  * 
diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu
index 82e6f2e47489..1868464e5d86 100644
--- a/sbin/gbde/image.uu
+++ b/sbin/gbde/image.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sbin/gbde/image.uu,v 1.1 2003/10/07 09:31:51 phk Exp $
 
 begin 644 gbde.image.bz2
 M0EIH.3%!629364"&9H\`Y1=_____________________________________
diff --git a/sbin/gbde/template.txt b/sbin/gbde/template.txt
index 3d22007befd9..6bd638fa3a41 100644
--- a/sbin/gbde/template.txt
+++ b/sbin/gbde/template.txt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/template.txt,v 1.1 2002/10/20 11:16:13 phk Exp $
 #
 # Sector size is the smallest unit of data which can be read or written.
 # Making it too small decreases performance and decreases available space.
diff --git a/sbin/gbde/test.sh b/sbin/gbde/test.sh
index eeb2c4dee78e..0332526ff4b0 100644
--- a/sbin/gbde/test.sh
+++ b/sbin/gbde/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/test.sh,v 1.3 2003/10/17 19:52:07 phk Exp $
 
 set -e
 
diff --git a/sbin/gpt/Makefile b/sbin/gpt/Makefile
index a680986f0fe4..207356478aa9 100644
--- a/sbin/gpt/Makefile
+++ b/sbin/gpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.4 2002/12/01 02:10:34 marcel Exp $
 
 PROG=	gpt
 SRCS=	add.c create.c destroy.c gpt.c map.c migrate.c recover.c show.c
diff --git a/sbin/gpt/add.c b/sbin/gpt/add.c
index f0ce9a87a61d..badb4156f8f6 100644
--- a/sbin/gpt/add.c
+++ b/sbin/gpt/add.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/add.c,v 1.5 2003/11/16 06:45:26 kensmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/gpt/create.c b/sbin/gpt/create.c
index e9ac8cedb127..6af1aeb1083f 100644
--- a/sbin/gpt/create.c
+++ b/sbin/gpt/create.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/create.c,v 1.5 2002/12/02 01:42:03 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/gpt/destroy.c b/sbin/gpt/destroy.c
index 8c85d24c43d4..dd10d8ec7524 100644
--- a/sbin/gpt/destroy.c
+++ b/sbin/gpt/destroy.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/destroy.c,v 1.2 2002/11/10 20:22:25 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/gpt/gpt.8 b/sbin/gpt/gpt.8
index 9d08c7e0b8ff..4f1155d353e1 100644
--- a/sbin/gpt/gpt.8
+++ b/sbin/gpt/gpt.8
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.2 2003/06/02 11:19:23 ru Exp $
 .\"
 .Dd November 30, 2002
 .Os
diff --git a/sbin/gpt/gpt.c b/sbin/gpt/gpt.c
index 6ab98d1ed3fc..f43a9eef17d1 100644
--- a/sbin/gpt/gpt.c
+++ b/sbin/gpt/gpt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.6 2002/12/02 01:42:03 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/gpt/gpt.h b/sbin/gpt/gpt.h
index 4aa8666cba01..2df28b967c9d 100644
--- a/sbin/gpt/gpt.h
+++ b/sbin/gpt/gpt.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/gpt.h,v 1.4 2002/11/02 07:08:15 marcel Exp $
  */
 
 #ifndef _GPT_H_
diff --git a/sbin/gpt/map.c b/sbin/gpt/map.c
index fbce87fd9732..6a01a8251c5a 100644
--- a/sbin/gpt/map.c
+++ b/sbin/gpt/map.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/map.c,v 1.3 2002/10/27 03:23:05 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/gpt/map.h b/sbin/gpt/map.h
index 34ea0a65397e..5c1c60d3e3b6 100644
--- a/sbin/gpt/map.h
+++ b/sbin/gpt/map.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/map.h,v 1.3 2002/12/02 01:42:03 marcel Exp $
  */
 
 #ifndef _MAP_H_
diff --git a/sbin/gpt/migrate.c b/sbin/gpt/migrate.c
index f0a0d7384714..854c77146618 100644
--- a/sbin/gpt/migrate.c
+++ b/sbin/gpt/migrate.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/migrate.c,v 1.6 2003/11/16 06:43:25 kensmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/gpt/mkdisk.sh b/sbin/gpt/mkdisk.sh
index ebac19aaf508..c4861a14a03b 100644
--- a/sbin/gpt/mkdisk.sh
+++ b/sbin/gpt/mkdisk.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/gpt/mkdisk.sh,v 1.1 2002/07/20 19:27:43 peter Exp $
 
 dd if=/dev/zero of=disk count=125307
 sudo mdconfig -a -t vnode -f disk -u 4
diff --git a/sbin/gpt/recover.c b/sbin/gpt/recover.c
index d4b8418cd6d1..0740e734a04b 100644
--- a/sbin/gpt/recover.c
+++ b/sbin/gpt/recover.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/recover.c,v 1.4 2003/11/16 06:45:26 kensmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/gpt/show.c b/sbin/gpt/show.c
index 6acfbe00d11a..e17f906e870d 100644
--- a/sbin/gpt/show.c
+++ b/sbin/gpt/show.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/show.c,v 1.6 2003/02/13 01:00:26 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index b89c2002b2c7..28bb2feab9cf 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.8 (Berkeley) 6/21/2000
 #
 # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/growfs/Makefile,v 1.5 2003/06/11 23:24:31 obrien Exp $
 #
 
 MAINTAINER=	tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index fac09b718970..ebeaf61cdacb 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/growfs/debug.c,v 1.8 2003/08/14 18:40:59 rwatson Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 81f76d3200b6..3ff7e7002d8b 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  * $TSHeader: src/sbin/growfs/debug.h,v 1.2 2000/11/16 18:43:50 tom Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/growfs/debug.h,v 1.2 2003/08/14 18:40:59 rwatson Exp $
  *
  */
 
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index ed9a619b6713..d7bf43466c31 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/growfs/growfs.8,v 1.19 2003/06/17 19:21:43 brueffer Exp $
 .\"
 .Dd September 8, 2000
 .Dt GROWFS 8
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index bfd40882f622..6fbea9ef5d31 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -48,7 +48,7 @@ All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/growfs/growfs.c,v 1.16 2003/10/30 05:43:56 trhodes Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/idmapd/Makefile b/sbin/idmapd/Makefile
index 65921572f7df..a4fa9b724a55 100644
--- a/sbin/idmapd/Makefile
+++ b/sbin/idmapd/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/idmapd/Makefile,v 1.1 2003/11/14 21:04:33 alfred Exp $
 
 PROG=	idmapd
 SRCS=	idmapd.c
diff --git a/sbin/idmapd/idmapd.8 b/sbin/idmapd/idmapd.8
index 05d939c1998b..132fe3dee985 100644
--- a/sbin/idmapd/idmapd.8
+++ b/sbin/idmapd/idmapd.8
@@ -20,7 +20,7 @@
 .\" connection with the use of the software, even if it has been or is hereafter
 .\" advised of the possibility of such damages.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/idmapd/idmapd.8,v 1.2 2003/11/22 02:16:53 alfred Exp $
 man
 .\"
 .Dd November 14, 2003
diff --git a/sbin/idmapd/idmapd.c b/sbin/idmapd/idmapd.c
index 8dccd15c68fb..df5b3bdb9a1f 100644
--- a/sbin/idmapd/idmapd.c
+++ b/sbin/idmapd/idmapd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/idmapd/idmapd.c,v 1.2 2003/11/22 02:16:53 alfred Exp $ */
 /* $Id: idmapd.c,v 1.5 2003/11/05 14:58:58 rees Exp $ */
 
 /*
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index ceb660aa60c0..38eec08cc969 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.24 2002/10/23 03:40:11 rwatson Exp $
 
 PROG=	ifconfig
 SRCS=	ifconfig.c
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 710fbe0a7301..63806135a1cb 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.72 2003/10/01 08:32:37 ru Exp $
 .\"
 .Dd April 28, 2003
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 0e433a54cf46..15c6c62b96f3 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.92 2003/10/26 04:36:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index 7430c691142e..6856fd2fcc70 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.10 2003/04/28 16:37:38 sam Exp $
  */
 
 extern struct ifreq ifr;
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 031dc8f03b4d..aa02c9d454ce 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.8 2003/11/01 00:03:20 brooks Exp $
  */
 
 /*-
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index 41b718b228c3..9c26b71d4186 100644
--- a/sbin/ifconfig/ifmac.c
+++ b/sbin/ifconfig/ifmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.2 2002/10/23 22:50:04 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index d8e9d8886293..5b220f3d6816 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.15 2003/06/25 15:05:17 sam Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 7e089b9003a4..27a9a1523eb1 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.5 2002/04/18 17:14:09 imp Exp $";
 #endif
 static int			__tag = 0;
 static int			__have_tag = 0;
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 75ec72dde4d6..78d08bb99d4c 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.28 2003/11/19 19:57:20 gordon Exp $
 
 PROG=	init
 MAN=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 1ee8ddaccd80..f3f88047680d 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.40 2003/11/11 18:37:50 kensmith Exp $
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index ccff3c7f0446..697d784e1cb6 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.56 2003/12/05 04:28:03 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ip6fw/Makefile b/sbin/ip6fw/Makefile
index 8100032dbe1b..5a956b5d4236 100644
--- a/sbin/ip6fw/Makefile
+++ b/sbin/ip6fw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ip6fw/Makefile,v 1.4 2001/12/04 02:19:48 obrien Exp $
 
 PROG=   ip6fw
 WARNS=	0
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index 2e4c77758337..fcb7635ada53 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.19.2.1 2004/01/09 23:54:23 dwmalone Exp $
 .\"
 .\"	$KAME$
 .\"
diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c
index 9f00b0ccac8f..a1ba322d9616 100644
--- a/sbin/ip6fw/ip6fw.c
+++ b/sbin/ip6fw/ip6fw.c
@@ -48,7 +48,7 @@
  * NEW command line interface for IP firewall facility
  *
  * $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.15 2003/10/31 18:31:55 brooks Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/ip6fw/sample.sh b/sbin/ip6fw/sample.sh
index 00641401f6e7..b020a176bdfa 100644
--- a/sbin/ip6fw/sample.sh
+++ b/sbin/ip6fw/sample.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $FreeBSD$
+# $FreeBSD: src/sbin/ip6fw/sample.sh,v 1.2 2000/05/04 17:33:27 phantom Exp $
 
 fwcmd=/sbin/ip6fw
 
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index 731894817a0b..0ce65789c29d 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipf/Makefile,v 1.13 2003/06/06 11:30:49 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfs/Makefile b/sbin/ipfs/Makefile
index f067de22072e..0f956a2b48dc 100644
--- a/sbin/ipfs/Makefile
+++ b/sbin/ipfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfs/Makefile,v 1.3 2002/03/26 10:09:09 darrenr Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index 43da14b357ab..77ba8a2c11b3 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.18 2003/06/06 11:30:49 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index 023f682b25f5..48c61d737982 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfw/Makefile,v 1.12 2002/07/11 17:33:37 bde Exp $
 
 PROG=	ipfw
 SRCS=	ipfw2.c
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 7d64d65593de..4d857574c5f2 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.134 2003/12/02 00:23:45 sam Exp $
 .\"
 .Dd December 1, 2003
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 7597ebdc4ce1..21a7d41dccc4 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.42 2003/10/31 18:31:55 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ipmon/Makefile b/sbin/ipmon/Makefile
index e4a9da517662..0140c7607c5d 100644
--- a/sbin/ipmon/Makefile
+++ b/sbin/ipmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipmon/Makefile,v 1.13 2003/06/06 11:30:49 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 81c407b2ebe4..732b377d1a0d 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipnat/Makefile,v 1.15 2003/06/06 11:30:49 guido Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/kldconfig/Makefile b/sbin/kldconfig/Makefile
index e92daf6c6f7c..d0fa74b7246f 100644
--- a/sbin/kldconfig/Makefile
+++ b/sbin/kldconfig/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldconfig/Makefile,v 1.3 2003/04/23 20:22:32 johan Exp $
 #
 
 PROG=		kldconfig
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index 65766ec33ae2..2b2549ae1555 100644
--- a/sbin/kldconfig/kldconfig.8
+++ b/sbin/kldconfig/kldconfig.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldconfig/kldconfig.8,v 1.5 2002/08/21 18:10:46 trhodes Exp $
 .\"
 .Dd June 15, 2001
 .Dt KLDCONFIG 8
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 0f7c72100e18..e6b271e6fbd4 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.5 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index da597d4594f9..0c442b4e5e37 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldload/Makefile,v 1.10 2003/04/23 20:22:33 johan Exp $
 #
 
 PROG=	kldload
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index dd28d38454ba..bf60be2eaf56 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldload/kldload.8,v 1.21 2003/03/03 22:48:06 ru Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 9e841bccf908..1822307eb9f4 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldload/kldload.c,v 1.10 2003/05/03 18:41:57 obrien Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index b602a3edfb1f..fcea3e08bb9a 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldstat/Makefile,v 1.9 2003/04/23 20:24:13 johan Exp $
 #
 
 PROG=	kldstat
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index bbabb73ee3ae..b8dffdcfde28 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldstat/kldstat.8,v 1.11 2002/07/06 19:33:21 charnier Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index d72e97279d93..8bf3c2594a3a 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldstat/kldstat.c,v 1.12 2003/05/03 18:41:57 obrien Exp $");
 
 #include <err.h>
 #include <stdint.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 1f71a8f8313e..855258d5380c 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldunload/Makefile,v 1.9 2003/04/23 20:26:21 johan Exp $
 #
 
 PROG=	kldunload
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index f74965613500..d61a4dd07d3b 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.12 2002/07/06 19:33:23 charnier Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index be86960b3e17..083f4f054806 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.13 2003/05/03 18:41:57 obrien Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 776fef457db9..89a0a657bc75 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ldconfig/Makefile,v 1.18 2001/12/04 02:19:49 obrien Exp $
 
 PROG=	ldconfig
 SRCS=	elfhints.c ldconfig.c shlib.c support.c
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 9bdf56e4271e..62ab6b0db883 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/elfhints.c,v 1.8 2001/05/02 23:56:18 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 2c84f0ee4daf..9ff1e51207dd 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.32 2003/05/08 17:25:41 trhodes Exp $
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 284ec0bc7f52..6e318de3ad0f 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.38 2002/09/17 01:48:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 859bcbd204bc..23265ff334a7 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/ldconfig.h,v 1.5 2002/03/21 13:14:19 imp Exp $
  */
 
 #ifndef LDCONFIG_H
diff --git a/sbin/mca/Makefile b/sbin/mca/Makefile
index 89a29e72da32..af82b20631ee 100644
--- a/sbin/mca/Makefile
+++ b/sbin/mca/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mca/Makefile,v 1.1 2002/07/20 19:31:11 peter Exp $
 PROG=	mca
 WARNS=	4
 NOMAN=	yes
diff --git a/sbin/mca/mca.c b/sbin/mca/mca.c
index 0c4e1a0c5a80..1d761ae634fe 100644
--- a/sbin/mca/mca.c
+++ b/sbin/mca/mca.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mca/mca.c,v 1.3 2002/11/01 06:34:35 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 352212829ddb..1482070085a3 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/md5/Makefile,v 1.7 2001/12/04 02:19:49 obrien Exp $
 
 PROG=	md5
 
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index de7b902410fa..9cffbb6c0dc9 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/md5/md5.1,v 1.19 2003/11/02 23:12:08 se Exp $
 .Dd February 14, 1994
 .Dt MD5 1
 .Os
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 9fd0cf8a3284..541d4dc969b9 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/md5/md5.c,v 1.31 2003/11/02 23:12:08 se Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 3abf56b74a8e..7400745d3d46 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdconfig/Makefile,v 1.7 2001/12/04 02:19:50 obrien Exp $
 
 PROG=		mdconfig
 MAN=		mdconfig.8
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 4c4b3066929d..423151f062db 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -39,7 +39,7 @@
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.23 2003/10/11 09:59:25 blackend Exp $
 .\"
 .Dd December 31, 2000
 .Dt MDCONFIG 8
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 6296da799268..5e4c4e4ed1d7 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.30 2003/07/11 05:47:05 kan Exp $
  *
  */
 
diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile
index 999793f0e103..fa780fc3a968 100644
--- a/sbin/mdmfs/Makefile
+++ b/sbin/mdmfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.5 2003/04/27 01:40:45 dougb Exp $
 
 PROG=		mdmfs
 LINKS=		${BINDIR}/${PROG} ${BINDIR}/mount_mfs
diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8
index daf66c271f12..8aa858491ea1 100644
--- a/sbin/mdmfs/mdmfs.8
+++ b/sbin/mdmfs/mdmfs.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.18 2003/08/05 15:04:39 yar Exp $
 .\"
 .Dd August 5, 2001
 .Dt MDMFS 8
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index db143ccd7986..51098f1d0c3d 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.17 2003/08/05 15:04:39 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/mdioctl.h>
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index c83c6bcd0da7..5745d4a1ec1a 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/mknod/Makefile,v 1.5 2001/12/04 02:19:50 obrien Exp $
 
 PROG=	mknod
 WARNS=	0
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 55e3f2f1b054..b5e1b04092b1 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.25 2003/03/25 18:43:10 trhodes 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/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index 3c08f565225d..bc4271f8047f 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.1 2003/03/02 01:50:33 mckusick Exp $
 
 PROG=	mksnap_ffs
 MAN=	mksnap_ffs.8
diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8
index 2465f557f2ff..dad6de648e94 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.8
+++ b/sbin/mksnap_ffs/mksnap_ffs.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.3 2003/09/07 14:11:02 charnier Exp $
 .\"
 .Dd January 19, 2003
 .Dt MKSNAP_FFS 8
diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c
index a061286ba181..cebb126e58ed 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.c
+++ b/sbin/mksnap_ffs/mksnap_ffs.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.5.2.1 2004/01/27 19:33:06 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 407abea2f1f3..fd9770e6efe1 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.13 2003/10/26 00:35:05 trhodes Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 638f8a4a1eb2..f24526a9d1cc 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/extern.h,v 1.4 2002/03/21 13:14:19 imp Exp $
  */
 
 /* vfslist.c */
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index 3fd3558e2dfe..f10624df4da8 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.12 2002/08/21 18:10:52 trhodes Exp $
 .\"
 .Dd March 30, 1995
 .Dt GETMNTOPTS 3
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 04d2ff222858..63f5c2f1491b 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount/getmntopts.c,v 1.10 2003/05/03 18:41:58 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 8ca7cd51585b..99e659aa5131 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.20 2002/10/14 19:40:00 rwatson Exp $
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 486b17f5a0bd..52ce4dbe0849 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.60 2003/10/22 18:25:49 seanc Exp $
 .\"
 .Dd April 7, 2003
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index ff4fb8c2b784..8170df8a908a 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.55 2003/12/05 09:36:56 iedowse Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index f15ef9aa9600..0befff288cdd 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.23 2002/08/03 16:03:18 mux Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index 5209f04b020c..4c7223d31a0a 100644
--- a/sbin/mount/pathnames.h
+++ b/sbin/mount/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.2 (Berkeley) 3/27/94
- *	$FreeBSD$
+ *	$FreeBSD: src/sbin/mount/pathnames.h,v 1.2 2003/06/29 17:53:48 gordon Exp $
  */
 
 #define	_PATH_MOUNTDPID	"/var/run/mountd.pid"
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index 0362691547af..c2d3b9203a9f 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount/vfslist.c,v 1.5 2003/05/03 18:41:58 obrien Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 0841157ecdba..b5385f96b6c1 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_cd9660/Makefile,v 1.8 2003/09/26 20:26:21 fjoe Exp $
 
 PROG=	mount_cd9660
 SRCS=	mount_cd9660.c getmntopts.c
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index db266cc744ba..b1c8e1a76aa7 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.22 2003/09/26 20:26:21 fjoe 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 4ac65869571f..aa7dc3730e02 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -49,7 +49,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.25.2.1 2003/12/17 11:35:10 tjr Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 3eefb92eb8c0..9f623e68b19a 100644
--- a/sbin/mount_ext2fs/Makefile
+++ b/sbin/mount_ext2fs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ext2fs/Makefile,v 1.7 2003/11/13 19:18:43 johan Exp $
 
 PROG=	mount_ext2fs
 SRCS=	mount_ext2fs.c getmntopts.c
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index e93c49571c95..c934fe076e01 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.14 2003/01/01 18:48:45 schweikh 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 875aaeef99e0..b9d0fda9fcb9 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.16 2003/11/13 19:18:43 johan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index 12b30c4e8087..0fb0abd9da60 100644
--- a/sbin/mount_hpfs/Makefile
+++ b/sbin/mount_hpfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_hpfs/Makefile,v 1.5 2001/12/04 02:19:50 obrien Exp $
 #
 
 PROG=	mount_hpfs
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index 0cdcb20e2e15..a75604c09534 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.8,v 1.11 2002/12/27 12:15:32 schweikh Exp $
 .\"
 .Dd May 20, 1999
 .Dt MOUNT_HPFS 8
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index 95986f13fa0b..bf8073f90cb7 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.c,v 1.4 2003/08/07 04:50:29 imp Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 7fedb6818fab..46f85196f454 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdosfs/Makefile,v 1.26 2003/10/23 16:09:20 trhodes Exp $
 #
 
 PROG=	mount_msdosfs
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 609aa66ac9c9..ef813471fe7e 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.8,v 1.29 2003/10/23 16:09:20 trhodes Exp $
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOSFS 8
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 29a1f11c26e4..4cd23d3811e3 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.31.2.1 2003/12/17 11:35:10 tjr Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 0d3751498e87..7c7b7ce04355 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.13 2003/03/25 00:16:41 mdodd 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 55d0a1efdec9..33b32f8d19fd 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.40 2003/09/10 08:24:33 ru Exp $
 .\"
 .Dd May 11, 2003
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index e319ec8f9b42..c82f3e6d198a 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.61 2003/05/12 19:48:47 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_nfs4/Makefile b/sbin/mount_nfs4/Makefile
index c418b72f7e8e..f7b5992d66a4 100644
--- a/sbin/mount_nfs4/Makefile
+++ b/sbin/mount_nfs4/Makefile
@@ -1,6 +1,6 @@
 #	${.CURDIR}(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nfs4/Makefile,v 1.1 2003/11/14 21:04:33 alfred Exp $
 
 PROG=	mount_nfs4
 SRCS=	mount_nfs4.c getmntopts.c mounttab.c
diff --git a/sbin/mount_nfs4/mount_nfs4.8 b/sbin/mount_nfs4/mount_nfs4.8
index 440b4059ab1f..87b9295726e6 100644
--- a/sbin/mount_nfs4/mount_nfs4.8
+++ b/sbin/mount_nfs4/mount_nfs4.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nfs4/mount_nfs4.8,v 1.2 2003/11/22 02:18:30 alfred Exp $
 .\"
 .Dd November 14, 2003
 .Dt MOUNT_NFS4 8
diff --git a/sbin/mount_nfs4/mount_nfs4.c b/sbin/mount_nfs4/mount_nfs4.c
index 1e8b2637377d..cf19c591513b 100644
--- a/sbin/mount_nfs4/mount_nfs4.c
+++ b/sbin/mount_nfs4/mount_nfs4.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/mount_nfs4/mount_nfs4.c,v 1.2 2003/11/22 02:18:30 alfred Exp $ */
 /* $Id: mount_nfs.c,v 1.5 2003/11/05 14:58:58 rees Exp $ */
 
 /*
@@ -73,7 +73,7 @@ static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount_nfs4/mount_nfs4.c,v 1.2 2003/11/22 02:18:30 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 5a301105fef7..ff3f294cb561 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ntfs/Makefile,v 1.8 2003/09/26 20:26:21 fjoe Exp $
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 483c6f68e58e..09bebde6ab55 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.19 2003/09/26 20:26:21 fjoe Exp $
 .\"
 .Dd January 3, 1999
 .Dt MOUNT_NTFS 8
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 5cabb09d34c3..f9a4bc507268 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.9.2.1 2003/12/17 11:35:10 tjr Exp $
  *
  */
 
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 7139b3f9bd1d..40947bcc7ef1 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nullfs/Makefile,v 1.10 2001/12/04 02:19:51 obrien Exp $
 
 PROG=	mount_nullfs
 SRCS=	mount_nullfs.c getmntopts.c
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index f582a402674e..50669eb02410 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nullfs/mount_nullfs.8,v 1.26 2003/02/05 13:50:41 charnier Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULLFS 8
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index 1da7dfd2a3eb..0d6dd19afb53 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.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_nullfs/mount_nullfs.c,v 1.21 2002/08/13 16:07:39 mux Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 2b8d62b33f56..9c08c520ee35 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.10 2001/12/04 02:19:51 obrien 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 13e33a1b321c..931f16896142 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.20 2003/10/22 18:25:48 seanc 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 cdfd73689645..3a8458a1f993 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.18 2002/11/05 20:06:01 jhb Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index bd9163c8720c..b87cd69930a2 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_udf/Makefile,v 1.3 2003/11/05 06:21:45 scottl Exp $
 
 PROG=	mount_udf
 SRCS=	mount_udf.c getmntopts.c
diff --git a/sbin/mount_udf/mount_udf.8 b/sbin/mount_udf/mount_udf.8
index f91a866542c2..27041ab4a5f1 100644
--- a/sbin/mount_udf/mount_udf.8
+++ b/sbin/mount_udf/mount_udf.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_udf/mount_udf.8,v 1.5 2003/11/05 06:21:45 scottl Exp $
 .\"
 .Dd March 23, 2002
 .Dt MOUNT_UDF 8
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 264c24c5d5ea..440eb6c78ccc 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_udf/mount_udf.c,v 1.8.2.1 2003/12/17 11:35:10 tjr Exp $
  */
 
 /*
diff --git a/sbin/mount_umapfs/Makefile b/sbin/mount_umapfs/Makefile
index bb19eaeb3daa..7aa1ee45d4cd 100644
--- a/sbin/mount_umapfs/Makefile
+++ b/sbin/mount_umapfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_umapfs/Makefile,v 1.11 2001/12/04 02:19:52 obrien Exp $
 
 PROG=	mount_umapfs
 SRCS=	mount_umapfs.c getmntopts.c
diff --git a/sbin/mount_umapfs/mount_umapfs.8 b/sbin/mount_umapfs/mount_umapfs.8
index c3d1c45292ed..047ff3614fad 100644
--- a/sbin/mount_umapfs/mount_umapfs.8
+++ b/sbin/mount_umapfs/mount_umapfs.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_umap.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_umapfs/mount_umapfs.8,v 1.19 2002/12/12 17:25:55 ru Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_UMAPFS 8
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index 06964bf08f93..b9ba86bc2dd0 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.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_umapfs/mount_umapfs.c,v 1.21 2002/08/03 16:03:20 mux Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index dbe870fa80ec..bad9eddbc9e2 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_unionfs/Makefile,v 1.11 2001/12/04 02:19:53 obrien Exp $
 
 PROG=	mount_unionfs
 SRCS=	mount_unionfs.c getmntopts.c
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 6bb2655c1e3e..6dd7b7d4d649 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_unionfs/mount_unionfs.8,v 1.15 2002/12/12 17:25:55 ru Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_UNIONFS 8
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 28263d0d2681..b419c805bc11 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.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_unionfs/mount_unionfs.c,v 1.20 2002/08/13 16:02:45 mux Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index 2dcf9c688654..a53c84d78ad5 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/Makefile,v 1.8 2002/04/12 19:11:09 ru Exp $
 
 PROG		= natd
 SRCS		= natd.c icmp.c
diff --git a/sbin/natd/README b/sbin/natd/README
index d2e8a9ae6709..f55a7ffe92d3 100644
--- a/sbin/natd/README
+++ b/sbin/natd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/README,v 1.3 2003/01/23 08:35:21 ru Exp $
 
 	A Network Address Translation Daemon for FreeBSD
 
diff --git a/sbin/natd/icmp.c b/sbin/natd/icmp.c
index 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 d8c7bf8f33a6..ad49755c069f 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.61 2003/09/23 07:41:55 marcus Exp $
 .Dd February 28, 2003
 .Dt NATD 8
 .Os
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index f8ba6a66a900..7d498ee0e8bc 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.44 2003/09/23 07:41:55 marcus 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/Makefile b/sbin/newfs/Makefile
index efbe7abfe492..c67ce2675f57 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/Makefile,v 1.22 2003/02/11 03:06:45 jmallett Exp $
 
 PROG=	newfs
 DPADD=	${LIBUFS}
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 2ca9508379ed..c5d6b172a69e 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.83 2003/11/27 01:19:23 wes Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index da6ac1ff3864..91b20c72ee3c 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.64 2003/10/11 08:24:07 blackend Exp $
 .\"
 .Dd May 18, 2002
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index aff266e7fa14..88e7dad9efbd 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -52,7 +52,7 @@ static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.74 2003/11/16 07:17:30 wes Exp $");
 
 /*
  * newfs: friendly front end to mkfs
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index 1c82685518ba..89260f8d8501 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -39,7 +39,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/newfs/newfs.h,v 1.14 2003/11/16 07:17:30 wes Exp $
  */
 
 #include <libufs.h>
diff --git a/sbin/newfs/ref.test b/sbin/newfs/ref.test
index 1967e247d4e5..eee6b632255b 100644
--- a/sbin/newfs/ref.test
+++ b/sbin/newfs/ref.test
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/ref.test,v 1.3 2003/02/22 23:26:11 mckusick Exp $
 00c08266df6b0c79d2673515c182216a
 c00458f223a9119190591e8b8679bf97
 7d5b3c75244898dbb07a4cd20860c8a1
diff --git a/sbin/newfs/runtest00.sh b/sbin/newfs/runtest00.sh
index a95dbcc83b25..1ef96f34bc93 100644
--- a/sbin/newfs/runtest00.sh
+++ b/sbin/newfs/runtest00.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/runtest00.sh,v 1.1 2002/03/19 21:05:29 phk Exp $
 
 set -e
 
diff --git a/sbin/newfs/runtest01.sh b/sbin/newfs/runtest01.sh
index 47128326ed24..f87aec93904c 100644
--- a/sbin/newfs/runtest01.sh
+++ b/sbin/newfs/runtest01.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/runtest01.sh,v 1.1 2002/03/19 21:05:29 phk Exp $
 
 set -e
 
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index 9d5af35a3ca8..525e313ab22a 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs_msdos/Makefile,v 1.7 2003/01/30 15:09:21 nyan Exp $
 
 PROG=	newfs_msdos
 MAN=	newfs_msdos.8
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 7d5718d530e6..59af2d16d7cf 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.16 2002/08/21 18:11:32 trhodes 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 80eed76941e0..ea6272d54f87 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.19 2002/11/03 08:54:46 scottl Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 22717c576f42..d36527836fe2 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/nfsiod/Makefile,v 1.9 2002/08/10 20:19:04 mux Exp $
 
 PROG=	nfsiod
 WARNS?=	6
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 623beeec136b..ec87a2a0acb4 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.17 2003/08/12 20:01:10 ceri Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 72432b4e3a9a..35ab121f7478 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.16 2003/05/03 18:41:58 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/sbin/nologin/Makefile b/sbin/nologin/Makefile
index 31ac9f06e1ea..1003be02b435 100644
--- a/sbin/nologin/Makefile
+++ b/sbin/nologin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/nologin/Makefile,v 1.9 2003/11/17 06:39:38 das Exp $
 
 PROG=	nologin
 MAN=	nologin.5 nologin.8
diff --git a/sbin/nologin/nologin.5 b/sbin/nologin/nologin.5
index 9d63c889e115..9316a803d1fa 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.11 2001/07/15 07:49:16 dd Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8
index 7f8f9fff2877..670c48936b2d 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.12 2003/11/17 06:39:54 das Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/sbin/nologin/nologin.c b/sbin/nologin/nologin.c
index 2454df4bf785..0c96749945c3 100644
--- a/sbin/nologin/nologin.c
+++ b/sbin/nologin/nologin.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/nologin/nologin.c,v 1.1 2003/11/17 06:39:38 das Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile
index baae98ebb108..95c2a24269d7 100644
--- a/sbin/nos-tun/Makefile
+++ b/sbin/nos-tun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/nos-tun/Makefile,v 1.4 2001/12/04 02:19:55 obrien Exp $
 
 PROG=	nos-tun
 WARNS=	0
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 0cfdeb132df1..b70747cfb5f6 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.14 2002/07/06 19:34:12 charnier 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 b54ef7258f4e..6306bc4bd708 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -57,7 +57,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nos-tun/nos-tun.c,v 1.13 2003/10/26 04:37:57 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 740567fb74f9..44a809600fed 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.18 2003/03/05 22:42:03 seanc Exp $
 
 PROG=	ping
 MAN=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 3c9a24abe7bc..940db6136325 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.50 2003/09/08 19:57:18 ru Exp $
 .\"
 .Dd October 2, 2002
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index cf01858e5d46..87dcff6e5a46 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.101 2003/07/14 12:43:48 maxim Exp $");
 
 /*
  *			P I N G . C
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 4073a56debff..80a8677cb38c 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping6/Makefile,v 1.10 2003/10/24 18:26:29 ume Exp $
 
 PROG=	ping6
 MAN=	ping6.8
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 84a51edfb1f8..c03f3137e90b 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.19 2003/10/24 18:26:29 ume Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 42c517cba95f..fac43bee41e9 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.25 2003/10/24 18:26:29 ume Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index d909e1abecd1..fd9224e8bf95 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/quotacheck/Makefile,v 1.7 2002/01/25 20:45:30 phk Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	quotacheck
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index ff99b744f52b..ff2f6937a1d2 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/quotacheck/preen.c,v 1.24 2003/05/03 18:41:59 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 4e8806ad2a9b..88e57b4bf8db 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.14 2002/08/27 00:49:25 trhodes Exp $
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index a5cce23f11bc..4c9b9f142538 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.22 2003/08/07 05:38:56 imp Exp $");
 
 /*
  * Fix up / report on disk quotas & usage
diff --git a/sbin/raidctl/Makefile b/sbin/raidctl/Makefile
index 0705eab52a6d..f722d70d29a9 100644
--- a/sbin/raidctl/Makefile
+++ b/sbin/raidctl/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/raidctl/Makefile,v 1.1 2002/10/20 08:17:34 scottl Exp $
 #	$NetBSD: Makefile,v 1.7 2000/05/23 00:46:53 thorpej Exp $
 PROG=	raidctl 
 SRCS=	rf_configure.c raidctl.c
diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index d384b81b0284..30550984c8d4 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/raidctl/raidctl.8,v 1.7 2003/09/14 13:41:57 ru Exp $
 .\"     $NetBSD: raidctl.8,v 1.21 2000/08/10 15:14:14 oster Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sbin/raidctl/raidctl.c b/sbin/raidctl/raidctl.c
index 4b7d27d06bdb..54315be67dac 100644
--- a/sbin/raidctl/raidctl.c
+++ b/sbin/raidctl/raidctl.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/raidctl/raidctl.c,v 1.1 2002/10/20 08:17:34 scottl Exp $
  */
 
 /*      $NetBSD: raidctl.c,v 1.25 2000/10/31 14:18:39 lukem Exp $   */
diff --git a/sbin/raidctl/rf_configure.c b/sbin/raidctl/rf_configure.c
index 8df788971940..d6f18d5aa0eb 100644
--- a/sbin/raidctl/rf_configure.c
+++ b/sbin/raidctl/rf_configure.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sbin/raidctl/rf_configure.c,v 1.1 2002/10/20 08:17:34 scottl Exp $ */
 /*	$NetBSD: rf_configure.c,v 1.13 2001/01/27 19:32:47 oster Exp $	*/
 
 /*
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 9d8d27bb0bd0..3a452989eb45 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -1,5 +1,5 @@
 #       $NetBSD: Makefile,v 1.1 1999/11/23 05:28:20 mrg Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/rcorder/Makefile,v 1.3 2002/06/21 15:52:05 obrien Exp $
 
 PROG=   rcorder
 SRCS=   ealloc.c hash.c rcorder.c
diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8
index fa3f0210469e..4c79c5244757 100644
--- a/sbin/rcorder/rcorder.8
+++ b/sbin/rcorder/rcorder.8
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/rcorder/rcorder.8,v 1.3 2002/11/25 16:23:03 ru Exp $
 .\"
 .Dd July 17, 2000
 .Dt RCORDER 8
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index 862be6bb0562..988a9489add6 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/reboot/Makefile,v 1.12 2002/11/04 17:39:54 gordon Exp $
 
 PROG=	reboot
 DPADD=	${LIBUTIL}
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index dda3abd5f9bb..549cb828c0c4 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.43 2003/01/13 18:57:19 trhodes Exp $
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/nextboot.8 b/sbin/reboot/nextboot.8
index 765fa796fe04..d33b9fe3627b 100644
--- a/sbin/reboot/nextboot.8
+++ b/sbin/reboot/nextboot.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/nextboot.8,v 1.4 2002/12/12 17:25:56 ru Exp $
 .\"
 .Dd November 4, 2002
 .Dt NEXTBOOT 8
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index 56e53f60a1a9..8e937eb70a05 100644
--- a/sbin/reboot/nextboot.sh
+++ b/sbin/reboot/nextboot.sh
@@ -3,7 +3,7 @@
 # Copyright 2002. Gordon Tetlow.
 # gordon@FreeBSD.org
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/reboot/nextboot.sh,v 1.1 2002/05/24 04:06:03 gordon Exp $
 
 delete="NO"
 force="NO"
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 1bd33754e6d4..e21f2f7ea7a4 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.21 2002/12/27 12:15:33 schweikh Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 9b3c62d45a29..d1bc75feed13 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.19 2003/05/03 18:41:59 obrien Exp $");
 
 #include <sys/reboot.h>
 #include <sys/types.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 5571947d8960..939165598972 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.21 2003/05/01 21:18:36 ru Exp $
 
 .PATH: ${.CURDIR}/../dump
 
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index e8725045455b..2af0bdf4d1a8 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.25 2003/10/26 04:43:02 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 4a4a2d87de18..92474742f8a3 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.7 2002/03/20 22:49:40 imp Exp $
  */
 
 struct entry	*addentry(char *, ino_t, int);
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 5fc468bbc3fa..1545a784c8a7 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.14 2003/08/06 08:46:21 ache Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index d636880e2165..1b5d24b0c1c5 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.21 2003/08/06 08:46:21 ache Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index f72e25de9ae1..a240d9648011 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.43 2003/06/08 12:51:28 charnier Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index a9eb31ee6233..cbf9f706b599 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.16 2002/09/25 04:06:37 mike Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index d00c3b3a7e5d..8a8529dcc7ed 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)restore.h	8.3 (Berkeley) 9/13/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/restore/restore.h,v 1.7 2002/09/25 04:06:37 mike Exp $
  */
 
 /*
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index ffda3fc57d32..34bd6bd9488d 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.13 2002/09/25 04:06:37 mike Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 70ff44ab998a..1b91d72cda2d 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.37 2002/09/25 04:06:37 mike Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index e42465d71c63..b553a0836863 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.13 2002/09/25 04:06:37 mike Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index 7e3dd09bb760..c4c208774ca2 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.19 2003/08/04 21:31:51 ache Exp $
 
 PROG=	route
 MAN=	route.8
diff --git a/sbin/route/keywords b/sbin/route/keywords
index 18f995d2b85e..8d5d4cda79ac 100644
--- a/sbin/route/keywords
+++ b/sbin/route/keywords
@@ -1,5 +1,5 @@
 #	@(#)keywords	8.2 (Berkeley) 3/19/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/route/keywords,v 1.5 2001/06/12 13:31:53 ru Exp $
 
 add
 atalk
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 8b436b3f4603..1623b003b59c 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.35 2003/11/10 14:28:33 brueffer Exp $
 .\"
 .Dd June 8, 2001
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 452cf87eab87..246574bad1a7 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.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/route/route.c,v 1.69 2003/04/16 12:06:53 ru Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 23e8828d6461..12d95c2627b6 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.12 2001/12/04 02:19:56 obrien Exp $
+# $FreeBSD: src/sbin/routed/Makefile,v 1.12 2001/12/04 02:19:56 obrien Exp $
 
 PROG=   routed
 SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc
index 265f86d1ed55..5789693e70bc 100644
--- a/sbin/routed/Makefile.inc
+++ b/sbin/routed/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/Makefile.inc,v 1.4 2001/10/25 08:37:12 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 2e7aa3064ffb..4f5f264fadab 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.15 2003/08/07 05:38:56 imp Exp $
  */
 
 #ifdef  sgi
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/defs.h,v 1.15 2003/08/07 05:38:56 imp Exp $"
 #endif
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 548fc7c565da..05c91137e4a1 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.10 2003/01/01 18:48:46 schweikh 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.10 2003/01/01 18:48:46 schweikh Exp $"
 
 struct interface *ifnet;		/* all interfaces */
 
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 6d258f1e78d8..f1bffaa87e36 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.10 2002/02/18 20:35:19 mike 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.10 2002/02/18 20:35:19 mike 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 62299b02abee..1360f8523187 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.15 2003/02/11 02:31:53 ache 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.15 2003/02/11 02:31:53 ache Exp $"
 
 
 pid_t	mypid;
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index cc110efc5c0e..c691e075c1b9 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.9 2002/08/25 13:10:42 charnier 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.9 2002/08/25 13:10:42 charnier Exp $"
 
 
 u_int update_seqno;
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index 7a2c34a0d11d..c410c219b53e 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.11 2002/04/07 17:01:20 asmodai 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.11 2002/04/07 17:01:20 asmodai Exp $"
 
 
 struct parm *parms;
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index b99bcc24d28e..da8b76f62810 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.6 2000/08/11 08:24:38 sheldonh Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index edbf2361aeba..b8e8f6413cb4 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.6 2000/08/11 08:24:38 sheldonh 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.6 2000/08/11 08:24:38 sheldonh 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 cf43c6c96878..c3f70084f61f 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.6 2002/03/21 13:20:48 imp Exp $
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 56eed8c31bab..8a4ff5fd75ec 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.8 2000/08/11 08:24:38 sheldonh 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.8 2000/08/11 08:24:38 sheldonh Exp $"
 
 /* router advertisement ICMP packet */
 struct icmp_ad {
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index dc51e9ab21dc..c78fe394def2 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/routed.8,v 1.29 2002/07/06 19:34:52 charnier Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 61a251180041..46c835c0e8a4 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.11 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	rtquery
 MAN=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index b8c18b045b4d..a0a5c62e8be8 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.19 2003/06/08 12:55:55 charnier Exp $
 .\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index a41c0fd9b0b1..1030495bc855 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.15 2002/02/18 20:35:20 mike Exp $
  */
 
 char copyright[] =
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 96737f98f007..abfce17cefac 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.17 2003/01/01 18:48:46 schweikh 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.17 2003/01/01 18:48:46 schweikh 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 5b258df0d8d3..30b21ed79034 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.9 2003/08/07 05:38:56 imp 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.9 2003/08/07 05:38:56 imp Exp $"
 
 
 #ifdef sgi
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index d6baa1e64c2b..ded03a774fd5 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.7 2003/08/22 18:59:55 ume Exp $
 
 SRCDIR=	${.CURDIR}/../../usr.sbin/rtsold
 
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 31b46ac84797..f8e55bd88829 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/savecore/Makefile,v 1.11 2002/05/13 12:07:57 ru Exp $
 
 PROG=	savecore
 WARNS=	4
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index cd8518b9693c..8261ad903117 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.20 2003/09/04 10:07:01 dougb Exp $
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index c7e8a1572927..47d736c63c7a 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.65 2003/10/08 07:37:11 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index 8b9cef55688c..a778f97fff56 100644
--- a/sbin/sconfig/Makefile
+++ b/sbin/sconfig/Makefile
@@ -1,5 +1,5 @@
 # Cronyx Id: sbin.sconfig.Makefile,v 1.1.4.1 2003/02/17 12:51:24 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/sconfig/Makefile,v 1.2 2003/12/03 17:03:20 imp Exp $
 
 PROG=	sconfig
 MAN=	sconfig.8
diff --git a/sbin/sconfig/sconfig.8 b/sbin/sconfig/sconfig.8
index 354d0fee6fed..241209d0ca30 100644
--- a/sbin/sconfig/sconfig.8
+++ b/sbin/sconfig/sconfig.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.2 2003/12/03 17:03:20 imp Exp $
 .Dd November 21, 2003
 .Dt SCONFIG 8
 .Os FreeBSD
diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c
index d2130dfb6109..6416239d6963 100644
--- a/sbin/sconfig/sconfig.c
+++ b/sbin/sconfig/sconfig.c
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: sconfig.c,v 1.2.2.4 2003/06/20 16:20:48 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/sconfig/sconfig.c,v 1.2 2003/12/03 17:03:20 imp Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index e22759fcc401..57eeb25d8941 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/shutdown/Makefile,v 1.8 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	shutdown
 MAN=	shutdown.8
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 9786f259d9d2..e03f2f98d97e 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.21 2002/12/23 16:04:50 ru Exp $
 .\"
 .Dd December 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 9e2f8c6c7ba5..1361e2725fb6 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/shutdown/shutdown.c,v 1.25 2003/05/05 22:49:22 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 3060c747b7ba..a35d8751272e 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.12 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	slattach
 WARNS=	0
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index cabd3d024574..f7a0dcf121a0 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.23 2002/12/23 16:04:50 ru Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index d662294878c0..bc24870d2795 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.39 2003/01/08 06:43:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile
index b394c39a4e83..05c538781182 100644
--- a/sbin/spppcontrol/Makefile
+++ b/sbin/spppcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/spppcontrol/Makefile,v 1.6 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	spppcontrol
 MAN=	spppcontrol.8
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index 66896c30b98b..224b8e435938 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.13 2002/01/10 16:02:23 ru Exp $
 .\"
 .Dd December 30, 2001
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index a1df0f49942b..c708aa7944cd 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.13 2003/05/03 18:41:59 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/sbin/startslip/Makefile b/sbin/startslip/Makefile
index 5ac6581b20aa..f8e6969b9d5f 100644
--- a/sbin/startslip/Makefile
+++ b/sbin/startslip/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/startslip/Makefile,v 1.8 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	startslip
 WARNS=	0
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 7faf33f8909c..7ddfd7abd79f 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.21 2002/04/19 23:06:29 charnier Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index cc8a716df0f0..d33287a6800d 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.35 2003/05/05 22:49:22 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile
index 65927c6341d1..e6965fb9d13c 100644
--- a/sbin/sunlabel/Makefile
+++ b/sbin/sunlabel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.8 2003/05/17 19:05:17 ru Exp $
 
 PROG=sunlabel
 SRCS=sunlabel.c geom_sunlabel_enc.c
diff --git a/sbin/sunlabel/runtest.sh b/sbin/sunlabel/runtest.sh
index 73833e0b7fee..fe784b8bae18 100644
--- a/sbin/sunlabel/runtest.sh
+++ b/sbin/sunlabel/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/sunlabel/runtest.sh,v 1.3 2003/04/23 08:25:44 phk Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/sunlabel/sunlabel.c b/sbin/sunlabel/sunlabel.c
index 0425beeb15ff..5f97673fdb7d 100644
--- a/sbin/sunlabel/sunlabel.c
+++ b/sbin/sunlabel/sunlabel.c
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.7 2003/10/30 15:04:37 harti Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 85b0f0ab60bb..bb0e1788a017 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/swapon/Makefile,v 1.8 2002/12/28 23:39:47 dillon Exp $
 
 PROG=	swapon
 MAN=	swapon.8
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index e6251423237b..b9a29b502b20 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.26 2003/02/28 00:55:18 keramida Exp $
 .\"
 .Dd December 28, 2002
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 063eff4c7db6..448986556358 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.18 2003/05/03 18:41:59 obrien Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 58f3e9bc8129..1a626575ab75 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.8 2001/12/04 02:19:58 obrien Exp $
 
 PROG=	sysctl
 WARNS=	0
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index f510fb8fb3f0..f2410fdf51ff 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.53 2003/11/07 21:28:29 des Exp $
 .\"
 .Dd March 10, 2002
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index b7284ab0ec73..540ca915ca13 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.59 2003/11/07 16:41:47 des Exp $";
 #endif /* not lint */
 
 #ifdef __i386__
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index d501d104b4b7..682fcdc9c7ee 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/tunefs/Makefile,v 1.8 2003/01/23 08:15:05 ru Exp $
 
 PROG=	tunefs
 DPADD=	${LIBUFS}
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index a91084b22fb9..ca294c0af0f6 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.33 2003/06/17 22:47:11 brueffer Exp $
 .\"
 .Dd May 18, 2002
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 839199b3784c..ba4fcb442b6d 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.39 2003/05/03 18:41:59 obrien Exp $");
 
 /*
  * tunefs: change layout parameters to an existing file system.
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 51bcbad2f92f..33d1bb9b842e 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.10 2003/02/23 13:22:41 johan Exp $
 
 PROG=	umount
 SRCS=	umount.c vfslist.c mounttab.c
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index d992c3882775..340cd1fc696a 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.18 2003/07/18 17:43:13 iedowse Exp $
 .\"
 .Dd July 18, 2003
 .Dt UMOUNT 8
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index f2b24446e467..bc98cfa1ba29 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.43 2003/12/05 09:29:42 iedowse Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index a51ed5d348d6..cb607b250bdf 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/vinum/Makefile,v 1.25 2003/05/01 07:19:29 grog Exp $
 
 PROG=	vinum
 SRCS=	v.c list.c vinumparser.c vinumutil.c vext.h commands.c
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index 14b8f405e073..be9325cd9993 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -37,7 +37,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: commands.c,v 1.52 2003/05/08 00:33:57 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/commands.c,v 1.54 2003/11/17 15:56:00 rwatson Exp $
  */
 
 #include "vext.h"
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index ee5602aa3cce..89f65a32544d 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -40,7 +40,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: list.c,v 1.32 2003/04/28 06:19:06 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/list.c,v 1.40 2003/10/26 04:47:31 peter Exp $
  */
 
 #include "vext.h"
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index b7389c365e41..e50868425d23 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -37,7 +37,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: v.c,v 1.38 2003/05/01 01:39:42 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/v.c,v 1.39 2003/06/12 05:54:53 grog Exp $
  */
 
 #include "vext.h"
diff --git a/sbin/vinum/vext.h b/sbin/vinum/vext.h
index f065bf1ba4db..be303e23456c 100644
--- a/sbin/vinum/vext.h
+++ b/sbin/vinum/vext.h
@@ -36,7 +36,7 @@
 
 /*
  * $Id: vext.h,v 1.22 2003/04/28 06:19:06 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/vext.h,v 1.27 2003/05/01 01:40: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 6eb4f792e4b1..29dade2b3fd5 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" $Id: vinum.8,v 1.15 2001/05/14 01:10:37 grog Exp grog $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.65 2003/11/17 16:04:52 rwatson Exp $
 .\"
 .Dd May 5, 2003
 .Dt VINUM 8
author	cvs2svn <cvs2svn@FreeBSD.org>	2004-02-23 15:32:56 +0000
committer	cvs2svn <cvs2svn@FreeBSD.org>	2004-02-23 15:32:56 +0000
commit	84a7b99b4e02a260bf7ff9b540032f4cb7bc612a (patch)
tree	85059f7e88bcf124efae7c17bd99cfa18627a8c4 /sbin
parent	a28c3ad292f6f6cbe1c4ff05efb3d53eb45f17ff (diff)