occured->occurred

idea from deraadt@ via NetBSD
millert@ ok

54 files changed, 120 insertions, 120 deletions

diff --git a/sys/arch/hp300/DOC/HPMMU.notes b/sys/arch/hp300/DOC/HPMMU.notes
index be817ab9784..3529aa490a4 100644
--- a/sys/arch/hp300/DOC/HPMMU.notes
+++ b/sys/arch/hp300/DOC/HPMMU.notes
@@ -1,4 +1,4 @@
-$OpenBSD: HPMMU.notes,v 1.2 1997/01/12 15:12:09 downsj Exp $
+$OpenBSD: HPMMU.notes,v 1.3 2001/09/20 17:02:29 mpech Exp $
 $NetBSD: HPMMU.notes,v 1.2 1994/10/26 07:22:51 cgd Exp $
 
 Overview:
@@ -78,14 +78,14 @@ Hardware registers:
 		TLB.  More info below.
 	5F400C:	MMU command/status register.  Defined as follows:
 
-		bit 15:	If 1, indicates a page table fault occured
-		bit 14:	If 1, indicates a page fault occured
+		bit 15:	If 1, indicates a page table fault occurred
+		bit 14:	If 1, indicates a page fault occurred
 		bit 13: If 1, indicates a protection fault (write to RO page)
 		bit 6:	MC68881 enable.  Tied to chip enable line.
 			(set this bit to enable)
 		bit 5:	MC68020 instruction cache enable.  Tied to Insruction
 			cache disable line.  (set this bit to enable)
-		bit 3:	If 1, indicates an MMU related bus error occured.
+		bit 3:	If 1, indicates an MMU related bus error occurred.
 			Bits 13-15 are now valid.
 		bit 2:	External cache enable.  (set this bit to enable)
 		bit 1:	Supervisor mapping enable.  Enables translation of
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index e607f116233..42d3e7d2fbf 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.13 2001/08/26 00:15:36 miod Exp $	*/
+/*	$OpenBSD: hd.c,v 1.14 2001/09/20 17:02:30 mpech Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -1027,7 +1027,7 @@ hderror(unit)
 		return(1);
 
 	/*
-	 * First conjure up the block number at which the error occured.
+	 * First conjure up the block number at which the error occurred.
 	 * Note that not all errors report a block number, in that case
 	 * we just use b_blkno.
  	 */
@@ -1045,7 +1045,7 @@ hderror(unit)
 	 * Now output a generic message suitable for badsect.
 	 * Note that we don't use harderr cuz it just prints
 	 * out b_blkno which is just the beginning block number
-	 * of the transfer, not necessary where the error occured.
+	 * of the transfer, not necessary where the error occurred.
 	 */
 	printf("%s%c: hard error sn%d\n", rs->sc_dev.dv_xname,
 	    'a'+hdpart(bp->b_dev), pbn);
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 1ae24c7edcb..730beb099e8 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.64 2001/09/19 20:50:56 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.65 2001/09/20 17:02:30 mpech Exp $	*/
 /*	$NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $	*/
 
 /*
@@ -1193,7 +1193,7 @@ parityerrorfind()
 #endif
 	/*
 	 * If looking is true we are searching for a known parity error
-	 * and it has just occured.  All we do is return to the higher
+	 * and it has just occurred.  All we do is return to the higher
 	 * level invocation.
 	 */
 	if (looking)
@@ -1201,7 +1201,7 @@ parityerrorfind()
 	s = splhigh();
 	/*
 	 * If setjmp returns true, the parity error we were searching
-	 * for has just occured (longjmp above) at the current pg+o
+	 * for has just occurred (longjmp above) at the current pg+o
 	 */
 	if (setjmp(&parcatch)) {
 		printf("Parity error at 0x%x\n", ctob(pg)|o);
@@ -1209,7 +1209,7 @@ parityerrorfind()
 		goto done;
 	}
 	/*
-	 * If we get here, a parity error has occured for the first time
+	 * If we get here, a parity error has occurred for the first time
 	 * and we need to find it.  We turn off any external caches and
 	 * loop thru memory, testing every longword til a fault occurs and
 	 * we regain control at setjmp above.  Note that because of the
diff --git a/sys/arch/i386/i386/microtime.s b/sys/arch/i386/i386/microtime.s
index 3badf053761..eb0667d9d6b 100644
--- a/sys/arch/i386/i386/microtime.s
+++ b/sys/arch/i386/i386/microtime.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: microtime.s,v 1.13 1998/08/27 05:00:34 deraadt Exp $	*/
+/*	$OpenBSD: microtime.s,v 1.14 2001/09/20 17:02:30 mpech Exp $	*/
 /*	$NetBSD: microtime.s,v 1.16 1995/04/17 12:06:47 cgd Exp $	*/
 
 /*-
@@ -73,7 +73,7 @@ ENTRY(microtime)
 	# timer chip doesn't let us atomically read the current counter
 	# value and the output state (i.e., overflow state).  We have
 	# to read the ICU interrupt request register (IRR) to see if the
-	# overflow has occured.  Because we lack atomicity, we use
+	# overflow has occurred.  Because we lack atomicity, we use
 	# the (very accurate) heuristic that we do not check for
 	# overflow if the value read is close to 0.
 	# E.g., if we just checked the IRR, we might read a non-overflowing
diff --git a/sys/arch/i386/i386/ns_cksum.c b/sys/arch/i386/i386/ns_cksum.c
index 50accfe6e85..5016c0f411a 100644
--- a/sys/arch/i386/i386/ns_cksum.c
+++ b/sys/arch/i386/i386/ns_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_cksum.c,v 1.4 1996/05/07 07:21:50 deraadt Exp $	*/
+/*	$OpenBSD: ns_cksum.c,v 1.5 2001/09/20 17:02:30 mpech Exp $	*/
 /*	$NetBSD: ns_cksum.c,v 1.5 1996/05/03 19:42:20 christos Exp $	*/
 
 /*
@@ -98,7 +98,7 @@ ns_cksum(m, len)
 		 * 32 bit arithmetic registers for adding,
 		 * with carries from the low added
 		 * into the high (by normal carry-chaining)
-		 * so long as we fold back before 16 carries have occured.
+		 * so long as we fold back before 16 carries have occurred.
 		 */
 		if (1 & (int) w)
 			goto uuuuglyy;
