$Id$ -> $FreeBSD$

187 files changed, 187 insertions, 187 deletions

diff --git a/sys/boot/alpha/Makefile b/sys/boot/alpha/Makefile
index 81dec03..a36f2cf 100644
--- a/sys/boot/alpha/Makefile
+++ b/sys/boot/alpha/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 SUBDIR=		libalpha
 SUBDIR+=	boot1 boot2 netboot
diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index 7346c5b..e3f52a9 100644
--- a/sys/boot/alpha/boot1/boot1.c
+++ b/sys/boot/alpha/boot1/boot1.c
@@ -1,5 +1,5 @@
 /*
- * $Id: boot1.c,v 1.3 1998/10/18 19:05:07 dfr Exp $
+ * $FreeBSD$
  * From	$NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/boot1/sys.c b/sys/boot/alpha/boot1/sys.c
index 79f1702..4766c9a 100644
--- a/sys/boot/alpha/boot1/sys.c
+++ b/sys/boot/alpha/boot1/sys.c
@@ -25,7 +25,7 @@
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
  *	fromL Id: sys.c,v 1.21 1997/06/09 05:10:56 bde Exp
- *	$Id: sys.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/alpha/boot2/conf.c b/sys/boot/alpha/boot2/conf.c
index e4f439b..a105c7f 100644
--- a/sys/boot/alpha/boot2/conf.c
+++ b/sys/boot/alpha/boot2/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  * From	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
diff --git a/sys/boot/alpha/boot2/version b/sys/boot/alpha/boot2/version
index 6346f50..bc9aa00 100644
--- a/sys/boot/alpha/boot2/version
+++ b/sys/boot/alpha/boot2/version
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c
index 4140024..b9c5ff7 100644
--- a/sys/boot/alpha/common/main.c
+++ b/sys/boot/alpha/common/main.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.8 1998/10/31 17:12:32 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/alpha/common/setdef0.c b/sys/boot/alpha/common/setdef0.c
index b41276d..49f662a 100644
--- a/sys/boot/alpha/common/setdef0.c
+++ b/sys/boot/alpha/common/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.1 1998/06/10 10:53:12 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/common/setdef1.c b/sys/boot/alpha/common/setdef1.c
index 659618a..13668f0 100644
--- a/sys/boot/alpha/common/setdef1.c
+++ b/sys/boot/alpha/common/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.1 1998/06/10 10:53:13 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index 4928647..fe642eb 100644
--- a/sys/boot/alpha/libalpha/Makefile
+++ b/sys/boot/alpha/libalpha/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1998/10/14 09:53:25 peter Exp $
+# $FreeBSD$
 
 LIB=		alpha
 NOPIC=		true
diff --git a/sys/boot/alpha/libalpha/OSFpal.c b/sys/boot/alpha/libalpha/OSFpal.c
index b77ee12..870296b 100644
--- a/sys/boot/alpha/libalpha/OSFpal.c
+++ b/sys/boot/alpha/libalpha/OSFpal.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From	$NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c
index 196915c..95b6cba 100644
--- a/sys/boot/alpha/libalpha/alpha_copy.c
+++ b/sys/boot/alpha/libalpha/alpha_copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.2 1998/09/03 02:10:07 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/alpha/libalpha/alpha_module.c b/sys/boot/alpha/libalpha/alpha_module.c
index afa065f..4ac21d4 100644
--- a/sys/boot/alpha/libalpha/alpha_module.c
+++ b/sys/boot/alpha/libalpha/alpha_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/bbinfo.h b/sys/boot/alpha/libalpha/bbinfo.h
index 5529035..94aa4bb 100644
--- a/sys/boot/alpha/libalpha/bbinfo.h
+++ b/sys/boot/alpha/libalpha/bbinfo.h
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From $NetBSD: bbinfo.h,v 1.2 1997/04/06 08:40:57 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c
index fa0842b..5513583 100644
--- a/sys/boot/alpha/libalpha/bootinfo.c
+++ b/sys/boot/alpha/libalpha/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.6 1999/03/20 14:13:09 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/common.h b/sys/boot/alpha/libalpha/common.h
index 8acd3f93..ff18476 100644
--- a/sys/boot/alpha/libalpha/common.h
+++ b/sys/boot/alpha/libalpha/common.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/delay.c b/sys/boot/alpha/libalpha/delay.c
index a7621b7..faaf982 100644
--- a/sys/boot/alpha/libalpha/delay.c
+++ b/sys/boot/alpha/libalpha/delay.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c
index dcd07ed..d8ee113 100644
--- a/sys/boot/alpha/libalpha/devicename.c
+++ b/sys/boot/alpha/libalpha/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/08/22 10:31:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/elf_freebsd.c b/sys/boot/alpha/libalpha/elf_freebsd.c
index 0958b95..4efd603 100644
--- a/sys/boot/alpha/libalpha/elf_freebsd.c
+++ b/sys/boot/alpha/libalpha/elf_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: elf_freebsd.c,v 1.6 1998/10/15 21:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
 
 /*-
diff --git a/sys/boot/alpha/libalpha/getsecs.c b/sys/boot/alpha/libalpha/getsecs.c
index f234a37..13f1e53 100644
--- a/sys/boot/alpha/libalpha/getsecs.c
+++ b/sys/boot/alpha/libalpha/getsecs.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From:	$NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h
index 79b231a..8e1dd71 100644
--- a/sys/boot/alpha/libalpha/libalpha.h
+++ b/sys/boot/alpha/libalpha/libalpha.h
@@ -1,4 +1,4 @@
-/* $Id: libalpha.h,v 1.3 1998/09/20 21:46:19 dfr Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/alpha/libalpha/pal.S b/sys/boot/alpha/libalpha/pal.S
index c33f317..d411318 100644
--- a/sys/boot/alpha/libalpha/pal.S
+++ b/sys/boot/alpha/libalpha/pal.S
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom.c b/sys/boot/alpha/libalpha/prom.c
index 380326c..e32d43d 100644
--- a/sys/boot/alpha/libalpha/prom.c
+++ b/sys/boot/alpha/libalpha/prom.c
@@ -1,4 +1,4 @@
-/* $Id: prom.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/alpha/libalpha/prom_disp.S b/sys/boot/alpha/libalpha/prom_disp.S
index 6d5e087..184f1d3 100644
--- a/sys/boot/alpha/libalpha/prom_disp.S
+++ b/sys/boot/alpha/libalpha/prom_disp.S
@@ -1,5 +1,5 @@
 /* 
- * $Id$ 
+ * $FreeBSD$ 
  * From: $NetBSD: prom_disp.S,v 1.2 1997/04/06 08:41:00 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom_swpal.S b/sys/boot/alpha/libalpha/prom_swpal.S
index b4d3cac..be57632 100644
--- a/sys/boot/alpha/libalpha/prom_swpal.S
+++ b/sys/boot/alpha/libalpha/prom_swpal.S
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: prom_swpal.S,v 1.2 1997/04/06 08:41:01 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/reboot.c b/sys/boot/alpha/libalpha/reboot.c
index 35750ec..3361c6c 100644
--- a/sys/boot/alpha/libalpha/reboot.c
+++ b/sys/boot/alpha/libalpha/reboot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c
index 6b7d17b..6039a72 100644
--- a/sys/boot/alpha/libalpha/srmdisk.c
+++ b/sys/boot/alpha/libalpha/srmdisk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: srmdisk.c,v 1.3 1998/11/02 23:28:10 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/srmnet.c b/sys/boot/alpha/libalpha/srmnet.c
index d15fa5f..d36e557 100644
--- a/sys/boot/alpha/libalpha/srmnet.c
+++ b/sys/boot/alpha/libalpha/srmnet.c
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/start.S b/sys/boot/alpha/libalpha/start.S
index f42b5da..fcc5406 100644
--- a/sys/boot/alpha/libalpha/start.S
+++ b/sys/boot/alpha/libalpha/start.S
@@ -1,5 +1,5 @@
 /* 
- * $Id: start.S,v 1.2 1998/10/31 17:12:32 dfr Exp $ 
+ * $FreeBSD$ 
  * From: $NetBSD: start.S,v 1.4 1998/03/28 00:54:15 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/time.c b/sys/boot/alpha/libalpha/time.c
index 7b87d2f..18af172 100644
--- a/sys/boot/alpha/libalpha/time.c
+++ b/sys/boot/alpha/libalpha/time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/netboot/conf.c b/sys/boot/alpha/netboot/conf.c
index 8a0e10b..354f9cd 100644
--- a/sys/boot/alpha/netboot/conf.c
+++ b/sys/boot/alpha/netboot/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
  */
 
