diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index 0662e28ce8ac..4ad5a34556fb 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	7.3 (Berkeley) 6/9/91
+#	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
+#	$Id$
 
 # Makefile for i386 tags file
 
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index 2a626832e87c..4b0f1b6fa5de 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)comreg.h	7.2 (Berkeley) 5/9/91
+ *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index 0662e28ce8ac..4ad5a34556fb 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	7.3 (Berkeley) 6/9/91
+#	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
+#	$Id$
 
 # Makefile for i386 tags file
 
diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index 3fd9155f93fd..2e4f162d9a12 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -1,7 +1,4 @@
 #
-# Ported to boot 386BSD by Julian Elischer (julian@tfs.com)
-# September 1992
-#
 # Permission to use, copy, modify and distribute this software and its
 # documentation is hereby granted, provided that both the copyright
 # notice and this permission notice appear in all copies of the
@@ -22,57 +19,10 @@
 # any improvements or extensions that they make and grant Carnegie Mellon
 # the rights to redistribute these changes.
 #
+#	from: Mach, Revision 2.2	92/04/04  11:33:46  rpd
+#	$Id$
 #
-# HISTORY
-# $Log: Makefile,v $
-# Revision 1.6  1993/07/11  12:02:17  andrew
-# Fixes from bde, including support for loading @ any MB boundary (e.g. a
-# kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-# buffering to speed booting from floppies.  Also works with aha174x
-# controllers in enhanced mode.
-#
-# Revision 1.5  1993/07/04  14:03:03  cgd
-# do the right thing, so things aren't built in /usr/src/sys
-#
-# Revision 1.4  1993/06/18  08:03:14  cgd
-# install floppy boot block, too.
-#
-# Revision 1.3  1993/06/08  03:36:39  deraadt
-# makes more sense if src is mounted readonly
-#
-# Revision 1.2  1993/04/28  08:45:51  deraadt
-# Ensure the rmaouthdr shell script is executable before running it!
-#
-# Revision 1.1  1993/03/21  18:08:11  cgd
-# after 0.2.2 "stable" patches applied
-#
-# 
-# 93/06/30  bde
-#	fd boot is now fast enough.
-#	(Safe) target fd0 and (unsafe) target wd0 to temporarily avoid
-#	updating /use/mdec.
-#
-# 93/06/29  bde
-#	Deleted weirdness for not-really-separate code and data segments.
-#	It is not necessary now that the GDT is dynamically initialized.
-#	table.o doesn't need to be early any more.  boot.sed is not used
-#	any more (delete it).  The shell commands that failed with status
-#	0 no longer exist so the 93/06/28 fixes got deleted.
-#
-#	Use .S extension for asm files to get (g)cc to preprocess them
-#	automatically.
-#
-# 93/06/28  bde
-#	Don't exit 0 from failing shell commands.
-#
-# Thu Sep 10 22:40:23 PDT 1992
-# Ported to 386BSD by Julian Elischer
-# julian@tfs.com
-#
-# Revision 2.2	92/04/04  11:33:46  rpd
-#	Fabricated for MACH 3.0
-#	[92/03/30	     mg32]
-#
+
 wd0:
 	dd if=boot of=biosboot count=1
 	dd if=boot of=bootbios skip=1
diff --git a/sys/i386/boot/README.386BSD b/sys/i386/boot/README.386BSD
index ae61346800cb..cc5cb8fe2fbc 100644
--- a/sys/i386/boot/README.386BSD
+++ b/sys/i386/boot/README.386BSD
@@ -147,3 +147,5 @@ these should install painlessly.
 Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
+
+$Id$
diff --git a/sys/i386/boot/README.MACH b/sys/i386/boot/README.MACH
index a94c720327b6..cb6232936e28 100644
--- a/sys/i386/boot/README.MACH
+++ b/sys/i386/boot/README.MACH
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer, September 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,18 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: README.MACH,v $
-Revision 1.1  1993/03/21  18:08:16  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:33:55  rpd
- * 	From 2.5
- * 	[92/03/30            mg32]
- * 
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
+ *	$Id$
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/i386/boot/asm.S b/sys/i386/boot/asm.S
index 55ce675a0eb0..b2914285a422 100644
--- a/sys/i386/boot/asm.S
+++ b/sys/i386/boot/asm.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,41 +22,11 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
+ *	$Id$
  */
 
-/*
- * HISTORY
- * $Log: asm.S,v $
-Revision 1.2  1993/07/11  12:02:19  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
- *
- * 93/06/28  bde
- *	Switch IDT for debugger.
- *
- *	Change all addr16's to addr32's and all data16's to data32's.
- *
- * 93/06/26  bde
- *	Avoid "pushw $xreal".  Gas botches it even for 32-bit mode.
- *
-Revision 1.1  1993/03/21  18:08:21  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:34:13  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	From 2.5 boot: pruned inb(), outb(), and pzero().
- * 	[92/03/30            rvb]
- * 
- * Revision 2.2  91/04/02  14:35:10  mbj
- * 	Added _sp() => where is the stack at. [kupfer]
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
- */
 
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
diff --git a/sys/i386/boot/asm.h b/sys/i386/boot/asm.h
index 9b1b303ff156..43242bdec0fa 100644
--- a/sys/i386/boot/asm.h
+++ b/sys/i386/boot/asm.h
@@ -1,6 +1,4 @@
 /* 
- * Ported to Boot 386BSD by Julian Elsicher (julian@tfs.com) Sept. 1992
- *
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,80 +22,10 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
+ *	$Id$
  */
