diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h
index 870c5de887ec..1bc590caa367 100644
--- a/sys/alpha/include/console.h
+++ b/sys/alpha/include/console.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: console.h,v 1.18 1995/01/28 22:15:30 sos Exp $
+ *	$Id: console.h,v 1.19 1995/05/30 08:00:28 rgrimes Exp $
  */
 
 #ifndef	_CONSOLE_H_
@@ -117,7 +117,7 @@ struct mouse_info {
 #define KD_HERCULES	2		/* hercules adapter          	*/
 #define KD_CGA		3		/* color graphics adapter    	*/
 #define KD_EGA		4		/* enhanced graphics adapter 	*/
-#define KD_VGA		5		/* video graohics adapter    	*/
+#define KD_VGA		5		/* video graphics adapter    	*/
 
 #define KD_TEXT		0		/* set text mode restore fonts  */
 #define KD_TEXT0	0		/* ditto			*/
@@ -238,7 +238,7 @@ typedef struct ssaver ssaver_t;
 #define F(x)		((x)+F_FN-1)
 #define	S(x)		((x)+F_SCR-1)
 #define NOKEY		0x100		/* no key pressed marker 	*/
-#define FKEY		0x200		/* funtion key marker 		*/
+#define FKEY		0x200		/* function key marker 		*/
 #define MKEY		0x400		/* meta key marker (prepend ESC)*/
 #define BKEY		0x800		/* backtab (ESC [ Z)		*/
 
diff --git a/sys/alpha/linux/linux.h b/sys/alpha/linux/linux.h
index 22bc387e6031..c0fbc0a20fe2 100644
--- a/sys/alpha/linux/linux.h
+++ b/sys/alpha/linux/linux.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.2 1995/11/22 07:43:43 bde Exp $
+ *	$Id: linux.h,v 1.3 1995/12/29 22:12:10 sos Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index 0c5667ba8294..7be09ac82bbe 100644
--- a/sys/amd64/include/cputypes.h
+++ b/sys/amd64/include/cputypes.h
@@ -11,7 +11,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cputypes.h,v 1.3 1994/09/04 19:59:23 pst Exp $
+ *	$Id: cputypes.h,v 1.4 1995/12/24 08:10:50 davidg Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index 291a0a1dba7a..bb584a12c48b 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.10 1995/03/16 18:11:42 bde Exp $
+ *	$Id: frame.h,v 1.11 1995/12/14 08:21:33 phk Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
@@ -67,7 +67,7 @@ struct trapframe {
 	int	tf_eip;
 	int	tf_cs;
 	int	tf_eflags;
-	/* below only when transitting rings (e.g. user to kernel) */
+	/* below only when crossing rings (e.g. user to kernel) */
 	int	tf_esp;
 	int	tf_ss;
 };
@@ -93,7 +93,7 @@ struct intrframe {
 	int	if_eip;
 	int	if_cs;
 	int	if_eflags;
-	/* below only when transitting rings (e.g. user to kernel) */
+	/* below only when crossing rings (e.g. user to kernel) */
 	int	if_esp;
 	int	if_ss;
 };
@@ -119,7 +119,7 @@ struct clockframe {
 	int	cf_eip;
 	int	cf_cs;
 	int	cf_eflags;
-	/* below only when transitting rings (e.g. user to kernel) */
+	/* below only when crossing rings (e.g. user to kernel) */
 	int	cf_esp;
 	int	cf_ss;
 };
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index d36ede3cbd1e..943bb062db09 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$Id: ieeefp.h,v 1.1 1994/08/04 19:16:37 wollman Exp $
+ *	$Id: ieeefp.h,v 1.2 1994/08/05 14:36:04 wollman Exp $
  */
 
 /*
@@ -52,13 +52,13 @@ typedef enum {
 } fp_rnd_t;
 
 /*
- * FP precison modes
+ * FP precision modes
  */
 typedef enum {
-	FP_PS=0,	/* 24 bit (single-precsion) */
+	FP_PS=0,	/* 24 bit (single-precision) */
 	FP_PRS,		/* reserved */
 	FP_PD,		/* 53 bit (double-precision) */
-	FP_PE		/* 64 bit (extended-precsion) */
+	FP_PE		/* 64 bit (extended-precision) */
 } fp_prec_t;
 
 #define fp_except_t	int
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index ef5ee1b6a124..b7569f6d3d76 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.30 1995/12/10 13:38:09 phk Exp $
+ * 	$Id: pmap.h,v 1.31 1995/12/17 07:39:05 bde Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -133,7 +133,7 @@ pmap_kextract(vm_offset_t va)
 #endif
 
 /*
- * macros to generate page directory/table indicies
+ * macros to generate page directory/table indices
  */
 
 #define	pdei(va)	(((va)&PD_MASK)>>PD_SHIFT)
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 3d96dbc52495..4c412c4786b2 100644
--- a/sys/amd64/include/psl.h
+++ b/sys/amd64/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$Id: psl.h,v 1.5 1994/08/10 03:51:18 wollman Exp $
+ *	$Id: psl.h,v 1.6 1995/01/14 13:20:25 bde Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
@@ -78,7 +78,7 @@
 /*
  * Bits that can be changed in user mode on 486's.  We allow these bits
  * to be changed using ptrace(), sigreturn() and procfs.  Setting PS_NT
- * is undesireable but it may as well be allowed since users can inflict
+ * is undesirable but it may as well be allowed since users can inflict
  * it on the kernel directly.  Changes to PSL_AC are silently ignored on
  * 386's.
  */
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index 9fc18148ff36..ce988e4d6060 100644
--- a/sys/amd64/include/reg.h
+++ b/sys/amd64/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$Id: reg.h,v 1.9 1994/10/02 17:31:29 phk Exp $
+ *	$Id: reg.h,v 1.10 1995/01/14 10:41:41 bde Exp $
  */
 
 #ifndef _MACHINE_REG_H_
@@ -71,7 +71,7 @@
 /*
  * Registers accessible to ptrace(2) syscall for debugger
  * The machine-dependent code for PT_{SET,GET}REGS needs to
- * use whichver order, defined above, is correct, so that it
+ * use whichever order, defined above, is correct, so that it
  * is all invisible to the user.
  */
 struct reg {
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index dcac309481a7..5fadb985345b 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$Id: segments.h,v 1.8 1995/02/14 19:21:15 sos Exp $
+ *	$Id: segments.h,v 1.9 1995/05/30 08:00:50 rgrimes Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
@@ -124,7 +124,7 @@ union	descriptor	{
 #define	SDT_MEMROD	20	/* memory read only expand dwn limit */
 #define	SDT_MEMRODA	21	/* memory read only expand dwn limit accessed */
 #define	SDT_MEMRWD	22	/* memory read write expand dwn limit */
-#define	SDT_MEMRWDA	23	/* memory read write expand dwn limit acessed */
+#define	SDT_MEMRWDA	23	/* memory read write expand dwn limit accessed */
 #define	SDT_MEME	24	/* memory execute only */
 #define	SDT_MEMEA	25	/* memory execute only accessed */
 #define	SDT_MEMER	26	/* memory execute read */
@@ -226,7 +226,7 @@ struct region_descriptor {
 #define	L43BSDCALLS_SEL	2	/* notyet */
 #define	LUCODE_SEL	3
 #define	LUDATA_SEL	4
-/* seperate stack, es,fs,gs sels ? */
+/* separate stack, es,fs,gs sels ? */
 /* #define	LPOSIXCALLS_SEL	5*/	/* notyet */
 #define NLDT		(LUDATA_SEL + 1)
 
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index 75cc79dae89b..c5035499ee0f 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: specialreg.h,v 1.6 1995/01/14 10:44:55 bde Exp $
+ *	$Id: specialreg.h,v 1.7 1995/05/30 08:00:54 rgrimes Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
@@ -59,7 +59,7 @@
 #define CR0_AM	0x00040000	/* Alignment Mask (set to enable AC flag) */
 
 /*
- * Cyrix 486 DLC special registers, accessable as IO ports.
+ * Cyrix 486 DLC special registers, accessible as IO ports.
  */
 #define CCR0	0xc0		/* configuration control register 0 */
 #define CCR0_NC0	0x01	/* first 64K of each 1M memory region is
@@ -79,7 +79,7 @@
 
 /*
  * the following four 3-byte registers control the non-cacheable regions.
- * These registers must be written as three seperate bytes.
+ * These registers must be written as three separate bytes.
  *
  * NCRx+0: A31-A24 of starting address
  * NCRx+1: A23-A16 of starting address
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index fd07e357ffd8..7c39ffd273b0 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$Id: tss.h,v 1.4 1993/11/17 23:25:04 wollman Exp $
+ *	$Id: tss.h,v 1.5 1995/05/30 08:00:57 rgrimes Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
@@ -46,12 +46,12 @@
 
 struct i386tss {
 	int	tss_link;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp0; 	/* kernel stack pointer priviledge level 0 */
+	int	tss_esp0; 	/* kernel stack pointer privilege level 0 */
 #define	tss_ksp	tss_esp0
 	int	tss_ss0;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp1; 	/* kernel stack pointer priviledge level 1 */
+	int	tss_esp1; 	/* kernel stack pointer privilege level 1 */
 	int	tss_ss1;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp2; 	/* kernel stack pointer priviledge level 2 */
+	int	tss_esp2; 	/* kernel stack pointer privilege level 2 */
 	int	tss_ss2;	/* actually 16 bits: top 16 bits must be zero */
 	int	tss_cr3; 	/* page table directory */
 #define	tss_ptd	tss_cr3
diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index 74a75107ca19..fccfdad2609d 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.16 1995/09/08 03:14:00 julian Exp $
+ *	$Id: isa.h,v 1.17 1995/11/18 09:29:39 bde Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
@@ -146,7 +146,7 @@
 #define	IO_CGASIZE	16		/* CGA controllers */
 #define	IO_COMSIZE	8		/* 8250, 16x50 com controllers */
 #define	IO_DMASIZE	16		/* 8237 DMA controllers */
-#define	IO_DPGSIZE	32		/* 74LS612 DMA page reisters */
+#define	IO_DPGSIZE	32		/* 74LS612 DMA page registers */
 #define	IO_EISASIZE	256		/* EISA controllers */
 #define	IO_FDCSIZE	8		/* Nec765 floppy controllers */
 #define	IO_GAMSIZE	16		/* AT compatible game controllers */
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index a4caf6e941ce..dd823e006350 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.233 1996/01/09 23:14:57 ats Exp $
+#	$Id: LINT,v 1.234 1996/01/13 23:30:10 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -51,7 +51,7 @@ options		OPEN_MAX=128
 #
 options		MATH_EMULATE		#Support for x87 emulation
 # Don't enable both of these in a real config.
-options		GPL_MATH_EMULATE	#Support for x87 emualtion via
+options		GPL_MATH_EMULATE	#Support for x87 emulation via
 					#new math emulator 
 
 #
@@ -75,7 +75,7 @@ config		kernel	root on wd0 dumps on wd0
 options		"COMPAT_43"
 
 #
-# Allow user-mode programs to manipulat their local descriptor tables.
+# Allow user-mode programs to manipulate their local descriptor tables.
 # This option is required for the WINE Windows(tm) emulator, and is
 # not used by anything else (that we know of).
 #
@@ -247,7 +247,7 @@ options		UNION			#Union filesystem
 # THis DEVFS is experimental but seems to work
 options		DEVFS			#devices filesystem
 
-# Make space in the kernel for a MFS rootfilesystem.  Define to the number
+# Make space in the kernel for a MFS root filesystem.  Define to the number
 # of kilobytes to reserve for the filesystem.
 options		MFS_ROOT=10
 # Allow the MFS_ROOT code to load the MFS image from floppy if it is missing.
@@ -584,7 +584,7 @@ options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to
 #
 # Network interfaces: `cx', `ed', `el', `ep', `ie', `is', `le', `lnc'
 #
-# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver (reqires sppp)
+# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver (requires sppp)
 # cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing)
 # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 # el: 3Com 3C501 (slow!)
@@ -699,7 +699,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # wt: Wangtek and Archive QIC-02/QIC-36 tape drives
 # ctx: Cortex-I frame grabber
 # apm: Laptop Advanced Power Management (experimental)
-# spigot: The Creative Labs Video Spigot video-aquisition board
+# spigot: The Creative Labs Video Spigot video-acquisition board
 # meteor: Matrox Meteor video capture board
 # cy: Cyclades serial driver
 # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
@@ -741,7 +741,7 @@ device pca0 at isa? port IO_TIMER1 tty
 device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
 # for the Sony CDU31/33A CDROM
 device		scd0	at isa? port 0x230 bio
-# for the soundblaster 16 multicd - up to 4 devices
+# for the SoundBlaster 16 multicd - up to 4 devices
 controller      matcd0  at isa? port 0x230 bio
 device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 device		ctx0	at isa? port 0x230 iomem 0xd0000
@@ -830,7 +830,7 @@ controller	pcic0 at crd?
 # Laptop/Notebook options:
 #
 # See also:
-#  apm under `Miscellaneous hardare'
+#  apm under `Miscellaneous hardware'
 #  options		PSM_NO_RESET  for the `psm' driver
 # above.
 
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index d683b331a9b6..f09e5579e906 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -92,8 +92,8 @@ struct meteor_counts {
 
 				/* METEORCAPTUR capture options */
 #define METEOR_CAP_SINGLE	0x0001	/* capture one frame */
-#define METEOR_CAP_CONTINOUS	0x0002	/* contiuously capture */
-#define METEOR_CAP_STOP_CONT	0x0004	/* stop the continous capture */
+#define METEOR_CAP_CONTINOUS	0x0002	/* continuously capture */
+#define METEOR_CAP_STOP_CONT	0x0004	/* stop the continuous capture */
 
 				/* METEORCAPFRM capture commands */
 #define METEOR_CAP_N_FRAMES	0x0001	/* capture N frames */
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 11a2b61e8cb8..a03ce651c1d7 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.18 1995/05/30 08:02:00 rgrimes Exp $
+ * $Id: if_edreg.h,v 1.19 1995/09/26 08:57:45 phk Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
@@ -211,7 +211,7 @@
 
 /*
  * OVW: OverWrite. Indicates a receive ring-buffer overrun. Incoming network
- *	would exceed (has exceeded?) the boundry pointer, resulting in data
+ *	would exceed (has exceeded?) the boundary pointer, resulting in data
  *	that was previously received and not yet read from the buffer to be
  *	overwritten.
  */
@@ -266,7 +266,7 @@
 
 /*
  * OVWE: OverWrite error interrupt Enable. If set, an interrupt is generated whenever
- *	the receive ring-buffer is overrun. i.e. when the boundry pointer is exceeded.
+ *	the receive ring-buffer is overrun. i.e. when the boundary pointer is exceeded.
  */
 #define ED_IMR_OVWE	0x10
 
@@ -318,7 +318,7 @@
 /*
  * AR: Auto-initialize Remote. When 0, data must be removed from ring-buffer
  *	under program control. When 1, remote DMA is automatically initiated
- *	and the boundry pointer is automatically updated
+ *	and the boundary pointer is automatically updated
  */
 #define ED_DCR_AR	0x10
 
@@ -500,7 +500,7 @@
 
 /*
  * FAE: Frame Alignment Error. Indicates that the incoming packet did not end on
- *	a byte boundry and the CRC did not match at the last byte boundry.
+ *	a byte boundary and the CRC did not match at the last byte boundary.
  */
 #define ED_RSR_FAE	0x04
 
@@ -513,7 +513,7 @@
 /*
  * MPA: Missed Packet. Indicates that the received packet couldn't be stored in
  *	the ring-buffer because of insufficient buffer space (exceeding the
- *	boundry pointer), or because the transfer to the ring-buffer was inhibited
+ *	boundary pointer), or because the transfer to the ring-buffer was inhibited
  *	by RCR_MON - monitor mode.
  */
 #define ED_RSR_MPA	0x10
@@ -526,7 +526,7 @@
 #define ED_RSR_PHY	0x20
 
 /*
- * DIS: Receiver Disabled. Set to indicate that the receiver has enetered monitor
+ * DIS: Receiver Disabled. Set to indicate that the receiver has entered monitor
  *	mode. Cleared when the receiver exits monitor mode.
  */
 #define ED_RSR_DIS	0x40
@@ -539,7 +539,7 @@
 #define ED_RSR_DFR	0x80
 
 /*
- * receive ring discriptor
+ * receive ring descriptor
  *
  * The National Semiconductor DS8390 Network interface controller uses
  * the following receive ring headers.  The way this works is that the
@@ -574,7 +574,7 @@ struct ed_ring	{
  * Compile-time config flags
  */
 /*
- * this sets the default for enabling/disablng the tranceiver
+ * this sets the default for enabling/disabling the transceiver
  */
 #define ED_FLAGS_DISABLE_TRANCEIVER	0x0001
 
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 181c7688fb5d..873479257567 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: eisaconf.h,v 1.6 1995/11/21 12:52:49 bde Exp $
+ *	$Id: eisaconf.h,v 1.7 1996/01/29 03:13:23 gibbs Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
@@ -74,7 +74,7 @@ struct eisa_driver {
 					/* Return the device to a safe
 					 * state before shutdown
 					 */
-	u_long  *unit;			/* Next availible unit */
+	u_long  *unit;			/* Next available unit */
 };
 
 /* To be replaced by the "super device" generic device structure... */
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 374ed5cda284..a9b3593dd61e 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -6,7 +6,7 @@
  * met: 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer. 2. The name
  * of the author may not be used to endorse or promote products derived from
- * this software withough specific prior written permission
+ * this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.8 1995/05/30 08:02:09 rgrimes Exp $
+ *  $Id: if_epreg.h,v 1.9 1996/01/29 03:16:14 gibbs Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -141,7 +141,7 @@ struct ep_board {
 /**************************************************************************
  *									  *
  * These define the EEPROM data structure.  They are used in the probe
- * function to verify the existance of the adapter after having sent
+ * function to verify the existence of the adapter after having sent
  * the ID_Sequence.
  *
  * There are others but only the ones we use are defined here.
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index 933f4d837bbc..5c1a9334f373 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -35,7 +35,7 @@
  */
 
 #define FE_FMV0		16	/* Hardware status.		*/
-#define FE_FMV1		17	/* Hardrare type?  Always 0	*/
+#define FE_FMV1		17	/* Hardware type?  Always 0	*/
 #define FE_FMV2		18	/* Hardware configuration.	*/
 #define FE_FMV3		19	/* Hardware enable.		*/
 #define FE_FMV4		20	/* Station address #1		*/
diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index 20966a686f80..c6fd165f9e54 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.h
@@ -105,7 +105,7 @@ struct nic_info {
 	int ic;            /* Type of ic, Am7990, Am79C960 etc. */
 	int mem_mode;
 	int iobase;
-	int mode;          /* Mode setting at initialisation */
+	int mode;          /* Mode setting at initialization */
 };
 
 struct host_ring_entry {
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index 692999242916..176f002cf547 100644
--- a/sys/dev/scd/scdreg.h
+++ b/sys/dev/scd/scdreg.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scdreg.h,v 1.3 1995/02/06 22:35:07 jkh Exp $
+ * $Id: scdreg.h,v 1.1 1995/03/24 18:33:02 jkh Exp $
  *
  */
 
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 6c895e2b976b..cf7044844bf0 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.13 1995/11/28 00:17:32 ache Exp $
+ *	$Id: syscons.h,v 1.14 1995/12/10 13:39:20 phk Exp $
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index 7618126c3101..61fbf702012b 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$Id: bpb.h,v 1.1 1994/09/19 15:41:37 dfr Exp $ */
+/*	$Id: bpb.h,v 1.2 1995/05/30 08:07:30 rgrimes Exp $ */
 /*	$NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $	*/
 
 /*
@@ -50,7 +50,7 @@ struct bpb50 {
 	u_short bpbSecPerTrack;	/* sectors per track */
 	u_short bpbHeads;	/* number of heads */
 	u_long bpbHiddenSecs;	/* number of hidden sectors */
-	u_long bpbHugeSectors;	/* number of sectrs if bpbSectors == 0 */
+	u_long bpbHugeSectors;	/* number of sectors if bpbSectors == 0 */
 };
 
 /*
@@ -116,5 +116,5 @@ struct byte_bpb50 {
 	char bpbSecPerTrack[2];	/* sectors per track */
 	char bpbHeads[2];	/* number of heads */
 	char bpbHiddenSecs[4];	/* number of hidden sectors */
-	char bpbHugeSectors[4];	/* number of sectrs if bpbSectors == 0 */
+	char bpbHugeSectors[4];	/* number of sectors if bpbSectors == 0 */
 };
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 0d485c49e127..18eae6b8956b 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.4 1995/11/07 14:06:45 phk Exp $ */
+/*	$Id: msdosfsmount.h,v 1.5 1995/11/16 11:48:10 bde Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@ struct msdosfsmount {
 	u_long pm_fatsize;	/* size of fat in bytes */
 	u_int *pm_inusemap;	/* ptr to bitmap of in-use clusters */
 	char pm_ronly;		/* read only if non-zero */
-	char pm_waitonfat;	/* wait for writes of the fat to complt, when 0 use bdwrite, else use bwrite */
+	char pm_waitonfat;	/* wait for writes of the fat to complete, when 0 use bdwrite, else use bwrite */
 	struct netexport pm_export;	/* export information */
 };
 
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 7ff725b335cf..30d5f1baba19 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.6 1995/05/30 08:15:30 rgrimes Exp $
+ * $Id: inode.h,v 1.7 1995/11/05 23:35:56 dyson Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
@@ -58,7 +58,7 @@
  * information. The first part is the information that is needed
  * only while the file is active (such as the identity of the file
  * and linkage to speed its lookup). The second part is the
- * permannent meta-data associated with the file which is read
+ * permanent meta-data associated with the file which is read
  * in from the permanent dinode from long term storage when the
  * file becomes active, and is put back when the file is no longer
  * being used.
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 7ff725b335cf..30d5f1baba19 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.6 1995/05/30 08:15:30 rgrimes Exp $
+ * $Id: inode.h,v 1.7 1995/11/05 23:35:56 dyson Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
@@ -58,7 +58,7 @@
  * information. The first part is the information that is needed
  * only while the file is active (such as the identity of the file
  * and linkage to speed its lookup). The second part is the
- * permannent meta-data associated with the file which is read
+ * permanent meta-data associated with the file which is read
  * in from the permanent dinode from long term storage when the
  * file becomes active, and is put back when the file is no longer
  * being used.
diff --git a/sys/i386/apm/apm_init/real_prot.h b/sys/i386/apm/apm_init/real_prot.h
index 93b3f28fd427..490d9c7b894f 100644
--- a/sys/i386/apm/apm_init/real_prot.h
+++ b/sys/i386/apm/apm_init/real_prot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id: real_prot.h,v 1.2 1995/02/17 02:22:33 phk Exp $
+ *	$Id: real_prot.h,v 1.3 1995/05/30 07:58:16 rgrimes Exp $
  */
 
 /*
@@ -40,7 +40,7 @@
  * use.
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
- * Nov., 1994	Commited to FreeBSD 2.0-current
+ * Nov., 1994	Committed to FreeBSD 2.0-current
  * Jan., 1995	Ported to RT-Mach 3.0 MK83g
  */
 
diff --git a/sys/i386/bios/apm_init/real_prot.h b/sys/i386/bios/apm_init/real_prot.h
index 93b3f28fd427..490d9c7b894f 100644
--- a/sys/i386/bios/apm_init/real_prot.h
+++ b/sys/i386/bios/apm_init/real_prot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id: real_prot.h,v 1.2 1995/02/17 02:22:33 phk Exp $
+ *	$Id: real_prot.h,v 1.3 1995/05/30 07:58:16 rgrimes Exp $
  */
 
 /*
@@ -40,7 +40,7 @@
  * use.
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
- * Nov., 1994	Commited to FreeBSD 2.0-current
+ * Nov., 1994	Committed to FreeBSD 2.0-current
  * Jan., 1995	Ported to RT-Mach 3.0 MK83g
  */
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index a4caf6e941ce..dd823e006350 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.233 1996/01/09 23:14:57 ats Exp $
+#	$Id: LINT,v 1.234 1996/01/13 23:30:10 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -51,7 +51,7 @@ options		OPEN_MAX=128
 #
 options		MATH_EMULATE		#Support for x87 emulation
 # Don't enable both of these in a real config.
-options		GPL_MATH_EMULATE	#Support for x87 emualtion via
+options		GPL_MATH_EMULATE	#Support for x87 emulation via
 					#new math emulator 
 
 #
@@ -75,7 +75,7 @@ config		kernel	root on wd0 dumps on wd0
 options		"COMPAT_43"
 
 #
-# Allow user-mode programs to manipulat their local descriptor tables.
+# Allow user-mode programs to manipulate their local descriptor tables.
 # This option is required for the WINE Windows(tm) emulator, and is
 # not used by anything else (that we know of).
 #
@@ -247,7 +247,7 @@ options		UNION			#Union filesystem
 # THis DEVFS is experimental but seems to work
 options		DEVFS			#devices filesystem
 
-# Make space in the kernel for a MFS rootfilesystem.  Define to the number
+# Make space in the kernel for a MFS root filesystem.  Define to the number
 # of kilobytes to reserve for the filesystem.
 options		MFS_ROOT=10
 # Allow the MFS_ROOT code to load the MFS image from floppy if it is missing.
@@ -584,7 +584,7 @@ options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to
 #
 # Network interfaces: `cx', `ed', `el', `ep', `ie', `is', `le', `lnc'
 #
-# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver (reqires sppp)
+# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver (requires sppp)
 # cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing)
 # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 # el: 3Com 3C501 (slow!)
@@ -699,7 +699,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # wt: Wangtek and Archive QIC-02/QIC-36 tape drives
 # ctx: Cortex-I frame grabber
 # apm: Laptop Advanced Power Management (experimental)
-# spigot: The Creative Labs Video Spigot video-aquisition board
+# spigot: The Creative Labs Video Spigot video-acquisition board
 # meteor: Matrox Meteor video capture board
 # cy: Cyclades serial driver
 # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
@@ -741,7 +741,7 @@ device pca0 at isa? port IO_TIMER1 tty
 device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
 # for the Sony CDU31/33A CDROM
 device		scd0	at isa? port 0x230 bio
-# for the soundblaster 16 multicd - up to 4 devices
+# for the SoundBlaster 16 multicd - up to 4 devices
 controller      matcd0  at isa? port 0x230 bio
 device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 device		ctx0	at isa? port 0x230 iomem 0xd0000
@@ -830,7 +830,7 @@ controller	pcic0 at crd?
 # Laptop/Notebook options:
 #
 # See also:
-#  apm under `Miscellaneous hardare'
+#  apm under `Miscellaneous hardware'
 #  options		PSM_NO_RESET  for the `psm' driver
 # above.
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index a4caf6e941ce..dd823e006350 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.233 1996/01/09 23:14:57 ats Exp $
+#	$Id: LINT,v 1.234 1996/01/13 23:30:10 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -51,7 +51,7 @@ options		OPEN_MAX=128
 #
 options		MATH_EMULATE		#Support for x87 emulation
 # Don't enable both of these in a real config.
-options		GPL_MATH_EMULATE	#Support for x87 emualtion via
+options		GPL_MATH_EMULATE	#Support for x87 emulation via
 					#new math emulator 
 
 #
@@ -75,7 +75,7 @@ config		kernel	root on wd0 dumps on wd0
 options		"COMPAT_43"
 
 #
-# Allow user-mode programs to manipulat their local descriptor tables.
+# Allow user-mode programs to manipulate their local descriptor tables.
 # This option is required for the WINE Windows(tm) emulator, and is
 # not used by anything else (that we know of).
 #
@@ -247,7 +247,7 @@ options		UNION			#Union filesystem
 # THis DEVFS is experimental but seems to work
 options		DEVFS			#devices filesystem
 
-# Make space in the kernel for a MFS rootfilesystem.  Define to the number
+# Make space in the kernel for a MFS root filesystem.  Define to the number
 # of kilobytes to reserve for the filesystem.
 options		MFS_ROOT=10
 # Allow the MFS_ROOT code to load the MFS image from floppy if it is missing.
@@ -584,7 +584,7 @@ options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to
 #
 # Network interfaces: `cx', `ed', `el', `ep', `ie', `is', `le', `lnc'
 #
-# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver (reqires sppp)
+# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver (requires sppp)
 # cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing)
 # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 # el: 3Com 3C501 (slow!)
@@ -699,7 +699,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # wt: Wangtek and Archive QIC-02/QIC-36 tape drives
 # ctx: Cortex-I frame grabber
 # apm: Laptop Advanced Power Management (experimental)
-# spigot: The Creative Labs Video Spigot video-aquisition board
+# spigot: The Creative Labs Video Spigot video-acquisition board
 # meteor: Matrox Meteor video capture board
 # cy: Cyclades serial driver
 # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
@@ -741,7 +741,7 @@ device pca0 at isa? port IO_TIMER1 tty
 device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
 # for the Sony CDU31/33A CDROM
 device		scd0	at isa? port 0x230 bio
-# for the soundblaster 16 multicd - up to 4 devices
+# for the SoundBlaster 16 multicd - up to 4 devices
 controller      matcd0  at isa? port 0x230 bio
 device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 device		ctx0	at isa? port 0x230 iomem 0xd0000
@@ -830,7 +830,7 @@ controller	pcic0 at crd?
 # Laptop/Notebook options:
 #
 # See also:
-#  apm under `Miscellaneous hardare'
+#  apm under `Miscellaneous hardware'
 #  options		PSM_NO_RESET  for the `psm' driver
 # above.
 
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index 181c7688fb5d..873479257567 100644
--- a/sys/i386/eisa/eisaconf.h
+++ b/sys/i386/eisa/eisaconf.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: eisaconf.h,v 1.6 1995/11/21 12:52:49 bde Exp $
+ *	$Id: eisaconf.h,v 1.7 1996/01/29 03:13:23 gibbs Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
@@ -74,7 +74,7 @@ struct eisa_driver {
 					/* Return the device to a safe
 					 * state before shutdown
 					 */
-	u_long  *unit;			/* Next availible unit */
+	u_long  *unit;			/* Next available unit */
 };
 
 /* To be replaced by the "super device" generic device structure... */
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index 0a25b84ee584..28e6c7c7a794 100644
--- a/sys/i386/ibcs2/coff.h
+++ b/sys/i386/ibcs2/coff.h
@@ -13,7 +13,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -26,7 +26,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: coff.h,v 1.1 1994/10/12 19:37:16 sos Exp $
+ *	$Id: coff.h,v 1.1 1994/10/14 08:53:14 sos Exp $
  */
 
 #ifndef _COFF_H
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index 870c5de887ec..1bc590caa367 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: console.h,v 1.18 1995/01/28 22:15:30 sos Exp $
+ *	$Id: console.h,v 1.19 1995/05/30 08:00:28 rgrimes Exp $
  */
 
 #ifndef	_CONSOLE_H_
@@ -117,7 +117,7 @@ struct mouse_info {
 #define KD_HERCULES	2		/* hercules adapter          	*/
 #define KD_CGA		3		/* color graphics adapter    	*/
 #define KD_EGA		4		/* enhanced graphics adapter 	*/
-#define KD_VGA		5		/* video graohics adapter    	*/
+#define KD_VGA		5		/* video graphics adapter    	*/
 
 #define KD_TEXT		0		/* set text mode restore fonts  */
 #define KD_TEXT0	0		/* ditto			*/
@@ -238,7 +238,7 @@ typedef struct ssaver ssaver_t;
 #define F(x)		((x)+F_FN-1)
 #define	S(x)		((x)+F_SCR-1)
 #define NOKEY		0x100		/* no key pressed marker 	*/
-#define FKEY		0x200		/* funtion key marker 		*/
+#define FKEY		0x200		/* function key marker 		*/
 #define MKEY		0x400		/* meta key marker (prepend ESC)*/
 #define BKEY		0x800		/* backtab (ESC [ Z)		*/
 
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index 0c5667ba8294..7be09ac82bbe 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -11,7 +11,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cputypes.h,v 1.3 1994/09/04 19:59:23 pst Exp $
+ *	$Id: cputypes.h,v 1.4 1995/12/24 08:10:50 davidg Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/cronyx.h b/sys/i386/include/cronyx.h
index c98094e48b49..5b2160da9c4c 100644
--- a/sys/i386/include/cronyx.h
+++ b/sys/i386/include/cronyx.h
@@ -7,7 +7,7 @@
  * This software is distributed with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Authors grant any other persons or organisations permission to use
+ * Authors grant any other persons or organizations permission to use
  * or modify this software as long as this message is kept with the software,
  * all derivative works or modified versions.
  *
@@ -159,7 +159,7 @@ typedef struct {		/* hdlc channel option register 2 */
 	unsigned ctsae : 1;	/* CTS automatic enable */
 	unsigned rtsao : 1;	/* RTS automatic output enable */
 	unsigned zero1 : 1;
-	unsigned crcninv : 1;	/* CRC invertion option */
+	unsigned crcninv : 1;	/* CRC inversion option */
 	unsigned zero2 : 1;
 	unsigned fcsapd : 1;	/* FCS append */
 	unsigned zero3 : 1;
@@ -206,7 +206,7 @@ typedef struct {		/* channel option register 1 */
 
 typedef struct {		/* channel option register 2 */
 	unsigned syns : 4;	/* number of extra SYN chars before a frame */
-	unsigned crcninv : 1;	/* CRC invertion option */
+	unsigned crcninv : 1;	/* CRC inversion option */
 	unsigned ebcdic : 1;	/* use EBCDIC as char set (instead of ASCII) */
 	unsigned bcc : 1;	/* BCC append enable */
 	unsigned lrc : 1;       /* longitudinal redundancy check */
@@ -447,7 +447,7 @@ typedef struct _stat_t {
 typedef struct _board_t {
 	unsigned short port;	/* base board port, 0..3f0 */
 	unsigned short num;     /* board number, 0..2 */
-	unsigned char irq;      /* intterupt request {3 5 7 10 11 12 15} */
+	unsigned char irq;      /* interrupt request {3 5 7 10 11 12 15} */
 	unsigned char dma;      /* DMA request {5 6 7} */
 	unsigned char if0type;  /* chan0 interface RS-232/RS-449/V.35 */
 	unsigned char if8type;  /* chan8 interface RS-232/RS-449/V.35 */
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 291a0a1dba7a..bb584a12c48b 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.10 1995/03/16 18:11:42 bde Exp $
+ *	$Id: frame.h,v 1.11 1995/12/14 08:21:33 phk Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
@@ -67,7 +67,7 @@ struct trapframe {
 	int	tf_eip;
 	int	tf_cs;
 	int	tf_eflags;
-	/* below only when transitting rings (e.g. user to kernel) */
+	/* below only when crossing rings (e.g. user to kernel) */
 	int	tf_esp;
 	int	tf_ss;
 };
@@ -93,7 +93,7 @@ struct intrframe {
 	int	if_eip;
 	int	if_cs;
 	int	if_eflags;
-	/* below only when transitting rings (e.g. user to kernel) */
+	/* below only when crossing rings (e.g. user to kernel) */
 	int	if_esp;
 	int	if_ss;
 };
@@ -119,7 +119,7 @@ struct clockframe {
 	int	cf_eip;
 	int	cf_cs;
 	int	cf_eflags;
-	/* below only when transitting rings (e.g. user to kernel) */
+	/* below only when crossing rings (e.g. user to kernel) */
 	int	cf_esp;
 	int	cf_ss;
 };
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index d36ede3cbd1e..943bb062db09 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$Id: ieeefp.h,v 1.1 1994/08/04 19:16:37 wollman Exp $
+ *	$Id: ieeefp.h,v 1.2 1994/08/05 14:36:04 wollman Exp $
  */
 
 /*
@@ -52,13 +52,13 @@ typedef enum {
 } fp_rnd_t;
 
 /*
- * FP precison modes
+ * FP precision modes
  */
 typedef enum {
-	FP_PS=0,	/* 24 bit (single-precsion) */
+	FP_PS=0,	/* 24 bit (single-precision) */
 	FP_PRS,		/* reserved */
 	FP_PD,		/* 53 bit (double-precision) */
-	FP_PE		/* 64 bit (extended-precsion) */
+	FP_PE		/* 64 bit (extended-precision) */
 } fp_prec_t;
 
 #define fp_except_t	int
diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h
index 67329399ad84..2a9212b7a4b3 100644
--- a/sys/i386/include/ioctl_fd.h
+++ b/sys/i386/include/ioctl_fd.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id: ioctl_fd.h,v 1.6 1994/09/25 18:41:21 joerg Exp $
+ * $Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp $
  */
 
 #ifndef _IOCTL_FD_H
@@ -46,7 +46,7 @@ struct fd_formb {
 		struct fd_form_data {
 			/*
 			 * DO NOT CHANGE THE LAYOUT OF THIS STRUCTS
-			 * it is hardware-dependant since it exactly
+			 * it is hardware-dependent since it exactly
 			 * matches the byte sequence to write to FDC
 			 * during its `format track' operation
 			 */
diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h
index d683b331a9b6..f09e5579e906 100644
--- a/sys/i386/include/ioctl_meteor.h
+++ b/sys/i386/include/ioctl_meteor.h
@@ -92,8 +92,8 @@ struct meteor_counts {
 
 				/* METEORCAPTUR capture options */
 #define METEOR_CAP_SINGLE	0x0001	/* capture one frame */
-#define METEOR_CAP_CONTINOUS	0x0002	/* contiuously capture */
-#define METEOR_CAP_STOP_CONT	0x0004	/* stop the continous capture */
+#define METEOR_CAP_CONTINOUS	0x0002	/* continuously capture */
+#define METEOR_CAP_STOP_CONT	0x0004	/* stop the continuous capture */
 
 				/* METEORCAPFRM capture commands */
 #define METEOR_CAP_N_FRAMES	0x0001	/* capture N frames */
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index d88733470281..0143deb968ba 100644
--- a/sys/i386/include/pcaudioio.h
+++ b/sys/i386/include/pcaudioio.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudioio.h,v 1.3 1994/09/29 08:31:39 sos Exp $
+ *	$Id: pcaudioio.h,v 1.4 1995/05/30 08:00:44 rgrimes Exp $
  */
 
 #ifndef _PCAUDIOIO_H_
diff --git a/sys/i386/include/pcvt_ioctl.h b/sys/i386/include/pcvt_ioctl.h
index b5f08427ec4e..e6075c52cc7e 100644
--- a/sys/i386/include/pcvt_ioctl.h
+++ b/sys/i386/include/pcvt_ioctl.h
@@ -221,7 +221,7 @@ struct mousedefs {
 #define EGA_ADAPTOR	3	/* Enhanced Graphics Adaptor */
 #define VGA_ADAPTOR	4	/* Video Graphics Adaptor/Array */
 
-/* Deifinitions of Monitor types */
+/* Definitions of Monitor types */
 
 #define MONITOR_MONO	0	/* Monochrome Monitor */
 #define MONITOR_COLOR	1	/* Color Monitor */
@@ -376,10 +376,10 @@ struct screeninfo {
 				/* on write, if -1, no change		*/
 	int vga_family;		/* if adaptor_type = VGA, this reflects */
 				/* the chipset family after a read	*/
-				/* nothing happenes on write ...        */
+				/* nothing happens on write ...        */
 	int vga_type;		/* if adaptor_type = VGA, this reflects */
 				/* the chipset after a read		*/
-				/* nothing happenes on write ...        */
+				/* nothing happens on write ...        */
 	int vga_132;		/* set to 1 if driver has support for	*/
 				/* 132 column operation for chipset	*/
 				/* currently ignored on write		*/
@@ -543,7 +543,7 @@ struct pcvtinfo {			/* compile time option values */
 
 #define VT_FALSE	0		/* release of VT refused */
 #define VT_TRUE		1		/* VT released */
-#define VT_ACKACQ	2		/* acknowledging VT acquiration */
+#define VT_ACKACQ	2		/* acknowledging VT acquisition */
 
 
 #define VT_ACTIVATE	_IO('v', 5 /*, int */)
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index ef5ee1b6a124..b7569f6d3d76 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.30 1995/12/10 13:38:09 phk Exp $
+ * 	$Id: pmap.h,v 1.31 1995/12/17 07:39:05 bde Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -133,7 +133,7 @@ pmap_kextract(vm_offset_t va)
 #endif
 
 /*
- * macros to generate page directory/table indicies
+ * macros to generate page directory/table indices
  */
 
 #define	pdei(va)	(((va)&PD_MASK)>>PD_SHIFT)
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 3d96dbc52495..4c412c4786b2 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$Id: psl.h,v 1.5 1994/08/10 03:51:18 wollman Exp $
+ *	$Id: psl.h,v 1.6 1995/01/14 13:20:25 bde Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
@@ -78,7 +78,7 @@
 /*
  * Bits that can be changed in user mode on 486's.  We allow these bits
  * to be changed using ptrace(), sigreturn() and procfs.  Setting PS_NT
- * is undesireable but it may as well be allowed since users can inflict
+ * is undesirable but it may as well be allowed since users can inflict
  * it on the kernel directly.  Changes to PSL_AC are silently ignored on
  * 386's.
  */
diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h
index 5fe7ffc79bc4..97f6c6516387 100644
--- a/sys/i386/include/random.h
+++ b/sys/i386/include/random.h
@@ -1,7 +1,7 @@
 /*
  * random.h -- A strong random number generator
  *
- * $Id$
+ * $Id: random.h,v 1.3 1995/12/29 08:04:13 markm Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -62,7 +62,7 @@
 
 #if defined(KERNEL)
 
-/* Interrupts to be used in the randomising process */
+/* Interrupts to be used in the randomizing process */
 
 extern inthand2_t *sec_intr_handler[ICU_LEN];
 extern int sec_intr_unit[ICU_LEN];
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index 9fc18148ff36..ce988e4d6060 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$Id: reg.h,v 1.9 1994/10/02 17:31:29 phk Exp $
+ *	$Id: reg.h,v 1.10 1995/01/14 10:41:41 bde Exp $
  */
 
 #ifndef _MACHINE_REG_H_
@@ -71,7 +71,7 @@
 /*
  * Registers accessible to ptrace(2) syscall for debugger
  * The machine-dependent code for PT_{SET,GET}REGS needs to
- * use whichver order, defined above, is correct, so that it
+ * use whichever order, defined above, is correct, so that it
  * is all invisible to the user.
  */
 struct reg {
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index dcac309481a7..5fadb985345b 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$Id: segments.h,v 1.8 1995/02/14 19:21:15 sos Exp $
+ *	$Id: segments.h,v 1.9 1995/05/30 08:00:50 rgrimes Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
@@ -124,7 +124,7 @@ union	descriptor	{
 #define	SDT_MEMROD	20	/* memory read only expand dwn limit */
 #define	SDT_MEMRODA	21	/* memory read only expand dwn limit accessed */
 #define	SDT_MEMRWD	22	/* memory read write expand dwn limit */
-#define	SDT_MEMRWDA	23	/* memory read write expand dwn limit acessed */
+#define	SDT_MEMRWDA	23	/* memory read write expand dwn limit accessed */
 #define	SDT_MEME	24	/* memory execute only */
 #define	SDT_MEMEA	25	/* memory execute only accessed */
 #define	SDT_MEMER	26	/* memory execute read */
@@ -226,7 +226,7 @@ struct region_descriptor {
 #define	L43BSDCALLS_SEL	2	/* notyet */
 #define	LUCODE_SEL	3
 #define	LUDATA_SEL	4
-/* seperate stack, es,fs,gs sels ? */
+/* separate stack, es,fs,gs sels ? */
 /* #define	LPOSIXCALLS_SEL	5*/	/* notyet */
 #define NLDT		(LUDATA_SEL + 1)
 
diff --git a/sys/i386/include/soundcard.h b/sys/i386/include/soundcard.h
index 02d0da742f32..725a0231b50b 100644
--- a/sys/i386/include/soundcard.h
+++ b/sys/i386/include/soundcard.h
@@ -30,7 +30,7 @@
  /* 
   * If you make modifications to this file, please contact me before
   * distributing the modified version. There is already enough 
-  * divercity in the world.
+  * diversity in the world.
   *
   * Regards,
   * Hannu Savolainen
@@ -135,7 +135,7 @@
  *	Sample loading mechanism for internal synthesizers (/dev/sequencer)
  *	The following patch_info structure has been designed to support
  *	Gravis UltraSound. It tries to be universal format for uploading
- *	sample based patches but is propably too limited.
+ *	sample based patches but is probably too limited.
  */
 
 struct patch_info {
@@ -383,7 +383,7 @@ struct patmgr_info {	/* Note! size must be < 4k since kmalloc() is used */
 /*		undefined		0x20 */
 /* The controller numbers 0x21 to 0x3f are reserved for the */
 /* least significant bytes of the controllers 0x00 to 0x1f. */
-/* These controllers are not recognised by the driver. */
+/* These controllers are not recognized by the driver. */
 
 /* Controllers 64 to 69 (0x40 to 0x45) are on/off switches. */
 /* 0=OFF and 127=ON (intermediate values are possible) */
@@ -671,7 +671,7 @@ typedef struct copr_msg {
 /* 
  * The AD1848 codec and compatibles have three line level inputs
  * (line, aux1 and aux2). Since each card manufacturer have assigned
- * different meanings to these inputs, it's inpractical to assign
+ * different meanings to these inputs, it's impractical to assign
  * specific meanings (line, cd, synth etc.) to them.
  */
 #define SOUND_MIXER_LINE1	14	/* Input source 1  (aux1) */
@@ -1001,7 +1001,7 @@ void seqbuf_dump(void);	/* This function must be provided by programs */
 #endif
 
 /*
- * Timing and syncronization macros
+ * Timing and synchronization macros
  */
 
 #define _TIMER_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index 75cc79dae89b..c5035499ee0f 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: specialreg.h,v 1.6 1995/01/14 10:44:55 bde Exp $
+ *	$Id: specialreg.h,v 1.7 1995/05/30 08:00:54 rgrimes Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
@@ -59,7 +59,7 @@
 #define CR0_AM	0x00040000	/* Alignment Mask (set to enable AC flag) */
 
 /*
- * Cyrix 486 DLC special registers, accessable as IO ports.
+ * Cyrix 486 DLC special registers, accessible as IO ports.
  */
 #define CCR0	0xc0		/* configuration control register 0 */
 #define CCR0_NC0	0x01	/* first 64K of each 1M memory region is
@@ -79,7 +79,7 @@
 
 /*
  * the following four 3-byte registers control the non-cacheable regions.
- * These registers must be written as three seperate bytes.
+ * These registers must be written as three separate bytes.
  *
  * NCRx+0: A31-A24 of starting address
  * NCRx+1: A23-A16 of starting address
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index fd07e357ffd8..7c39ffd273b0 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$Id: tss.h,v 1.4 1993/11/17 23:25:04 wollman Exp $
+ *	$Id: tss.h,v 1.5 1995/05/30 08:00:57 rgrimes Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
@@ -46,12 +46,12 @@
 
 struct i386tss {
 	int	tss_link;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp0; 	/* kernel stack pointer priviledge level 0 */
+	int	tss_esp0; 	/* kernel stack pointer privilege level 0 */
 #define	tss_ksp	tss_esp0
 	int	tss_ss0;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp1; 	/* kernel stack pointer priviledge level 1 */
+	int	tss_esp1; 	/* kernel stack pointer privilege level 1 */
 	int	tss_ss1;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp2; 	/* kernel stack pointer priviledge level 2 */
+	int	tss_esp2; 	/* kernel stack pointer privilege level 2 */
 	int	tss_ss2;	/* actually 16 bits: top 16 bits must be zero */
 	int	tss_cr3; 	/* page table directory */
 #define	tss_ptd	tss_cr3
diff --git a/sys/i386/include/ultrasound.h b/sys/i386/include/ultrasound.h
index 40e2443e6f65..5571ca08d0e8 100644
--- a/sys/i386/include/ultrasound.h
+++ b/sys/i386/include/ultrasound.h
@@ -52,7 +52,7 @@
  *		_GUS_VOICEOFF	- Stops voice (no parameters)
  *		_GUS_VOICEFADE	- Stops the voice smoothly.
  *		_GUS_VOICEMODE	- Alters the voice mode, don't start or stop voice (P1=voice mode)
- *		_GUS_VOICEBALA	- Sets voice balence (P1, 0=left, 7=middle and 15=right, default 7)
+ *		_GUS_VOICEBALA	- Sets voice balance (P1, 0=left, 7=middle and 15=right, default 7)
  *		_GUS_VOICEFREQ	- Sets voice (sample) playback frequency (P1=Hz)
  *		_GUS_VOICEVOL	- Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off)
  *		_GUS_VOICEVOL2	- Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off)
diff --git a/sys/i386/isa/atapi.h b/sys/i386/isa/atapi.h
index 875a5c9dec75..dce6d9e84dcc 100644
--- a/sys/i386/isa/atapi.h
+++ b/sys/i386/isa/atapi.h
@@ -7,7 +7,7 @@
  * This software is distributed with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Authors grant any other persons or organisations permission to use
+ * Authors grant any other persons or organizations permission to use
  * or modify this software as long as this message is kept with the software,
  * all derivative works or modified versions.
  *
@@ -52,7 +52,7 @@
 #define AER_ABRT        0x04            /* command aborted */
 #define AER_MCR         0x08            /* media change requested */
 #define AER_SKEY        0xf0            /* sense key mask */
-#define AER_SK_NO_SENSE         0x00    /* no spesific sense key info */
+#define AER_SK_NO_SENSE         0x00    /* no specific sense key info */
 #define AER_SK_RECOVERED_ERROR  0x10    /* command succeeded, data recovered */
 #define AER_SK_NOT_READY        0x20    /* no access to drive */
 #define AER_SK_MEDIUM_ERROR     0x30    /* non-recovered data error */
diff --git a/sys/i386/isa/b004.h b/sys/i386/isa/b004.h
index 9c5576c8f945..6fc8a1e384a8 100644
--- a/sys/i386/isa/b004.h
+++ b/sys/i386/isa/b004.h
@@ -116,7 +116,7 @@ struct b004_struct {
 #define B004_BOARDTYPE(minor)		b004_table[minor].boardtype
 
 /*
- * Additonal defines for B008-boards
+ * Additional defines for B008-boards
  */
 #define B008_DMA(minor)			b004_table[minor].int
 #define B008_INT(minor)			b004_table[minor].dma
diff --git a/sys/i386/isa/cxreg.h b/sys/i386/isa/cxreg.h
index df1f74384546..34b03f9a90db 100644
--- a/sys/i386/isa/cxreg.h
+++ b/sys/i386/isa/cxreg.h
@@ -8,7 +8,7 @@
  * This software is distributed with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Authors grant any other persons or organisations permission to use
+ * Authors grant any other persons or organizations permission to use
  * or modify this software as long as this message is kept with the software,
  * all derivative works or modified versions.
  *
@@ -35,7 +35,7 @@
 
 /*
  * Interrupt acknowledge register, P is board port, L is interrupt level,
- * as prodrammed in PILR.
+ * as programmed in PILR.
  */
 #define IACK(p,l)   (R(p,l) | 0x4000)
 
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index 11a2b61e8cb8..a03ce651c1d7 100644
--- a/sys/i386/isa/if_edreg.h
+++ b/sys/i386/isa/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.18 1995/05/30 08:02:00 rgrimes Exp $
+ * $Id: if_edreg.h,v 1.19 1995/09/26 08:57:45 phk Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
@@ -211,7 +211,7 @@
 
 /*
  * OVW: OverWrite. Indicates a receive ring-buffer overrun. Incoming network
- *	would exceed (has exceeded?) the boundry pointer, resulting in data
+ *	would exceed (has exceeded?) the boundary pointer, resulting in data
  *	that was previously received and not yet read from the buffer to be
  *	overwritten.
  */
@@ -266,7 +266,7 @@
 
 /*
  * OVWE: OverWrite error interrupt Enable. If set, an interrupt is generated whenever
- *	the receive ring-buffer is overrun. i.e. when the boundry pointer is exceeded.
+ *	the receive ring-buffer is overrun. i.e. when the boundary pointer is exceeded.
  */
 #define ED_IMR_OVWE	0x10
 
@@ -318,7 +318,7 @@
 /*
  * AR: Auto-initialize Remote. When 0, data must be removed from ring-buffer
  *	under program control. When 1, remote DMA is automatically initiated
- *	and the boundry pointer is automatically updated
+ *	and the boundary pointer is automatically updated
  */
 #define ED_DCR_AR	0x10
 
@@ -500,7 +500,7 @@
 
 /*
  * FAE: Frame Alignment Error. Indicates that the incoming packet did not end on
- *	a byte boundry and the CRC did not match at the last byte boundry.
+ *	a byte boundary and the CRC did not match at the last byte boundary.
  */
 #define ED_RSR_FAE	0x04
 
@@ -513,7 +513,7 @@
 /*
  * MPA: Missed Packet. Indicates that the received packet couldn't be stored in
  *	the ring-buffer because of insufficient buffer space (exceeding the
- *	boundry pointer), or because the transfer to the ring-buffer was inhibited
+ *	boundary pointer), or because the transfer to the ring-buffer was inhibited
  *	by RCR_MON - monitor mode.
  */
 #define ED_RSR_MPA	0x10
@@ -526,7 +526,7 @@
 #define ED_RSR_PHY	0x20
 
 /*
- * DIS: Receiver Disabled. Set to indicate that the receiver has enetered monitor
+ * DIS: Receiver Disabled. Set to indicate that the receiver has entered monitor
  *	mode. Cleared when the receiver exits monitor mode.
  */
 #define ED_RSR_DIS	0x40
@@ -539,7 +539,7 @@
 #define ED_RSR_DFR	0x80
 
 /*
- * receive ring discriptor
+ * receive ring descriptor
  *
  * The National Semiconductor DS8390 Network interface controller uses
  * the following receive ring headers.  The way this works is that the
@@ -574,7 +574,7 @@ struct ed_ring	{
  * Compile-time config flags
  */
 /*
- * this sets the default for enabling/disablng the tranceiver
+ * this sets the default for enabling/disabling the transceiver
  */
 #define ED_FLAGS_DISABLE_TRANCEIVER	0x0001
 
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
index 4d7859dd71c6..f4e8d3bfe145 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -4,7 +4,7 @@
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  *
- * $Id$
+ * $Id: if_elreg.h,v 1.2 1994/08/02 07:39:34 davidg Exp $
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
@@ -19,8 +19,8 @@
 #define EL_RBC	0xa	/* Receive buffer clear */
 #define EL_RBH	0xb	/* Receive buffer ptr high byte */
 #define EL_EAW	0xc	/* Ethernet address window */
-#define EL_AS	0xe	/* Auxillary status register */
-#define EL_AC	0xe	/* Auxillary command register */
+#define EL_AS	0xe	/* Auxiliary status register */
+#define EL_AC	0xe	/* Auxiliary command register */
 #define EL_BUF	0xf	/* Data buffer */
 
 /* Receive status register bits */
@@ -56,12 +56,12 @@
 #define EL_TXC_DCOLL16	0x04	/* Detect collision 16 */
 #define EL_TXC_DSUCCESS	0x08	/* Detect success */
 
-/* Auxillary status register bits */
+/* Auxiliary status register bits */
 #define EL_AS_RXBUSY	0x01	/* Receive busy */
 #define EL_AS_DMADONE	0x10	/* DMA finished */
 #define EL_AS_TXBUSY	0x80	/* Transmit busy */
 
-/* Auxillary command register bits */
+/* Auxiliary command register bits */
 #define EL_AC_HOST	0x00	/* System bus can access buffer */
 #define EL_AC_IRQE	0x01	/* IRQ enable */
 #define EL_AC_TXBAD	0x02	/* Transmit frames with bad FCS */
diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h
index 374ed5cda284..a9b3593dd61e 100644
--- a/sys/i386/isa/if_epreg.h
+++ b/sys/i386/isa/if_epreg.h
@@ -6,7 +6,7 @@
  * met: 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer. 2. The name
  * of the author may not be used to endorse or promote products derived from
- * this software withough specific prior written permission
+ * this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.8 1995/05/30 08:02:09 rgrimes Exp $
+ *  $Id: if_epreg.h,v 1.9 1996/01/29 03:16:14 gibbs Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -141,7 +141,7 @@ struct ep_board {
 /**************************************************************************
  *									  *
  * These define the EEPROM data structure.  They are used in the probe
- * function to verify the existance of the adapter after having sent
+ * function to verify the existence of the adapter after having sent
  * the ID_Sequence.
  *
  * There are others but only the ones we use are defined here.
diff --git a/sys/i386/isa/if_fereg.h b/sys/i386/isa/if_fereg.h
index 933f4d837bbc..5c1a9334f373 100644
--- a/sys/i386/isa/if_fereg.h
+++ b/sys/i386/isa/if_fereg.h
@@ -35,7 +35,7 @@
  */
 
 #define FE_FMV0		16	/* Hardware status.		*/
-#define FE_FMV1		17	/* Hardrare type?  Always 0	*/
+#define FE_FMV1		17	/* Hardware type?  Always 0	*/
 #define FE_FMV2		18	/* Hardware configuration.	*/
 #define FE_FMV3		19	/* Hardware enable.		*/
 #define FE_FMV4		20	/* Station address #1		*/
diff --git a/sys/i386/isa/if_ixreg.h b/sys/i386/isa/if_ixreg.h
index 3dd4903986c0..8b2743bb72db 100644
--- a/sys/i386/isa/if_ixreg.h
+++ b/sys/i386/isa/if_ixreg.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ixreg.h,v 1.5 1995/05/10 15:19:29 rgrimes Exp $
+ *	$Id: if_ixreg.h,v 1.6 1995/05/30 08:02:17 rgrimes Exp $
  */
 
 /*
@@ -106,7 +106,7 @@
 #define	eeprom_enetaddr_low	0x02	/* Ethernet address, low word */
 #define	eeprom_enetaddr_mid	0x03	/* Ethernet address, middle word */
 #define	eeprom_enetaddr_high	0x04	/* Ethernet address, high word */
-#define	eeprom_config2		0x05	/* Configureation register 2 */
+#define	eeprom_config2		0x05	/* Configuration register 2 */
 #define	  CONNECT_TPE		  0x0001	/* 0 = BNC, 1 = TPE */
 
 /* this converts a kernal virtual address to a board offset */
@@ -211,7 +211,7 @@ typedef struct /* System Control Block */
 	volatile
 	u_short	rsc_errors;	/* did not have resources to receive */
 	volatile
-	u_short	ovr_errors;	/* system bus was not availiable to receive */
+	u_short	ovr_errors;	/* system bus was not available to receive */
 	}	scb_t;
 
 typedef struct /* command block - nop (also the common part of cb's */
diff --git a/sys/i386/isa/if_lnc.h b/sys/i386/isa/if_lnc.h
index 20966a686f80..c6fd165f9e54 100644
--- a/sys/i386/isa/if_lnc.h
+++ b/sys/i386/isa/if_lnc.h
@@ -105,7 +105,7 @@ struct nic_info {
 	int ic;            /* Type of ic, Am7990, Am79C960 etc. */
 	int mem_mode;
 	int iobase;
-	int mode;          /* Mode setting at initialisation */
+	int mode;          /* Mode setting at initialization */
 };
 
 struct host_ring_entry {
diff --git a/sys/i386/isa/if_zpreg.h b/sys/i386/isa/if_zpreg.h
index a1eb1f54f4e6..b036510fee8d 100644
--- a/sys/i386/isa/if_zpreg.h
+++ b/sys/i386/isa/if_zpreg.h
@@ -8,7 +8,7 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -21,12 +21,12 @@
  * (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: if_zpreg.h,v 1.1 1995/02/17 02:22:53 phk Exp $
+ *	$Id: if_zpreg.h,v 1.2 1995/05/30 08:02:33 rgrimes Exp $
  */
 /**************************************************************************
  *										  *
  * These define the EEPROM data structure.  They are used in the probe
- * function to verify the existance of the adapter after having sent
+ * function to verify the existence of the adapter after having sent
  * the ID_Sequence.
  *
  * There are others but only the ones we use are defined here.
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index 74a75107ca19..fccfdad2609d 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.16 1995/09/08 03:14:00 julian Exp $
+ *	$Id: isa.h,v 1.17 1995/11/18 09:29:39 bde Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
@@ -146,7 +146,7 @@
 #define	IO_CGASIZE	16		/* CGA controllers */
 #define	IO_COMSIZE	8		/* 8250, 16x50 com controllers */
 #define	IO_DMASIZE	16		/* 8237 DMA controllers */
-#define	IO_DPGSIZE	32		/* 74LS612 DMA page reisters */
+#define	IO_DPGSIZE	32		/* 74LS612 DMA page registers */
 #define	IO_EISASIZE	256		/* EISA controllers */
 #define	IO_FDCSIZE	8		/* Nec765 floppy controllers */
 #define	IO_GAMSIZE	16		/* AT compatible game controllers */
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index d71000233663..123d86f85793 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.26 1995/11/20 12:41:46 phk Exp $
+ *	$Id: isa_device.h,v 1.27 1996/01/27 01:57:02 bde Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -116,7 +116,7 @@ struct isa_driver {
 extern char eintrnames[];	/* end of intrnames[] */
 extern u_long intrcnt[];	/* counts for for each device and stray */
 extern char intrnames[];	/* string table containing device names */
-extern u_long *intr_countp[];	/* indirectors into intrcnt[] */
+extern u_long *intr_countp[];	/* pointers into intrcnt[] */
 extern inthand2_t *intr_handler[];	/* C entry points of intr handlers */
 extern u_int intr_mask[];	/* sets of intrs masked during handling of 1 */
 extern int intr_unit[];		/* cookies to pass to intr handlers */
diff --git a/sys/i386/isa/pcic.h b/sys/i386/isa/pcic.h
index 6b99d72b680d..bc5ae5e35610 100644
--- a/sys/i386/isa/pcic.h
+++ b/sys/i386/isa/pcic.h
@@ -60,7 +60,7 @@
  * INDEX register for the PCIC controller.  You then read or write
  * the value from or to the DATA register for that controller.
  *
- * The first pair of chips shares I/O addresss for DATA and INDEX,
+ * The first pair of chips shares I/O addresses for DATA and INDEX,
  * as does the second pair.   (To the programmer, it looks like each
  * pair is a single chip.)  The i/o port addresses are hard-wired
  * into the PCIC; so the following addresses should be valid for
diff --git a/sys/i386/isa/scdreg.h b/sys/i386/isa/scdreg.h
index 692999242916..176f002cf547 100644
--- a/sys/i386/isa/scdreg.h
+++ b/sys/i386/isa/scdreg.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scdreg.h,v 1.3 1995/02/06 22:35:07 jkh Exp $
+ * $Id: scdreg.h,v 1.1 1995/03/24 18:33:02 jkh Exp $
  *
  */
 
diff --git a/sys/i386/isa/syscons.h b/sys/i386/isa/syscons.h
index 6c895e2b976b..cf7044844bf0 100644
--- a/sys/i386/isa/syscons.h
+++ b/sys/i386/isa/syscons.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.13 1995/11/28 00:17:32 ache Exp $
+ *	$Id: syscons.h,v 1.14 1995/12/10 13:39:20 phk Exp $
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h
index 06f702141192..2ee160bff92e 100644
--- a/sys/i386/isa/wtreg.h
+++ b/sys/i386/isa/wtreg.h
@@ -9,7 +9,7 @@
  * This software is distributed with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Authors grant any other persons or organisations permission to use
+ * Authors grant any other persons or organizations permission to use
  * or modify this software as long as this message is kept with the software,
  * all derivative works or modified versions.
  *
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wtreg.h,v 1.5 1995/05/30 08:03:24 rgrimes Exp $
+ * $Id: wtreg.h,v 1.6 1996/01/08 12:46:15 joerg Exp $
  *
  */
 
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 22bc387e6031..c0fbc0a20fe2 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.2 1995/11/22 07:43:43 bde Exp $
+ *	$Id: linux.h,v 1.3 1995/12/29 22:12:10 sos Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/i386/scsi/aic7xxx.h b/sys/i386/scsi/aic7xxx.h
index 8bfb807dadaa..f92e00307b3d 100644
--- a/sys/i386/scsi/aic7xxx.h
+++ b/sys/i386/scsi/aic7xxx.h
@@ -20,7 +20,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7xxx.h,v 1.19 1996/01/23 21:47:53 se Exp $
+ *	$Id: aic7xxx.h,v 1.20 1996/01/29 03:17:39 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_H_
@@ -90,7 +90,7 @@ typedef enum {
  * first 26 bytes of the structure need to be transfered to the card during
  * normal operation.  The remaining fields (next_waiting and host_scb) are
  * initialized the first time an SCB is allocated in get_scb().  The fields
- * starting at byte 32 are used for kernel level bookeeping.  
+ * starting at byte 32 are used for kernel level bookkeeping.  
  */
 struct scb {
 /* ------------    Begin hardware supported fields    ---------------- */
@@ -139,7 +139,7 @@ struct ahc_data {
 	int	our_id;			/* our scsi id */
 	int	our_id_b;		/* B channel scsi id */
 	int	vect;
-	struct	scb *immed_ecb;		/* an outstanding immediete command */
+	struct	scb *immed_ecb;		/* an outstanding immediate command */
 	struct	scsi_link sc_link;
 	struct	scsi_link sc_link_b;	/* Second bus for Twin channel cards */
 	u_short	needsdtr_orig;		/* Targets we initiate sync neg with */
diff --git a/sys/i386/scsi/btreg.h b/sys/i386/scsi/btreg.h
index ab4c1952bc41..34d6e1294129 100644
--- a/sys/i386/scsi/btreg.h
+++ b/sys/i386/scsi/btreg.h
@@ -6,13 +6,13 @@
  * Mellon University, makes this software available to CMU to distribute
  * or use in any manner that they see fit as long as this message is kept with
  * the software. For this reason TFS also grants any other persons or
- * organisations permission to use or modify this software.
+ * organizations permission to use or modify this software.
  *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: btreg.h,v 1.1 1995/12/12 08:57:22 gibbs Exp $
+ *      $Id: btreg.h,v 1.2 1995/12/14 14:19:17 peter Exp $
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/isa/syscons.h b/sys/isa/syscons.h
index 6c895e2b976b..cf7044844bf0 100644
--- a/sys/isa/syscons.h
+++ b/sys/isa/syscons.h
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.13 1995/11/28 00:17:32 ache Exp $
+ *	$Id: syscons.h,v 1.14 1995/12/10 13:39:20 phk Exp $
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index 1a64047b8e7f..dc46ac4f9010 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -7,7 +7,7 @@
 /*
  * Written by Julian Elischer (julian@DIALIX.oz.au)
  *
- * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.7 1995/10/04 11:05:09 julian Exp $
+ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.8 1995/11/09 08:16:48 bde Exp $
  */
 
 /* first a couple of defines for compatibility with inodes */
@@ -112,7 +112,7 @@ struct	devnode	/* the equivalent of an INODE */
 			int	entrycount;
 		}Dir;
 		struct {
-			char	*name;	/* must be allocated separatly */
+			char	*name;	/* must be allocated separately */
 			int	namelen;
 		}Slnk;
 		struct {
diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h
index 7618126c3101..61fbf702012b 100644
--- a/sys/msdosfs/bpb.h
+++ b/sys/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$Id: bpb.h,v 1.1 1994/09/19 15:41:37 dfr Exp $ */
+/*	$Id: bpb.h,v 1.2 1995/05/30 08:07:30 rgrimes Exp $ */
 /*	$NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $	*/
 
 /*
@@ -50,7 +50,7 @@ struct bpb50 {
 	u_short bpbSecPerTrack;	/* sectors per track */
 	u_short bpbHeads;	/* number of heads */
 	u_long bpbHiddenSecs;	/* number of hidden sectors */
-	u_long bpbHugeSectors;	/* number of sectrs if bpbSectors == 0 */
+	u_long bpbHugeSectors;	/* number of sectors if bpbSectors == 0 */
 };
 
 /*
@@ -116,5 +116,5 @@ struct byte_bpb50 {
 	char bpbSecPerTrack[2];	/* sectors per track */
 	char bpbHeads[2];	/* number of heads */
 	char bpbHiddenSecs[4];	/* number of hidden sectors */
-	char bpbHugeSectors[4];	/* number of sectrs if bpbSectors == 0 */
+	char bpbHugeSectors[4];	/* number of sectors if bpbSectors == 0 */
 };
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index 0d485c49e127..18eae6b8956b 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.4 1995/11/07 14:06:45 phk Exp $ */
+/*	$Id: msdosfsmount.h,v 1.5 1995/11/16 11:48:10 bde Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@ struct msdosfsmount {
 	u_long pm_fatsize;	/* size of fat in bytes */
 	u_int *pm_inusemap;	/* ptr to bitmap of in-use clusters */
 	char pm_ronly;		/* read only if non-zero */
-	char pm_waitonfat;	/* wait for writes of the fat to complt, when 0 use bdwrite, else use bwrite */
+	char pm_waitonfat;	/* wait for writes of the fat to complete, when 0 use bdwrite, else use bwrite */
 	struct netexport pm_export;	/* export information */
 };
 
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 2be863546d53..626e7c65b426 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpf.h,v 1.6 1995/09/08 11:08:55 bde Exp $
+ * $Id: bpf.h,v 1.7 1995/11/04 13:25:03 bde Exp $
  */
 
 #ifndef _NET_BPF_H_
@@ -166,7 +166,7 @@ struct bpf_hdr {
 #define DLT_FDDI	10	/* FDDI */
 
 /*
- * The instruction encondings.
+ * The instruction encodings.
  */
 /* instruction classes */
 #define BPF_CLASS(code) ((code) & 0x07)
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 0474c8a3f17f..dff9acab5e5c 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpfdesc.h,v 1.5 1995/06/15 18:11:00 pst Exp $
+ * $Id: bpfdesc.h,v 1.6 1995/12/14 09:53:11 phk Exp $
  */
 
 #ifndef _NET_BPFDESC_H_
@@ -98,7 +98,7 @@ struct bpf_if {
 	struct bpf_if **bif_driverp;	/* pointer into softc */
 	u_int bif_dlt;			/* link layer type */
 	u_int bif_hdrlen;		/* length of header (with padding) */
-	struct ifnet *bif_ifp;		/* correspoding interface */
+	struct ifnet *bif_ifp;		/* corresponding interface */
 };
 
 #endif
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index da89ee7126f7..b58c4b2daea8 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $Id: if_llc.h,v 1.2 1994/08/02 07:46:16 davidg Exp $
+ * $Id: if_llc.h,v 1.3 1994/08/21 05:11:42 paul Exp $
  */
 
 #ifndef _NET_IF_LLC_H_
@@ -41,7 +41,7 @@
  * IEEE 802.2 Link Level Control headers, for use in conjunction with
  * 802.{3,4,5} media access control methods.
  *
- * Headers here do not use bit fields due to shortcommings in many
+ * Headers here do not use bit fields due to shortcomings in many
  * compilers.
  */
 
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index e3fd618fb8af..1ea8c01c6d44 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -1,5 +1,5 @@
 /*	from Id: if_ppp.h,v 1.12 1995/04/24 02:40:23 paulus Exp	*/
-/*	$Id$ */
+/*	$Id: if_ppp.h,v 1.5 1995/10/31 20:24:10 peter Exp $ */
 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
@@ -17,7 +17,7 @@
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #ifndef _IF_PPP_H_
@@ -61,8 +61,8 @@
  */
 #define SC_TIMEOUT	0x00000400	/* timeout is currently pending */
 #define SC_VJ_RESET	0x00000800	/* need to reset VJ decomp */
-#define SC_COMP_RUN	0x00001000	/* compressor has been inited */
-#define SC_DECOMP_RUN	0x00002000	/* decompressor has been inited */
+#define SC_COMP_RUN	0x00001000	/* compressor has been initiated */
+#define SC_DECOMP_RUN	0x00002000	/* decompressor has been initiated */
 #define SC_DC_ERROR	0x00004000	/* non-fatal decomp error detected */
 #define SC_DC_FERROR	0x00008000	/* fatal decomp error detected */
 #define SC_TBUSY	0x10000000	/* xmitter doesn't need a packet yet */
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index 2ac4d8df4ca5..4f3e3562d019 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -1,5 +1,5 @@
 /*	from Id: if_pppvar.h,v 1.1 1994/12/15 22:28:09 paulus Exp	*/
-/*	$Id$	*/
+/*	$Id: if_pppvar.h,v 1.2 1995/10/31 20:24:11 peter Exp $	*/
 /*
  * if_pppvar.h - private structures and declarations for PPP.
  *
@@ -39,7 +39,7 @@
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index d6089e46d1af..5a76ac01fa7e 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $Id: if_slvar.h,v 1.7 1995/08/30 00:33:21 bde Exp $
+ * $Id: if_slvar.h,v 1.8 1995/12/14 09:53:16 phk Exp $
  */
 
 #ifndef _NET_IF_SLVAR_H_
@@ -54,7 +54,7 @@ struct sl_softc {
 	u_int	sc_flags;		/* see below */
 	u_int	sc_escape;	/* =1 if last char input was FRAME_ESCAPE */
 	long	sc_lasttime;		/* last time a char arrived */
-	long	sc_abortcount;		/* number of abort esacpe chars */
+	long	sc_abortcount;		/* number of abort escape chars */
 	long	sc_starttime;		/* time of first abort in window */
 	u_int	sc_keepalive;		/* time	to decide link hang */
 	u_int	sc_outfill;		/* time	to send	FRAME_END when output idle */
@@ -71,7 +71,7 @@ struct sl_softc {
 
 /* visible flags */
 #define	SC_COMPRESS	IFF_LINK0	/* compress TCP traffic */
-#define	SC_NOICMP	IFF_LINK1	/* supress ICMP traffic */
+#define	SC_NOICMP	IFF_LINK1	/* suppress ICMP traffic */
 #define	SC_AUTOCOMP	IFF_LINK2	/* auto-enable TCP compression */
 
 
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 95197d742d73..378fdd3697e1 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -7,7 +7,7 @@
  * This software is distributed with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Authors grant any other persons or organisations permission to use
+ * Authors grant any other persons or organizations permission to use
  * or modify this software as long as this message is kept with the software,
  * all derivative works or modified versions.
  *
diff --git a/sys/net/route.h b/sys/net/route.h
index 55b2738344b8..e6e504ae1b05 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.18 1995/11/16 19:00:09 phk Exp $
+ * $Id: route.h,v 1.19 1995/12/14 09:53:28 phk Exp $
  */
 
 #ifndef _NET_ROUTE_H_
@@ -63,8 +63,8 @@ struct rt_metrics {
 	u_long	rmx_mtu;	/* MTU for this path */
 	u_long	rmx_hopcount;	/* max hops expected */
 	u_long	rmx_expire;	/* lifetime for route, e.g. redirect */
-	u_long	rmx_recvpipe;	/* inbound delay-bandwith product */
-	u_long	rmx_sendpipe;	/* outbound delay-bandwith product */
+	u_long	rmx_recvpipe;	/* inbound delay-bandwidth product */
+	u_long	rmx_sendpipe;	/* outbound delay-bandwidth product */
 	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
 	u_long	rmx_rtt;	/* estimated round trip time */
 	u_long	rmx_rttvar;	/* estimated rtt variance */
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index f7230c5a1d87..2d52056b898b 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -35,7 +35,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $Id: slcompress.h,v 1.7 1995/10/31 19:22:32 peter Exp $
+ * $Id: slcompress.h,v 1.8 1995/11/18 13:07:51 bde Exp $
  */
 
 #ifndef _NET_SLCOMPRESS_H_
@@ -59,7 +59,7 @@
  *
  * There are 5 numbers which can change (they are always inserted
  * in the following order): TCP urgent pointer, window,
- * acknowlegement, sequence number and IP ID.  (The urgent pointer
+ * acknowledgement, sequence number and IP ID.  (The urgent pointer
  * is different from the others in that its value is sent, not the
  * change in value.)  Since typical use of SLIP links is biased
  * toward small packets (see comments on MTU/MSS below), changes
diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h
index 799f4ff4215d..833277b9991b 100644
--- a/sys/netccitt/pk.h
+++ b/sys/netccitt/pk.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk.h	8.1 (Berkeley) 6/10/93
- * $Id: pk.h,v 1.4 1995/05/30 08:08:57 rgrimes Exp $
+ * $Id: pk.h,v 1.5 1995/11/21 12:54:10 bde Exp $
  */
 
 #ifndef _NETCCITT_PK_H_
@@ -48,7 +48,7 @@
  *
  */
 
-/* Packet type identifier field defintions. */
+/* Packet type identifier field definitions. */
 
 #define X25_CALL                         11
 #define X25_CALL_ACCEPTED                15
@@ -104,7 +104,7 @@ typedef char    bool;
 /*
  *  X.25 Packet format definitions
  *  This will eventually have to be rewritten without reference
- *  to bit fields, to be ansi C compliant and allignment safe.
+ *  to bit fields, to be ansi C compliant and alignment safe.
  */
 
 typedef u_char octet;
diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h
index 86b8d3659ab9..f15ac5786409 100644
--- a/sys/netccitt/pk_var.h
+++ b/sys/netccitt/pk_var.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_var.h	8.1 (Berkeley) 6/10/93
- * $Id: pk_var.h,v 1.6 1995/07/29 11:41:27 bde Exp $
+ * $Id: pk_var.h,v 1.7 1995/11/21 12:54:12 bde Exp $
  */
 
 #ifndef _NETCCITT_PK_VAR_H_
@@ -139,7 +139,7 @@ struct	pkcb {
  *	Interface address, x25 version. Exactly one of these structures is
  *	allocated for each interface with an x25 address.
  *
- *	The ifaddr structure conatins the protocol-independent part
+ *	The ifaddr structure contains the protocol-independent part
  *	of the structure, and is assumed to be first.
  */
 struct x25_ifaddr {
@@ -223,7 +223,7 @@ extern struct x25bitslice x25_bitslice[];
 		       ISOFIFTTYPE(i, IFT_FDDI)))
 
 /*
- * miscellenous debugging info
+ * miscellaneous debugging info
  */
 struct mbuf_cache {
 	int	mbc_size;
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 55ee6da1a2d5..f11b46f93490 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id: igmp_var.h,v 1.6 1995/06/13 17:51:07 wollman Exp $
+ * $Id: igmp_var.h,v 1.7 1995/11/14 20:33:54 phk Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
@@ -47,7 +47,7 @@
  *
  * Written by Steve Deering, Stanford, May 1988.
  *
- * MULTICAST Revisiob: 3.3.1.1
+ * MULTICAST Revision: 3.3.1.1
  */
 
 struct igmpstat {
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index a538899bc377..49bd819424dd 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_icmp.h,v 1.5 1995/11/14 20:34:13 phk Exp $
+ * $Id: ip_icmp.h,v 1.6 1996/01/19 01:19:08 fenner Exp $
  */
 
 #ifndef _NETINET_IP_ICMP_H_
@@ -114,7 +114,7 @@ struct icmp {
 /*
  * Lower bounds on packet lengths for various types.
  * For the error advice packets must first insure that the
- * packet is large enought to contain the returned ip header.
+ * packet is large enough to contain the returned ip header.
  * Only then can we do the check to see if 64 bits of packet
  * data have been returned, since we need to check the returned
  * ip header length.
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 5b4a47039915..0ca618d69a47 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: ip_var.h,v 1.17 1995/12/05 17:46:25 wollman Exp $
+ *	$Id: ip_var.h,v 1.18 1995/12/14 09:53:45 phk Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
@@ -136,7 +136,7 @@ struct	ipstat {
 	u_long	ips_localout;		/* total ip packets generated here */
 	u_long	ips_odropped;		/* lost packets due to nobufs, etc. */
 	u_long	ips_reassembled;	/* total packets reassembled ok */
-	u_long	ips_fragmented;		/* datagrams sucessfully fragmented */
+	u_long	ips_fragmented;		/* datagrams successfully fragmented */
 	u_long	ips_ofragments;		/* output fragments created */
 	u_long	ips_cantfrag;		/* don't fragment flag was set, etc. */
 	u_long	ips_badoptions;		/* error in option processing */
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index aa304b43b092..c7e315ffff0d 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp_timer.h,v 1.6 1995/02/14 02:35:18 wollman Exp $
+ * $Id: tcp_timer.h,v 1.7 1995/11/14 20:34:45 phk Exp $
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
@@ -44,7 +44,7 @@
 #define	TCPT_NTIMERS	4
 
 #define	TCPT_REXMT	0		/* retransmit */
-#define	TCPT_PERSIST	1		/* retransmit persistance */
+#define	TCPT_PERSIST	1		/* retransmit persistence */
 #define	TCPT_KEEP	2		/* keep alive */
 #define	TCPT_2MSL	3		/* 2*msl quiet time timer */
 
@@ -92,7 +92,7 @@
 						   if 0, no idea yet */
 #define	TCPTV_SRTTDFLT	(  3*PR_SLOWHZ)		/* assumed RTT if no info */
 
-#define	TCPTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistance */
+#define	TCPTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistence */
 #define	TCPTV_PERSMAX	( 60*PR_SLOWHZ)		/* maximum persist interval */
 
 #define	TCPTV_KEEP_INIT	( 75*PR_SLOWHZ)		/* initial connect keep alive */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 1a67aac7dec9..d1d77061cbbb 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id: tcp_var.h,v 1.26 1995/12/29 01:12:02 davidg Exp $
+ * 	$Id: tcp_var.h,v 1.27 1996/01/19 08:02:34 peter Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
@@ -102,7 +102,7 @@ struct tcpcb {
 					 */
 /* congestion control (for slow start, source quench, retransmit after loss) */
 	u_long	snd_cwnd;		/* congestion-controlled window */
-	u_long	snd_ssthresh;		/* snd_cwnd size threshhold for
+	u_long	snd_ssthresh;		/* snd_cwnd size threshold for
 					 * for slow start exponential to
 					 * linear switch
 					 */
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index 83fa01470a62..b0b5b64efb71 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx.h
  *
- * $Id: ipx.h,v 1.5 1995/11/24 12:25:02 bde Exp $
+ * $Id: ipx.h,v 1.6 1995/12/16 02:14:31 bde Exp $
  */
 
 #ifndef _NETIPX_IPX_H_
@@ -132,7 +132,7 @@ struct sockaddr_ipx {
 struct ipx {
 	u_short	ipx_sum;	/* Checksum */
 	u_short	ipx_len;	/* Length, in bytes, including header */
-	u_char	ipx_tc;		/* Transport Crontrol (i.e. hop count) */
+	u_char	ipx_tc;		/* Transport Control (i.e. hop count) */
 	u_char	ipx_pt;		/* Packet Type (i.e. level 2 protocol) */
 	struct ipx_addr	ipx_dna;	/* Destination Network Address */
 	struct ipx_addr	ipx_sna;	/* Source Network Address */
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 3ceb48ad540e..31a1322b4d6a 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx.h
  *
- * $Id: spx.h,v 1.5 1995/11/24 12:25:11 bde Exp $
+ * $Id: spx.h,v 1.6 1995/12/16 02:14:34 bde Exp $
  */
 
 #ifndef _NETIPX_SPX_H_
@@ -131,7 +131,7 @@ struct spxpcb {
 	u_short	s_swl1;			/* == tcp snd_wl1 */
 	u_short	s_swl2;			/* == tcp snd_wl2 */
 	int	s_cwmx;			/* max allowable cwnd */
-	int	s_ssthresh;		/* s_cwnd size threshhold for
+	int	s_ssthresh;		/* s_cwnd size threshold for
 					 * slow start exponential-to-
 					 * linear switch */
 /* transmit timing stuff
diff --git a/sys/netipx/spx_timer.h b/sys/netipx/spx_timer.h
index f7012da734ef..6a43d2d2251d 100644
--- a/sys/netipx/spx_timer.h
+++ b/sys/netipx/spx_timer.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_timer.h
  *
- * $Id: spx_timer.h,v 1.3 1995/10/31 23:36:45 julian Exp $
+ * $Id: spx_timer.h,v 1.4 1995/11/04 09:03:39 julian Exp $
  */
 
 #ifndef _NETIPX_SPX_TIMER_H_
@@ -44,7 +44,7 @@
  * down PR_SLOWHZ times a second.
  */
 #define	SPXT_REXMT	0		/* retransmit */
-#define	SPXT_PERSIST	1		/* retransmit persistance */
+#define	SPXT_PERSIST	1		/* retransmit persistence */
 #define	SPXT_KEEP	2		/* keep alive */
 #define	SPXT_2MSL	3		/* 2*msl quiet time timer */
 
@@ -91,7 +91,7 @@
 						   if 0, no idea yet */
 #define	SPXTV_SRTTDFLT	(  3*PR_SLOWHZ)		/* assumed RTT if no info */
 
-#define	SPXTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistance */
+#define	SPXTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistence */
 #define	SPXTV_PERSMAX	( 60*PR_SLOWHZ)		/* maximum persist interval */
 
 #define	SPXTV_KEEP	( 75*PR_SLOWHZ)		/* keep alive - 75 secs */
diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h
index 646b6b8fc6f2..7b1c32284822 100644
--- a/sys/netiso/clnp.h
+++ b/sys/netiso/clnp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp.h	8.2 (Berkeley) 4/16/94
- * $Id: clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp $
+ * $Id: clnp.h,v 1.4 1995/05/30 08:10:12 rgrimes Exp $
  */
 
 #ifndef _NETISO_CLNP_H_
@@ -63,7 +63,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp.h,v 1.4 1995/05/30 08:10:12 rgrimes Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp.h,v $ */
 
 /* should be config option but cpp breaks with too many #defines */
@@ -81,7 +81,7 @@ SOFTWARE.
 	(msb) = (u_char)((hword) >> 8);\
 	(lsb) = (u_char)((hword) & 0xff)
 /*
- *	Move the two charcters into the halfword
+ *	Move the two characters into the halfword
  */
 #define	CTOH(msb, lsb, hword)\
 	(hword) = ((msb) << 8) | (lsb)
@@ -140,7 +140,7 @@ struct clnp_segment {
 
 /*
  *	NOTE:
- *		The clnp_frag structure is stored in an mbuf immedately preceeding
+ *		The clnp_frag structure is stored in an mbuf immediately preceding
  *	the fragment data. Since there are words in this struct,
  *	it must be word aligned.
  *
@@ -171,7 +171,7 @@ struct clnp_fragl {
  *	The following structure is used to index into an options section
  *	of a clnp datagram. These values can be used without worry that
  *	offset or length fields are invalid or too big, etc. That is,
- *	the consistancy of the options will be guaranteed before this
+ *	the consistency of the options will be guaranteed before this
  *	structure is filled in. Any pointer (field ending in p) is
  *	actually the offset from the beginning of the mbuf the option
  *	is contained in.  A value of NULL for any pointer
diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h
index 3bfd6436ebca..a646e543f741 100644
--- a/sys/netiso/iso_var.h
+++ b/sys/netiso/iso_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_var.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_var.h,v 1.6 1995/11/21 12:54:20 bde Exp $
+ * $Id: iso_var.h,v 1.7 1995/12/10 13:45:20 phk Exp $
  */
 
 #ifndef _NETISO_ISO_VAR_H_
@@ -63,14 +63,14 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.6 1995/11/21 12:54:20 bde Exp $
+/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.7 1995/12/10 13:45:20 phk Exp $
  * $Source: /home/ncvs/src/sys/netiso/iso_var.h,v $
  */
 
 /*
  *	Interface address, iso version. One of these structures is
  *	allocated for each interface with an osi address. The ifaddr
- *	structure conatins the protocol-independent part
+ *	structure contains the protocol-independent part
  *	of the structure, and is assumed to be first.
  */
 struct iso_ifaddr {
diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h
index 6322835dd379..0229779401c4 100644
--- a/sys/netiso/tp_pcb.h
+++ b/sys/netiso/tp_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_pcb.h,v 1.4 1995/04/26 21:32:39 pst Exp $
+ * $Id: tp_pcb.h,v 1.5 1995/05/30 08:11:27 rgrimes Exp $
  */
 
 #ifndef _NETISO_TP_PCB_H_
@@ -66,7 +66,7 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.4 1995/04/26 21:32:39 pst Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.5 1995/05/30 08:11:27 rgrimes Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_pcb.h,v $
  *
  *
@@ -99,7 +99,7 @@ SOFTWARE.
  *
  * Possible improvement:
  * Might not need the ref_state stuff either...
- * REF_FREE could correspond to tp_state == CLOSED or nonexistend tpcb,
+ * REF_FREE could correspond to tp_state == CLOSED or nonexistent tpcb,
  * REF_OPEN to tp_state anywhere from AK_WAIT or CR_SENT to CLOSING
  * REF_OPENING could correspond to LISTENING, because that's the
  * way it's used, not because the correspondence is exact.
diff --git a/sys/netiso/tp_tpdu.h b/sys/netiso/tp_tpdu.h
index c9a36795323e..d4a8be5142a4 100644
--- a/sys/netiso/tp_tpdu.h
+++ b/sys/netiso/tp_tpdu.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_tpdu.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp $
+ * $Id: tp_tpdu.h,v 1.4 1995/05/30 08:11:38 rgrimes Exp $
  */
 
 #ifndef _NETISO_TP_TPDU_H_
@@ -66,7 +66,7 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.4 1995/05/30 08:11:38 rgrimes Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_tpdu.h,v $
  *
  * This ghastly set of macros makes it possible to
@@ -129,7 +129,7 @@ struct tp0du {
 #define tp0du_mbz _tp0_mbz
 
 /*
- * This is used when the extended format seqence numbers are
+ * This is used when the extended format sequence numbers are
  * being sent and received.
  */
 				/*
diff --git a/sys/netns/idp.h b/sys/netns/idp.h
index 96b8694d2fc7..2efa0af9f671 100644
--- a/sys/netns/idp.h
+++ b/sys/netns/idp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp.h	8.1 (Berkeley) 6/10/93
- * $Id: idp.h,v 1.2 1994/08/02 07:51:40 davidg Exp $
+ * $Id: idp.h,v 1.3 1994/08/21 06:22:05 paul Exp $
  */
 
 #ifndef _NETNS_IDP_H_
@@ -43,7 +43,7 @@
 struct idp {
 	u_short	idp_sum;	/* Checksum */
 	u_short	idp_len;	/* Length, in bytes, including header */
-	u_char	idp_tc;		/* Transport Crontrol (i.e. hop count) */
+	u_char	idp_tc;		/* Transport Control (i.e. hop count) */
 	u_char	idp_pt;		/* Packet Type (i.e. level 2 protocol) */
 	struct ns_addr	idp_dna;	/* Destination Network Address */
 	struct ns_addr	idp_sna;	/* Source Network Address */
diff --git a/sys/netns/ns.h b/sys/netns/ns.h
index 87e849d9229f..94e5290b09b7 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- * $Id: ns.h,v 1.5 1995/10/26 20:31:44 julian Exp $
+ * $Id: ns.h,v 1.6 1995/11/21 12:54:28 bde Exp $
  */
 
 #ifndef _NETNS_NS_H_
@@ -63,7 +63,7 @@
 #define NSPORT_RE	3		/* Router Error */
 
 /*
- * Ports < NSPORT_RESERVED are reserved for priveleged
+ * Ports < NSPORT_RESERVED are reserved for privileged
  * processes (e.g. root).
  */
 #define NSPORT_RESERVED		3000
diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h
index f92d0ff4ea12..a343e7fd97d9 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: spp_var.h,v 1.3 1994/08/21 06:22:12 paul Exp $
+ * $Id: spp_var.h,v 1.4 1995/07/29 11:42:01 bde Exp $
  */
 
 #ifndef _NETNS_SPP_VAR_H_
@@ -83,7 +83,7 @@ struct sppcb {
 	u_short	s_swl1;			/* == tcp snd_wl1 */
 	u_short	s_swl2;			/* == tcp snd_wl2 */
 	int	s_cwmx;			/* max allowable cwnd */
-	int	s_ssthresh;		/* s_cwnd size threshhold for
+	int	s_ssthresh;		/* s_cwnd size threshold for
 					 * slow start exponential-to-
 					 * linear switch */
 /* transmit timing stuff
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 03464f431d43..7f04283399ae 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.15 1995/12/03 10:02:41 bde Exp $
+ * $Id: nfs.h,v 1.16 1995/12/17 21:12:05 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -69,7 +69,7 @@
 #define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
 #define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
 #define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runable */
+#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
 #define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
 #ifndef NFS_GATHERDELAY
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
@@ -89,7 +89,7 @@
 
 /*
  * XXX
- * sys/buf.h should be editted to change B_APPENDWRITE --> B_NEEDCOMMIT, but
+ * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
  * until then...
  * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
  * M_NFSRVDESC and M_NFSBIGFH added.
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 03464f431d43..7f04283399ae 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.15 1995/12/03 10:02:41 bde Exp $
+ * $Id: nfs.h,v 1.16 1995/12/17 21:12:05 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -69,7 +69,7 @@
 #define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
 #define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
 #define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runable */
+#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
 #define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
 #ifndef NFS_GATHERDELAY
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
@@ -89,7 +89,7 @@
 
 /*
  * XXX
- * sys/buf.h should be editted to change B_APPENDWRITE --> B_NEEDCOMMIT, but
+ * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
  * until then...
  * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
  * M_NFSRVDESC and M_NFSBIGFH added.
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 03464f431d43..7f04283399ae 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.15 1995/12/03 10:02:41 bde Exp $
+ * $Id: nfs.h,v 1.16 1995/12/17 21:12:05 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -69,7 +69,7 @@
 #define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
 #define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
 #define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runable */
+#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
 #define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
 #ifndef NFS_GATHERDELAY
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
@@ -89,7 +89,7 @@
 
 /*
  * XXX
- * sys/buf.h should be editted to change B_APPENDWRITE --> B_NEEDCOMMIT, but
+ * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
  * until then...
  * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
  * M_NFSRVDESC and M_NFSBIGFH added.
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 03464f431d43..7f04283399ae 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.15 1995/12/03 10:02:41 bde Exp $
+ * $Id: nfs.h,v 1.16 1995/12/17 21:12:05 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -69,7 +69,7 @@
 #define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
 #define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
 #define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runable */
+#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
 #define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
 #ifndef NFS_GATHERDELAY
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
@@ -89,7 +89,7 @@
 
 /*
  * XXX
- * sys/buf.h should be editted to change B_APPENDWRITE --> B_NEEDCOMMIT, but
+ * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
  * until then...
  * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
  * M_NFSRVDESC and M_NFSBIGFH added.
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 03464f431d43..7f04283399ae 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.15 1995/12/03 10:02:41 bde Exp $
+ * $Id: nfs.h,v 1.16 1995/12/17 21:12:05 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -69,7 +69,7 @@
 #define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
 #define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
 #define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runable */
+#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
 #define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
 #ifndef NFS_GATHERDELAY
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
@@ -89,7 +89,7 @@
 
 /*
  * XXX
- * sys/buf.h should be editted to change B_APPENDWRITE --> B_NEEDCOMMIT, but
+ * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
  * until then...
  * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
  * M_NFSRVDESC and M_NFSBIGFH added.
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 03464f431d43..7f04283399ae 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.15 1995/12/03 10:02:41 bde Exp $
+ * $Id: nfs.h,v 1.16 1995/12/17 21:12:05 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -69,7 +69,7 @@
 #define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
 #define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
 #define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runable */
+#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
 #define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
 #ifndef NFS_GATHERDELAY
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
@@ -89,7 +89,7 @@
 
 /*
  * XXX
- * sys/buf.h should be editted to change B_APPENDWRITE --> B_NEEDCOMMIT, but
+ * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
  * until then...
  * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
  * M_NFSRVDESC and M_NFSBIGFH added.
diff --git a/sys/pc98/pc98/atapi.h b/sys/pc98/pc98/atapi.h
index 875a5c9dec75..dce6d9e84dcc 100644
--- a/sys/pc98/pc98/atapi.h
+++ b/sys/pc98/pc98/atapi.h
@@ -7,7 +7,7 @@
  * This software is distributed with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Authors grant any other persons or organisations permission to use
+ * Authors grant any other persons or organizations permission to use
  * or modify this software as long as this message is kept with the software,
  * all derivative works or modified versions.
  *
@@ -52,7 +52,7 @@
 #define AER_ABRT        0x04            /* command aborted */
 #define AER_MCR         0x08            /* media change requested */
 #define AER_SKEY        0xf0            /* sense key mask */
-#define AER_SK_NO_SENSE         0x00    /* no spesific sense key info */
+#define AER_SK_NO_SENSE         0x00    /* no specific sense key info */
 #define AER_SK_RECOVERED_ERROR  0x10    /* command succeeded, data recovered */
 #define AER_SK_NOT_READY        0x20    /* no access to drive */
 #define AER_SK_MEDIUM_ERROR     0x30    /* non-recovered data error */
diff --git a/sys/pccard/cis.h b/sys/pccard/cis.h
index 677b197a0a8c..99c13af3e045 100644
--- a/sys/pccard/cis.h
+++ b/sys/pccard/cis.h
@@ -74,7 +74,7 @@
 #define	CIS_BYTEORDER	0x43	/* Byte order of memory data */
 #define	CIS_DATE	0x44	/* Format data/time */
 #define	CIS_BATTERY	0x45	/* Battery replacement date */
-#define	CIS_ORG		0x46	/* Organisation of data on card */
+#define	CIS_ORG		0x46	/* Organization of data on card */
 #define	CIS_END		0xFF	/* Termination code */
 
 /*
diff --git a/sys/pci/dc21040.h b/sys/pci/dc21040.h
index e3ff9e868018..3fb22622ab1f 100644
--- a/sys/pci/dc21040.h
+++ b/sys/pci/dc21040.h
@@ -8,7 +8,7 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: dc21040.h,v 1.4 1995/05/05 20:09:48 davidg Exp $
+ * $Id: dc21040.h,v 1.5 1995/09/29 19:52:08 davidg Exp $
  *
  */
 
@@ -156,7 +156,7 @@ typedef struct {
 #define	TULIP_STS_FULDPLXSHRT	0x00000800L		/* (RW)  Full Duplex Short Fram Rcvd (DC21040) */
 #define	TULIP_STS_GPTIMEOUT	0x00000800L		/* (RW)  General Purpose Timeout (DC21140) */
 #define	TULIP_STS_AUI		0x00000400L		/* (RW)  AUI/TP Switch (DC21040) */
-#define	TULIP_STS_RXTIMEOUT	0x00000200L		/* (RW)  Receive Watchbog Timeout */
+#define	TULIP_STS_RXTIMEOUT	0x00000200L		/* (RW)  Receive Watchdog Timeout */
 #define	TULIP_STS_RXSTOPPED	0x00000100L		/* (RW)  Receive Process Stopped */
 #define	TULIP_STS_RXNOBUF	0x00000080L		/* (RW)  Receive Buffer Unavailable */
 #define	TULIP_STS_RXINTR	0x00000040L		/* (RW)  Receive Interrupt */
@@ -177,7 +177,7 @@ typedef struct {
 #define	TULIP_CMD_STOREFWD	0x00200000L		/* (RW)  Store and Foward (DC21140) */
 #define	TULIP_CMD_NOHEARTBEAT	0x00080000L		/* (RW)  No Heartbeat (DC21140) */
 #define	TULIP_CMD_PORTSELECT	0x00040000L		/* (RW)  Post Select (100Mb) (DC21140) */
-#define	TULIP_CMD_ENHCAPTEFFCT	0x00040000L		/* (RW)  Enhanced Capture Effecty (DC21041) */
+#define	TULIP_CMD_ENHCAPTEFFCT	0x00040000L		/* (RW)  Enhanced Capture Effect (DC21041) */
 #define	TULIP_CMD_CAPTREFFCT	0x00020000L		/* (RW)  Capture Effect (!802.3) */
 #define	TULIP_CMD_BACKPRESSURE	0x00010000L		/* (RW)  Back Pressure (!802.3) (DC21040) */
 #define	TULIP_CMD_THRESHOLDCTL	0x0000C000L		/* (RW)  Threshold Control */
@@ -246,7 +246,7 @@ typedef struct {
 #define	TULIP_BUSMODE_DESC_BIGENDIAN	0x00100000L	/* DC21041 only */
 
 /*
- * These are the defintitions used for the DEC DC21140
+ * These are the definitions used for the DEC DC21140
  * evaluation board.
  */
 #define	TULIP_GP_EB_PINS		0x0000011F	/* General Purpose Pin directions */
@@ -265,7 +265,7 @@ typedef struct {
 #define	TULIP_GP_DE500_FORCE_100	0x00000001L
 
 /*
- * These are the defintitions used for the Cogent EM100
+ * These are the definitions used for the Cogent EM100
  * DC21140 board.
  */
 #define	TULIP_GP_EM100_PINS		0x0000013F	/* General Purpose Pin directions */
@@ -277,7 +277,7 @@ typedef struct {
 
 
 /*
- * These are the defintitions used for the Znyx ZX342
+ * These are the definitions used for the Znyx ZX342
  * 10/100 board
  */
 #define	TULIP_GP_ZX34X_PINS		0x0000011F	/* General Purpose Pin directions */
diff --git a/sys/pci/if_vxreg.h b/sys/pci/if_vxreg.h
index a9795643a63d..cbd27358160d 100644
--- a/sys/pci/if_vxreg.h
+++ b/sys/pci/if_vxreg.h
@@ -6,7 +6,7 @@
  * met: 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer. 2. The name
  * of the author may not be used to endorse or promote products derived from
- * this software withough specific prior written permission
+ * this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -129,7 +129,7 @@ struct vx_softc {
 /**************************************************************************
  *									  *
  * These define the EEPROM data structure.  They are used in the probe
- * function to verify the existance of the adapter after having sent
+ * function to verify the existence of the adapter after having sent
  * the ID_Sequence.
  *
  * There are others but only the ones we use are defined here.
diff --git a/sys/pci/pcibus.h b/sys/pci/pcibus.h
index 690ccbd3ac0d..a797cff6e901 100644
--- a/sys/pci/pcibus.h
+++ b/sys/pci/pcibus.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.h,v 1.2 1995/03/21 23:01:03 se Exp $
+**  $Id: pcibus.h,v 1.3 1995/11/21 12:54:54 bde Exp $
 **
 **  Declarations for pci bus driver.
 **
@@ -65,7 +65,7 @@
 **		(should be a long word alligned one), and a value.
 **
 **	pcibus_regirq():
-**		Register an interupt handler for a pci device.
+**		Register an interrupt handler for a pci device.
 **		Requires a tag (from pcitag), the register number
 **		(should be a long word alligned one), and a value.
 **
diff --git a/sys/pci/pdq_os.h b/sys/pci/pdq_os.h
index 60c4538a75b9..6176a0971423 100644
--- a/sys/pci/pdq_os.h
+++ b/sys/pci/pdq_os.h
@@ -8,7 +8,7 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -21,9 +21,12 @@
  * (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: pdq_os.h,v 1.4 1995/10/29 15:33:36 phk Exp $
+ * $Id: pdq_os.h,v 1.5 1995/12/07 12:47:43 davidg Exp $
  *
  * $Log: pdq_os.h,v $
+ * Revision 1.5  1995/12/07 12:47:43  davidg
+ * Untangled the vm.h include file spaghetti.
+ *
  * Revision 1.4  1995/10/29  15:33:36  phk
  * Second batch of cleanup changes.
  * This time mostly making a lot of things static and some unused
diff --git a/sys/pci/pdqreg.h b/sys/pci/pdqreg.h
index 08038f4b7a9a..d29a4f38d341 100644
--- a/sys/pci/pdqreg.h
+++ b/sys/pci/pdqreg.h
@@ -8,7 +8,7 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -21,9 +21,12 @@
  * (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: pdqreg.h,v 1.1 1995/03/14 09:16:07 davidg Exp $
+ * $Id: pdqreg.h,v 1.2 1995/05/30 08:13:15 rgrimes Exp $
  *
  * $Log: pdqreg.h,v $
+ * Revision 1.2  1995/05/30 08:13:15  rgrimes
+ * Remove trailing whitespace.
+ *
  * Revision 1.1  1995/03/14  09:16:07  davidg
  * Added support for generic FDDI and the DEC DEFEA and DEFPA FDDI adapters.
  *
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index cd843c017907..93085cbeb0d1 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.7 (Berkeley) 1/21/94
- * $Id: buf.h,v 1.26 1995/12/28 23:34:28 davidg Exp $
+ * $Id: buf.h,v 1.27 1996/01/19 03:59:03 dyson Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -66,7 +66,7 @@ struct buf {
 	LIST_ENTRY(buf) b_hash;		/* Hash chain. */
 	LIST_ENTRY(buf) b_vnbufs;	/* Buffer's associated vnode. */
 	TAILQ_ENTRY(buf) b_freelist;	/* Free list position if not active. */
-	struct	buf *b_actf, **b_actb;	/* Device driver queue when active. *depricated* XXX */
+	struct	buf *b_actf, **b_actb;	/* Device driver queue when active. *deprecated* XXX */
 	TAILQ_ENTRY(buf) b_act;		/* Device driver queue when active. *new* */
 	struct  proc *b_proc;		/* Associated proc; NULL if kernel. */
 	long	b_flags;	/* B_* flags. */
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index cd843c017907..93085cbeb0d1 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.7 (Berkeley) 1/21/94
- * $Id: buf.h,v 1.26 1995/12/28 23:34:28 davidg Exp $
+ * $Id: buf.h,v 1.27 1996/01/19 03:59:03 dyson Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -66,7 +66,7 @@ struct buf {
 	LIST_ENTRY(buf) b_hash;		/* Hash chain. */
 	LIST_ENTRY(buf) b_vnbufs;	/* Buffer's associated vnode. */
 	TAILQ_ENTRY(buf) b_freelist;	/* Free list position if not active. */
-	struct	buf *b_actf, **b_actb;	/* Device driver queue when active. *depricated* XXX */
+	struct	buf *b_actf, **b_actb;	/* Device driver queue when active. *deprecated* XXX */
 	TAILQ_ENTRY(buf) b_act;		/* Device driver queue when active. *new* */
 	struct  proc *b_proc;		/* Associated proc; NULL if kernel. */
 	long	b_flags;	/* B_* flags. */
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index cc566ec9b194..a249ca1139ad 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -1,10 +1,10 @@
 /*
  * 16 Feb 93	Julian Elischer		ADDED for SCSI system
  *
- *	$Id: chio.h,v 1.4 1993/11/18 05:03:24 rgrimes Exp $
+ *	$Id: chio.h,v 1.5 1995/05/30 08:14:13 rgrimes Exp $
  */
 
-/* This is a "convertet" mtio.h from 386BSD
+/* This is a "converted" mtio.h from 386BSD
    Stefan Grefen grefen@goofy.zdv.uni-mainz.de
  */
 
@@ -61,7 +61,7 @@ struct chop {
 				u_char add_sense_code_qualifier;
 				} specs;
 				short add_sense;
-/* WARINING LSB only */
+/* WARNING LSB only */
 #define CH_CHOLDER	0x0290	/* Cartridge holder is missing */
 #define CH_STATUSQ	0x0390	/* Status is questionable */
 #define CH_CTS_CLOSED	0x0490	/* CTS door is closed */
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index f766c9d3dd0a..5695c2725c04 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: diskslice.h,v 1.10 1995/05/30 08:14:19 rgrimes Exp $
+ *	$Id: diskslice.h,v 1.11 1996/01/27 04:18:15 bde Exp $
  */
 
 #ifndef _SYS_DISKSLICE_H_
@@ -48,7 +48,7 @@ struct	diskslice {
 	struct disklabel *ds_label;	/* BSD label, if any */
 	void	*ds_bdev;		/* devfs token for whole slice */
 	void	*ds_cdev;		/* devfs token for raw whole slice */
-#ifdef MAXPARTITIONS			/* XXX don't depend on dislabel.h */
+#ifdef MAXPARTITIONS			/* XXX don't depend on disklabel.h */
 #if MAXPARTITIONS !=	8		/* but check consistency if possible */
 #error "inconsistent MAXPARTITIONS"
 #endif
@@ -94,7 +94,7 @@ struct	diskslice {
 struct diskslices {
 	struct bdevsw *dss_bdevsw;	/* for containing device */
 	struct cdevsw *dss_cdevsw;	/* for containing device */
-	int	dss_first_bsd_slice;	/* COMPATIBILTY_SLICE is mapped here */
+	int	dss_first_bsd_slice;	/* COMPATIBILITY_SLICE is mapped here */
 	u_int	dss_nslices;		/* actual dimension of dss_slices[] */
 	struct diskslice
 		dss_slices[MAX_SLICES];	/* actually usually less */
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 33afa9a454d5..7861e2781bf6 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: fcntl.h,v 1.2 1994/08/02 07:52:57 davidg Exp $
  */
 
 #ifndef _SYS_FCNTL_H_
@@ -85,7 +85,7 @@
 #define	O_ASYNC		0x0040		/* signal pgrp when data ready */
 #define	O_FSYNC		0x0080		/* synchronous writes */
 #endif
-#define	O_CREAT		0x0200		/* create if nonexistant */
+#define	O_CREAT		0x0200		/* create if nonexistent */
 #define	O_TRUNC		0x0400		/* truncate to zero length */
 #define	O_EXCL		0x0800		/* error if already exists */
 #ifdef KERNEL
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index 67329399ad84..2a9212b7a4b3 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id: ioctl_fd.h,v 1.6 1994/09/25 18:41:21 joerg Exp $
+ * $Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp $
  */
 
 #ifndef _IOCTL_FD_H
@@ -46,7 +46,7 @@ struct fd_formb {
 		struct fd_form_data {
 			/*
 			 * DO NOT CHANGE THE LAYOUT OF THIS STRUCTS
-			 * it is hardware-dependant since it exactly
+			 * it is hardware-dependent since it exactly
 			 * matches the byte sequence to write to FDC
 			 * during its `format track' operation
 			 */
diff --git a/sys/sys/ftape.h b/sys/sys/ftape.h
index 79a644276ad0..eaad609928ba 100644
--- a/sys/sys/ftape.h
+++ b/sys/sys/ftape.h
@@ -172,7 +172,7 @@ typedef struct qic_vtbl {
 	char vt_vname[44];	/* Set name */
 	UCHAR vt_savdate[4];	/* Date saved */
 	UCHAR vt_flags;		/* Volume flags */
-	UCHAR vt_multi;		/* Multi cartidge sequence no. */
+	UCHAR vt_multi;		/* Multi cartridge sequence no. */
 	UCHAR vt_vext[26];	/* Extension data */
 	char vt_passwd[8];	/* Password for volume */
 	UCHAR vt_dirsize[4];	/* Directory section size */
@@ -190,7 +190,7 @@ typedef struct qic_vtbl {
 
 /* Data compression map structure. */
 typedef struct qic_dcmap {
-	UCHAR dc_sig[4];	/* Siguature "DCMS" */
+	UCHAR dc_sig[4];	/* Signature "DCMS" */
 	USHORT dc_mlen;		/* Total map length */
 	UCHAR dc_unused1[6];
 	ULONG dc_offset[7421];	/* Byte offsets to segments */
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index 90eff5a72563..b34b9d2921e7 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- *	$Id: imgact_aout.h,v 1.3 1995/05/30 08:14:25 rgrimes Exp $
+ *	$Id: imgact_aout.h,v 1.4 1995/07/26 17:25:48 davidg Exp $
  */
 
 #ifndef	_IMGACT_AOUT_H_
@@ -139,7 +139,7 @@ struct exec {
 /*
  * a_flags
  */
-#define EX_PIC		0x10	/* contains position independant code */
+#define EX_PIC		0x10	/* contains position independent code */
 #define EX_DYNAMIC	0x20	/* contains run-time link-edit info */
 #define EX_DPMASK	0x30	/* mask for the above */
 
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index abe902f57825..a8afb3104b7b 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id$
+ * $Id: ioctl.h,v 1.2 1994/08/02 07:53:04 davidg Exp $
  */
 
 #ifndef	_SYS_IOCTL_H_
@@ -47,7 +47,7 @@
 /*
  * Pun for SunOS prior to 3.2.  SunOS 3.2 and later support TIOCGWINSZ
  * and TIOCSWINSZ (yes, even 3.2-3.5, the fact that it wasn't documented
- * nonwithstanding).
+ * notwithstanding).
  */
 struct ttysize {
 	unsigned short	ts_lines;
@@ -75,7 +75,7 @@ __END_DECLS
 
 /*
  * Keep outside _SYS_IOCTL_H_
- * Compatability with old terminal driver
+ * Compatibility with old terminal driver
  *
  * Source level -> #define USE_OLD_TTY
  * Kernel level -> options COMPAT_43 or COMPAT_SUNOS
diff --git a/sys/sys/ioctl_meteor.h b/sys/sys/ioctl_meteor.h
index d683b331a9b6..f09e5579e906 100644
--- a/sys/sys/ioctl_meteor.h
+++ b/sys/sys/ioctl_meteor.h
@@ -92,8 +92,8 @@ struct meteor_counts {
 
 				/* METEORCAPTUR capture options */
 #define METEOR_CAP_SINGLE	0x0001	/* capture one frame */
-#define METEOR_CAP_CONTINOUS	0x0002	/* contiuously capture */
-#define METEOR_CAP_STOP_CONT	0x0004	/* stop the continous capture */
+#define METEOR_CAP_CONTINOUS	0x0002	/* continuously capture */
+#define METEOR_CAP_STOP_CONT	0x0004	/* stop the continuous capture */
 
 				/* METEORCAPFRM capture commands */
 #define METEOR_CAP_N_FRAMES	0x0001	/* capture N frames */
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 806759202044..bac7c24d3196 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id: kernel.h,v 1.17 1995/11/29 10:49:14 julian Exp $
+ * $Id: kernel.h,v 1.18 1995/12/16 21:50:15 bde Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
@@ -98,8 +98,8 @@ extern long timedelta;
  * element.
  *
  * These numbers are arbitrary and are chosen ONLY for ordering; the
- * enumeration values are explicit rather than imlicit to provide
- * for binary compatability with inserted elements.
+ * enumeration values are explicit rather than implicit to provide
+ * for binary compatibility with inserted elements.
  *
  * The SI_SUB_RUN_SCHEDULER value must have the highest lexical value.
  *
@@ -111,7 +111,7 @@ extern long timedelta;
  * initializations to take place at splimp().  This is a historical
  * wart that should be removed -- probably running everything at
  * splimp() until the first init that doesn't want it is the correct
- * fix.  They are currently present to ensure historical behaviour.
+ * fix.  They are currently present to ensure historical behavior.
  */
 enum sysinit_sub_id {
 	SI_SUB_DUMMY		= 0x00000000,	/* not executed; for linker*/
@@ -121,7 +121,7 @@ enum sysinit_sub_id {
 	SI_SUB_KMEM		= 0x18000000,	/* kernel memory*/
 	SI_SUB_CPU		= 0x20000000,	/* CPU resource(s)*/
 	SI_SUB_DEVFS		= 0x22000000,	/* get DEVFS ready */
-	SI_SUB_DRIVERS		= 0x23000000,	/* Let Drivers initialise */
+	SI_SUB_DRIVERS		= 0x23000000,	/* Let Drivers initialize */
 	SI_SUB_CONFIGURE	= 0x24000000,	/* Configure devices */
 	SI_SUB_INTRINSIC	= 0x28000000,	/* proc 0*/
 	SI_SUB_RUN_QUEUE	= 0x30000000,	/* the run queue*/
@@ -252,7 +252,7 @@ void	kproc_start __P((void *udata));
 #else /* PSEUDO_LKM */
 
 /*
- * Compatability.  To be deprecated after LKM is updated.
+ * Compatibility.  To be deprecated after LKM is updated.
  */
 #define	PSEUDO_SET(sym, name)	SYSINIT(ps, SI_SUB_PSEUDO, SI_ORDER_ANY, sym, 0)
 
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 46605431c5fa..f29524440a25 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.3 (Berkeley) 1/21/94
- * $Id: mbuf.h,v 1.11 1995/11/21 12:55:12 bde Exp $
+ * $Id: mbuf.h,v 1.12 1995/12/14 08:32:33 phk Exp $
  */
 
 #ifndef _SYS_MBUF_H_
@@ -340,7 +340,7 @@ union mcluster {
 /* length to m_copy to copy all */
 #define	M_COPYALL	1000000000
 
-/* compatiblity with 4.3 */
+/* compatibility with 4.3 */
 #define  m_copy(m, o, l)	m_copym((m), (o), (l), M_DONTWAIT)
 
 /*
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 93198fb62e47..e6bad82c15f6 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.13 (Berkeley) 3/27/94
- *	$Id: mount.h,v 1.29 1995/11/13 08:52:08 bde Exp $
+ *	$Id: mount.h,v 1.30 1995/12/22 16:02:39 phk Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
@@ -91,7 +91,7 @@ struct statfs {
 #define	MOUNT_FDESC	7	/* File Descriptor Filesystem */
 #define	MOUNT_PORTAL	8	/* Portal Filesystem */
 #define MOUNT_NULL	9	/* Minimal Filesystem Layer */
-#define MOUNT_UMAP	10	/* User/Group Identifer Remapping Filesystem */
+#define MOUNT_UMAP	10	/* User/Group Identifier Remapping Filesystem */
 #define MOUNT_KERNFS	11	/* Kernel Information Filesystem */
 #define MOUNT_PROCFS	12	/* /proc Filesystem */
 #define MOUNT_AFS	13	/* Andrew Filesystem */
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 01ef593cd70b..78ea814a6fa6 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $Id: mtio.h,v 1.5 1995/03/21 11:21:37 dufault Exp $
+ * $Id: mtio.h,v 1.6 1996/01/08 12:26:15 joerg Exp $
  */
 
 #ifndef _SYS_MTIO_H_
@@ -69,7 +69,7 @@ struct mtop {
 #define MTSETBSIZ	10
 
 /* Set density values for device. They are defined in the SCSI II spec	*/
-/* and range from 0 to 0x17. Sets the value for the openned mode only	*/
+/* and range from 0 to 0x17. Sets the value for the opened mode only	*/
 
 #define MTSETDNSTY	11
 
@@ -92,7 +92,7 @@ struct mtget {
 #if defined (__FreeBSD__)
 	daddr_t mt_blksiz;	/* presently operating blocksize */
 	daddr_t mt_density;	/* presently operating density */
-	daddr_t mt_comp;	/* presently operating compresion */
+	daddr_t mt_comp;	/* presently operating compression */
 	daddr_t mt_blksiz0;	/* blocksize for mode 0 */
 	daddr_t mt_blksiz1;	/* blocksize for mode 1 */
 	daddr_t mt_blksiz2;	/* blocksize for mode 2 */
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 9900f7ebc3dc..62cc5a8f1623 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.2 (Berkeley) 1/4/94
- * $Id: namei.h,v 1.7 1995/07/31 00:35:58 bde Exp $
+ * $Id: namei.h,v 1.8 1995/08/28 09:19:06 julian Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
@@ -128,7 +128,7 @@ struct nameidata {
 #define	NOCROSSMOUNT	0x00100	/* do not cross mount points */
 #define	RDONLY		0x00200	/* lookup with read-only semantics */
 #define	HASBUF		0x00400	/* has allocated pathname buffer */
-#define	SAVENAME	0x00800	/* save pathanme buffer */
+#define	SAVENAME	0x00800	/* save pathname buffer */
 #define	SAVESTART	0x01000	/* save starting directory */
 #define ISDOTDOT	0x02000	/* current component name is .. */
 #define MAKEENTRY	0x04000	/* entry is to be added to name cache */
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 8eafd167cad7..88e0e1610527 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
- * $Id: param.h,v 1.9 1995/10/06 09:56:26 phk Exp $
+ * $Id: param.h,v 1.10 1995/12/05 21:03:13 bde Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -162,7 +162,7 @@
 #define MAXFRAG 	8
 
 /*
- * MAXPATHLEN defines the longest permissable path length after expanding
+ * MAXPATHLEN defines the longest permissible path length after expanding
  * symbolic links. It is used to allocate a temporary buffer from the buffer
  * pool in which to do the name expansion, hence should be a power of two,
  * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index 281580556f59..68e688a152c1 100644
--- a/sys/sys/pipe.h
+++ b/sys/sys/pipe.h
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id$
+ * $Id: pipe.h,v 1.1 1996/01/28 23:38:22 dyson Exp $
  */
 
 #ifndef OLD_PIPE
@@ -27,7 +27,7 @@ struct vm_object;
 
 /*
  * pipe buffer information
- * Seperate in, out, cnt is used to simplify calculations.
+ * Separate in, out, cnt is used to simplify calculations.
  */
 struct pipebuf {
 	u_int	cnt;		/* number of chars currently in buffer */
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index c276b879aa31..73b2edd0145c 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.8 (Berkeley) 1/21/94
- * $Id: proc.h,v 1.18 1995/07/13 08:48:03 davidg Exp $
+ * $Id: proc.h,v 1.19 1996/01/24 18:11:23 peter Exp $
  */
 
 #ifndef _SYS_PROC_H_
@@ -76,8 +76,8 @@ struct	pgrp {
  * control, known in UN*X as a process; it has references to substructures
  * containing descriptions of things that the process uses, but may share
  * with related processes.  The process structure and the substructures
- * are always addressible except for those marked "(PROC ONLY)" below,
- * which might be addressible only on a processor on which the process
+ * are always addressable except for those marked "(PROC ONLY)" below,
+ * which might be addressable only on a processor on which the process
  * is running.
  */
 struct	proc {
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 5fe7ffc79bc4..97f6c6516387 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -1,7 +1,7 @@
 /*
  * random.h -- A strong random number generator
  *
- * $Id$
+ * $Id: random.h,v 1.3 1995/12/29 08:04:13 markm Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -62,7 +62,7 @@
 
 #if defined(KERNEL)
 
-/* Interrupts to be used in the randomising process */
+/* Interrupts to be used in the randomizing process */
 
 extern inthand2_t *sec_intr_handler[ICU_LEN];
 extern int sec_intr_unit[ICU_LEN];
diff --git a/sys/sys/rlist.h b/sys/sys/rlist.h
index 4c85b717b592..5a02795de67b 100644
--- a/sys/sys/rlist.h
+++ b/sys/sys/rlist.h
@@ -7,7 +7,7 @@
  * and this paragraph are duplicated in all such forms.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * Resource lists.
  *
@@ -16,7 +16,7 @@
  *		rlist_alloc(&swapmap, 100, &loc); obtain 100 sectors from swap
  *
  *	from: unknown?
- *	$Id: rlist.h,v 1.6 1993/11/25 01:38:01 wollman Exp $
+ *	$Id: rlist.h,v 1.7 1994/10/09 07:35:10 davidg Exp $
  */
 
 #ifndef _SYS_RLIST_H_
diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h
index de461663a516..cc6291e7db20 100644
--- a/sys/sys/scsiio.h
+++ b/sys/sys/scsiio.h
@@ -1,5 +1,5 @@
 /*
- * $Id: scsiio.h,v 1.3 1995/01/08 13:39:46 dufault Exp $
+ * $Id: scsiio.h,v 1.4 1995/04/28 19:26:02 dufault Exp $
  */
 #ifndef _SYS_SCSIIO_H_
 #define _SYS_SCSIIO_H_
@@ -26,7 +26,7 @@ typedef struct	scsireq {
 	int	error;		/* error bits */
 } scsireq_t;
 
-/* bit defintions for flags */
+/* bit definitions for flags */
 #define SCCMD_READ		0x00000001
 #define SCCMD_WRITE		0x00000002
 #define SCCMD_IOV		0x00000004
@@ -57,7 +57,7 @@ struct	scsi_addr {
 
 #define SCIOCREPROBE	_IOW('Q', 3, struct scsi_addr) /* look for new devs */
 #define SCIOCIDENTIFY	_IOR('Q', 4, struct scsi_addr) /* where are you? */
-#define SCIOCDECONFIG	_IO('Q', 5)	/* please dissappear */
+#define SCIOCDECONFIG	_IO('Q', 5)	/* please disappear */
 #define SCIOCRECONFIG	_IO('Q', 6)	/* please check again */
 #define SCIOCRESET	_IO('Q', 7)	/* reset the device */
 #define SCIOCADDR	_IOW('Q', 8, struct scsi_addr) /* Change address */
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 30aa0e8addf4..7cc6e5a84df6 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $Id: shm.h,v 1.5 1995/07/29 11:42:52 bde Exp $ */
+/* $Id: shm.h,v 1.6 1995/08/30 00:33:35 bde Exp $ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 
 #define SHM_RDONLY  010000  /* Attach read-only (else read-write) */
 #define SHM_RND     020000  /* Round attach address to SHMLBA */
-#define SHMLBA      CLBYTES /* Segment low boundry address multiple */
+#define SHMLBA      CLBYTES /* Segment low boundary address multiple */
 
 /* "official" access mode definitions; somewhat braindead since you have
    to specify (SHM_* >> 3) for group and (SHM_* >> 6) for world permissions */
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 3eba5f008540..0178010f638e 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $Id: socket.h,v 1.7 1995/09/13 05:35:49 davidg Exp $
+ * $Id: socket.h,v 1.8 1996/01/05 17:49:30 davidg Exp $
  */
 
 #ifndef _SYS_SOCKET_H_
@@ -102,7 +102,7 @@ struct	linger {
 #define	AF_NS		6		/* XEROX NS protocols */
 #define	AF_ISO		7		/* ISO protocols */
 #define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* european computer manufacturers */
+#define	AF_ECMA		8		/* European computer manufacturers */
 #define	AF_DATAKIT	9		/* datakit protocols */
 #define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
 #define	AF_SNA		11		/* IBM SNA */
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 952f0b9cad67..e2de7ecc6d36 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.1 (Berkeley) 6/2/93
- * $Id: socketvar.h,v 1.8 1995/12/14 08:32:36 phk Exp $
+ * $Id: socketvar.h,v 1.9 1995/12/14 22:51:13 bde Exp $
  */
 
 #ifndef _SYS_SOCKETVAR_H_
@@ -55,7 +55,7 @@ struct socket {
 	caddr_t	so_pcb;			/* protocol control block */
 	struct	protosw *so_proto;	/* protocol handle */
 /*
- * Variables for connection queueing.
+ * Variables for connection queuing.
  * Socket where accepts occur is so_head in all subsidiary sockets.
  * If so_head is 0, socket is not related to an accept.
  * For head socket so_q0 queues partially completed connections,
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 02d0da742f32..725a0231b50b 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -30,7 +30,7 @@
  /* 
   * If you make modifications to this file, please contact me before
   * distributing the modified version. There is already enough 
-  * divercity in the world.
+  * diversity in the world.
   *
   * Regards,
   * Hannu Savolainen
@@ -135,7 +135,7 @@
  *	Sample loading mechanism for internal synthesizers (/dev/sequencer)
  *	The following patch_info structure has been designed to support
  *	Gravis UltraSound. It tries to be universal format for uploading
- *	sample based patches but is propably too limited.
+ *	sample based patches but is probably too limited.
  */
 
 struct patch_info {
@@ -383,7 +383,7 @@ struct patmgr_info {	/* Note! size must be < 4k since kmalloc() is used */
 /*		undefined		0x20 */
 /* The controller numbers 0x21 to 0x3f are reserved for the */
 /* least significant bytes of the controllers 0x00 to 0x1f. */
-/* These controllers are not recognised by the driver. */
+/* These controllers are not recognized by the driver. */
 
 /* Controllers 64 to 69 (0x40 to 0x45) are on/off switches. */
 /* 0=OFF and 127=ON (intermediate values are possible) */
@@ -671,7 +671,7 @@ typedef struct copr_msg {
 /* 
  * The AD1848 codec and compatibles have three line level inputs
  * (line, aux1 and aux2). Since each card manufacturer have assigned
- * different meanings to these inputs, it's inpractical to assign
+ * different meanings to these inputs, it's impractical to assign
  * specific meanings (line, cd, synth etc.) to them.
  */
 #define SOUND_MIXER_LINE1	14	/* Input source 1  (aux1) */
@@ -1001,7 +1001,7 @@ void seqbuf_dump(void);	/* This function must be provided by programs */
 #endif
 
 /*
- * Timing and syncronization macros
+ * Timing and synchronization macros
  */
 
 #define _TIMER_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 2065b243bb0b..b9ea32e8b0db 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.4 (Berkeley) 2/23/94
- * $Id: systm.h,v 1.34 1996/01/16 10:22:20 bde Exp $
+ * $Id: systm.h,v 1.35 1996/01/29 03:20:44 gibbs Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -50,7 +50,7 @@
  * It can only be decreased by process 1 (/sbin/init).
  *
  * Security levels are as follows:
- *   -1	permannently insecure mode - always run system in level 0 mode.
+ *   -1	permanently insecure mode - always run system in level 0 mode.
  *    0	insecure mode - immutable and append-only flags make be turned off.
  *	All devices may be read or written subject to permission modes.
  *    1	secure mode - immutable and append-only flags may not be changed;
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index 5f41b471d6c2..51accc7fd0b2 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -31,10 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $Id: ttydev.h,v 1.2 1994/08/02 07:53:58 davidg Exp $
+ * $Id: ttydev.h,v 1.3 1994/08/26 12:07:31 jkh Exp $
  */
 
-/* COMPATABILITY HEADER FILE */
+/* COMPATIBILITY HEADER FILE */
 
 #ifndef _SYS_TTYDEV_H_
 #define	_SYS_TTYDEV_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 26297d83cb9a..dbf42cbf9ba9 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.28 1995/12/25 07:24:13 bde Exp $
+ * $Id: vnode.h,v 1.29 1996/01/19 03:59:06 dyson Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -195,8 +195,8 @@ extern int		vttoif_tab[];
  * Flags to various vnode functions.
  */
 #define	SKIPSYSTEM	0x0001		/* vflush: skip vnodes marked VSYSTEM */
-#define	FORCECLOSE	0x0002		/* vflush: force file closeure */
-#define	WRITECLOSE	0x0004		/* vflush: only close writeable files */
+#define	FORCECLOSE	0x0002		/* vflush: force file closure */
+#define	WRITECLOSE	0x0004		/* vflush: only close writable files */
 #define	DOCLOSE		0x0008		/* vclean: close active files */
 #define	V_SAVE		0x0001		/* vinvalbuf: sync file first */
 #define	V_SAVEMETA	0x0002		/* vinvalbuf: leave indirect blocks */
@@ -260,7 +260,7 @@ extern void	(*lease_updatetime) __P((int deltat));
 
 
 /*
- * Mods for exensibility.
+ * Mods for extensibility.
  */
 
 /*
@@ -318,9 +318,9 @@ extern struct vnodeop_desc *vnodeop_descs[];
 /*
  * This macro is very helpful in defining those offsets in the vdesc struct.
  *
- * This is stolen from X11R4.  I ingored all the fancy stuff for
+ * This is stolen from X11R4.  I ignored all the fancy stuff for
  * Crays, so if you decide to port this to such a serious machine,
- * you might want to consult Intrisics.h's XtOffset{,Of,To}.
+ * you might want to consult Intrinsic.h's XtOffset{,Of,To}.
  */
 #define VOPARG_OFFSET(p_type,field) \
         ((int) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 0b8ec48970b1..6bf75a50313e 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -31,14 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.1 (Berkeley) 6/2/93
- * $Id: wait.h,v 1.3 1994/08/21 04:42:17 paul Exp $
+ * $Id: wait.h,v 1.4 1995/05/30 08:14:54 rgrimes Exp $
  */
 
 #ifndef _SYS_WAIT_H_
 #define _SYS_WAIT_H_
 
 /*
- * This file holds definitions relevent to the wait4 system call
+ * This file holds definitions relevant to the wait4 system call
  * and the alternate interfaces that use it (wait, wait3, waitpid).
  */
 
@@ -81,7 +81,7 @@
 #define WUNTRACED	2	/* tell about stopped, untraced children */
 
 #ifndef _POSIX_SOURCE
-/* POSIX extensions and 4.2/4.3 compatability: */
+/* POSIX extensions and 4.2/4.3 compatibility: */
 
 /*
  * Tokens for special values of the "pid" parameter to wait4.
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 41f204cb6f38..5a7ffb0f660a 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
- * $Id: fs.h,v 1.4 1995/03/10 22:18:16 davidg Exp $
+ * $Id: fs.h,v 1.5 1995/05/30 08:15:07 rgrimes Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
@@ -72,7 +72,7 @@
  * Addresses stored in inodes are capable of addressing fragments
  * of `blocks'. File system blocks of at most size MAXBSIZE can
  * be optionally broken into 2, 4, or 8 pieces, each of which is
- * addressible; these pieces may be DEV_BSIZE, or some multiple of
+ * addressable; these pieces may be DEV_BSIZE, or some multiple of
  * a DEV_BSIZE unit.
  *
  * Large files consist of exclusively large data blocks.  To avoid
@@ -240,7 +240,7 @@ struct fs {
 /* actually longer */
 };
 /*
- * Filesystem idetification
+ * Filesystem identification
  */
 #define	FS_MAGIC	0x011954	/* the fast filesystem magic number */
 #define	FS_OKAY		0x7c269d38	/* superblock checksum */
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 7ff725b335cf..30d5f1baba19 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.6 1995/05/30 08:15:30 rgrimes Exp $
+ * $Id: inode.h,v 1.7 1995/11/05 23:35:56 dyson Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
@@ -58,7 +58,7 @@
  * information. The first part is the information that is needed
  * only while the file is active (such as the identity of the file
  * and linkage to speed its lookup). The second part is the
- * permannent meta-data associated with the file which is read
+ * permanent meta-data associated with the file which is read
  * in from the permanent dinode from long term storage when the
  * file becomes active, and is put back when the file is no longer
  * being used.
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index c20d9673fff3..231e0bbcbe69 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id: swap_pager.h,v 1.12 1995/12/11 04:58:03 dyson Exp $
+ *	$Id: swap_pager.h,v 1.13 1995/12/14 09:54:54 phk Exp $
  */
 
 /*
@@ -50,7 +50,7 @@
 /*
  * SWB_NPAGES can be set to any value from 1 to 16 pages per allocation,
  * however, due to the allocation spilling into non-swap pager backed memory,
- * suggest keeping SWB_NPAGES small (1-4).  If high performance is manditory
+ * suggest keeping SWB_NPAGES small (1-4).  If high performance is mandatory
  * perhaps up to 8 pages might be in order????
  * Above problem has been fixed, now we support 16 pages per block.  Unused
  * space is recovered by the swap pager now...
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index e24eace3bca6..0f800bfa2cdb 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.h,v 1.10 1995/12/14 09:55:00 phk Exp $
+ * $Id: vm_map.h,v 1.11 1996/01/19 03:59:55 dyson Exp $
  */
 
 /*
@@ -170,7 +170,7 @@ struct vmspace {
  *	a sharing map, it is necessary to have a timestamp from each.
  *	[If the main map timestamp has changed, the share_map and
  *	associated timestamp are no longer valid; the map version
- *	does not include a reference for the imbedded share_map.]
+ *	does not include a reference for the embedded share_map.]
  */
 typedef struct {
 	int main_timestamp;
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index b67c9a565301..a360a40b3df2 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_page.h,v 1.23 1995/12/11 04:58:26 dyson Exp $
+ * $Id: vm_page.h,v 1.24 1996/01/19 04:00:17 dyson Exp $
  */
 
 /*
@@ -166,7 +166,7 @@ struct vm_page {
  *		non-interrupt times.
  *
  *	inactive
- *		Low activity, candidates for reclaimation.
+ *		Low activity, candidates for reclamation.
  *		This is the list of pages that should be
  *		paged out next.
  *