diff --git a/sys/boot/alpha/netboot/version b/sys/boot/alpha/netboot/version
index 6346f50..bc9aa00 100644
--- a/sys/boot/alpha/netboot/version
+++ b/sys/boot/alpha/netboot/version
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/arc/Makefile b/sys/boot/arc/Makefile
index 4b04369..82043c4 100644
--- a/sys/boot/arc/Makefile
+++ b/sys/boot/arc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+# $FreeBSD$
 
 SUBDIR=		lib
 SUBDIR+=	loader
diff --git a/sys/boot/arc/include/arcfuncs.h b/sys/boot/arc/include/arcfuncs.h
index cc4e48d..25c7446 100644
--- a/sys/boot/arc/include/arcfuncs.h
+++ b/sys/boot/arc/include/arcfuncs.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/include/arctypes.h b/sys/boot/arc/include/arctypes.h
index e9c73d3..b823e49 100644
--- a/sys/boot/arc/include/arctypes.h
+++ b/sys/boot/arc/include/arctypes.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/include/libarc.h b/sys/boot/arc/include/libarc.h
index 7162159..085d6bb 100644
--- a/sys/boot/arc/include/libarc.h
+++ b/sys/boot/arc/include/libarc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile
index ec5b6bc..023821c 100644
--- a/sys/boot/arc/lib/Makefile
+++ b/sys/boot/arc/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1999/07/28 20:28:45 se Exp $
+# $FreeBSD$
 
 LIB=		arc
 NOPIC=		true