-/* 
- * HISTORY
- * $Log: asm.h,v $
- * Revision 1.2  1993/07/11  12:02:19  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
- *
- *
- * 93/06/28  bde
- *	Deleted addr16 and data16.  These produce the same prefix bytes as
- *	addr32 and data32 but have confusing names.  There is no way to make
- *	gas produce 16-bit addresses or operand sizes.  Instead, we let it
- *	produce 32-bit addresses and operand sizes and explicitly code the
- *	correct prefix(es) to make the address modes and operand sizes what
- *	gas thinks they are.  It would be safer to use prefixes before
- *	_every_ instruction (there are alleady a lot of unnecessary data32's
- *	before short jumps in case the jumps are actually long).  We must
- *	avoid "word" instructions becuase gas would produce the wrong prefix
- *	and there is no way to cancel a prefix.  We sometimes avoid adding
- *	a prefix using kludges like
- *		"xorl %eax, %eax	# actually xorw %ax, %ax".
- *
- * 93/06/28  bde
- *	Added addr32.
- *
- * Revision 1.1  1993/03/21  18:08:18  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.7  92/02/29  15:33:41  rpd
- * 	Added ENTRY2.
- * 	[92/02/28            rpd]
- * 
- * Revision 2.6  92/02/19  15:07:52  elf
- * 	Changed #if __STDC__ to #ifdef __STDC__
- * 	[92/01/16            jvh]
- * 
- * Revision 2.5  91/05/14  16:02:45  mrt
- * 	Correcting copyright
- * 
- * Revision 2.4  91/02/05  17:10:42  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:30:29  mrt]
- * 
- * Revision 2.3  90/12/20  16:35:27  jeffreyh
- * 	changes for __STDC__
- * 	[90/12/06            jeffreyh]
- * 
- * Revision 2.2  90/05/03  15:24:12  dbg
- * 	First checkin.
- * 
- *
- * 	Typo on ENTRY if gprof
- * 	[90/03/29            rvb]
- * 
- * 	fix SVC for "ifdef wheeze" [kupfer]
- * 	Fix the GPROF definitions.
- * 	ENTRY(x) gets profiled iffdef GPROF.
- * 	Entry(x) (and DATA(x)) is NEVER profiled.
- * 	MCOUNT can be used by asm that intends to build a frame,
- * 	after the frame is built.
- *	[90/02/26            rvb]
- *
- * 	Add #define addr16 .byte 0x67
- * 	[90/02/09            rvb]
- * 	Added LBi, SVC and ENTRY
- * 	[89/11/10  09:51:33  rvb]
- * 
- * 	New a.out and coff compatible .s files.
- * 	[89/10/16            rvb]
- */
-
 
 #define S_ARG0	 4(%esp)
 #define S_ARG1	 8(%esp)
diff --git a/sys/i386/boot/bios.S b/sys/i386/boot/bios.S
index c4ad6ad62530..687ca18c7d4b 100644
--- a/sys/i386/boot/bios.S
+++ b/sys/i386/boot/bios.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,43 +22,11 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
+ *	$Id$
  */
 
-/*
- * HISTORY
- * $Log: bios.S,v $
-Revision 1.2  1993/07/11  12:02:20  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
- *
- * 93/06/28  bde
- *	Guess the disk size when the BIOS doesn't support the diskinfo
- *	interrupt.
- *
- *	Change biosread() interface.  Sector count and io address are now
- *	args.
- *
- *	Change all data16's to data32's.
- *
-Revision 1.1  1993/03/21  18:08:23  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:34:26  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	From 2.5 version
- * 	[92/03/30            mg32]
- * 
- * Revision 2.2  91/04/02  14:35:21  mbj
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
- */
-
-
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
    by Intel Corporation, Santa Clara, California.
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index 3fd9155f93fd..2e4f162d9a12 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,7 +1,4 @@
 #
-# Ported to boot 386BSD by Julian Elischer (julian@tfs.com)
-# September 1992
-#
 # Permission to use, copy, modify and distribute this software and its
 # documentation is hereby granted, provided that both the copyright
 # notice and this permission notice appear in all copies of the
@@ -22,57 +19,10 @@
 # any improvements or extensions that they make and grant Carnegie Mellon
 # the rights to redistribute these changes.
 #
+#	from: Mach, Revision 2.2	92/04/04  11:33:46  rpd
+#	$Id$
 #
-# HISTORY
-# $Log: Makefile,v $
-# Revision 1.6  1993/07/11  12:02:17  andrew
-# Fixes from bde, including support for loading @ any MB boundary (e.g. a
-# kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-# buffering to speed booting from floppies.  Also works with aha174x
-# controllers in enhanced mode.
-#
-# Revision 1.5  1993/07/04  14:03:03  cgd
-# do the right thing, so things aren't built in /usr/src/sys
-#
-# Revision 1.4  1993/06/18  08:03:14  cgd
-# install floppy boot block, too.
-#
-# Revision 1.3  1993/06/08  03:36:39  deraadt
-# makes more sense if src is mounted readonly
-#
-# Revision 1.2  1993/04/28  08:45:51  deraadt
-# Ensure the rmaouthdr shell script is executable before running it!
-#
-# Revision 1.1  1993/03/21  18:08:11  cgd
-# after 0.2.2 "stable" patches applied
-#
-# 
-# 93/06/30  bde
-#	fd boot is now fast enough.
-#	(Safe) target fd0 and (unsafe) target wd0 to temporarily avoid
-#	updating /use/mdec.
-#
-# 93/06/29  bde
-#	Deleted weirdness for not-really-separate code and data segments.
-#	It is not necessary now that the GDT is dynamically initialized.
-#	table.o doesn't need to be early any more.  boot.sed is not used
-#	any more (delete it).  The shell commands that failed with status
-#	0 no longer exist so the 93/06/28 fixes got deleted.
-#
-#	Use .S extension for asm files to get (g)cc to preprocess them
-#	automatically.
-#
-# 93/06/28  bde
-#	Don't exit 0 from failing shell commands.
-#
-# Thu Sep 10 22:40:23 PDT 1992
-# Ported to 386BSD by Julian Elischer
-# julian@tfs.com
-#
-# Revision 2.2	92/04/04  11:33:46  rpd
-#	Fabricated for MACH 3.0
-#	[92/03/30	     mg32]
-#
+
 wd0:
 	dd if=boot of=biosboot count=1
 	dd if=boot of=bootbios skip=1
diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD
index ae61346800cb..cc5cb8fe2fbc 100644
--- a/sys/i386/boot/biosboot/README.386BSD
+++ b/sys/i386/boot/biosboot/README.386BSD
@@ -147,3 +147,5 @@ these should install painlessly.
 Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
+
+$Id$
diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH
index a94c720327b6..cb6232936e28 100644
--- a/sys/i386/boot/biosboot/README.MACH
+++ b/sys/i386/boot/biosboot/README.MACH
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer, September 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,18 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: README.MACH,v $
-Revision 1.1  1993/03/21  18:08:16  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:33:55  rpd
- * 	From 2.5
- * 	[92/03/30            mg32]
- * 
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
+ *	$Id$
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S
index 55ce675a0eb0..b2914285a422 100644
--- a/sys/i386/boot/biosboot/asm.S
+++ b/sys/i386/boot/biosboot/asm.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,41 +22,11 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
+ *	$Id$
  */
 
-/*
- * HISTORY
- * $Log: asm.S,v $
-Revision 1.2  1993/07/11  12:02:19  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
- *
- * 93/06/28  bde
- *	Switch IDT for debugger.
- *
- *	Change all addr16's to addr32's and all data16's to data32's.
- *
- * 93/06/26  bde
- *	Avoid "pushw $xreal".  Gas botches it even for 32-bit mode.
- *
-Revision 1.1  1993/03/21  18:08:21  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:34:13  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	From 2.5 boot: pruned inb(), outb(), and pzero().
- * 	[92/03/30            rvb]
- * 
- * Revision 2.2  91/04/02  14:35:10  mbj
- * 	Added _sp() => where is the stack at. [kupfer]
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
- */
 
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index 9b1b303ff156..43242bdec0fa 100644
--- a/sys/i386/boot/biosboot/asm.h
+++ b/sys/i386/boot/biosboot/asm.h
@@ -1,6 +1,4 @@
 /* 
- * Ported to Boot 386BSD by Julian Elsicher (julian@tfs.com) Sept. 1992
- *
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,80 +22,10 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
+ *	$Id$
  */
-/* 
- * HISTORY
- * $Log: asm.h,v $
- * Revision 1.2  1993/07/11  12:02:19  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
- *
- *
- * 93/06/28  bde
- *	Deleted addr16 and data16.  These produce the same prefix bytes as
- *	addr32 and data32 but have confusing names.  There is no way to make
- *	gas produce 16-bit addresses or operand sizes.  Instead, we let it
- *	produce 32-bit addresses and operand sizes and explicitly code the
- *	correct prefix(es) to make the address modes and operand sizes what
- *	gas thinks they are.  It would be safer to use prefixes before
- *	_every_ instruction (there are alleady a lot of unnecessary data32's
- *	before short jumps in case the jumps are actually long).  We must
- *	avoid "word" instructions becuase gas would produce the wrong prefix
- *	and there is no way to cancel a prefix.  We sometimes avoid adding
- *	a prefix using kludges like
- *		"xorl %eax, %eax	# actually xorw %ax, %ax".
- *
- * 93/06/28  bde
- *	Added addr32.
- *
- * Revision 1.1  1993/03/21  18:08:18  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.7  92/02/29  15:33:41  rpd
- * 	Added ENTRY2.
- * 	[92/02/28            rpd]
- * 
- * Revision 2.6  92/02/19  15:07:52  elf
- * 	Changed #if __STDC__ to #ifdef __STDC__
- * 	[92/01/16            jvh]
- * 
- * Revision 2.5  91/05/14  16:02:45  mrt
- * 	Correcting copyright
- * 
- * Revision 2.4  91/02/05  17:10:42  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:30:29  mrt]
- * 
- * Revision 2.3  90/12/20  16:35:27  jeffreyh
- * 	changes for __STDC__
- * 	[90/12/06            jeffreyh]
- * 
- * Revision 2.2  90/05/03  15:24:12  dbg
- * 	First checkin.
- * 
- *
- * 	Typo on ENTRY if gprof
- * 	[90/03/29            rvb]
- * 
- * 	fix SVC for "ifdef wheeze" [kupfer]
- * 	Fix the GPROF definitions.
- * 	ENTRY(x) gets profiled iffdef GPROF.
- * 	Entry(x) (and DATA(x)) is NEVER profiled.
- * 	MCOUNT can be used by asm that intends to build a frame,
- * 	after the frame is built.
- *	[90/02/26            rvb]
- *
- * 	Add #define addr16 .byte 0x67
- * 	[90/02/09            rvb]
- * 	Added LBi, SVC and ENTRY
- * 	[89/11/10  09:51:33  rvb]
- * 
- * 	New a.out and coff compatible .s files.
- * 	[89/10/16            rvb]
- */
-
 
 #define S_ARG0	 4(%esp)
 #define S_ARG1	 8(%esp)
diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S
index c4ad6ad62530..687ca18c7d4b 100644
--- a/sys/i386/boot/biosboot/bios.S
+++ b/sys/i386/boot/biosboot/bios.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,43 +22,11 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
+ *	$Id$
  */
 
