occured->occurred

idea from deraadt@ via NetBSD
millert@ ok

p.s. Next commit will fix a typo in the sys/

23 files changed, 59 insertions, 59 deletions

diff --git a/bin/ksh/io.c b/bin/ksh/io.c
index 05e5490f68d..7113d6fa0b4 100644
--- a/bin/ksh/io.c
+++ b/bin/ksh/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.9 2000/08/20 22:14:32 millert Exp $	*/
+/*	$OpenBSD: io.c,v 1.10 2001/09/19 10:58:07 mpech Exp $	*/
 
 /*
  * shell buffered IO and formatted output
@@ -15,7 +15,7 @@ static int initio_done;
  */
 
 
-/* A shell error occured (eg, syntax error, etc.) */
+/* A shell error occurred (eg, syntax error, etc.) */
 void
 #ifdef HAVE_PROTOTYPES
 errorf(const char *fmt, ...)
diff --git a/bin/ksh/lex.h b/bin/ksh/lex.h
index 334e46ca6eb..83e9e941c6b 100644
--- a/bin/ksh/lex.h
+++ b/bin/ksh/lex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.h,v 1.5 1999/06/15 01:18:35 millert Exp $	*/
+/*	$OpenBSD: lex.h,v 1.6 2001/09/19 10:58:07 mpech Exp $	*/
 
 /*
  * Source input, lexer and parser
@@ -22,7 +22,7 @@ struct source {
 	char	ugbuf[2];	/* buffer for ungetsc() (SREREAD) and
 				 * alias (SALIAS) */
 	int	line;		/* line number */
-	int	errline;	/* line the error occured on (0 if not set) */
+	int	errline;	/* line the error occurred on (0 if not set) */
 	const char *file;	/* input file name */
 	int	flags;		/* SF_* */
 	Area	*areap;
diff --git a/bin/ksh/trap.c b/bin/ksh/trap.c
index c7df99ade92..7ed32e84e19 100644
--- a/bin/ksh/trap.c
+++ b/bin/ksh/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.10 1999/01/19 20:41:56 millert Exp $	*/
+/*	$OpenBSD: trap.c,v 1.11 2001/09/19 10:58:07 mpech Exp $	*/
 
 /*
  * signal handling
@@ -171,7 +171,7 @@ fatal_trap_check()
 }
 
 /* Returns the signal number of any pending traps: ie, a signal which has
- * occured for which a trap has been set or for which the TF_DFL_INTR flag
+ * occurred for which a trap has been set or for which the TF_DFL_INTR flag
  * is set.
  */
 int
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 6a305f92ea6..23c34b4b16f 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_io.c,v 1.23 2001/07/09 07:04:26 deraadt Exp $	*/
+/*	$OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: ar_io.c,v 1.23 2001/07/09 07:04:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -626,7 +626,7 @@ ar_read(buf, cnt)
  * Return:
  *	Number of bytes written. 0 indicates end of volume reached and with no
  *	flaws (as best that can be detected). A -1 indicates an unrecoverable
- *	error in the archive occured.
+ *	error in the archive occurred.
  */
 
 #ifdef __STDC__
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 2aa67c87375..056e3a6abcd 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf_subs.c,v 1.8 2001/05/16 03:04:55 mickey Exp $	*/
+/*	$OpenBSD: buf_subs.c,v 1.9 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.8 2001/05/16 03:04:55 mickey Exp $";
+static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.9 2001/09/19 10:58:07 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -597,7 +597,7 @@ rd_wrbuf(in, cpcnt)
 			/*
 			 * read error, return what we got (or the error if
 			 * no data was copied). The caller must know that an
-			 * error occured and has the best knowledge what to
+			 * error occurred and has the best knowledge what to
 			 * do with it
 			 */
 			if ((res = cpcnt - incnt) > 0)
diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index 6048d549be0..8df99a3581c 100644
--- a/lib/libz/gzio.c
+++ b/lib/libz/gzio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gzio.c,v 1.5 2000/03/02 00:29:52 todd Exp $	*/
+/*	$OpenBSD: gzio.c,v 1.6 2001/09/19 10:58:07 mpech Exp $	*/
 /* gzio.c -- IO on .gz files
  * Copyright (C) 1995-1998 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -842,9 +842,9 @@ int ZEXPORT gzclose (file)
 }
 
 /* ===========================================================================
-     Returns the error message for the last error which occured on the
+     Returns the error message for the last error which occurred on the
    given compressed file. errnum is set to zlib error number. If an
-   error occured in the file system and not in the compression library,
+   error occurred in the file system and not in the compression library,
    errnum is set to Z_ERRNO and the application may consult errno
    to get the exact error code.
 */
diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c
index 9d0ecd8b965..dadf2fefde2 100644
--- a/libexec/identd/identd.c
+++ b/libexec/identd/identd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identd.c,v 1.20 2001/08/12 17:53:16 fgsch Exp $	*/
+/*	$OpenBSD: identd.c,v 1.21 2001/09/19 10:58:07 mpech Exp $	*/
 
 /*
  * This program is in the public domain and may be used freely by anyone
@@ -378,7 +378,7 @@ main(argc, argv)
 			} while (nfds < 0 && errno == EINTR);
 
 			/*
-			 * An error occured in select? Just die
+			 * An error occurred in select? Just die
 			 */
 			if (nfds < 0)
 				ERROR("main: select");
diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c
index 1749cb75f8c..7a679f9a399 100644
--- a/libexec/ld.so/dlfcn.c
+++ b/libexec/ld.so/dlfcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dlfcn.c,v 1.8 2001/09/15 20:44:52 drahn Exp $ */
+/*	$OpenBSD: dlfcn.c,v 1.9 2001/09/19 10:58:07 mpech Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -241,7 +241,7 @@ _dl_unload_deps(elf_object_t *object)
 /*
  *	dlerror()
  *
- *	Return a character string describing the last dl... error occured.
+ *	Return a character string describing the last dl... error occurred.
  */
 const char *
 dlerror()
diff --git a/sbin/fsck_msdos/ext.h b/sbin/fsck_msdos/ext.h
index a2897518367..5df7e5ecc70 100644
--- a/sbin/fsck_msdos/ext.h
+++ b/sbin/fsck_msdos/ext.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext.h,v 1.5 1998/01/11 20:40:33 provos Exp $	*/
+/*	$OpenBSD: ext.h,v 1.6 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: ext.h,v 1.5 1997/10/17 11:19:48 ws Exp $	*/
 
 /*
@@ -73,7 +73,7 @@ int checkfilesys __P((const char *));
 #define	FSDIRMOD	2		/* Some directory was modified */
 #define	FSFATMOD	4		/* The FAT was modified */
 #define	FSERROR		8		/* Some unrecovered error remains */