diff --git a/sys/boot/arc/lib/abort.c b/sys/boot/arc/lib/abort.c
index 0048061..4e5951b 100644
--- a/sys/boot/arc/lib/abort.c
+++ b/sys/boot/arc/lib/abort.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/arcconsole.c b/sys/boot/arc/lib/arcconsole.c
index e8ecb22..9607b6b 100644
--- a/sys/boot/arc/lib/arcconsole.c
+++ b/sys/boot/arc/lib/arcconsole.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/arc/lib/arcdisk.c b/sys/boot/arc/lib/arcdisk.c
index 5a6be39..2b54854 100644
--- a/sys/boot/arc/lib/arcdisk.c
+++ b/sys/boot/arc/lib/arcdisk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/arc/lib/arch/alpha/copy.c b/sys/boot/arc/lib/arch/alpha/copy.c
index 2ca1397..2847812 100644
--- a/sys/boot/arc/lib/arch/alpha/copy.c
+++ b/sys/boot/arc/lib/arch/alpha/copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.3 1998/09/20 21:46:19 dfr Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/arc/lib/arch/alpha/rpb.c b/sys/boot/arc/lib/arch/alpha/rpb.c
index ac56c82..4923461 100644
--- a/sys/boot/arc/lib/arch/alpha/rpb.c
+++ b/sys/boot/arc/lib/arch/alpha/rpb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/arch/alpha/setjmp.S b/sys/boot/arc/lib/arch/alpha/setjmp.S
index 24502a4..8e153f7 100644
--- a/sys/boot/arc/lib/arch/alpha/setjmp.S
+++ b/sys/boot/arc/lib/arch/alpha/setjmp.S
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/boot/arc/lib/arch/alpha/start.S b/sys/boot/arc/lib/arch/alpha/start.S
index af038e9..1b4fc59 100644
--- a/sys/boot/arc/lib/arch/alpha/start.S
+++ b/sys/boot/arc/lib/arch/alpha/start.S
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/lib/bootinfo.c b/sys/boot/arc/lib/bootinfo.c
index 949a93c..8b74e0d 100644
--- a/sys/boot/arc/lib/bootinfo.c
+++ b/sys/boot/arc/lib/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.3 1998/10/15 21:55:58 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/delay.c b/sys/boot/arc/lib/delay.c
index 67b0bf6..e897b4e 100644
--- a/sys/boot/arc/lib/delay.c
+++ b/sys/boot/arc/lib/delay.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/devicename.c b/sys/boot/arc/lib/devicename.c
index 595c7d2..56c8c43 100644
--- a/sys/boot/arc/lib/devicename.c
+++ b/sys/boot/arc/lib/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.3 1998/09/26 10:51:37 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/elf_freebsd.c b/sys/boot/arc/lib/elf_freebsd.c
index 8463759..4e75820 100644
--- a/sys/boot/arc/lib/elf_freebsd.c
+++ b/sys/boot/arc/lib/elf_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: elf_freebsd.c,v 1.6 1998/10/15 21:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
 
 /*-
diff --git a/sys/boot/arc/lib/module.c b/sys/boot/arc/lib/module.c
index 367bf0c..a6a3997 100644
--- a/sys/boot/arc/lib/module.c
+++ b/sys/boot/arc/lib/module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.2 1998/08/31 21:10:40 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/arc/lib/prom.c b/sys/boot/arc/lib/prom.c
index abf2d39..5f13801 100644
--- a/sys/boot/arc/lib/prom.c
+++ b/sys/boot/arc/lib/prom.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.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/lib/setjmperr.c b/sys/boot/arc/lib/setjmperr.c
index c68ca02..9c005e1 100644
--- a/sys/boot/arc/lib/setjmperr.c
+++ b/sys/boot/arc/lib/setjmperr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/time.c b/sys/boot/arc/lib/time.c
index 8158970..bf0ba1a 100644
--- a/sys/boot/arc/lib/time.c
+++ b/sys/boot/arc/lib/time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/loader/conf.c b/sys/boot/arc/loader/conf.c
index 1b5384c..d40ea46 100644
--- a/sys/boot/arc/loader/conf.c
+++ b/sys/boot/arc/loader/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.2 1998/08/31 21:10:36 msmith Exp $
+ * $FreeBSD$
  * From	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
diff --git a/sys/boot/arc/loader/main.c b/sys/boot/arc/loader/main.c
index d086a59..ccee80f 100644
--- a/sys/boot/arc/loader/main.c
+++ b/sys/boot/arc/loader/main.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.1.1.1 1999/07/28 20:28:47 se Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/arc/loader/setdef0.c b/sys/boot/arc/loader/setdef0.c
index 79874ea..49f662a 100644
--- a/sys/boot/arc/loader/setdef0.c
+++ b/sys/boot/arc/loader/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/arc/loader/setdef1.c b/sys/boot/arc/loader/setdef1.c
index 9fffaf7..13668f0 100644
--- a/sys/boot/arc/loader/setdef1.c
+++ b/sys/boot/arc/loader/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/arc/loader/version b/sys/boot/arc/loader/version
index 23262b9..bc9aa00 100644
--- a/sys/boot/arc/loader/version
+++ b/sys/boot/arc/loader/version
@@ -1,4 +1,4 @@
-$Id: version,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index c29494b..0d1dc14 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.7 1998/11/02 23:28:10 msmith Exp $
+# $FreeBSD$
 
 SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c load_aout.c load_elf.c ls.c misc.c 
diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index d780038..c52854e 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bcache.c,v 1.4 1998/11/19 18:12:03 paul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 70b4671..f69d430 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: boot.c,v 1.13 1999/07/15 20:40:52 n_hibma Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index 1cabf70..9138b56 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootstrap.h,v 1.22 1999/06/26 12:26:54 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index cc75032..aa81abc 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: commands.c,v 1.10 1999/02/01 06:08:20 jkh Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index 8c4377f..3f2a879 100644
--- a/sys/boot/common/console.c
+++ b/sys/boot/common/console.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: console.c,v 1.3 1998/10/11 10:19:11 peter Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index a66523a..cf12680 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -1,5 +1,5 @@
 /*	
- * $Id: dev_net.c,v 1.3 1998/09/20 21:46:19 dfr Exp $
+ * $FreeBSD$
  * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
  */
 