-/*
- * HISTORY
- * $Log: bios.S,v $
-Revision 1.2  1993/07/11  12:02:20  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
- *
- * 93/06/28  bde
- *	Guess the disk size when the BIOS doesn't support the diskinfo
- *	interrupt.
- *
- *	Change biosread() interface.  Sector count and io address are now
- *	args.
- *
- *	Change all data16's to data32's.
- *
-Revision 1.1  1993/03/21  18:08:23  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:34:26  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	From 2.5 version
- * 	[92/03/30            mg32]
- * 
- * Revision 2.2  91/04/02  14:35:21  mbj
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
- */
-
-
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
    by Intel Corporation, Santa Clara, California.
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index 142f10cee158..1e15ab7073ac 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -25,90 +23,10 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- *	$Id: boot.c,v 1.6 1993/10/11 02:43:42 rgrimes Exp $
+ *	from: Mach, [92/04/03  16:51:14  rvb]
+ *	$Id: boot.c,v 1.7 1993/10/15 12:33:03 rgrimes Exp $
  */
 
-/*
- * HISTORY
- * $Log: boot.c,v $
- * Revision 1.6  1993/10/11  02:43:42  rgrimes
- * Fixed the options hd(1,... to be more accurate (removed word options it
- * now reads:
- *
- * printf("use hd(1,a)/386bsd to boot sd0 when wd0 is also installed\n");
- *
- * I know the person wanted more explination, but there is little room in
- * the boot blocks for verbose text!
- *
- * Revision 1.5  1993/10/09  08:31:39  chmr
- * Changed the "Insert filesystem floppy" prompt to give the user a choice in
- * which drive he wants the root file system (A or B).
- *
- * Revision 1.4  1993/10/08  20:19:23  rgrimes
- * Remove the ``loader overlaps bss, kernel must bzero'' printf since that
- * is so often reported as an error condition when it is not.  We print the
- * size of things so for those who want to know if this happened they can
- * figure it out from the size information that is printed.
- *
- * Revision 1.3  1993/07/16  13:06:08  rgrimes
- * Changed header from 386BSD BOOT to FreeBSD BOOT.
- *
- * Revision 1.2  1993/07/13  18:15:24  root
- * New boot blocks, from Bruce Evans, and NetBSD fixes.  Allows kernel to
- * be loaded above 1MB.  Same boot code for floppies now.  Speed improvements.
- * etc etc etc. (I don't have much history on this, but then have been tested)
- *
- * Revision 1.8  1993/07/11  12:02:21  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
- *
- * Revision 1.7  1993/06/18  06:50:52  cgd
- * convert magic numbers to network byte order, and attendent changes
- *
- * Revision 1.6  1993/06/14  00:47:08  deraadt
- * *whoops*. The previous commit killed a few important characters of code.
- *
- * Revision 1.5  1993/06/05  22:52:11  cgd
- * make sure kernel is small enough; this is a really weird fix from
- * rod, pk patch #159.  the comment is:
- *
- * The +28672 is for memory allocated by locore.s that must fit in the bss!
- *
- * this seems way wrong to me, but i'm not going to fix it in locore right
- * now...
- *
- * Revision 1.4  1993/05/04  10:22:39  deraadt
- * if we timeout asking for kernel name, print a \n before proceeding.
- * Funny how one character can bug ya so much, eh?
- *
- * Revision 1.3  1993/04/28  06:37:58  cgd
- * bsd->netbsd
- *
- * Revision 1.2  1993/04/28  05:32:55  cgd
- * new kernel name is "bsd"  also, add "o*" to list of kernels to boot.
- *
- * Revision 1.1  1993/03/21  18:08:26  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:34:37  rpd
- *
- * 93/07/03  bde
- *	Write first 4096 bytes to load address, not always to address 0.
- *
- * 93/06/29  bde
- *	Don't clobber BIOS variables.
- *
- * 	Change date in banner.
- * 	[92/04/03  16:51:14  rvb]
- * 
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	From 2.5 version.
- * 	[92/03/30            mg32]
- * 
- */
 
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
@@ -158,7 +76,7 @@ int drive;
 		ouraddr,
 		argv[7] = memsize(0),
 		argv[8] = memsize(1),
-		"$Revision: 1.6 $");
+		"$Revision: 1.7 $");
 	printf("use hd(1,a)/386bsd to boot sd0 when wd0 is also installed\n");
 	gateA20();
 loadstart:
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index ae53305a9732..f77f8823fb9d 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,18 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: boot.h,v $
- * Revision 1.1  1993/03/21  18:08:29  cgd
- * after 0.2.2 "stable" patches applied
  *
- * Revision 2.2  92/04/04  11:35:03  rpd
- * 	Fabricated from 3.0 bootstrap.  But too many things are global.
- * 	[92/03/30            mg32]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S
index 435d820b9862..2569dd253879 100644
--- a/sys/i386/boot/biosboot/boot2.S
+++ b/sys/i386/boot/biosboot/boot2.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,54 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: boot2.S,v $
-Revision 1.2  1993/07/11  12:02:22  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
  *