diff --git a/sys/arch/m68k/060sp/fpsp.s b/sys/arch/m68k/060sp/fpsp.s
index c974e93d744..73d4ef0a99a 100644
--- a/sys/arch/m68k/060sp/fpsp.s
+++ b/sys/arch/m68k/060sp/fpsp.s
@@ -1,5 +1,5 @@
 #
-# $OpenBSD: fpsp.s,v 1.2 1996/05/30 22:14:22 niklas Exp $
+# $OpenBSD: fpsp.s,v 1.3 2001/09/20 17:02:30 mpech Exp $
 # $NetBSD: fpsp.s,v 1.2 1996/05/15 19:48:03 is Exp $
 #
 
@@ -23533,7 +23533,7 @@ no_exc:
 #		in INEX2.						#
 #									#
 #	A10.	Or in INEX.						#
-#		If INEX is set, round error occured.  This is		#
+#		If INEX is set, round error occurred.  This is		#
 #		compensated for by 'or-ing' in the INEX2 flag to	#
 #		the lsb of Y.						#
 #									#
@@ -23999,7 +23999,7 @@ A9_con:
 	fmul.x		%fp1,%fp0	# calculate X * SCALE -> Y to fp0
 
 # A10. Or in INEX.
-#      If INEX is set, round error occured.  This is compensated
+#      If INEX is set, round error occurred.  This is compensated
 #      for by 'or-ing' in the INEX2 flag to the lsb of Y.
 #
 # Register usage:
diff --git a/sys/arch/m68k/060sp/pfpsp.s b/sys/arch/m68k/060sp/pfpsp.s
index 13baf32fb26..4765a42a885 100644
--- a/sys/arch/m68k/060sp/pfpsp.s
+++ b/sys/arch/m68k/060sp/pfpsp.s
@@ -1,5 +1,5 @@
 #
-# $OpenBSD: pfpsp.s,v 1.2 1996/05/30 22:15:10 niklas Exp $
+# $OpenBSD: pfpsp.s,v 1.3 2001/09/20 17:02:30 mpech Exp $
 # $NetBSD: pfpsp.s,v 1.2 1996/05/15 19:49:12 is Exp $
 #
 
@@ -13494,7 +13494,7 @@ no_exc:
 #		in INEX2.						#
 #									#
 #	A10.	Or in INEX.						#
-#		If INEX is set, round error occured.  This is		#
+#		If INEX is set, round error occurred.  This is		#
 #		compensated for by 'or-ing' in the INEX2 flag to	#
 #		the lsb of Y.						#
 #									#
@@ -13960,7 +13960,7 @@ A9_con:
 	fmul.x		%fp1,%fp0	# calculate X * SCALE -> Y to fp0
 
 # A10. Or in INEX.
-#      If INEX is set, round error occured.  This is compensated
+#      If INEX is set, round error occurred.  This is compensated
 #      for by 'or-ing' in the INEX2 flag to the lsb of Y.
 #
 # Register usage:
diff --git a/sys/arch/m68k/fpsp/bindec.sa b/sys/arch/m68k/fpsp/bindec.sa
index e38a8766c1d..7ef5cb0788a 100644
--- a/sys/arch/m68k/fpsp/bindec.sa
+++ b/sys/arch/m68k/fpsp/bindec.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: bindec.sa,v 1.2 1996/05/29 21:05:24 niklas Exp $
+*	$OpenBSD: bindec.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: bindec.sa,v 1.3 1994/10/26 07:48:51 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -103,7 +103,7 @@
 *		in INEX2.
 *
 *	A10.	Or in INEX.
-*		If INEX is set, round error occured.  This is
+*		If INEX is set, round error occurred.  This is
 *		compensated for by 'or-ing' in the INEX2 flag to
 *		the lsb of Y.
 *
@@ -545,7 +545,7 @@ A9_con:
 
 
 * A10. Or in INEX.
-*      If INEX is set, round error occured.  This is compensated
+*      If INEX is set, round error occurred.  This is compensated
 *      for by 'or-ing' in the INEX2 flag to the lsb of Y.
 *
 * Register usage:
diff --git a/sys/arch/m68k/fpsp/decbin.sa b/sys/arch/m68k/fpsp/decbin.sa
index a091b708b65..cbd32d764e2 100644
--- a/sys/arch/m68k/fpsp/decbin.sa
+++ b/sys/arch/m68k/fpsp/decbin.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: decbin.sa,v 1.2 1996/05/29 21:05:27 niklas Exp $
+*	$OpenBSD: decbin.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: decbin.sa,v 1.2 1994/10/26 07:48:59 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -96,7 +96,7 @@
 *	in an inex2 exception.  If so, set inex1 in the fpsr and 
 *	check if the inex1 exception is enabled.  If so, set d7 upper
 *	word to $0100.  This will signal unimp.sa that an enabled inex1
-*	exception occured.  Unimp will fix the stack.
+*	exception occurred.  Unimp will fix the stack.
 *	
 
 DECBIN    IDNT    2,1 Motorola 040 Floating Point Software Package
diff --git a/sys/arch/m68k/fpsp/netbsd.sa b/sys/arch/m68k/fpsp/netbsd.sa
index 6fa7c6b7d5d..933bc0fff30 100644
--- a/sys/arch/m68k/fpsp/netbsd.sa
+++ b/sys/arch/m68k/fpsp/netbsd.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: netbsd.sa,v 1.3 1997/07/06 07:46:21 downsj Exp $
+*	$OpenBSD: netbsd.sa,v 1.4 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: netbsd.sa,v 1.3 1997/04/25 02:26:04 thorpej Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -107,7 +107,7 @@ real_dz:
 *	necessary for E1 exceptions.
 *
 * Code following the 'inex' label is to handle bug #1232.  In this
-* bug, if an E1 snan, ovfl, or unfl occured, and the process was
+* bug, if an E1 snan, ovfl, or unfl occurred, and the process was
 * swapped out before taking the exception, the exception taken on
 * return was inex, rather than the correct exception.  The snan, ovfl,
 * and unfl exception to be taken must not have been enabled.  The