diff --git a/sys/boot/common/dev_net.h b/sys/boot/common/dev_net.h
index 7c256ff..3b3d107 100644
--- a/sys/boot/common/dev_net.h
+++ b/sys/boot/common/dev_net.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern struct devsw netdev;
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c
index 83489c6..77d6ffa 100644
--- a/sys/boot/common/devopen.c
+++ b/sys/boot/common/devopen.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devopen.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/common/gensetdefs.c b/sys/boot/common/gensetdefs.c
index 9927e8a..a78e456 100644
--- a/sys/boot/common/gensetdefs.c
+++ b/sys/boot/common/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: gensetdefs.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 897f117..4f321bd 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: interp.c,v 1.17 1999/03/08 10:32:38 dcs Exp $
+ * $FreeBSD$
  */
 /*
  * Simple commandline interpreter, toplevel and misc.
diff --git a/sys/boot/common/interp_backslash.c b/sys/boot/common/interp_backslash.c
index 6de118e..6325e4e 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/sys/boot/common/interp_backslash.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- *	$Id: interp_backslash.c,v 1.2 1998/09/03 06:14:41 jkh Exp $
+ * $FreeBSD$
  *
  * Routine for doing backslash elimination.
  */
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index 4f65327..8b965ff 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: interp_forth.c,v 1.12 1999/02/04 17:06:46 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
diff --git a/sys/boot/common/interp_parse.c b/sys/boot/common/interp_parse.c
index 6c38710..0f83c43 100644
--- a/sys/boot/common/interp_parse.c
+++ b/sys/boot/common/interp_parse.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- *	$Id: interp_parse.c,v 1.6 1999/01/13 08:11:41 msmith Exp $
+ * $FreeBSD$
  * 
  * The meat of the simple parser.
  */
diff --git a/sys/boot/common/isapnp.c b/sys/boot/common/isapnp.c
index 865e8f6..1941706 100644
--- a/sys/boot/common/isapnp.c
+++ b/sys/boot/common/isapnp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: isapnp.c,v 1.3 1998/10/21 20:07:04 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h
index d1311b2..3ebd66a 100644
--- a/sys/boot/common/isapnp.h
+++ b/sys/boot/common/isapnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: isapnp.h,v 1.2 1998/10/21 20:07:04 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/boot/common/load.c b/sys/boot/common/load.c
index d59fdf3..e91c5fb 100644
--- a/sys/boot/common/load.c
+++ b/sys/boot/common/load.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/load_aout.c b/sys/boot/common/load_aout.c
index 3e6aece..8947a73 100644
--- a/sys/boot/common/load_aout.c
+++ b/sys/boot/common/load_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: load_aout.c,v 1.13 1999/01/22 23:50:14 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index bc514b1..024fece 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: load_elf.c,v 1.10 1999/01/04 18:37:41 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 27268bb..ef847c1 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.8,v 1.7 1999/06/23 09:06:18 ru Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index 73f8057..ef99d70 100644
--- a/sys/boot/common/ls.c
+++ b/sys/boot/common/ls.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ls.c,v 1.6 1998/10/11 10:28:51 peter Exp $
+ * $FreeBSD$
  * From: $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
  */
 
diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk
index 1376c53..9741ed3 100644
--- a/sys/boot/common/merge_help.awk
+++ b/sys/boot/common/merge_help.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $Id: mergehelp.awk,v 1.3 1999/01/13 20:06:52 jabley Exp $
+# $FreeBSD$
 #
 # Merge two boot loader help files for FreeBSD 3.0
 # Joe Abley <jabley@patho.gen.nz>
diff --git a/sys/boot/common/misc.c b/sys/boot/common/misc.c
index 36600e7..819d4a4 100644
--- a/sys/boot/common/misc.c
+++ b/sys/boot/common/misc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: misc.c,v 1.4 1998/09/26 10:51:38 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index 0141659..d2adeab 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: module.c,v 1.8 1999/02/22 13:12:37 dcs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/panic.c b/sys/boot/common/panic.c
index bee6a03..bad1e45 100644
--- a/sys/boot/common/panic.c
+++ b/sys/boot/common/panic.c
@@ -1,5 +1,5 @@
 /*
- * $Id: panic.c,v 1.3 1998/09/18 02:01:38 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
  */
 
diff --git a/sys/boot/common/pnpdata b/sys/boot/common/pnpdata
index 62d35a8..f2e2620 100644
--- a/sys/boot/common/pnpdata
+++ b/sys/boot/common/pnpdata
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 # This file contains the system default Plug-and-Play data.  It is
 # derived from a number of sources, including:
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index ab10716..5f724bb 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1999/03/17 23:03:36 dcs Exp $
+# $FreeBSD$
 #
 LIB=			ficl
 NOPROFILE=		yes
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/sys/boot/ficl/softwords/freebsd.fr
index 9ebeacb..96205c0 100644
--- a/sys/boot/ficl/softwords/freebsd.fr
+++ b/sys/boot/ficl/softwords/freebsd.fr
@@ -22,7 +22,7 @@
 \ ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ ** SUCH DAMAGE.
 \ **