- * 93/07/06  bde
- *	Delete LOADMSG define (not used).
- *
- * 93/06/29  bde
- *	Use EXT.
- *
- *	Initialize GDT and IDT pointers at boot time.
- *
- *	Convert (drive | head | junk) to drive arg for boot() (not strictly
- *	necessary - boot() only uses drive & 0x80).
- *
- * 93/06/28  bde
- *	Initialize top bits of %eax for setting _ouraddr.  start.s
- *	initialized them suitably, but this isn't documented, and the BIOS
- *	isn't documented to preserve them.
- *
- *	Use addr32 for setting _ouraddr.  Without this, there were extra bytes
- *	0, 0 after the store.  These decode as "add %al, (%bx,%si)" in 16-bit
- *	mode would clobber something (except %al is very likely to be 0 :-).
- *
- *	Clear the bss.  This may be unnecessary.  Some is already cleared in
- *	the disk image.
- *
- *	Loop if boot() returns.
- *
-Revision 1.1  1993/03/21  18:08:33  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:35:26  rpd
- * 	From 2.5
- * 	[92/03/30            rvb]
- * 
- * Revision 2.2  91/04/02  14:39:21  mbj
- * 	Put into rcs tree
- * 	[90/02/09            rvb]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
+ *	$Id$
  */
 
 #include	"asm.h"
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 5be5723c7f6e..a8d1602a4adb 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,35 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: disk.c,v $
- * Revision 1.3  1993/07/11  12:02:23  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
  *
- * Revision 1.2  1993/06/18  02:28:58  cgd
- * make it *do* something when loading the kernel, a la sun twiddling-thing
- *
- * Revision 1.1  1993/03/21  18:08:36  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:35:49  rpd
- * 	Fabricated from 3.0 bootstrap and 2.5 boot disk.c:
- * 	with support for scsi
- * 	[92/03/30            mg32]
- * 
- */
-
-/*
- * 9/20/92
- * Peng-Toh Sim.  sim@cory.berkeley.edu
- * Added bad144 support under 386bsd for wd's
- * So, bad block remapping is done when loading the kernel.
+ *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
+ *	$Id$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index 5327f88a5c7e..6a5a58a3e3be 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,30 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: io.c,v $
- * Revision 1.3  1993/07/11  12:02:24  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
  *
- * Revision 1.2  1993/06/18  02:28:59  cgd
- * make it *do* something when loading the kernel, a la sun twiddling-thing
- *
- * Revision 1.1  1993/03/21  18:08:38  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:35:57  rpd
- * 	Fixed for IBM L40's A20 initialization.
- * 	[92/03/30            rvb]
- * 
- * 	Created.
- * 	[92/03/30            mg32]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
+ *	$Id$
  */
 
 #include <i386/include/pio.h>
diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S
index 88bd1ba3174d..62b93ac50e42 100644
--- a/sys/i386/boot/biosboot/start.S
+++ b/sys/i386/boot/biosboot/start.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,98 +22,11 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
+ *	$Id$
  */
 
-/*
- * HISTORY
- * $Log: start.S,v $
-Revision 1.2  1993/07/11  12:02:24  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
- *
- * 93/07/06  bde
- *	Restored BOOTSEG to 0x9000 for distribution.  It should be decided
- *	at boot time to locate the bootstrap immediately underneath the
- *	debugger or whatever is in high memory.  This isn't safe yet,
- *	because it might make the read-ahead buffer might lie across a 64K
- *	DMA boundary.
- *
- * 93/07/03  bde
- *	Some floppy BIOS's can only handle reads of one track, so a LOADSZ
- *	of 16 doesn't work.  15 will do for now.
- *
- * 93/06/29  bde
- *	LOADSZ is 16, not 14.  The BIOS can handle a minimum of one floppy
- *	cylinder so it can always handle 16 sectors starting at head 0,
- *	sector 1.
- *
- * 93/06/28  bde
- *	Changed addr16's to addr32's.  One before a useless "xor %ecx, %ecx"
- *	did nothing (removed both prefix and xor).
- *
- * 	Initialize head = %dh = 0 for floppy case.
- *
- *	Fixed #ifdef DEBUG ... #endif that split data32; jmp load.  If
- *	DEBUG is defined then the jmp doesn't get prefixed.  This is fatal
- *	iff the jmp is long.  Usually the jmp will be short and the prefix
- *	unnecessary.  But it is more likely to be necessary if DEBUG is
- *	defined.
- *
- * 93/06/27  bde
- *	Removed bogus Int 21.  There is no Int 21 BIOS call.  The drive
- *	number is passed to here in %dl and the Int 21 is at best a nop.
- *	Some BIOS's treat Int 21 as a stray hardware interrupt and shut
- *	down all in-service interrupts.  This should not be a problem
- *	because this are not an interrupt handler so there are no
- *	in-service interrupts, but ...
- *
- *	Fixed fd/hd decision.  "%dl ge 0x80" (signed comparison) was always
- *	true, so fd's were treated as hd's.  This was not a problem because
- *	the boot block has a partition table.
- *
- *	Reduced BOOTSEG and added breakpoint so that debugger can look at
- *	this.  Having a fixed boot address is bad because some machines don't
- *	have 640K and others have debuggers and/or BIOS stuff in high memory.
- *
- * 93/04/30  bde
- *	Commented out "<leading white space> # %".  It's not C, and gcc-2's
- *	cpp doesn't allow it.  "# identifier" isn't C either but works for now.
- *
- *	Use $ EXT instead of $EXT to avoid broken DOLLARS_IN_IDENTIFIERS stuff
- *	in gcc-2.3.3.  (Bug is still in gcc-2.4.5 but is avoided by using .S
- *	files.)
- *
-Revision 1.1  1993/03/21  18:08:42  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:36:29  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	Need to zero dh on hd path; at least for an adaptec card.
- * 	[92/01/14            rvb]
- * 
- * 	From 2.5 boot:
- * 	Flush digit printing.
- * 	Fuse floppy and hd boot by using Int 21 to tell
- * 	boot type (slightly dubious since Int 21 is DOS
- * 	not BIOS)
- * 	[92/03/30            mg32]
- * 
- * Revision 2.2  91/04/02  14:42:04  mbj
- * 	Fix the BIG boot bug.  We had missed a necessary data
- * 	before a xor that was clearing a register used later
- * 	as an index register.
- * 	[91/03/01            rvb]
- * 	Remember floppy type for swapgeneric
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
- */
- 
-
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
    by Intel Corporation, Santa Clara, California.
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index 1f3a9b32b6ec..4ffe17194d99 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,18 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: sys.c,v $
- * Revision 1.1  1993/03/21  18:08:45  cgd
- * after 0.2.2 "stable" patches applied
  *