diff --git a/sys/arch/m68k/fpsp/res_func.sa b/sys/arch/m68k/fpsp/res_func.sa
index e95ebb7e183..59def49ba9e 100644
--- a/sys/arch/m68k/fpsp/res_func.sa
+++ b/sys/arch/m68k/fpsp/res_func.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: res_func.sa,v 1.2 1996/05/29 21:05:32 niklas Exp $
+*	$OpenBSD: res_func.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: res_func.sa,v 1.3 1994/10/26 07:49:22 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -325,7 +325,7 @@ cu_nuninx:
 	bne.b	cu_nunzro
 *
 * The mantissa is zero from the denorm loop.  Check sign and rmode
-* to see if rounding should have occured which would leave the lsb.
+* to see if rounding should have occurred which would leave the lsb.
 *
 	move.l	USER_FPCR(a6),d0
 	andi.l	#$30,d0		;isolate rmode
diff --git a/sys/arch/m68k/fpsp/skeleton.sa b/sys/arch/m68k/fpsp/skeleton.sa
index f1c9b6de869..322830b05de 100644
--- a/sys/arch/m68k/fpsp/skeleton.sa
+++ b/sys/arch/m68k/fpsp/skeleton.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: skeleton.sa,v 1.2 1996/05/29 21:05:39 niklas Exp $
+*	$OpenBSD: skeleton.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: skeleton.sa,v 1.3 1994/10/26 07:49:50 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -110,7 +110,7 @@ real_dz:
 *	necessary for E1 exceptions.
 *
 * Code following the 'inex' label is to handle bug #1232.  In this
-* bug, if an E1 snan, ovfl, or unfl occured, and the process was
+* bug, if an E1 snan, ovfl, or unfl occurred, and the process was
 * swapped out before taking the exception, the exception taken on
 * return was inex, rather than the correct exception.  The snan, ovfl,
 * and unfl exception to be taken must not have been enabled.  The
diff --git a/sys/arch/m68k/fpsp/x_operr.sa b/sys/arch/m68k/fpsp/x_operr.sa
index dec7e636576..f1d6cc0072f 100644
--- a/sys/arch/m68k/fpsp/x_operr.sa
+++ b/sys/arch/m68k/fpsp/x_operr.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: x_operr.sa,v 1.2 1996/05/29 21:05:47 niklas Exp $
+*	$OpenBSD: x_operr.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: x_operr.sa,v 1.4 1994/10/26 07:50:24 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -347,7 +347,7 @@ not_enabled:
 *
 * It is possible to have either inex2 or inex1 exceptions with the
 * operr.  If the inex enable bit is set in the FPCR, and either
-* inex2 or inex1 occured, we must clean up and branch to the
+* inex2 or inex1 occurred, we must clean up and branch to the
 * real inex handler.
 *
 ck_inex:
diff --git a/sys/arch/m68k/fpsp/x_ovfl.sa b/sys/arch/m68k/fpsp/x_ovfl.sa
index ef8cd31889f..a58eda43d9b 100644
--- a/sys/arch/m68k/fpsp/x_ovfl.sa
+++ b/sys/arch/m68k/fpsp/x_ovfl.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: x_ovfl.sa,v 1.2 1996/05/29 21:05:48 niklas Exp $
+*	$OpenBSD: x_ovfl.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: x_ovfl.sa,v 1.2 1994/10/26 07:50:26 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -117,7 +117,7 @@ no_e3_1:
 *
 * It is possible to have either inex2 or inex1 exceptions with the
 * ovfl.  If the inex enable bit is set in the FPCR, and either
-* inex2 or inex1 occured, we must clean up and branch to the
+* inex2 or inex1 occurred, we must clean up and branch to the
 * real inex handler.
 *
 ck_inex:
diff --git a/sys/arch/m68k/fpsp/x_snan.sa b/sys/arch/m68k/fpsp/x_snan.sa
index fd0962100fb..668580723ce 100644
--- a/sys/arch/m68k/fpsp/x_snan.sa
+++ b/sys/arch/m68k/fpsp/x_snan.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: x_snan.sa,v 1.2 1996/05/29 21:05:48 niklas Exp $
+*	$OpenBSD: x_snan.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: x_snan.sa,v 1.3 1994/10/26 07:50:28 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -83,7 +83,7 @@ fpsp_snan:
 *
 * It is possible to have an inex1 exception with the
 * snan.  If the inex enable bit is set in the FPCR, and either
-* inex2 or inex1 occured, we must clean up and branch to the
+* inex2 or inex1 occurred, we must clean up and branch to the
 * real inex handler.
 *
 ck_inex:
diff --git a/sys/arch/m68k/fpsp/x_unfl.sa b/sys/arch/m68k/fpsp/x_unfl.sa
index 9ed3f16fb64..62d50982ced 100644
--- a/sys/arch/m68k/fpsp/x_unfl.sa
+++ b/sys/arch/m68k/fpsp/x_unfl.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: x_unfl.sa,v 1.2 1996/05/29 21:05:49 niklas Exp $
+*	$OpenBSD: x_unfl.sa,v 1.3 2001/09/20 17:02:30 mpech Exp $
 *	$NetBSD: x_unfl.sa,v 1.3 1994/10/26 07:50:30 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -106,7 +106,7 @@ no_e3_1:
 *
 * It is possible to have either inex2 or inex1 exceptions with the
 * unfl.  If the inex enable bit is set in the FPCR, and either
-* inex2 or inex1 occured, we must clean up and branch to the
+* inex2 or inex1 occurred, we must clean up and branch to the
 * real inex handler.
 *
 ck_inex:
diff --git a/sys/arch/m68k/m68k/ns_cksum.c b/sys/arch/m68k/m68k/ns_cksum.c
index bafbe4c64fc..180d184142d 100644
--- a/sys/arch/m68k/m68k/ns_cksum.c
+++ b/sys/arch/m68k/m68k/ns_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_cksum.c,v 1.2 1996/04/21 22:17:51 deraadt Exp $	*/
+/*	$OpenBSD: ns_cksum.c,v 1.3 2001/09/20 17:02:30 mpech Exp $	*/
 /*	$NetBSD: ns_cksum.c,v 1.5 1996/04/01 01:38:15 briggs Exp $	*/
 
 /*
@@ -98,7 +98,7 @@ ns_cksum(m, len)
 		 * 32 bit arithmetic registers for adding,
 		 * with carries from the low added
 		 * into the high (by normal carry-chaining)
-		 * so long as we fold back before 16 carries have occured.
+		 * so long as we fold back before 16 carries have occurred.
 		 */
 		if (1 & (int) w)
 			goto uuuuglyy;