-\ **      $Id: freebsd.fr,v 1.2 1999/02/28 02:10:14 dcs Exp $
+\ ** $FreeBSD$
 
 \ Words for use in scripts:
 \ % ignore errors here
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index e219b56..9f40cb2 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\	$Id: loader.4th,v 1.2 1999/04/24 17:25:25 dcs Exp $
+\ $FreeBSD$
 
 include /boot/support.4th
 
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 3a42138..3aedb66 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.4th.8,v 1.2 1999/05/03 07:25:50 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 8bc0ec5..c860ae2 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-#	$Id: loader.conf,v 1.9 1999/08/10 17:15:20 wpaul Exp $
+# $FreeBSD$
 
 ##############################################################
 ###  Basic configuration options  ############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index c4114ff..8a76f82 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.conf.5,v 1.3 1999/05/13 14:53:13 brian Exp $
+.\" $FreeBSD$
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th
index 20126cc..5f594ef 100644
--- a/sys/boot/forth/support.4th
+++ b/sys/boot/forth/support.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\	$Id$
+\ $FreeBSD$
 
 \ Loader.rc support functions:
 \
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 27b2306..2ee6e63 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1999/05/24 22:44:32 rnordier Exp $
+# $FreeBSD$
 
 SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 7bbeb65..5ccddf2 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/10/19 19:13:52 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot0
 NOMAN=
diff --git a/sys/boot/i386/boot0/boot0.m4 b/sys/boot/i386/boot0/boot0.m4
index 72be7ed..d318d2a 100644
--- a/sys/boot/i386/boot0/boot0.m4
+++ b/sys/boot/i386/boot0/boot0.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot0.m4,v 1.3 1998/11/29 14:09:00 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s
index cc11f19..00c6391 100644
--- a/sys/boot/i386/boot0/boot0.s
+++ b/sys/boot/i386/boot0/boot0.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot0.s,v 1.10 1999/06/19 21:40:55 rnordier Exp $
+# $FreeBSD$
 
 # A 512-byte boot manager.
 
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 25ec504..578b452 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/05 07:24:51 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot2
 NOMAN=
diff --git a/sys/boot/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S
index d1707ef..d78aaf2 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/sys/boot/i386/boot2/boot1.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.s,v 1.8 1999/01/13 23:30:07 rnordier Exp $
+# $FreeBSD$
 
 		.set MEM_REL,0x700		# Relocation address
 		.set MEM_ARG,0x900		# Arguments
diff --git a/sys/boot/i386/boot2/boot1.m4 b/sys/boot/i386/boot2/boot1.m4
index 966d8c6..94dd13b 100644
--- a/sys/boot/i386/boot2/boot1.m4
+++ b/sys/boot/i386/boot2/boot1.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.m4,v 1.3 1998/11/08 15:36:35 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot2/boot1.s b/sys/boot/i386/boot2/boot1.s
index d1707ef..d78aaf2 100644
--- a/sys/boot/i386/boot2/boot1.s
+++ b/sys/boot/i386/boot2/boot1.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.s,v 1.8 1999/01/13 23:30:07 rnordier Exp $
+# $FreeBSD$
 
 		.set MEM_REL,0x700		# Relocation address
 		.set MEM_ARG,0x900		# Arguments
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 67c5ec8..eefcf08 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.23 1999/04/05 07:36:30 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/boot2/lib.h b/sys/boot/i386/boot2/lib.h
index 493c4d8..4bb93cf 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/sys/boot/i386/boot2/lib.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id:$
+ * $FreeBSD$
  */
 
 void sio_init(void);
diff --git a/sys/boot/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S
index 92237b8..e298205 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/sys/boot/i386/boot2/sio.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: sio.s,v 1.2 1998/10/20 20:20:48 rnordier Exp $
+# $FreeBSD$
 
 		.set SIO_PRT,SIOPRT		# Base port
 		.set SIO_FMT,SIOFMT		# 8N1
diff --git a/sys/boot/i386/boot2/sio.s b/sys/boot/i386/boot2/sio.s
index 92237b8..e298205 100644
--- a/sys/boot/i386/boot2/sio.s
+++ b/sys/boot/i386/boot2/sio.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: sio.s,v 1.2 1998/10/20 20:20:48 rnordier Exp $
+# $FreeBSD$
 
 		.set SIO_PRT,SIOPRT		# Base port
 		.set SIO_FMT,SIOFMT		# 8N1