- * Revision 2.2  92/04/04  11:36:34  rpd
- * 	Fabricated from 3.0 bootstrap and scratch.
- * 	[92/03/30            mg32]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
+ *	$Id$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index fc14801978f6..c53173d5aa0f 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,40 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: table.c,v $
- * Revision 1.2  1993/07/11  12:02:25  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
  *
- *
- * 93/06/28  bde
- *	Remove remaining magic numbers that depend on the load address.
- *	IDTs and many more GDT entries to support my debugger.
- *
- * 93/06/27  bde
- *	Remove unused Gdtr2.
- *	Remove some magic numbers from Gdtr and Gdt.  The boot loader may
- *	override the ones related to the standard load address of 0x90000.
- *
- * Revision 1.1  1993/03/21  18:08:47  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:36:43  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	Taken from 2.5 bootstrap.
- * 	[92/03/30            rvb]
- * 
- * Revision 2.2  91/04/02  14:42:22  mbj
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/boot/boot.c b/sys/i386/boot/boot.c
index 142f10cee158..1e15ab7073ac 100644
--- a/sys/i386/boot/boot.c
+++ b/sys/i386/boot/boot.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -25,90 +23,10 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- *	$Id: boot.c,v 1.6 1993/10/11 02:43:42 rgrimes Exp $
+ *	from: Mach, [92/04/03  16:51:14  rvb]
+ *	$Id: boot.c,v 1.7 1993/10/15 12:33:03 rgrimes Exp $
  */
 
-/*
- * HISTORY
- * $Log: boot.c,v $
- * Revision 1.6  1993/10/11  02:43:42  rgrimes
- * Fixed the options hd(1,... to be more accurate (removed word options it
- * now reads:
- *
- * printf("use hd(1,a)/386bsd to boot sd0 when wd0 is also installed\n");
- *
- * I know the person wanted more explination, but there is little room in
- * the boot blocks for verbose text!
- *
- * Revision 1.5  1993/10/09  08:31:39  chmr
- * Changed the "Insert filesystem floppy" prompt to give the user a choice in
- * which drive he wants the root file system (A or B).
- *
- * Revision 1.4  1993/10/08  20:19:23  rgrimes
- * Remove the ``loader overlaps bss, kernel must bzero'' printf since that
- * is so often reported as an error condition when it is not.  We print the
- * size of things so for those who want to know if this happened they can
- * figure it out from the size information that is printed.
- *
- * Revision 1.3  1993/07/16  13:06:08  rgrimes
- * Changed header from 386BSD BOOT to FreeBSD BOOT.
- *
- * Revision 1.2  1993/07/13  18:15:24  root
- * New boot blocks, from Bruce Evans, and NetBSD fixes.  Allows kernel to
- * be loaded above 1MB.  Same boot code for floppies now.  Speed improvements.
- * etc etc etc. (I don't have much history on this, but then have been tested)
- *
- * Revision 1.8  1993/07/11  12:02:21  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
- *
- * Revision 1.7  1993/06/18  06:50:52  cgd
- * convert magic numbers to network byte order, and attendent changes
- *
- * Revision 1.6  1993/06/14  00:47:08  deraadt
- * *whoops*. The previous commit killed a few important characters of code.
- *
- * Revision 1.5  1993/06/05  22:52:11  cgd
- * make sure kernel is small enough; this is a really weird fix from
- * rod, pk patch #159.  the comment is:
- *
- * The +28672 is for memory allocated by locore.s that must fit in the bss!
- *
- * this seems way wrong to me, but i'm not going to fix it in locore right
- * now...
- *
- * Revision 1.4  1993/05/04  10:22:39  deraadt
- * if we timeout asking for kernel name, print a \n before proceeding.
- * Funny how one character can bug ya so much, eh?
- *
- * Revision 1.3  1993/04/28  06:37:58  cgd
- * bsd->netbsd
- *
- * Revision 1.2  1993/04/28  05:32:55  cgd
- * new kernel name is "bsd"  also, add "o*" to list of kernels to boot.
- *
- * Revision 1.1  1993/03/21  18:08:26  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:34:37  rpd
- *
- * 93/07/03  bde
- *	Write first 4096 bytes to load address, not always to address 0.
- *
- * 93/06/29  bde
- *	Don't clobber BIOS variables.
- *
- * 	Change date in banner.
- * 	[92/04/03  16:51:14  rvb]
- * 
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	From 2.5 version.
- * 	[92/03/30            mg32]
- * 
- */
 
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
@@ -158,7 +76,7 @@ int drive;
 		ouraddr,
 		argv[7] = memsize(0),
 		argv[8] = memsize(1),
-		"$Revision: 1.6 $");
+		"$Revision: 1.7 $");
 	printf("use hd(1,a)/386bsd to boot sd0 when wd0 is also installed\n");
 	gateA20();
 loadstart:
diff --git a/sys/i386/boot/boot.h b/sys/i386/boot/boot.h
index ae53305a9732..f77f8823fb9d 100644
--- a/sys/i386/boot/boot.h
+++ b/sys/i386/boot/boot.h
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,18 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: boot.h,v $
- * Revision 1.1  1993/03/21  18:08:29  cgd
- * after 0.2.2 "stable" patches applied
  *