diff --git a/sys/arch/mac68k/dev/if_ae.c b/sys/arch/mac68k/dev/if_ae.c
index b95764ec73b..66b3b8f071d 100644
--- a/sys/arch/mac68k/dev/if_ae.c
+++ b/sys/arch/mac68k/dev/if_ae.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ae.c,v 1.16 2001/07/09 22:41:14 fgsch Exp $	*/
+/*	$OpenBSD: if_ae.c,v 1.17 2001/09/20 17:02:30 mpech Exp $	*/
 /*	$NetBSD: if_ae.c,v 1.62 1997/04/24 16:52:05 scottr Exp $	*/
 
 /*
@@ -648,7 +648,7 @@ aeintr(arg, slot)
 
 			/*
 			 * Decrement buffer in-use count if not zero (can only
-			 * be zero if a transmitter interrupt occured while not
+			 * be zero if a transmitter interrupt occurred while not
 			 * actually transmitting).
 			 * If data is ready to transmit, start it transmitting,
 			 * otherwise defer until after handling receiver.
diff --git a/sys/arch/mac68k/dev/pm_direct.c b/sys/arch/mac68k/dev/pm_direct.c
index a0423f468b6..87b3a7a6fe5 100644
--- a/sys/arch/mac68k/dev/pm_direct.c
+++ b/sys/arch/mac68k/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.c,v 1.3 1998/05/03 07:13:00 gene Exp $	*/
+/*	$OpenBSD: pm_direct.c,v 1.4 2001/09/20 17:02:30 mpech Exp $	*/
 /*  pm_direct.c 1.22 01/09/97 Takashi Hamada */
 
 /*
@@ -972,7 +972,7 @@ pm_adb_op(buffer, compRout, data, command)
 
 	PM_VIA_INTR_ENABLE();
 
-	/* wait until the PM interrupt is occured */
+	/* wait until the PM interrupt is occurred */
 	delay = 0x80000;
 	while(adbWaiting == 1) {
 		if ((via_reg(VIA1, vIFR) & 0x10) == 0x10)
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 2dc914231ad..6b596eec9fc 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.c,v 1.2 2001/09/01 17:43:09 drahn Exp $	*/
+/*	$OpenBSD: pm_direct.c,v 1.3 2001/09/20 17:02:30 mpech Exp $	*/
 /*	$NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*
@@ -1051,7 +1051,7 @@ pm_adb_op(buffer, compRout, data, command)
 
 	PM_VIA_INTR_ENABLE();
 
-	/* wait until the PM interrupt is occured */
+	/* wait until the PM interrupt is occurred */
 	ndelay = 0x80000;
 	while (adbWaiting == 1) {
 		if (read_via_reg(VIA1, vIFR) & 0x14)
diff --git a/sys/arch/mvme68k/stand/sboot/etherfun.c b/sys/arch/mvme68k/stand/sboot/etherfun.c
index cfdf24147e6..968748678f9 100644
--- a/sys/arch/mvme68k/stand/sboot/etherfun.c
+++ b/sys/arch/mvme68k/stand/sboot/etherfun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: etherfun.c,v 1.4 1997/01/29 07:58:37 deraadt Exp $ */
+/*	$OpenBSD: etherfun.c,v 1.5 2001/09/20 17:02:30 mpech Exp $ */
 
 /*
  *
@@ -163,7 +163,7 @@ do_get_file()
 	do_send_tftp(READ);
 	while (1) {
 		if (le_get(buf, sizeof(buf), 5) == 0) {
-			/* timeout occured */
+			/* timeout occurred */
 			if (last_ack)
 				do_send_tftp(last_ack);
 			else
diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c
index 2e223824cf6..70a349b5b74 100644
--- a/sys/arch/mvme88k/ddb/db_interface.c
+++ b/sys/arch/mvme88k/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.13 2001/08/31 01:06:26 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.14 2001/09/20 17:02:31 mpech Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -329,7 +329,7 @@ m88k_db_print_frame(addr, have_addr, count, modif)
 		}
 	}
 