-#define	FSFATAL		16		/* Some unrecoverable error occured */
+#define	FSFATAL		16		/* Some unrecoverable error occurred */
 
 /*
  * read a boot block in a machine independend fashion and translate
diff --git a/sbin/photurisd/schedule.c b/sbin/photurisd/schedule.c
index b48f25834e1..ecdc04f5695 100644
--- a/sbin/photurisd/schedule.c
+++ b/sbin/photurisd/schedule.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: schedule.c,v 1.6 2001/01/28 22:45:15 niklas Exp $	*/
+/*	$OpenBSD: schedule.c,v 1.7 2001/09/19 10:58:07 mpech Exp $	*/
 
 /*
  * Copyright 1997-2000 Niels Provos <provos@citi.umich.edu>
@@ -37,7 +37,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: schedule.c,v 1.6 2001/01/28 22:45:15 niklas Exp $";
+static char rcsid[] = "$OpenBSD: schedule.c,v 1.7 2001/09/19 10:58:07 mpech Exp $";
 #endif
 
 #define _SCHEDULE_C_
@@ -264,7 +264,7 @@ schedule_process(int sock)
 		    break;
 	       }
 
-	       /* Only send the packet when no error occured */
+	       /* Only send the packet when no error occurred */
 	       if (!remove) {
 		    st->retries++;
 
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 45a0b42c733..21fa4ebe9ef 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: arch.c,v 1.49 2001/06/07 13:53:22 espie Exp $ */
+/*	$OpenBSD: arch.c,v 1.50 2001/09/19 10:58:07 mpech Exp $ */
 /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
 
 /*
@@ -634,7 +634,7 @@ ArchMTimeMember(archive, member, hash)
  *
  * Results:
  *	svr4list: just read a list of names
- *	NULL:	  error occured
+ *	NULL:	  error occurred
  *	extended name
  *
  * Side-effect:
diff --git a/usr.bin/make/error.h b/usr.bin/make/error.h
index 095b9c7f3a2..7436b34c7b7 100644
--- a/usr.bin/make/error.h
+++ b/usr.bin/make/error.h
@@ -1,7 +1,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 /*	$OpenPackages$ */
-/*	$OpenBSD: error.h,v 1.6 2001/05/23 12:34:42 espie Exp $ */
+/*	$OpenBSD: error.h,v 1.7 2001/09/19 10:58:07 mpech Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
@@ -39,7 +39,7 @@
  *				takes a format string and two arguments.
  *
  *	Finish			Finish things up by printing the number of
- *				errors which occured, as passed to it, and
+ *				errors which occurred, as passed to it, and
  *				exiting.
  */
 extern void Error(char *, ...);
diff --git a/usr.bin/make/gnode.h b/usr.bin/make/gnode.h
index 7ba6e3c46c5..17d94d72be2 100644
--- a/usr.bin/make/gnode.h
+++ b/usr.bin/make/gnode.h
@@ -1,7 +1,7 @@
 #ifndef GNODE_H
 #define GNODE_H
 /*	$OpenPackages$ */
-/*	$OpenBSD: gnode.h,v 1.1 2001/05/23 12:34:43 espie Exp $ */
+/*	$OpenBSD: gnode.h,v 1.2 2001/09/19 10:58:07 mpech Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
@@ -84,7 +84,7 @@ struct GNode_ {
 				 *	mode only)
 				 *  MADE - Was out-of-date and has been made
 				 *  UPTODATE - Was already up-to-date
-				 *  ERROR - An error occured while it was being
+				 *  ERROR - An error occurred while it was being
 				 *	made (used only in compat mode)
 				 *  ABORTED - The target was aborted due to
 				 *	an error making an inferior (compat).
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 861a63354de..a11cda04569 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nohup.c,v 1.7 2001/08/19 18:54:47 mickey Exp $	*/
+/*	$OpenBSD: nohup.c,v 1.8 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)nohup.c	5.4 (Berkeley) 6/1/90";
 #endif
-static char rcsid[] = "$OpenBSD: nohup.c,v 1.7 2001/08/19 18:54:47 mickey Exp $";
+static char rcsid[] = "$OpenBSD: nohup.c,v 1.8 2001/09/19 10:58:07 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -64,7 +64,7 @@ static void usage();
 
 /* nohup shall exit with one of the following values:
    126 - The utility was found but could not be invoked.
-   127 - An error occured in the nohup utility, or the utility could
+   127 - An error occurred in the nohup utility, or the utility could
          not be found. */
 #define EXIT_NOEXEC	126
 #define EXIT_NOTFOUND	127
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index 6c216b08110..9754d949f5d 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.8 1999/02/04 23:18:57 millert Exp $	*/
+/*	$OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -38,7 +38,7 @@ static char RCSid[] =
 "$From: server.c,v 6.85 1996/03/12 22:55:38 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: server.c,v 1.8 1999/02/04 23:18:57 millert Exp $";
+"$OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)server.c	5.3 (Berkeley) 6/7/86";
@@ -594,7 +594,7 @@ static void query(name)
 		if (s > 0)
 			(void) sendcmd(QC_ONNFS, NULL);
 
-		/* Either the above check was true or an error occured */
+		/* Either the above check was true or an error occurred */
 		/* and is_nfs_mounted sent the error message */
 		if (s != 0) {
 			*ptarget = CNULL;
@@ -609,7 +609,7 @@ static void query(name)
 		if (s > 0)
 			(void) sendcmd(QC_ONRO, NULL);
 
-		/* Either the above check was true or an error occured */
+		/* Either the above check was true or an error occurred */
 		/* and is_ro_mounted sent the error message */
 		if (s != 0) {
 			*ptarget = CNULL;
@@ -795,7 +795,7 @@ static void recvfile(new, opts, mode, owner, group, mtime, atime, size)
 				(void) close(f);
 				(void) unlink(new);
 				fatalerr(
-				   "Read error occured while receiving file.");
+				   "Read error occurred while receiving file.");
 				finish();
 			}
 			amt -= j;
diff --git a/usr.bin/sudo/parse.yacc b/usr.bin/sudo/parse.yacc
index 5f4ff9562b5..53899089c1a 100644
--- a/usr.bin/sudo/parse.yacc
+++ b/usr.bin/sudo/parse.yacc
@@ -189,7 +189,7 @@ void
 yyerror(s)
     char *s;
 {
-    /* Save the line the first error occured on. */
+    /* Save the line the first error occurred on. */
     if (errorlineno == -1)
 	errorlineno = sudolineno ? sudolineno - 1 : 0;
     if (s) {
diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c
index ea63df571f8..50a64503b48 100644
--- a/usr.bin/sup/src/supcmain.c
+++ b/usr.bin/sup/src/supcmain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmain.c,v 1.11 2001/05/04 22:16:16 millert Exp $	*/
+/*	$OpenBSD: supcmain.c,v 1.12 2001/09/19 10:58:07 mpech Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -248,7 +248,7 @@
  *
  * 03-Feb-86  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Fixed small bug in signon that didn't retry connections if an
- *	error occured on the first attempt to connect. [V5.12]
+ *	error occurred on the first attempt to connect. [V5.12]
  *
  * 26-Jan-86  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	New command interface.  Added -bBDEO flags and "delete",
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 728d9bd498d..1b4d8d7a63c 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: read.c,v 1.4 2000/06/23 17:04:46 ericj Exp $	*/
+/*	$OpenBSD: read.c,v 1.5 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: read.c,v 1.4 1994/11/23 07:42:07 jtc Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: read.c,v 1.4 2000/06/23 17:04:46 ericj Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -67,7 +67,7 @@ static char rcsid[] = "$OpenBSD: read.c,v 1.4 2000/06/23 17:04:46 ericj Exp $";
  * it is displayed from the character closest to the beginning of the input to
  * the end.
  *
- * A non-zero return means an (non-fatal) error occured.
+ * A non-zero return means an (non-fatal) error occurred.
  *
  */
 int
@@ -138,7 +138,7 @@ bytes(fp, off)
  * it is displayed from the line closest to the beginning of the input to
  * the end.
  *
- * A non-zero return means an (non-fatal) error occured.
+ * A non-zero return means an (non-fatal) error occurred.
  *
  */
 int
diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c
index ef9c2f6434b..f2a54cb3c59 100644
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: decl.c,v 1.4 1998/07/29 03:14:48 millert Exp $	*/
+/*	$OpenBSD: decl.c,v 1.5 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: decl.c,v 1.11 1995/10/02 17:34:16 jpo Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: decl.c,v 1.4 1998/07/29 03:14:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: decl.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
 #endif
 
 #include <sys/param.h>
@@ -3090,7 +3090,7 @@ glchksz(sym)
 	if (sym->s_def == TDEF) {
 		if (sym->s_type->t_tspec == FUNC)
 			/*
-			 * this can happen if an syntax error occured
+			 * this can happen if an syntax error occurred
 			 * after a function declaration
 			 */
 			return;
diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c
index 6a8902dfee4..3d56f25c07c 100644
--- a/usr.bin/xlint/lint1/init.c
+++ b/usr.bin/xlint/lint1/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $	*/
+/*	$OpenBSD: init.c,v 1.3 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: init.c,v 1.4 1995/10/02 17:21:37 jpo Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.3 2001/09/19 10:58:07 mpech Exp $";
 #endif
 
 #include <stdlib.h>
@@ -41,7 +41,7 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $"
 #include "lint1.h"
 
 /*
- * initerr is set as soon as a fatal error occured in an initialisation.
+ * initerr is set as soon as a fatal error occurred in an initialisation.
  * The effect is that the rest of the initialisation is ignored (parsed
  * by yacc, expression trees built, but no initialisation takes place).
  */
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index e9b3f3c475c..2ab3833ba4e 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.c,v 1.4 1998/07/29 03:14:50 millert Exp $	*/
+/*	$OpenBSD: tree.c,v 1.5 2001/09/19 10:58:07 mpech Exp $	*/
 /*	$NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: tree.c,v 1.4 1998/07/29 03:14:50 millert Exp $";
+static char rcsid[] = "$OpenBSD: tree.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
 #endif
 
 #include <stdlib.h>
@@ -671,7 +671,7 @@ build(op, ln, rn)
 		break;
 	}
 
-	/* Return if an error occured. */
+	/* Return if an error occurred. */
 	if (ntn == NULL)
 		return (NULL);
 
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index afc65886deb..bc5d3184735 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printjob.c,v 1.25 2001/08/30 17:38:13 millert Exp $ */
+/*	$OpenBSD: printjob.c,v 1.26 2001/09/19 10:58:08 mpech Exp $ */
 /*	$NetBSD: printjob.c,v 1.9.4.3 1996/07/12 22:31:39 jtc Exp $	*/
 
 /*
@@ -504,7 +504,7 @@ pass2:
 /*
  * Print a file.
  * Set up the chain [ PR [ | {IF, OF} ] ] or {IF, RF, TF, NF, DF, CF, VF}.
- * Return -1 if a non-recoverable error occured,
+ * Return -1 if a non-recoverable error occurred,
  * 2 if the filter detected some errors (but printed the job anyway),
  * 1 if we should try to reprint this job and
  * 0 if all is well.
@@ -740,7 +740,7 @@ start:
 
 /*
  * Send the daemon control file (cf) and any data files.
- * Return -1 if a non-recoverable error occured, 1 if a recoverable error and
+ * Return -1 if a non-recoverable error occurred, 1 if a recoverable error and
  * 0 if all is well.
  */
 static int
diff --git a/usr.sbin/popa3d/misc.h b/usr.sbin/popa3d/misc.h
index 097d3c75c3a..2dba9f555fa 100644
--- a/usr.sbin/popa3d/misc.h
+++ b/usr.sbin/popa3d/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.1 2001/08/19 13:05:57 deraadt Exp $ */
+/* $OpenBSD: misc.h,v 1.2 2001/09/19 10:58:08 mpech Exp $ */
 
 /*
  * Miscellaneous syscall wrappers.
@@ -22,7 +22,7 @@ extern int unlock_fd(int fd);
 /*
  * Attempts to write all the supplied data. Returns the number of bytes
  * written. Any value that differs from the requested count means that
- * an error has occured; if the value is -1, errno is set appropriately.
+ * an error has occurred; if the value is -1, errno is set appropriately.
  */
 extern int write_loop(int fd, char *buffer, int count);