- * Revision 2.2  92/04/04  11:35:03  rpd
- * 	Fabricated from 3.0 bootstrap.  But too many things are global.
- * 	[92/03/30            mg32]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/boot/boot2.S b/sys/i386/boot/boot2.S
index 435d820b9862..2569dd253879 100644
--- a/sys/i386/boot/boot2.S
+++ b/sys/i386/boot/boot2.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,54 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: boot2.S,v $
-Revision 1.2  1993/07/11  12:02:22  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
  *
- * 93/07/06  bde
- *	Delete LOADMSG define (not used).
- *
- * 93/06/29  bde
- *	Use EXT.
- *
- *	Initialize GDT and IDT pointers at boot time.
- *
- *	Convert (drive | head | junk) to drive arg for boot() (not strictly
- *	necessary - boot() only uses drive & 0x80).
- *
- * 93/06/28  bde
- *	Initialize top bits of %eax for setting _ouraddr.  start.s
- *	initialized them suitably, but this isn't documented, and the BIOS
- *	isn't documented to preserve them.
- *
- *	Use addr32 for setting _ouraddr.  Without this, there were extra bytes
- *	0, 0 after the store.  These decode as "add %al, (%bx,%si)" in 16-bit
- *	mode would clobber something (except %al is very likely to be 0 :-).
- *
- *	Clear the bss.  This may be unnecessary.  Some is already cleared in
- *	the disk image.
- *
- *	Loop if boot() returns.
- *
-Revision 1.1  1993/03/21  18:08:33  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:35:26  rpd
- * 	From 2.5
- * 	[92/03/30            rvb]
- * 
- * Revision 2.2  91/04/02  14:39:21  mbj
- * 	Put into rcs tree
- * 	[90/02/09            rvb]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
+ *	$Id$
  */
 
 #include	"asm.h"
diff --git a/sys/i386/boot/disk.c b/sys/i386/boot/disk.c
index 5be5723c7f6e..a8d1602a4adb 100644
--- a/sys/i386/boot/disk.c
+++ b/sys/i386/boot/disk.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,35 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: disk.c,v $
- * Revision 1.3  1993/07/11  12:02:23  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
  *
- * Revision 1.2  1993/06/18  02:28:58  cgd
- * make it *do* something when loading the kernel, a la sun twiddling-thing
- *
- * Revision 1.1  1993/03/21  18:08:36  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:35:49  rpd
- * 	Fabricated from 3.0 bootstrap and 2.5 boot disk.c:
- * 	with support for scsi
- * 	[92/03/30            mg32]
- * 
- */
-
-/*
- * 9/20/92
- * Peng-Toh Sim.  sim@cory.berkeley.edu
- * Added bad144 support under 386bsd for wd's
- * So, bad block remapping is done when loading the kernel.
+ *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
+ *	$Id$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/io.c b/sys/i386/boot/io.c
index 5327f88a5c7e..6a5a58a3e3be 100644
--- a/sys/i386/boot/io.c
+++ b/sys/i386/boot/io.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,30 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: io.c,v $
- * Revision 1.3  1993/07/11  12:02:24  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
  *
- * Revision 1.2  1993/06/18  02:28:59  cgd
- * make it *do* something when loading the kernel, a la sun twiddling-thing
- *
- * Revision 1.1  1993/03/21  18:08:38  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:35:57  rpd
- * 	Fixed for IBM L40's A20 initialization.
- * 	[92/03/30            rvb]
- * 
- * 	Created.
- * 	[92/03/30            mg32]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
+ *	$Id$
  */
 
 #include <i386/include/pio.h>
diff --git a/sys/i386/boot/rmaouthdr b/sys/i386/boot/rmaouthdr
index 99f76a4d627c..4bb9c84924d1 100644
--- a/sys/i386/boot/rmaouthdr
+++ b/sys/i386/boot/rmaouthdr
@@ -1,15 +1,6 @@
 #!/bin/csh -f
-#  Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
-# 
 #
-# HISTORY
-# $Log: rmaouthdr,v $
-# Revision 1.1  1993/03/21  18:08:40  cgd
-# after 0.2.2 "stable" patches applied
-#
-# Revision 2.2  92/04/04  11:36:01  rpd
-# 	From 2.5 boot
-# 	[92/03/30            mg32]
-# 
+#	from: Mach, Revision 2.2  92/04/04  11:36:01  rpd
+#	$Id$ 
 #
 dd if=$1 of=$2 ibs=32 skip=1 obs=1024b
diff --git a/sys/i386/boot/start.S b/sys/i386/boot/start.S
index 88bd1ba3174d..62b93ac50e42 100644
--- a/sys/i386/boot/start.S
+++ b/sys/i386/boot/start.S
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,98 +22,11 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
+ *	$Id$
  */
 