diff --git a/sys/boot/i386/btx/Makefile b/sys/boot/i386/btx/Makefile
index 75a170e..39f78ed 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/sys/boot/i386/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/09/17 23:52:03 msmith Exp $
+# $FreeBSD$
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index 6657f6e..c29339d 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/09/25 17:14:15 peter Exp $
+# $FreeBSD$
 
 M4?=	m4
 
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index 29b9795..b3f3150 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/sys/boot/i386/btx/btx/btx.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.9 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/i386/btx/btx/btx.m4 b/sys/boot/i386/btx/btx/btx.m4
index 598db02..70649bb 100644
--- a/sys/boot/i386/btx/btx/btx.m4
+++ b/sys/boot/i386/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id:$
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/btx/btx/btx.s b/sys/boot/i386/btx/btx/btx.s
index 29b9795..b3f3150 100644
--- a/sys/boot/i386/btx/btx/btx.s
+++ b/sys/boot/i386/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.9 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index 32cb4ad..33e6275 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/10/13 18:29:18 rnordier Exp $
+# $FreeBSD$
 
 ORG=0x100000
 AFLAGS+=	--assembler-with-cpp
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/sys/boot/i386/btx/btxldr/btxldr.S
index 5d3b301..92748f1 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/sys/boot/i386/btx/btxldr/btxldr.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.4 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/i386/btx/btxldr/btxldr.s b/sys/boot/i386/btx/btxldr/btxldr.s
index 5d3b301..92748f1 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.s
+++ b/sys/boot/i386/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.4 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index e6fb758..40c6565 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/i386/btx/lib/btxcsu.s b/sys/boot/i386/btx/lib/btxcsu.s
index 9b3e4c2..f08ae75 100644
--- a/sys/boot/i386/btx/lib/btxcsu.s
+++ b/sys/boot/i386/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxcsu.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/sys/boot/i386/btx/lib/btxsys.s
index 16e3228..9c77b42 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/sys/boot/i386/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id:$
+# $FreeBSD$
 
 #
 # BTX system calls.
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/sys/boot/i386/btx/lib/btxv86.h
index 1e7717f..1152f8b 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/sys/boot/i386/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: btxv86.h,v 1.3 1998/10/02 16:22:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/sys/boot/i386/btx/lib/btxv86.s
index 46709a3..0d7d111 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/sys/boot/i386/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxv86.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 25ec504..578b452 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/05 07:24:51 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot2
 NOMAN=
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 67c5ec8..eefcf08 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.23 1999/04/05 07:36:30 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index 2d1e840..bb97590 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1999/07/19 18:07:44 rnordier Exp $
+# $FreeBSD$
 
 PROG=	kgzldr.o
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c
index 0313be7..cbcd498 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/sys/boot/i386/kgzldr/boot.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/crt.s b/sys/boot/i386/kgzldr/crt.s
index 4c04747..cfb479f 100644
--- a/sys/boot/i386/kgzldr/crt.s
+++ b/sys/boot/i386/kgzldr/crt.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: btx.s 1.10 1999/02/25 16:27:41 rnordier
-#	$Id:$
+# $FreeBSD$
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/sys/boot/i386/kgzldr/kgzldr.h
index 7f18c7e..5cd5b44 100644
--- a/sys/boot/i386/kgzldr/kgzldr.h
+++ b/sys/boot/i386/kgzldr/kgzldr.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #define KGZ_CRT	 0x1		/* Video console */
diff --git a/sys/boot/i386/kgzldr/lib.c b/sys/boot/i386/kgzldr/lib.c
index f763f31..ebec384 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/sys/boot/i386/kgzldr/lib.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/sio.s b/sys/boot/i386/kgzldr/sio.s
index 78fd6ca..bb354e2 100644
--- a/sys/boot/i386/kgzldr/sio.s
+++ b/sys/boot/i386/kgzldr/sio.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: sio.s 1.3 1999/01/10 14:48:03 rnordier
-#	$Id:$
+# $FreeBSD$
 #
 
 		.set SIO_PRT,SIOPRT		# Base port
diff --git a/sys/boot/i386/kgzldr/start.s b/sys/boot/i386/kgzldr/start.s
index d565cec..550fa52 100644
--- a/sys/boot/i386/kgzldr/start.s
+++ b/sys/boot/i386/kgzldr/start.s
@@ -23,7 +23,7 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id:$
+# $FreeBSD$
 #
 
 		.set entry,0x10			# kgz.entry
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 2cfd2e3..e28ac4a 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 1998/12/22 11:51:25 abial Exp $
+# $FreeBSD$
 #
 LIB=			i386
 NOPIC=
diff --git a/sys/boot/i386/libi386/aout_freebsd.c b/sys/boot/i386/libi386/aout_freebsd.c
index 96d74d8..b81e551 100644
--- a/sys/boot/i386/libi386/aout_freebsd.c
+++ b/sys/boot/i386/libi386/aout_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aout_freebsd.c,v 1.10 1998/10/09 07:11:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index 00c38ee..2b5ba09 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biosdisk.c,v 1.23 1999/01/25 23:07:02 rnordier Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index 92f4fd2..483384c 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index a6064ba..616a22c 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/sys/boot/i386/libi386/biospnp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biospnp.c,v 1.2 1998/10/23 22:29:08 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index a07012e..8363b9f 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index a07012e..8363b9f 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index a07012e..8363b9f 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c
index 7b35d1d..ee6fbc8 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/sys/boot/i386/libi386/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: comconsole.c,v 1.5 1998/11/22 07:59:16 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c
index 418163e..dfa685e 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/sys/boot/i386/libi386/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/09/26 01:30:20 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c
index 130b0ca..a3d3ef9 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/sys/boot/i386/libi386/elf32_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c
index 130b0ca..a3d3ef9 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/sys/boot/i386/libi386/elf64_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/elf_freebsd.c b/sys/boot/i386/libi386/elf_freebsd.c
index 130b0ca..a3d3ef9 100644
--- a/sys/boot/i386/libi386/elf_freebsd.c
+++ b/sys/boot/i386/libi386/elf_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/gatea20.c b/sys/boot/i386/libi386/gatea20.c
index bb109db..b852654 100644
--- a/sys/boot/i386/libi386/gatea20.c
+++ b/sys/boot/i386/libi386/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c
index 3d75c76..7040e9f 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/sys/boot/i386/libi386/i386_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i386_module.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index a7be851..1868faa 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: libi386.h,v 1.8 1998/10/02 20:53:17 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/i386/libi386/pread.c b/sys/boot/i386/libi386/pread.c
index 36ffb01..fb73f04 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/sys/boot/i386/libi386/pread.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: pread.c,v 1.2 1997/03/22 01:48:38 thorpej Exp $
  */
 
diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c
index 05e7711..a79bb05 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/sys/boot/i386/libi386/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- *	$Id: vidconsole.c,v 1.10 1998/12/31 13:44:04 abial Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 966d436..e74d16f 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.34 1999/04/24 17:49:47 dcs Exp $
+# $FreeBSD$
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 9b4d554..6ffa49f 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conf.c,v 1.9 1998/10/22 20:23:58 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/loader.8 b/sys/boot/i386/loader/loader.8
index 27268bb..ef847c1 100644
--- a/sys/boot/i386/loader/loader.8
+++ b/sys/boot/i386/loader/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.8,v 1.7 1999/06/23 09:06:18 ru Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index dfd1bff..3277738 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.13 1998/10/22 20:23:58 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/loader/version b/sys/boot/i386/loader/version
index ad31045..01f8500 100644
--- a/sys/boot/i386/loader/version
+++ b/sys/boot/i386/loader/version
@@ -1,4 +1,4 @@
-$Id: version,v 1.3 1999/02/08 04:14:31 dcs Exp $
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index ef206e5..1090ab0 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: $
+# $FreeBSD$
 
 PROG=		mbr
 NOMAN=
diff --git a/sys/boot/i386/mbr/mbr.m4 b/sys/boot/i386/mbr/mbr.m4
index 768e262..c8783b9 100644
--- a/sys/boot/i386/mbr/mbr.m4
+++ b/sys/boot/i386/mbr/mbr.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/mbr/mbr.s b/sys/boot/i386/mbr/mbr.s
index f849fb2..6c030de 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/sys/boot/i386/mbr/mbr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: mbr.s,v 1.1.1.1 1999/05/24 22:36:24 rnordier Exp $
+# $FreeBSD$
 
 # Master boot record
 
diff --git a/sys/boot/ofw/libofw/devicename.c b/sys/boot/ofw/libofw/devicename.c
index dcd07ed..d8ee113 100644
--- a/sys/boot/ofw/libofw/devicename.c
+++ b/sys/boot/ofw/libofw/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/08/22 10:31:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index 380326c..e32d43d 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/sys/boot/ofw/libofw/ofw_console.c
@@ -1,4 +1,4 @@
-/* $Id: prom.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/sys/boot/ofw/libofw/ofw_copy.c
index 196915c..95b6cba 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/sys/boot/ofw/libofw/ofw_copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.2 1998/09/03 02:10:07 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ofw/libofw/ofw_module.c b/sys/boot/ofw/libofw/ofw_module.c
index afa065f..4ac21d4 100644
--- a/sys/boot/ofw/libofw/ofw_module.c
+++ b/sys/boot/ofw/libofw/ofw_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index 72ce2ce..5d013df 100644
--- a/sys/boot/pc98/Makefile
+++ b/sys/boot/pc98/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/10/14 20:40:56 rnordier Exp $
+# $FreeBSD$
 
 SUBDIR=		btx boot2 libpc98 loader
 
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index c743472..800306d 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/boot/pc98/boot2/asm.S b/sys/boot/pc98/boot2/asm.S
index 01d47f2..f14c7f5 100644
--- a/sys/boot/pc98/boot2/asm.S
+++ b/sys/boot/pc98/boot2/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.4 1997/09/01 10:38:24 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/pc98/boot2/asm.h b/sys/boot/pc98/boot2/asm.h
index 2e0fcac..6f4bcc3 100644
--- a/sys/boot/pc98/boot2/asm.h
+++ b/sys/boot/pc98/boot2/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id: asm.h,v 1.3 1997/02/22 09:43:04 peter Exp $
+ * $FreeBSD$
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/boot/pc98/boot2/bios.S b/sys/boot/pc98/boot2/bios.S
index 4c66744..88d9506 100644
--- a/sys/boot/pc98/boot2/bios.S
+++ b/sys/boot/pc98/boot2/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.9 1998/05/02 02:06:07 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index df9d7fc..df8e755 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.2 1999/03/04 10:45:06 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h
index 2104071..4e32192 100644
--- a/sys/boot/pc98/boot2/boot.h
+++ b/sys/boot/pc98/boot2/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.14 1998/10/11 15:08:50 kato Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index 7aa768c..ad9d3ff 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.9 1997/05/28 09:22:59 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c
index 6047364..dc5fb00 100644
--- a/sys/boot/pc98/boot2/io.c
+++ b/sys/boot/pc98/boot2/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.13 1997/12/05 11:50:42 kato Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/boot/pc98/boot2/serial.S b/sys/boot/pc98/boot2/serial.S
index fed109e..1668815 100644
--- a/sys/boot/pc98/boot2/serial.S
+++ b/sys/boot/pc98/boot2/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.1 1999/02/03 08:39:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/start.S b/sys/boot/pc98/boot2/start.S
index 24459cd..a7e6935 100644
--- a/sys/boot/pc98/boot2/start.S
+++ b/sys/boot/pc98/boot2/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.6 1998/07/30 02:27:41 alex Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index 591d432..1b138b3 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.15 1998/05/02 02:06:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/table.c b/sys/boot/pc98/boot2/table.c
index 059ace2..b6e113a 100644
--- a/sys/boot/pc98/boot2/table.c
+++ b/sys/boot/pc98/boot2/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.1 1999/02/03 08:39:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/btx/Makefile b/sys/boot/pc98/btx/Makefile
index b4c19e5..39f78ed 100644
--- a/sys/boot/pc98/btx/Makefile
+++ b/sys/boot/pc98/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index b74deea..a856eda 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/10/13 18:29:18 rnordier Exp $
+# $FreeBSD$
 
 M4?=	m4
 
diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S
index d4e8d89..eb19131 100644
--- a/sys/boot/pc98/btx/btx/btx.S
+++ b/sys/boot/pc98/btx/btx/btx.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/pc98/btx/btx/btx.m4 b/sys/boot/pc98/btx/btx/btx.m4
index 6526c6b..70649bb 100644
--- a/sys/boot/pc98/btx/btx/btx.m4
+++ b/sys/boot/pc98/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.m4,v 1.1.1.1 1998/09/12 04:29:23 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s
index d4e8d89..eb19131 100644
--- a/sys/boot/pc98/btx/btx/btx.s
+++ b/sys/boot/pc98/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index 5bd155c..b6f4016 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 ORG=0x100000
 #AFLAGS+=	-x assembler-with-cpp
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.S b/sys/boot/pc98/btx/btxldr/btxldr.S
index 6217eb2..cc8c6a1 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.S
+++ b/sys/boot/pc98/btx/btxldr/btxldr.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.5 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.s b/sys/boot/pc98/btx/btxldr/btxldr.s
index 6217eb2..cc8c6a1 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.s
+++ b/sys/boot/pc98/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.5 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index e47e653..40c6565 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/10/11 11:27:48 rnordier Exp $
+# $FreeBSD$
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/pc98/btx/lib/btxcsu.s b/sys/boot/pc98/btx/lib/btxcsu.s
index 28b878b..f08ae75 100644
--- a/sys/boot/pc98/btx/lib/btxcsu.s
+++ b/sys/boot/pc98/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxcsu.s,v 1.2 1998/10/04 21:15:45 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/pc98/btx/lib/btxsys.s b/sys/boot/pc98/btx/lib/btxsys.s
index 6273bfa..9c77b42 100644
--- a/sys/boot/pc98/btx/lib/btxsys.s
+++ b/sys/boot/pc98/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxsys.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX system calls.
diff --git a/sys/boot/pc98/btx/lib/btxv86.h b/sys/boot/pc98/btx/lib/btxv86.h
index 05708f2..1152f8b 100644
--- a/sys/boot/pc98/btx/lib/btxv86.h
+++ b/sys/boot/pc98/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: btxv86.h,v 1.4 1998/10/02 20:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/pc98/btx/lib/btxv86.s b/sys/boot/pc98/btx/lib/btxv86.s
index 14b7767..0d7d111 100644
--- a/sys/boot/pc98/btx/lib/btxv86.s
+++ b/sys/boot/pc98/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxv86.s,v 1.2 1998/10/22 20:22:07 msmith Exp $
+# $FreeBSD$
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index fad0149..cde163e 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1999/01/10 14:48:04 rnordier Exp $
+# $FreeBSD$
 #
 LIB=			pc98
 NOPIC=
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index 169452f..a82ef4a 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biosdisk.c,v 1.4 1999/08/05 03:12:20 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/libpc98/bootinfo.c b/sys/boot/pc98/libpc98/bootinfo.c
index 92bb219..6b780f1 100644
--- a/sys/boot/pc98/libpc98/bootinfo.c
+++ b/sys/boot/pc98/libpc98/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.4 1999/06/06 12:46:40 kato Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/comconsole.c b/sys/boot/pc98/libpc98/comconsole.c
index 82e4642..958b4e0 100644
--- a/sys/boot/pc98/libpc98/comconsole.c
+++ b/sys/boot/pc98/libpc98/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: comconsole.c,v 1.6 1999/01/10 14:48:05 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/gatea20.c b/sys/boot/pc98/libpc98/gatea20.c
index 45e4410..cad48c1 100644
--- a/sys/boot/pc98/libpc98/gatea20.c
+++ b/sys/boot/pc98/libpc98/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $Id: gatea20.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/sys/boot/pc98/libpc98/vidconsole.c
index 7804b66..db62063 100644
--- a/sys/boot/pc98/libpc98/vidconsole.c
+++ b/sys/boot/pc98/libpc98/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- *	$Id: vidconsole.c,v 1.1 1999/02/03 08:39:09 kato Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index e51a952..6d0af38 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1999/04/25 03:56:44 kato Exp $
+# $FreeBSD$
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 4b7aa2f..0fabadf 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.2 1999/03/04 10:48:14 kato Exp $
+ * $FreeBSD$
  */
 
 /*