-	if (s->fpecr & 255) { /* floating point error occured */
+	if (s->fpecr & 255) { /* floating point error occurred */
 		db_printf("fpecr: 0x%08x fpsr: 0x%08x fpcr: 0x%08x\n",
 		    s->fpecr, s->fpsr, s->fpcr);
 		db_printf("fcr1-4: 0x%08x  0x%08x  0x%08x  0x%08x\n",
diff --git a/sys/arch/mvme88k/dev/ssh.c b/sys/arch/mvme88k/dev/ssh.c
index ab98884198e..5c6032b0845 100644
--- a/sys/arch/mvme88k/dev/ssh.c
+++ b/sys/arch/mvme88k/dev/ssh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh.c,v 1.5 2001/08/26 02:37:07 miod Exp $	*/
+/*	$OpenBSD: ssh.c,v 1.6 2001/09/20 17:02:31 mpech Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -1305,7 +1305,7 @@ ssh_checkintr(sc, istat, dstat, sstat0, status)
 #endif
 		/*
 		 * If we were trying to start a command when the reselect
-		 * occured, need to put it at the head of the ready list,
+		 * occurred, need to put it at the head of the ready list,
 		 * mark target/lun unbusy and decrement sc_active count.
 		 */
 		if (sc->sc_nexus) {
diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index b9f75ee03eb..3a3bf9d9cb9 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.15 2001/08/24 22:53:14 miod Exp $   */
+/*   $OpenBSD: eh.S,v 1.16 2001/09/20 17:02:31 mpech Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -1121,7 +1121,7 @@ ASGLOBAL(use_SR3_pcb)
    * FLAGS: CPU status flags                                       *
    ***************************************************             *
    * immediate goal:                                               *
-   *   An exception occured while enabling the FPU. Since r31      *
+   *   An exception occurred while enabling the FPU. Since r31      *
    *   is the user's r31 while enabling the FPU, we had put        *
    *   our pcb pointer into SR3, so make room from                 *
    *   there for our stack pointer.                                *
@@ -2654,7 +2654,7 @@ ASGLOBAL(m197_use_SR3_pcb)
    * FLAGS: CPU status flags                                       *
    ***************************************************             *
    * immediate goal:                                               *
-   *   An exception occured while enabling the FPU. Since r31      *
+   *   An exception occurred while enabling the FPU. Since r31      *
    *   is the user's r31 while enabling the FPU, we had put        *
    *   our pcb pointer into SR3, so make room from                 *
    *   there for our stack pointer.                                *
diff --git a/sys/arch/mvme88k/stand/sboot/etherfun.c b/sys/arch/mvme88k/stand/sboot/etherfun.c
index 7fae0580b4c..543e7df47a9 100644
--- a/sys/arch/mvme88k/stand/sboot/etherfun.c
+++ b/sys/arch/mvme88k/stand/sboot/etherfun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: etherfun.c,v 1.2 2001/07/04 08:09:30 niklas Exp $	*/
+/*	$OpenBSD: etherfun.c,v 1.3 2001/09/20 17:02:31 mpech Exp $	*/
 
 /*
  *
@@ -162,7 +162,7 @@ do_get_file()
 	do_send_tftp(READ);
 	while (1) {
 		if (le_get(buf, sizeof(buf), 5) == 0) {
-			/* timeout occured */
+			/* timeout occurred */
 			if (last_ack)
 				do_send_tftp(last_ack);
 			else
diff --git a/sys/arch/sun3/sun3/kgdb_stub.c b/sys/arch/sun3/sun3/kgdb_stub.c
index 432be3fb19e..1f914d20c6c 100644
--- a/sys/arch/sun3/sun3/kgdb_stub.c
+++ b/sys/arch/sun3/sun3/kgdb_stub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgdb_stub.c,v 1.6 2001/08/12 20:18:30 mickey Exp $	*/
+/*	$OpenBSD: kgdb_stub.c,v 1.7 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: kgdb_stub.c,v 1.6 1996/10/23 16:30:48 gwr Exp $	*/
 
 /*
@@ -452,7 +452,7 @@ kgdb_trap(type, tf)
 	}
 	/*
 	 * Stick frame regs into our reg cache then tell remote host
-	 * that an exception has occured.
+	 * that an exception has occurred.
 	 */
 	regs_to_gdb(tf, gdb_regs);
 	if (type != T_BREAKPOINT) {
diff --git a/sys/arch/vax/vax/ns_cksum.c b/sys/arch/vax/vax/ns_cksum.c
index a7d23a5c369..a6f2f0a8ff6 100644
--- a/sys/arch/vax/vax/ns_cksum.c
+++ b/sys/arch/vax/vax/ns_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_cksum.c,v 1.3 1997/05/29 00:05:24 niklas Exp $	*/
+/*	$OpenBSD: ns_cksum.c,v 1.4 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: ns_cksum.c,v 1.3 1996/10/13 03:35:55 christos Exp $	*/
 /*
  * Copyright (c) 1985, 1986 Regents of the University of California.
@@ -99,7 +99,7 @@ ns_cksum(m, len)
 		 * 32 bit arithmetic registers for adding,
 		 * with carries from the low added
 		 * into the high (by normal carry-chaining)
-		 * so long as we fold back before 16 carries have occured.
+		 * so long as we fold back before 16 carries have occurred.
 		 *
 		 */
 		while ((mlen -= 32) >= 0) {
diff --git a/sys/compat/freebsd/freebsd_timex.h b/sys/compat/freebsd/freebsd_timex.h
index 4fbb7b64d24..a7a2ec5ffe3 100644
--- a/sys/compat/freebsd/freebsd_timex.h
+++ b/sys/compat/freebsd/freebsd_timex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_timex.h,v 1.2 1996/08/02 20:34:50 niklas Exp $	*/
+/*	$OpenBSD: freebsd_timex.h,v 1.3 2001/09/20 17:02:31 mpech Exp $	*/
 
 /******************************************************************************
  *                                                                            *
@@ -231,7 +231,7 @@
 #define TIME_INS	1	/* insert leap second warning */
 #define TIME_DEL	2	/* delete leap second warning */
 #define TIME_OOP	3	/* leap second in progress */
-#define TIME_WAIT	4	/* leap second has occured */
+#define TIME_WAIT	4	/* leap second has occurred */
 #define TIME_ERROR	5	/* clock not synchronized */
 
 /*
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index 0221e4a9add..216893478f8 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atavar.h,v 1.8 2001/06/25 19:31:48 csapuntz Exp $	*/
+/*	$OpenBSD: atavar.h,v 1.9 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: atavar.h,v 1.13 1999/03/10 13:11:43 bouyer Exp $	*/
 
 /*
@@ -78,7 +78,7 @@ struct ata_drive_datas {
 	/* 0x20-0x40 reserved for ATAPI_CFG_DRQ_MASK */
 	u_int8_t atapi_cap;
 
-	/* Keeps track of the number of resets that have occured in a row
+	/* Keeps track of the number of resets that have occurred in a row
 	   without a succesful command completion. */
 	u_int8_t n_resets;
 	u_int8_t n_dmaerrs;
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 278eb0b0734..57273e7a59e 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.28 2001/08/11 22:49:19 art Exp $	*/
+/*	$OpenBSD: audio.c,v 1.29 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: audio.c,v 1.105 1998/09/27 16:43:56 christos Exp $	*/
 
 /*
@@ -1604,7 +1604,7 @@ audio_write(dev, uio, ioflag)
 			saveerror = error;
 			error = audiostartp(sc);
 			if (saveerror != 0) {
-				/* Report the first error that occured. */
+				/* Report the first error that occurred. */
 				error = saveerror;
 			}
 		}
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 203b3eec311..4849d17e887 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.40 2000/01/07 23:08:17 gibbs Exp $
- * $OpenBSD: aic7xxx.c,v 1.30 2001/08/31 02:52:19 krw Exp $
+ * $OpenBSD: aic7xxx.c,v 1.31 2001/09/20 17:02:31 mpech Exp $
  */
 /*
  * A few notes on features of the driver.
@@ -5264,7 +5264,7 @@ ahc_abort_scbs(ahc, target, channel, lun, tag, role, status)
 	 * Go through the pending CCB list and look for
 	 * commands for this target that are still active.
 	 * These are other tagged commands that were
-	 * disconnected when the reset occured.
+	 * disconnected when the reset occurred.
 	 */
 	{
 		struct scb *scb;
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 819c04c2420..066528277d9 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390.c,v 1.18 2001/08/18 16:50:03 aaron Exp $	*/
+/*	$OpenBSD: dp8390.c,v 1.19 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $	*/
 
 /*
@@ -702,7 +702,7 @@ dp8390_intr(arg)
 
 			/*
 			 * Decrement buffer in-use count if not zero (can only
-			 * be zero if a transmitter interrupt occured while not
+			 * be zero if a transmitter interrupt occurred while not
 			 * actually transmitting).
 			 * If data is ready to transmit, start it transmitting,
 			 * otherwise defer until after handling receiver.
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 42985efc172..bba31c3f5ce 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.53 2001/07/08 23:38:05 fgsch Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.54 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -665,7 +665,7 @@ epinit(sc)
 	    S_CARD_FAILURE | S_RX_COMPLETE | S_TX_COMPLETE | S_TX_AVAIL);
 
 	/*
-	 * Attempt to get rid of any stray interrupts that occured during
+	 * Attempt to get rid of any stray interrupts that occurred during
 	 * configuration.  On the i386 this isn't possible because one may
 	 * already be queued.  However, a single stray interrupt is
 	 * unimportant.
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index df73b19b957..716b1a195d8 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.27 2001/09/17 16:24:49 jason Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.28 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -906,7 +906,7 @@ fxp_stats_update(arg)
 	    sp->rx_rnr_errors +
 	    sp->rx_overrun_errors;
 	/*
-	 * If any transmit underruns occured, bump up the transmit
+	 * If any transmit underruns occurred, bump up the transmit
 	 * threshold by another 512 bytes (64 * 8).
 	 */
 	if (sp->tx_underruns) {
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 93b4ec1106c..62cd5336b2f 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ed.c,v 1.47 2001/08/25 10:13:29 art Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.48 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $	*/
 
 /*
@@ -2294,7 +2294,7 @@ edintr(arg)
 
 			/*
 			 * Decrement buffer in-use count if not zero (can only
-			 * be zero if a transmitter interrupt occured while not
+			 * be zero if a transmitter interrupt occurred while not
 			 * actually transmitting).
 			 * If data is ready to transmit, start it transmitting,
 			 * otherwise defer until after handling receiver.
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index fb643a4a5e0..3d7e4d561ca 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fe.c,v 1.17 2001/07/08 23:38:07 fgsch Exp $	*/
+/*	$OpenBSD: if_fe.c,v 1.18 2001/09/20 17:02:31 mpech Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -1616,7 +1616,7 @@ fe_tint(sc, tstat)
 		 * packet transmission.  When we send two or more packets
 		 * with one start command (that's what we do when the
 		 * transmission queue is clauded), 86960 informs us number
-		 * of collisions occured on the last packet on the
+		 * of collisions occurred on the last packet on the
 		 * transmission only.  Number of collisions on previous
 		 * packets are lost.  I have told that the fact is clearly
 		 * stated in the Fujitsu document.
@@ -2073,7 +2073,7 @@ fe_get_packet(sc, len)
  *
  * I wrote a code for an experimental "delayed padding" technique.
  * When employed, it postpones the padding process for short packets.
- * If xmit() occured at the moment, the padding process is omitted, and
+ * If xmit() occurred at the moment, the padding process is omitted, and
  * garbages are sent as pad data.  If next packet is stored in the
  * transmission buffer before xmit(), write_mbuf() pads the previous
  * packet before transmitting new packet.  This *may* gain the
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index 93638f22006..c6cf79d41dc 100644
--- a/sys/dev/mii/brgphyreg.h
+++ b/sys/dev/mii/brgphyreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brgphyreg.h,v 1.3 2001/06/17 22:06:05 pvalchev Exp $	*/
+/*	$OpenBSD: brgphyreg.h,v 1.4 2001/09/20 17:02:31 mpech Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -61,7 +61,7 @@
 #define BRGPHY_BMSR_EXTSTS	0x0100	/* Extended status present */
 #define BRGPHY_BMSR_PRESUB	0x0040	/* Preamble surpression */
 #define BRGPHY_BMSR_ACOMP	0x0020	/* Autoneg complete */
-#define BRGPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occured */
+#define BRGPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occurred */
 #define BRGPHY_BMSR_ANEG	0x0008	/* Autoneg capable */
 #define BRGPHY_BMSR_LINK	0x0004	/* Link status */
 #define BRGPHY_BMSR_JABBER	0x0002	/* Jabber detected */
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index 7063b03c9c2..9571bf8af68 100644
--- a/sys/dev/mii/nsgphyreg.h
+++ b/sys/dev/mii/nsgphyreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsgphyreg.h,v 1.2 2001/06/17 22:06:05 pvalchev Exp $	*/
+/*	$OpenBSD: nsgphyreg.h,v 1.3 2001/09/20 17:02:31 mpech Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 2001
@@ -68,7 +68,7 @@
 #define NSGPHY_BMSR_EXTSTS	0x0100	/* 1000baseT Extended status present */
 #define NSGPHY_BMSR_PRESUB	0x0040	/* Preamble surpression */
 #define NSGPHY_BMSR_ACOMP	0x0020	/* Autoneg complete */
-#define NSGPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occured */
+#define NSGPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occurred */
 #define NSGPHY_BMSR_ANEG	0x0008	/* Autoneg capable */
 #define NSGPHY_BMSR_LINK	0x0004	/* Link status */
 #define NSGPHY_BMSR_JABBER	0x0002	/* Jabber detected */
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 97e1b93e847..0527b634fae 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.h
@@ -50,7 +50,7 @@
 #define XMPHY_MII_BMSR		0x01
 #define XMPHY_BMSR_EXTSTS	0x0100	/* Extended status present */
 #define XMPHY_BMSR_ACOMP	0x0020	/* Autoneg complete */
-#define XMPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occured */
+#define XMPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occurred */
 #define XMPHY_BMSR_ANEG		0x0008	/* Autoneg capable */
 #define XMPHY_BMSR_LINK		0x0004	/* Link status */
 #define XMPHY_BMSR_EXT		0x0001	/* Extended capability */
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index 843aaf49330..39c16c36d4f 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_card.c,v 1.1 2001/03/28 03:27:09 fgsch Exp $	*/
+/*	$OpenBSD: bktr_card.c,v 1.2 2001/09/20 17:02:31 mpech Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -1091,7 +1091,7 @@ checkTuner:
 	} /* end switch(card) */
 
 
-        /* At this point, a goto checkDBX has not occured */
+        /* At this point, a goto checkDBX has not occurred */
         /* We have not been able to select a Tuner */
         /* Some cards make use of the tuner address to */
         /* identify the make/model of tuner */
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index ea69837d34a..7b9f8145a64 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4281.c,v 1.6 2001/08/25 10:13:29 art Exp $ */
+/*	$OpenBSD: cs4281.c,v 1.7 2001/09/20 17:02:31 mpech Exp $ */
 /*	$Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $	*/
 
 /*
@@ -1130,7 +1130,7 @@ cs4281_init(sc)
 		0x00 <<  0;    /* PLSS[4:0] Left  PCM Playback */
 	BA0WRITE4(sc, CS4281_SRCSA, dat32);
 	
-	/* Set interrupt to occured at Half and Full terminal
+	/* Set interrupt to occurred at Half and Full terminal
 	 * count interrupt enable for DMA channel 0 and 1.
 	 * To keep DMA stop, set MSK.
 	 */
diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c
index 34e7a31cf1b..79a537047ec 100644
--- a/sys/dev/pci/if_tx.c
+++ b/sys/dev/pci/if_tx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tx.c,v 1.19 2001/08/25 10:13:29 art Exp $	*/
+/*	$OpenBSD: if_tx.c,v 1.20 2001/09/20 17:02:31 mpech Exp $	*/
 /* $FreeBSD: src/sys/pci/if_tx.c,v 1.45 2001/02/07 20:11:02 semenu Exp $ */
 
 /*-
@@ -1040,7 +1040,7 @@ epic_intr(arg)
 		      INTSTAT_APE|INTSTAT_DPE|INTSTAT_TXU|INTSTAT_RXE) ){
     	    if( status & (INTSTAT_FATAL|INTSTAT_PMA|INTSTAT_PTA|
 			  INTSTAT_APE|INTSTAT_DPE) ){
-		printf(EPIC_FORMAT ": PCI fatal error occured (%s%s%s%s)\n",
+		printf(EPIC_FORMAT ": PCI fatal error occurred (%s%s%s%s)\n",
     		    EPIC_ARGS(sc),
 		    (status&INTSTAT_PMA)?"PMA":"",
 		    (status&INTSTAT_PTA)?" PTA":"",
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index 0ec90d1fecd..5482dd5bac5 100644
--- a/sys/dev/raidframe/rf_engine.c
+++ b/sys/dev/raidframe/rf_engine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_engine.c,v 1.5 2000/01/11 18:02:21 peter Exp $	*/
+/*	$OpenBSD: rf_engine.c,v 1.6 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: rf_engine.c,v 1.9 2000/01/08 22:57:31 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -49,7 +49,7 @@
  *   If a node fails, the dag either rolls forward to the completion or     *
  *   rolls back, undoing previously-completed nodes and fails atomically.   *
  *   The direction of recovery is determined by the location of the failed  *
- *   node in the graph.  If the failure occured before the commit node in   *
+ *   node in the graph.  If the failure occurred before the commit node in   *
  *   the graph, backward recovery is used.  Otherwise, forward recovery is  *
  *   used.                                                                  *
  *                                                                          *
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 57a7204bb54..e871785986c 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.15 2001/05/03 02:20:33 aaron Exp $ */
+/*	$OpenBSD: ugen.c,v 1.16 2001/09/20 17:02:31 mpech Exp $ */
 /*	$NetBSD: ugen.c,v 1.45 2000/12/13 04:05:14 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -509,7 +509,7 @@ ugen_do_read(struct ugen_softc *sc, int endpt, struct uio *uio, int flag)
 
 	switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
 	case UE_INTERRUPT:
-		/* Block until activity occured. */
+		/* Block until activity occurred. */
 		s = splusb();
 		while (sce->q.c_cc == 0) {
 			if (flag & IO_NDELAY) {
diff --git a/sys/kern/kgdb_stub.c b/sys/kern/kgdb_stub.c
index d9e26662a73..663d3e732f1 100644
--- a/sys/kern/kgdb_stub.c
+++ b/sys/kern/kgdb_stub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgdb_stub.c,v 1.1 2001/01/24 09:37:59 hugh Exp $ */
+/* $OpenBSD: kgdb_stub.c,v 1.2 2001/09/20 17:02:31 mpech Exp $ */
 /*	$NetBSD: kgdb_stub.c,v 1.6 1998/08/30 20:30:57 scottr Exp $	*/
 
 /*
@@ -378,7 +378,7 @@ kgdb_trap(type, regs)
 #endif
 		kgdb_active = 1;
 	} else {
-		/* Tell remote host that an exception has occured. */
+		/* Tell remote host that an exception has occurred. */
 		sprintf(buffer, "S%02x", kgdb_signal(type));
 		kgdb_send(buffer);
 	}
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index ac20ca7e806..28ef6de78ee 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.41 2001/09/17 19:37:59 jason Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.42 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -223,7 +223,7 @@ sys_accept(p, v, retval)
 			    (caddr_t)SCARG(uap, anamelen),
 			    sizeof (*SCARG(uap, anamelen)));
 	}
-	/* if an error occured, free the file descriptor */
+	/* if an error occurred, free the file descriptor */
 	if (error) {
 		fdremove(p->p_fd, tmpfd);
 		ffree(fp);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 7bc622e21d9..bba0a96da0d 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.16 2001/07/21 12:22:57 itojun Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.17 2001/09/20 17:02:31 mpech Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -645,7 +645,7 @@ again:
 
 /*
  * This routine is called to generate a message from the routing
- * socket indicating that a redirect has occured, a routing lookup
+ * socket indicating that a redirect has occurred, a routing lookup
  * has failed, or that a protocol has detected timeouts to a particular
  * destination.
  */
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index 129aae5157b..b269c9db6d1 100644
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx_cksum.c,v 1.2 1996/10/26 09:34:49 mickey Exp $	*/
+/*	$OpenBSD: ipx_cksum.c,v 1.3 2001/09/20 17:02:32 mpech Exp $	*/
 
 /*-
  *
@@ -103,7 +103,7 @@ ipx_cksum(m, len)
 		 * 32 bit arithmetic registers for adding,
 		 * with carries from the low added
 		 * into the high (by normal carry-chaining)
-		 * so long as we fold back before 16 carries have occured.
+		 * so long as we fold back before 16 carries have occurred.
 		 */
 		if (1 & (int) w)
 			goto uuuuglyy;
diff --git a/sys/netiso/clnp_frag.c b/sys/netiso/clnp_frag.c
index dff3c3f14db..7f3b89742e9 100644
--- a/sys/netiso/clnp_frag.c
+++ b/sys/netiso/clnp_frag.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnp_frag.c,v 1.3 1996/04/21 22:29:11 deraadt Exp $	*/
+/*	$OpenBSD: clnp_frag.c,v 1.4 2001/09/20 17:02:32 mpech Exp $	*/
 /*	$NetBSD: clnp_frag.c,v 1.8 1996/04/13 01:34:23 cgd Exp $	*/
 
 /*-
@@ -263,9 +263,9 @@ clnp_fragment(ifp, m, first_hop, total_len, segoff, flags, rt)
 #endif				/* TROLL */
 
 			/*
-			 * Tough situation: if the error occured on the last
+			 * Tough situation: if the error occurred on the last
 			 * fragment, we can not send an ER, as the if_output
-			 * routine consumed the packet. If the error occured
+			 * routine consumed the packet. If the error occurred
 			 * on any intermediate packets, we can send an ER
 			 * because we still have the original header in (m).
 			 */
diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c
index a0f01c064ac..c8f2a5cc8cf 100644
--- a/sys/netiso/clnp_subr.c
+++ b/sys/netiso/clnp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnp_subr.c,v 1.3 1996/04/21 22:29:18 deraadt Exp $	*/
+/*	$OpenBSD: clnp_subr.c,v 1.4 2001/09/20 17:02:32 mpech Exp $	*/
 /*	$NetBSD: clnp_subr.c,v 1.8 1996/04/13 01:34:35 cgd Exp $	*/
 
 /*-
@@ -665,8 +665,8 @@ int
 clnp_badmtu(ifp, rt, line, file)
 	struct ifnet   *ifp;	/* outgoing interface */
 	struct rtentry *rt;	/* dst route */
-	int             line;	/* where the dirty deed occured */
-	char           *file;	/* where the dirty deed occured */
+	int             line;	/* where the dirty deed occurred */
+	char           *file;	/* where the dirty deed occurred */
 {
 	printf("sending on route %p with no mtu, line %d of file %s\n",
 	       rt, line, file);
diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c
index d5b283d3d2b..4de1d6e3f72 100644
--- a/sys/netns/ns_cksum.c
+++ b/sys/netns/ns_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_cksum.c,v 1.3 1999/02/23 21:55:29 mickey Exp $	*/
+/*	$OpenBSD: ns_cksum.c,v 1.4 2001/09/20 17:02:32 mpech Exp $	*/
 /*	$NetBSD: ns_cksum.c,v 1.3 1995/03/08 02:14:53 cgd Exp $	*/
 
 /*
@@ -98,7 +98,7 @@ ns_cksum(m, len)
 		 * 32 bit arithmetic registers for adding,
 		 * with carries from the low added
 		 * into the high (by normal carry-chaining)
-		 * so long as we fold back before 16 carries have occured.
+		 * so long as we fold back before 16 carries have occurred.
 		 */
 		if (1 & (long) w)
 			goto uuuuglyy;
diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h
index 7d30fb9ee83..da7d970f94b 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_error.h,v 1.2 1997/02/24 14:38:37 niklas Exp $	*/
+/*	$OpenBSD: ns_error.h,v 1.3 2001/09/20 17:02:32 mpech Exp $	*/
 /*	$NetBSD: ns_error.h,v 1.6 1995/03/26 20:36:20 jtc Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ struct  ns_epidp {
 #define	NS_ERR_BADSUM	1	/* Bad Checksum detected at dest */
 #define	NS_ERR_NOSOCK	2	/* Specified socket does not exist at dest*/
 #define	NS_ERR_FULLUP	3	/* Dest. refuses packet due to resource lim.*/
-#define	NS_ERR_UNSPEC_T	0x200	/* Unspec. Error occured before reaching dest*/
+#define	NS_ERR_UNSPEC_T	0x200	/* Unspec. Error occurred before reaching dest*/
 #define	NS_ERR_BADSUM_T	0x201	/* Bad Checksum detected in transit */
 #define	NS_ERR_UNREACH_HOST	0x202	/* Dest cannot be reached from here*/
 #define	NS_ERR_TOO_OLD	0x203	/* Packet x'd 15 routers without delivery*/
diff --git a/sys/sys/timex.h b/sys/sys/timex.h
index e9e6765e6f3..62bb71c13d6 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timex.h,v 1.5 1996/08/22 00:35:59 deraadt Exp $	*/
+/*	$OpenBSD: timex.h,v 1.6 2001/09/20 17:02:32 mpech Exp $	*/
 /*	$NetBSD: timex.h,v 1.2 1996/02/27 04:20:34 jonathan Exp $	*/
 
 /******************************************************************************
@@ -241,7 +241,7 @@
 #define TIME_INS	1	/* insert leap second warning */
 #define TIME_DEL	2	/* delete leap second warning */
 #define TIME_OOP	3	/* leap second in progress */
-#define TIME_WAIT	4	/* leap second has occured */
+#define TIME_WAIT	4	/* leap second has occurred */
 #define TIME_ERROR	5	/* clock not synchronized */
 
 /*
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index 3be80a7388d..f85693b932a 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_pager.c,v 1.15 2001/09/19 20:50:59 mickey Exp $	*/
+/*	$OpenBSD: uvm_pager.c,v 1.16 2001/09/20 17:02:32 mpech Exp $	*/
 /*	$NetBSD: uvm_pager.c,v 1.30 2000/05/20 03:36:06 thorpej Exp $	*/
 
 /*
@@ -502,7 +502,7 @@ ReTry:
 	}
 
 	/*
-	 * a pager error occured.
+	 * a pager error occurred.
 	 * for transient errors, drop to a cluster of 1 page ("pg")
 	 * and try again.  for hard errors, don't bother retrying.
 	 */
@@ -566,7 +566,7 @@ ReTry:
 	}
 
 	/*
-	 * a pager error occured (even after dropping the cluster, if there
+	 * a pager error occurred (even after dropping the cluster, if there
 	 * was one).    give up!   the caller only has one page ("pg")
 	 * to worry about.
 	 */