-/*
- * HISTORY
- * $Log: start.S,v $
-Revision 1.2  1993/07/11  12:02:24  andrew
-Fixes from bde, including support for loading @ any MB boundary (e.g. a
-kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
-buffering to speed booting from floppies.  Also works with aha174x
-controllers in enhanced mode.
-
- *
- * 93/07/06  bde
- *	Restored BOOTSEG to 0x9000 for distribution.  It should be decided
- *	at boot time to locate the bootstrap immediately underneath the
- *	debugger or whatever is in high memory.  This isn't safe yet,
- *	because it might make the read-ahead buffer might lie across a 64K
- *	DMA boundary.
- *
- * 93/07/03  bde
- *	Some floppy BIOS's can only handle reads of one track, so a LOADSZ
- *	of 16 doesn't work.  15 will do for now.
- *
- * 93/06/29  bde
- *	LOADSZ is 16, not 14.  The BIOS can handle a minimum of one floppy
- *	cylinder so it can always handle 16 sectors starting at head 0,
- *	sector 1.
- *
- * 93/06/28  bde
- *	Changed addr16's to addr32's.  One before a useless "xor %ecx, %ecx"
- *	did nothing (removed both prefix and xor).
- *
- * 	Initialize head = %dh = 0 for floppy case.
- *
- *	Fixed #ifdef DEBUG ... #endif that split data32; jmp load.  If
- *	DEBUG is defined then the jmp doesn't get prefixed.  This is fatal
- *	iff the jmp is long.  Usually the jmp will be short and the prefix
- *	unnecessary.  But it is more likely to be necessary if DEBUG is
- *	defined.
- *
- * 93/06/27  bde
- *	Removed bogus Int 21.  There is no Int 21 BIOS call.  The drive
- *	number is passed to here in %dl and the Int 21 is at best a nop.
- *	Some BIOS's treat Int 21 as a stray hardware interrupt and shut
- *	down all in-service interrupts.  This should not be a problem
- *	because this are not an interrupt handler so there are no
- *	in-service interrupts, but ...
- *
- *	Fixed fd/hd decision.  "%dl ge 0x80" (signed comparison) was always
- *	true, so fd's were treated as hd's.  This was not a problem because
- *	the boot block has a partition table.
- *
- *	Reduced BOOTSEG and added breakpoint so that debugger can look at
- *	this.  Having a fixed boot address is bad because some machines don't
- *	have 640K and others have debuggers and/or BIOS stuff in high memory.
- *
- * 93/04/30  bde
- *	Commented out "<leading white space> # %".  It's not C, and gcc-2's
- *	cpp doesn't allow it.  "# identifier" isn't C either but works for now.
- *
- *	Use $ EXT instead of $EXT to avoid broken DOLLARS_IN_IDENTIFIERS stuff
- *	in gcc-2.3.3.  (Bug is still in gcc-2.4.5 but is avoided by using .S
- *	files.)
- *
-Revision 1.1  1993/03/21  18:08:42  cgd
-after 0.2.2 "stable" patches applied
-
- * Revision 2.2  92/04/04  11:36:29  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	Need to zero dh on hd path; at least for an adaptec card.
- * 	[92/01/14            rvb]
- * 
- * 	From 2.5 boot:
- * 	Flush digit printing.
- * 	Fuse floppy and hd boot by using Int 21 to tell
- * 	boot type (slightly dubious since Int 21 is DOS
- * 	not BIOS)
- * 	[92/03/30            mg32]
- * 
- * Revision 2.2  91/04/02  14:42:04  mbj
- * 	Fix the BIG boot bug.  We had missed a necessary data
- * 	before a xor that was clearing a register used later
- * 	as an index register.
- * 	[91/03/01            rvb]
- * 	Remember floppy type for swapgeneric
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
- */
- 
-
 /*
   Copyright 1988, 1989, 1990, 1991, 1992 
    by Intel Corporation, Santa Clara, California.
diff --git a/sys/i386/boot/sys.c b/sys/i386/boot/sys.c
index 1f3a9b32b6ec..4ffe17194d99 100644
--- a/sys/i386/boot/sys.c
+++ b/sys/i386/boot/sys.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,18 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: sys.c,v $
- * Revision 1.1  1993/03/21  18:08:45  cgd
- * after 0.2.2 "stable" patches applied
  *
- * Revision 2.2  92/04/04  11:36:34  rpd
- * 	Fabricated from 3.0 bootstrap and scratch.
- * 	[92/03/30            mg32]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
+ *	$Id$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/table.c b/sys/i386/boot/table.c
index fc14801978f6..c53173d5aa0f 100644
--- a/sys/i386/boot/table.c
+++ b/sys/i386/boot/table.c
@@ -1,6 +1,4 @@
 /*
- * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,40 +22,9 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * $Log: table.c,v $
- * Revision 1.2  1993/07/11  12:02:25  andrew
- * Fixes from bde, including support for loading @ any MB boundary (e.g. a
- * kernel linked for 0xfe100000 will load at the 1MB mark) and read-ahead
- * buffering to speed booting from floppies.  Also works with aha174x
- * controllers in enhanced mode.
  *
- *
- * 93/06/28  bde
- *	Remove remaining magic numbers that depend on the load address.
- *	IDTs and many more GDT entries to support my debugger.
- *
- * 93/06/27  bde
- *	Remove unused Gdtr2.
- *	Remove some magic numbers from Gdtr and Gdt.  The boot loader may
- *	override the ones related to the standard load address of 0x90000.
- *
- * Revision 1.1  1993/03/21  18:08:47  cgd
- * after 0.2.2 "stable" patches applied
- *
- * Revision 2.2  92/04/04  11:36:43  rpd
- * 	Fix Intel Copyright as per B. Davies authorization.
- * 	[92/04/03            rvb]
- * 	Taken from 2.5 bootstrap.
- * 	[92/03/30            rvb]
- * 
- * Revision 2.2  91/04/02  14:42:22  mbj
- * 	Add Intel copyright
- * 	[90/02/09            rvb]
- * 
+ *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/sioreg.h b/sys/i386/isa/sioreg.h
index 2a626832e87c..4b0f1b6fa5de 100644
--- a/sys/i386/isa/sioreg.h
+++ b/sys/i386/isa/sioreg.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)comreg.h	7.2 (Berkeley) 5/9/91
+ *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 
diff --git a/sys/isa/sioreg.h b/sys/isa/sioreg.h
index 2a626832e87c..4b0f1b6fa5de 100644
--- a/sys/isa/sioreg.h
+++ b/sys/isa/sioreg.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)comreg.h	7.2 (Berkeley) 5/9/91
+ *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */