From 592b4684a393f187ed17f2dbde89e7e974b93bec Mon Sep 17 00:00:00 2001
From: "Todd T. Fries" <todd@cvs.openbsd.org>
Date: Fri, 14 Jun 2002 21:35:02 +0000
Subject: spelling; from Brian Poole <raj@cerias.purdue.edu>

---
 games/fortune/datfiles/limerick                | 2 +-
 games/hack/hack.c                              | 6 +++---
 lib/libc/gen/glob.c                            | 4 ++--
 lib/libc/stdio/fgetln.c                        | 4 ++--
 lib/libdes/VERSION                             | 2 +-
 lib/libdes/fcrypt.c                            | 2 +-
 libexec/smtpd/src/antispam_check_rules.example | 4 ++--
 sbin/isakmpd/DESIGN-NOTES                      | 4 ++--
 sbin/isakmpd/isakmpd.c                         | 4 ++--
 sbin/isakmpd/sysdep/common/libsysdep/md5.c     | 4 ++--
 share/doc/papers/beyond4.3/beyond43.ms         | 4 ++--
 share/man/man5/pf.conf.5                       | 4 ++--
 share/smtpd/example.antispam                   | 4 ++--
 sys/altq/altq_blue.c                           | 4 ++--
 sys/altq/altq_fifoq.h                          | 4 ++--
 sys/altq/altq_red.c                            | 4 ++--
 sys/altq/altq_rio.c                            | 4 ++--
 sys/arch/amiga/dev/grfabs_reg.h                | 4 ++--
 sys/arch/i386/pci/pci_addr_fixup.c             | 4 ++--
 sys/arch/mac68k/dev/ncr5380.c                  | 4 ++--
 sys/arch/mvme68k/dev/ipic.c                    | 4 ++--
 sys/arch/mvme88k/dev/vs.c                      | 6 +++---
 sys/arch/sparc/dev/spifreg.h                   | 4 ++--
 sys/arch/sparc64/sparc64/machdep.c             | 4 ++--
 sys/dev/ata/atareg.h                           | 6 +++---
 sys/dev/ic/advlib.h                            | 6 +++---
 sys/dev/ic/aic7xxx.c                           | 4 ++--
 sys/dev/ic/fxp.c                               | 4 ++--
 sys/dev/ic/gem.c                               | 6 +++---
 sys/dev/ic/hme.c                               | 4 ++--
 sys/dev/ic/if_wi_ieee.h                        | 4 ++--
 sys/dev/ic/lsi64854var.h                       | 4 ++--
 sys/dev/ic/ncr5380sbc.c                        | 4 ++--
 sys/dev/isa/ad1848.c                           | 6 +++---
 sys/dev/isa/pas.c                              | 4 ++--
 sys/dev/pci/if_bge.c                           | 4 ++--
 sys/dev/raidframe/rf_dag.h                     | 4 ++--
 sys/dev/sbus/be.c                              | 4 ++--
 sys/dev/sbus/sbusvar.h                         | 4 ++--
 sys/dev/sbus/spifreg.h                         | 4 ++--
 sys/kern/vfs_cluster.c                         | 4 ++--
 sys/lib/libkern/md5.c                          | 4 ++--
 sys/miscfs/nullfs/null_subr.c                  | 4 ++--
 sys/miscfs/tcfs/tcfs_subr.c                    | 4 ++--
 sys/miscfs/umapfs/umap_subr.c                  | 4 ++--
 sys/net/pf.c                                   | 6 +++---
 sys/net/slcompress.h                           | 4 ++--
 sys/netccitt/hd_input.c                        | 4 ++--
 sys/netinet/if_ether.h                         | 4 ++--
 sys/netinet6/in6.c                             | 4 ++--
 sys/netinet6/nd6.c                             | 4 ++--
 sys/scsi/README                                | 4 ++--
 sys/sys/unistd.h                               | 4 ++--
 sys/uvm/uvm_map.c                              | 4 ++--
 usr.bin/at/parsetime.c                         | 6 +++---
 usr.bin/error/error.h                          | 6 +++---
 usr.bin/error/input.c                          | 6 +++---
 usr.bin/error/main.c                           | 6 +++---
 usr.bin/error/pi.c                             | 8 ++++----
 usr.bin/mail/head.c                            | 6 +++---
 usr.bin/ssh/monitor_wrap.c                     | 4 ++--
 usr.bin/sup/src/supcmain.c                     | 4 ++--
 usr.bin/top/top.c                              | 4 ++--
 usr.bin/yacc/reader.c                          | 4 ++--
 usr.sbin/adduser/adduser.perl                  | 6 +++---
 usr.sbin/afs/src/ChangeLog.1999                | 2 +-
 usr.sbin/afs/src/lib/cmd/cmd.3                 | 4 ++--
 usr.sbin/afs/src/rx/rx.c                       | 2 +-
 usr.sbin/config/config.8                       | 4 ++--
 usr.sbin/config/main.c                         | 6 +++---
 usr.sbin/cron/do_command.c                     | 6 +++---
 usr.sbin/cron/entry.c                          | 8 ++++----
 usr.sbin/lpr/pac/pac.c                         | 6 +++---
 usr.sbin/mopd/mopa.out/mopa.out.c              | 6 +++---
 usr.sbin/mtrace/mtrace.c                       | 6 +++---
 usr.sbin/ppp/ppp/alias_smedia.c                | 4 ++--
 usr.sbin/ppp/ppp/ppp.8.m4                      | 4 ++--
 usr.sbin/ppp/ppp/slcompress.h                  | 4 ++--
 usr.sbin/rdate/ntp.c                           | 4 ++--
 usr.sbin/syslogd/syslogd.c                     | 6 +++---
 usr.sbin/user/useradd.8                        | 4 ++--
 usr.sbin/user/usermod.8                        | 4 ++--
 82 files changed, 182 insertions(+), 182 deletions(-)

diff --git a/games/fortune/datfiles/limerick b/games/fortune/datfiles/limerick
index 0e8d1b7e1eb..720594ef59c 100644
--- a/games/fortune/datfiles/limerick
+++ b/games/fortune/datfiles/limerick
@@ -3836,7 +3836,7 @@ As her bridegroom got into the bed,
 You can get up my bottom instead."
 %
 There was a young lady whose cunt
-Could accomodate a small punt.
+Could accommodate a small punt.
 	Her mother said, "Annie,
 	It matches your fanny,
 Which never was that of a runt."
diff --git a/games/hack/hack.c b/games/hack/hack.c
index 20acfc899b6..fe36d7b88a0 100644
--- a/games/hack/hack.c
+++ b/games/hack/hack.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: hack.c,v 1.4 2001/08/06 22:59:13 pjanzen Exp $	*/
+/*	$OpenBSD: hack.c,v 1.5 2002/06/14 21:34:58 todd Exp $	*/
 
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: hack.c,v 1.4 2001/08/06 22:59:13 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: hack.c,v 1.5 2002/06/14 21:34:58 todd Exp $";
 #endif /* not lint */
 
 #include "hack.h"
@@ -447,7 +447,7 @@ pickup(all)
 		}
 	lift_some:
 		if(inv_cnt() >= 52) {
-		    pline("Your knapsack cannot accomodate anymore items.");
+		    pline("Your knapsack cannot accommodate anymore items.");
 		    break;
 		}
 		if(wt > -5) pline("You have a little trouble lifting");
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 23ca3d55108..f62bfb158e5 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.19 2002/05/24 21:22:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.20 2002/06/14 21:34:58 todd Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -667,7 +667,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
 
 
 /*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
+ * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
  * add the new item, and update gl_pathc.
  *
  * This assumes the BSD realloc, which only copies the block when its size
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index e3e616545fc..748a612e50c 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fgetln.c,v 1.2 1996/08/19 08:32:29 tholo Exp $";
+static char *rcsid = "$OpenBSD: fgetln.c,v 1.3 2002/06/14 21:34:58 todd Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -114,7 +114,7 @@ fgetln(fp, lenp)
 	 * As a bonus, though, we can leave off the __SMOD.
 	 *
 	 * OPTIMISTIC is length that we (optimistically) expect will
-	 * accomodate the `rest' of the string, on each trip through the
+	 * accommodate the `rest' of the string, on each trip through the
 	 * loop below.
 	 */
 #define OPTIMISTIC 80
diff --git a/lib/libdes/VERSION b/lib/libdes/VERSION
index f95aded2bf1..a1972a0f18e 100644
--- a/lib/libdes/VERSION
+++ b/lib/libdes/VERSION
@@ -38,7 +38,7 @@ Version 3.26
 	Thanks to Jens Kupferschmidt <bt1cu@hpboot.rz.uni-leipzig.de>. */
 
 	SIGWINCH case put in des_read_passwd() so the function does not
-	'exit' if this function is recieved.
+	'exit' if this function is received.
 
 Version 3.25 17/07/96
 	Modified read_pwd.c so that stdin can be read if not a tty.
diff --git a/lib/libdes/fcrypt.c b/lib/libdes/fcrypt.c
index bdf7c3dbf26..01d81a317f5 100644
--- a/lib/libdes/fcrypt.c
+++ b/lib/libdes/fcrypt.c
@@ -69,7 +69,7 @@
  * I have included directive _DES_PARA for shared memory computers.
  * I have included a directive LONGCRYPT to using this routine to cipher
  * passwords with more then 8 bytes like HP-UX 10.x it used. The MAXPLEN
- * definition is the maximum of lenght of password and can changed. I have
+ * definition is the maximum of length of password and can changed. I have
  * defined 24.
  */
 
diff --git a/libexec/smtpd/src/antispam_check_rules.example b/libexec/smtpd/src/antispam_check_rules.example
index 1748efba6ce..3111500613c 100644
--- a/libexec/smtpd/src/antispam_check_rules.example
+++ b/libexec/smtpd/src/antispam_check_rules.example
@@ -1,4 +1,4 @@
-#	$OpenBSD: antispam_check_rules.example,v 1.3 2001/01/28 19:34:34 niklas Exp $
+#	$OpenBSD: antispam_check_rules.example,v 1.4 2002/06/14 21:34:58 todd Exp $
 
 #
 # example smtpd_check_rules file.  If you compiled smtpd with
@@ -39,7 +39,7 @@ noto:ALL:ALL:*@*@*:551 Sorry %H (%I), I don't allow unauthorized relaying. You c
 #
 # These people love spam. They love Spamford Wallace.
 # They have requested that all mail be let through to them with no
-# filtering for SPAM, and we accomodate them here. 
+# filtering for SPAM, and we accommodate them here. 
 #
 allow:ALL:ALL:ALL@hormel.mydomain.com spamboy@otherdomain.com
 
diff --git a/sbin/isakmpd/DESIGN-NOTES b/sbin/isakmpd/DESIGN-NOTES
index 02a75eb9702..6b5f8bebf05 100644
--- a/sbin/isakmpd/DESIGN-NOTES
+++ b/sbin/isakmpd/DESIGN-NOTES
@@ -1,4 +1,4 @@
-$OpenBSD: DESIGN-NOTES,v 1.20 2002/06/10 18:11:11 ho Exp $
+$OpenBSD: DESIGN-NOTES,v 1.21 2002/06/14 21:34:58 todd Exp $
 $EOM: DESIGN-NOTES,v 1.48 1999/08/12 22:34:25 niklas Exp $
 
 General coding conventions
@@ -301,7 +301,7 @@ RECORD_B : RECORD_A
 
 This creates some utility constants like RECORD_A_SZ, RECORD_A_FIELD_A_LEN,
 RECORD_A_FIELD_A_OFF, RECORD_A_FIELD_B_LEN etc.  The *_OFF contains the
-octet offset into the record and the *_LEN constants are the lenghts.
+octet offset into the record and the *_LEN constants are the lengths.
 The type fields can be: raw, num, mask, ign & cst.  Raw are used for
 octet buffers, num for (unsigned) numbers of 1, 2 or 4 octet's length
 in network byteorder, mask is a bitmask where the bit values have symbols
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index aa76265dd36..8ff2f540713 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isakmpd.c,v 1.43 2002/06/09 08:13:06 todd Exp $	*/
+/*	$OpenBSD: isakmpd.c,v 1.44 2002/06/14 21:34:58 todd Exp $	*/
 /*	$EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $	*/
 
 /*
@@ -96,7 +96,7 @@ static char *report_file = "/var/run/isakmpd.report";
 static int sigusr2ed = 0;
 
 /*
- * If we recieve a TERM signal, perform a "clean shutdown" of the daemon.
+ * If we receive a TERM signal, perform a "clean shutdown" of the daemon.
  * This includes to send DELETE notifications for all our active SAs.
  */
 static int sigtermed = 0;
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/md5.c b/sbin/isakmpd/sysdep/common/libsysdep/md5.c
index 923e5bd0e4b..8a7a483dcc9 100644
--- a/sbin/isakmpd/sysdep/common/libsysdep/md5.c
+++ b/sbin/isakmpd/sysdep/common/libsysdep/md5.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: md5.c,v 1.2 2001/01/28 22:38:48 niklas Exp $	*/
+/*	$OpenBSD: md5.c,v 1.3 2002/06/14 21:34:58 todd Exp $	*/
 
 /*
  * The rest of the code is derived from MD5C.C by RSADSI. Minor cosmetic
- * changes to accomodate it in the kernel by ji.
+ * changes to accommodate it in the kernel by ji.
  */
 
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
diff --git a/share/doc/papers/beyond4.3/beyond43.ms b/share/doc/papers/beyond4.3/beyond43.ms
index cad16c67223..16a32eeb93a 100644
--- a/share/doc/papers/beyond4.3/beyond43.ms
+++ b/share/doc/papers/beyond4.3/beyond43.ms
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: beyond43.ms,v 1.2 2001/02/03 08:14:56 niklas Exp $
+.\"	$OpenBSD: beyond43.ms,v 1.3 2002/06/14 21:34:58 todd Exp $
 .\"
 .\" Copyright (c) 1989 The Regents of the University of California.
 .\" All rights reserved.
@@ -154,7 +154,7 @@ The new ``fat'' filesystem allows these limits to be set at filesystem
 creation time.
 Old kernels will treat the new filesystems as read-only,
 and new kernels
-will accomodate both formats.
+will accommodate both formats.
 The filesystem check facility, \fCfsck\fP, has also been modified to check
 either type.
 .br
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 10a7ec44c09..9b8a1f3367e 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.conf.5,v 1.56 2002/06/08 17:10:52 dhartmei Exp $
+.\"	$OpenBSD: pf.conf.5,v 1.57 2002/06/14 21:34:58 todd Exp $
 .\"
 .\" Copyright (c) 2001, Daniel Hartmeier
 .\" All rights reserved.
@@ -472,7 +472,7 @@ UDP packets are matched to states using only host addresses and ports.
 ICMP messages fall in two categories: ICMP error messages, which always
 refer to a TCP or UDP packet, are matched against the refered to connection.
 If one keeps state on a TCP connection, and an ICMP source quench message
-refering to this TCP connection arrives, it will be matched to the right
+referring to this TCP connection arrives, it will be matched to the right
 state and get passed.
 .Pp
 For ICMP queries, keep state creates an ICMP state, and
diff --git a/share/smtpd/example.antispam b/share/smtpd/example.antispam
index 30e70ea3784..c9c41f23882 100644
--- a/share/smtpd/example.antispam
+++ b/share/smtpd/example.antispam
@@ -1,4 +1,4 @@
-#	$OpenBSD: example.antispam,v 1.2 2001/02/03 08:23:45 niklas Exp $
+#	$OpenBSD: example.antispam,v 1.3 2002/06/14 21:34:58 todd Exp $
 
 # example antispam file. Modify to suit your needs.
 #
@@ -29,7 +29,7 @@ noto:ALL:ALL:*@*@*:551 Sorry %H (%I), I don't allow unauthorized relaying. You c
 # "I'll have your spam dear, I love it!"
 #
 # The people below have requested that all mail be let through to them
-# with no filtering for SPAM, and we accomodate them here.
+# with no filtering for SPAM, and we accommodate them here.
 #
 allow:ALL:ALL:ALL@hormel.mydomain.com spamboy@otherdomain.com
 
diff --git a/sys/altq/altq_blue.c b/sys/altq/altq_blue.c
index 2b9964853f8..085f6f04d65 100644
--- a/sys/altq/altq_blue.c
+++ b/sys/altq/altq_blue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_blue.c,v 1.5 2002/05/17 07:16:26 kjc Exp $	*/
+/*	$OpenBSD: altq_blue.c,v 1.6 2002/06/14 21:34:58 todd Exp $	*/
 /*	$KAME: altq_blue.c,v 1.9 2002/04/03 05:38:50 kjc Exp $	*/
 
 /*
@@ -92,7 +92,7 @@
 /* fixed-point uses 12-bit decimal places */
 #define	FP_SHIFT	12	/* fixed-point shift */
 
-#define	BLUE_LIMIT	200	/* default max queue lenght */
+#define	BLUE_LIMIT	200	/* default max queue length */
 #define	BLUE_STATS		/* collect statistics */
 
 /* blue_list keeps all blue_state_t's allocated. */
diff --git a/sys/altq/altq_fifoq.h b/sys/altq/altq_fifoq.h
index 837cf67ced9..13c2e53aff3 100644
--- a/sys/altq/altq_fifoq.h
+++ b/sys/altq/altq_fifoq.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_fifoq.h,v 1.1 2001/06/27 05:28:35 kjc Exp $	*/
+/*	$OpenBSD: altq_fifoq.h,v 1.2 2002/06/14 21:34:58 todd Exp $	*/
 /*	$KAME: altq_fifoq.h,v 1.6 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ struct fifoq_conf {
 	int fifoq_limit;
 };
 
-#define	FIFOQ_LIMIT	50	/* default max queue lenght */
+#define	FIFOQ_LIMIT	50	/* default max queue length */
 
 /* 
  * IOCTLs for FIFOQ
diff --git a/sys/altq/altq_red.c b/sys/altq/altq_red.c
index b2d91f3ac7f..33b6516fdb6 100644
--- a/sys/altq/altq_red.c
+++ b/sys/altq/altq_red.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_red.c,v 1.4 2002/05/17 07:16:26 kjc Exp $	*/
+/*	$OpenBSD: altq_red.c,v 1.5 2002/06/14 21:34:58 todd Exp $	*/
 /*	$KAME: altq_red.c,v 1.10 2002/04/03 05:38:51 kjc Exp $	*/
 
 /*
@@ -146,7 +146,7 @@
 #define	TH_MIN		5	/* min threshold */
 #define	TH_MAX		15	/* max threshold */
 
-#define	RED_LIMIT	60	/* default max queue lenght */
+#define	RED_LIMIT	60	/* default max queue length */
 #define	RED_STATS		/* collect statistics */
 
 /*
diff --git a/sys/altq/altq_rio.c b/sys/altq/altq_rio.c
index 65f55cb822f..f68ed7c5837 100644
--- a/sys/altq/altq_rio.c
+++ b/sys/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rio.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: altq_rio.c,v 1.4 2002/06/14 21:34:58 todd Exp $	*/
 /*	$KAME: altq_rio.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -135,7 +135,7 @@
 #define	TH_MIN		 5	/* min threshold */
 #define	TH_MAX		15	/* max threshold */
 
-#define	RIO_LIMIT	60	/* default max queue lenght */
+#define	RIO_LIMIT	60	/* default max queue length */
 #define	RIO_STATS		/* collect statistics */
 
 #define	TV_DELTA(a, b, delta) {					\
diff --git a/sys/arch/amiga/dev/grfabs_reg.h b/sys/arch/amiga/dev/grfabs_reg.h
index a5ff4156a44..1c05207dceb 100644
--- a/sys/arch/amiga/dev/grfabs_reg.h
+++ b/sys/arch/amiga/dev/grfabs_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grfabs_reg.h,v 1.3 2002/03/14 01:26:29 millert Exp $	*/
+/*	$OpenBSD: grfabs_reg.h,v 1.4 2002/06/14 21:34:58 todd Exp $	*/
 /*	$NetBSD: grfabs_reg.h,v 1.5 1996/04/21 21:11:31 veego Exp $	*/
 
 /*
@@ -85,7 +85,7 @@ extern struct monitor_list *monitors;
  * If you do not mimic everyone else exactly problems will appear.
  * If you need a template look at alloc_bitmap() in grf_cc.c.
  *
- * WARNING: the plane array is only for convience, all data for bitplanes 
+ * WARNING: the plane array is only for convenience, all data for bitplanes 
  *	MUST be contiguous.  This is for mapping purposes.  The reason
  *	for the plane pointers and row_mod is to support interleaving
  *	on monitors that wish to support this. 
diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c
index bda77df0a85..a7753f34c74 100644
--- a/sys/arch/i386/pci/pci_addr_fixup.c
+++ b/sys/arch/i386/pci/pci_addr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_addr_fixup.c,v 1.13 2002/03/14 01:26:33 millert Exp $	*/
+/*	$OpenBSD: pci_addr_fixup.c,v 1.14 2002/06/14 21:34:58 todd Exp $	*/
 /*	$NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $	*/
 
 /*-
@@ -407,7 +407,7 @@ pciaddr_search(mem_port, startp, size)
 		struct extent *ex = mem_port? sc->extent_mem : sc->extent_port;
 
 		/* Search the PCI I/O memory space extent for free
-		 * space that will accomodate size.  Remember that the
+		 * space that will accommodate size.  Remember that the
 		 * extent stores allocated space and we're searching
 		 * for the gaps.
 		 *
diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c
index 9a82fd74ca2..6e7539089c6 100644
--- a/sys/arch/mac68k/dev/ncr5380.c
+++ b/sys/arch/mac68k/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380.c,v 1.18 2002/03/14 03:15:55 millert Exp $	*/
+/*	$OpenBSD: ncr5380.c,v 1.19 2002/06/14 21:34:58 todd Exp $	*/
 /*	$NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $	*/
 
 /*
@@ -1780,7 +1780,7 @@ SC_REQ	*reqp;
 		return (0);
 
 	/*
-	 * LWP: I think that this restriction is not strictly nessecary.
+	 * LWP: I think that this restriction is not strictly necessary.
 	 */
 	if ((req_len & 0x1) || ((u_int)req_addr & 0x3))
 		return (0);
diff --git a/sys/arch/mvme68k/dev/ipic.c b/sys/arch/mvme68k/dev/ipic.c
index d95f397ac21..5c15c74d740 100644
--- a/sys/arch/mvme68k/dev/ipic.c
+++ b/sys/arch/mvme68k/dev/ipic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipic.c,v 1.9 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: ipic.c,v 1.10 2002/06/14 21:34:58 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -115,7 +115,7 @@ ipicscan(parent, child, args)
 	}
 #endif
 
-	/* XXX can we determing IPIC_IPSPACE automatically? */
+	/* XXX can we determine IPIC_IPSPACE automatically? */
 	for (slot = 0; slot < sc->sc_nip; slot++) {
 		ipp = sc->sc_ipspace + (slot * IPIC_IP_MODSIZE);
 		if (badpaddr((paddr_t)ipp + IPIC_IP_IDOFFSET, 2))
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index fa0c17c6ac4..9273cb2cb0d 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.16 2002/03/14 01:26:39 millert Exp $ */
+/*	$OpenBSD: vs.c,v 1.17 2002/06/14 21:34:59 todd Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -995,8 +995,8 @@ vs_build_memory_structure(xs, iopb)
 
 	/*
 	 * We have the following things:
-	 *	virt			the virtuell address of the contiguous virtual memory block
-	 *	len			the lenght of the contiguous virtual memory block
+	 *	virt			the virtual address of the contiguous virtual memory block
+	 *	len			the length of the contiguous virtual memory block
 	 *	starting_point_virt	the virtual address of the contiguous *physical* memory block
 	 *	starting_point_phys	the *physical* address of the contiguous *physical* memory block
 	 *	point_virt		the pointer to the virtual memory we are checking at the moment
diff --git a/sys/arch/sparc/dev/spifreg.h b/sys/arch/sparc/dev/spifreg.h
index 629cbd6536f..8a7481f37e7 100644
--- a/sys/arch/sparc/dev/spifreg.h
+++ b/sys/arch/sparc/dev/spifreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spifreg.h,v 1.7 2002/01/13 01:54:48 jason Exp $	*/
+/*	$OpenBSD: spifreg.h,v 1.8 2002/06/14 21:34:59 todd Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -326,7 +326,7 @@ struct stcregs {
  *
  * The *iack registers are read/written with the IACK bit set.  When
  * the interrupt routine starts, it reads the MRAR, TRAR, and RRAR registers
- * from this mapping.  This signals an interrupt acknowlegement cycle.
+ * from this mapping.  This signals an interrupt acknowledgement cycle.
  * (NOTE: these are not really the MRAR, TRAR, and RRAR... They are copies
  * of the GSVR, I just mapped them to the same location as the mrar, trar,
  * and rrar because it seemed appropriate).
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index ac9a1de0fe1..8472f106339 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.42 2002/06/14 04:17:59 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.43 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -1637,7 +1637,7 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
 	size = round_page(size);
 
 	/*
-	 * Find a region of kernel virtual addresses that can accomodate
+	 * Find a region of kernel virtual addresses that can accommodate
 	 * our aligment requirements.
 	 */
 	oversize = size + align - PAGE_SIZE;
diff --git a/sys/dev/ata/atareg.h b/sys/dev/ata/atareg.h
index 23e75516a50..fee6f77cdfe 100644
--- a/sys/dev/ata/atareg.h
+++ b/sys/dev/ata/atareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atareg.h,v 1.5 2002/03/27 17:42:37 gluk Exp $	*/
+/*	$OpenBSD: atareg.h,v 1.6 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: atareg.h,v 1.5 1999/01/18 20:06:24 bouyer Exp $	*/
 
 #ifndef __DEV_ATA_ATAREG_H__
@@ -122,7 +122,7 @@ struct ataparams {
 #define	WDC_VER_ATA13	0x2000
 #define	WDC_VER_ATA14	0x4000
     u_int16_t   atap_ata_minor;  	/* 81: Minor version number */
-    u_int16_t	atap_cmd_set1;    	/* 82: command set suported */
+    u_int16_t	atap_cmd_set1;    	/* 82: command set supported */
 #define WDC_CMD1_NOP	0x4000
 #define WDC_CMD1_RB	0x2000
 #define WDC_CMD1_WB	0x1000
@@ -137,7 +137,7 @@ struct ataparams {
 #define WDC_CMD1_REMOV	0x0004
 #define WDC_CMD1_SEC	0x0002
 #define WDC_CMD1_SMART	0x0001
-    u_int16_t	atap_cmd_set2;    	/* 83: command set suported */
+    u_int16_t	atap_cmd_set2;    	/* 83: command set supported */
 #define ATAPI_CMD2_FCE	0x2000 /* Flush Cache Ext supported */
 #define ATAPI_CMD2_FC	0x1000 /* Flush Cache supported */
 #define ATAPI_CMD2_DCO	0x0800 /* Device Configuration Overlay supported */
diff --git a/sys/dev/ic/advlib.h b/sys/dev/ic/advlib.h
index e0b4c92a874..bad5641e250 100644
--- a/sys/dev/ic/advlib.h
+++ b/sys/dev/ic/advlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advlib.h,v 1.6 2002/03/14 01:26:53 millert Exp $	*/
+/*	$OpenBSD: advlib.h,v 1.7 2002/06/14 21:34:59 todd Exp $	*/
 /*      $NetBSD: advlib.h,v 1.5 1998/10/28 20:39:46 dante Exp $        */
 
 /*
@@ -449,10 +449,10 @@ typedef struct asc_scisq_1
 	u_int8_t	sg_queue_cnt;	/* number of SG entries */
 	u_int8_t	target_id;
 	u_int8_t	target_lun;
-	u_int32_t	data_addr; /* physical address of first segment to transef */
+	u_int32_t	data_addr; /* physical address of first segment to transfer */
 	u_int32_t	data_cnt;  /* byte count of first segment to transfer */
 	u_int32_t	sense_addr; /* physical address of the sense buffer */
-	u_int8_t	sense_len; /* lenght of sense buffer */
+	u_int8_t	sense_len; /* length of sense buffer */
 	u_int8_t	extra_bytes;
 } ASC_SCSIQ_1;
 
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 5b127c6401f..428be419620 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.38 2002/03/26 00:56:10 krw Exp $
+ * $OpenBSD: aic7xxx.c,v 1.39 2002/06/14 21:34:59 todd Exp $
  */
 /*
  * A few notes on features of the driver.
@@ -1052,7 +1052,7 @@ ahc_xxx_reset(devname, iot, ioh)
 #ifdef AHC_DUMP_SEQ
 	ahc_dumpseq(ahc);
 #endif
-	/* Retain the IRQ type accross the chip reset */
+	/* Retain the IRQ type across the chip reset */
 	hcntrl = (bus_space_read_1(iot, ioh, HCNTRL) & IRQMS) | INTEN;
 
 	bus_space_write_1(iot, ioh, HCNTRL, CHIPRST | PAUSE);
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index 859f48d9f46..f7a35e9c1e3 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.38 2002/06/09 03:14:18 todd Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.39 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -915,7 +915,7 @@ fxp_stats_update(arg)
 	 * then assume the receiver has locked up and attempt to clear
 	 * the condition by reprogramming the multicast filter. This is
 	 * a work-around for a bug in the 82557 where the receiver locks
-	 * up if it gets certain types of garbage in the syncronization
+	 * up if it gets certain types of garbage in the synchronization
 	 * bits prior to the packet header. This bug is supposed to only
 	 * occur in 10Mbps mode, but has been seen to occur in 100Mbps
 	 * mode as well (perhaps due to a 10/100 speed transition).
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 20b3564ac25..1797196fce0 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gem.c,v 1.24 2002/06/09 03:38:40 drahn Exp $	*/
+/*	$OpenBSD: gem.c,v 1.25 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -259,7 +259,7 @@ gem_config(sc)
 			 * connector.
 			 */
 			if (child->mii_phy > 1 || child->mii_inst > 1) {
-				printf("%s: cannot accomodate MII device %s"
+				printf("%s: cannot accommodate MII device %s"
 				       " at phy %d, instance %d\n",
 				       sc->sc_dev.dv_xname,
 				       child->mii_dev.dv_xname,
@@ -819,7 +819,7 @@ gem_init(struct ifnet *ifp)
 		(*sc->sc_hwinit)(sc);
 
 
-	/* step 15.  Give the reciever a swift kick */
+	/* step 15.  Give the receiver a swift kick */
 	bus_space_write_4(t, h, GEM_RX_KICK, GEM_NRXDESC-4);
 
 	/* Start the one second timer. */
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index 979f229ca43..5f1a0350d3d 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hme.c,v 1.15 2002/06/05 22:13:18 fgsch Exp $	*/
+/*	$OpenBSD: hme.c,v 1.16 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $	*/
 
 /*-
@@ -275,7 +275,7 @@ hme_config(sc)
 			 * connector.
 			 */
 			if (child->mii_phy > 1 || child->mii_inst > 1) {
-				printf("%s: cannot accomodate MII device %s"
+				printf("%s: cannot accommodate MII device %s"
 				    " at phy %d, instance %d\n",
 				    sc->sc_dev.dv_xname,
 				    child->mii_dev.dv_xname,
diff --git a/sys/dev/ic/if_wi_ieee.h b/sys/dev/ic/if_wi_ieee.h
index 7ce194f472b..047a153dbf4 100644
--- a/sys/dev/ic/if_wi_ieee.h
+++ b/sys/dev/ic/if_wi_ieee.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_ieee.h,v 1.8 2002/06/02 16:11:41 millert Exp $	*/
+/*	$OpenBSD: if_wi_ieee.h,v 1.9 2002/06/14 21:34:59 todd Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -380,7 +380,7 @@ struct wi_ltv_keys {
  */
 
 /*
- * standard hermes recieve frame used by wavelan/prism2 cards
+ * standard hermes receive frame used by wavelan/prism2 cards
  */
 struct wi_rx_frame {
 	/*
diff --git a/sys/dev/ic/lsi64854var.h b/sys/dev/ic/lsi64854var.h
index 132af9fe203..ece40308f7e 100644
--- a/sys/dev/ic/lsi64854var.h
+++ b/sys/dev/ic/lsi64854var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsi64854var.h,v 1.3 2002/03/14 01:26:54 millert Exp $	*/
+/*	$OpenBSD: lsi64854var.h,v 1.4 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: lsi64854var.h,v 1.4 2001/03/29 02:58:39 petrov Exp $ */
 
 /*-
@@ -44,7 +44,7 @@ struct lsi64854_softc {
 
 	bus_space_handle_t	sc_regs;	/* the registers */
 	u_int			sc_rev;		/* revision */
-	int			sc_burst;	/* max suported burst size */
+	int			sc_burst;	/* max supported burst size */
 
 	int			sc_channel;
 #define L64854_CHANNEL_SCSI	1
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index fa4f4125ee1..68c81ee8e09 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380sbc.c,v 1.15 2002/03/14 03:16:05 millert Exp $	*/
+/*	$OpenBSD: ncr5380sbc.c,v 1.16 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $	*/
 
 /*
@@ -1507,7 +1507,7 @@ success:
 /*
  * The message system:
  *
- * This is a revamped message system that now should easier accomodate
+ * This is a revamped message system that now should easier accommodate
  * new messages, if necessary.
  *
  * Currently we accept these messages:
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index 0c243868cf3..79f2786e029 100644
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ad1848.c,v 1.25 2002/03/14 01:26:56 millert Exp $	*/
+/*	$OpenBSD: ad1848.c,v 1.26 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $	*/
 
 /*
@@ -1265,7 +1265,7 @@ ad1848_commit_settings(addr)
 	(void)ADREAD(sc, AD1848_IDATA);
 	(void)ADREAD(sc, AD1848_IDATA);
 	/*
-	 * Write to I8 starts resyncronization. Wait until it completes.
+	 * Write to I8 starts resynchronization. Wait until it completes.
 	 */
 	timeout = 100000;
 	while (timeout > 0 && ADREAD(sc, AD1848_IADDR) == SP_IN_INIT)
@@ -1280,7 +1280,7 @@ ad1848_commit_settings(addr)
 	/* Now wait for resync for capture side of the house */
     }
     /*
-     * Write to I8 starts resyncronization. Wait until it completes.
+     * Write to I8 starts resynchronization. Wait until it completes.
      */
     timeout = 100000;
     while (timeout > 0 && ADREAD(sc, AD1848_IADDR) == SP_IN_INIT)
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index df407777a5e..76e8be0ecc2 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pas.c,v 1.22 2002/03/14 01:26:56 millert Exp $	*/
+/*	$OpenBSD: pas.c,v 1.23 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
  */
 /*
  * Todo:
- * 	- look at other PAS drivers (for PAS native suport)
+ * 	- look at other PAS drivers (for PAS native support)
  * 	- use common sb.c once emulation is setup
  */
 
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 13912181dc6..5d883d95a56 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.12 2002/04/29 15:25:38 nate Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.13 2002/06/14 21:34:59 todd Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -1812,7 +1812,7 @@ bge_reset(sc)
  * on the receive return list.
  *
  * Note: we have to be able to handle two possibilities here:
- * 1) the frame is from the jumbo recieve ring
+ * 1) the frame is from the jumbo receive ring
  * 2) the frame is from the standard receive ring
  */
 
diff --git a/sys/dev/raidframe/rf_dag.h b/sys/dev/raidframe/rf_dag.h
index 4200e3bb193..6221d88fbd4 100644
--- a/sys/dev/raidframe/rf_dag.h
+++ b/sys/dev/raidframe/rf_dag.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_dag.h,v 1.2 1999/02/16 00:02:28 niklas Exp $	*/
+/*	$OpenBSD: rf_dag.h,v 1.3 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: rf_dag.h,v 1.3 1999/02/05 00:06:07 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -222,7 +222,7 @@ struct RF_DagList_s {
   (_h_)->status = rf_enable;     \
 }
 
-/* convience macro for declaring a create dag function */
+/* convenience macro for declaring a create dag function */
 
 #define RF_CREATE_DAG_FUNC_DECL(_name_) \
 void _name_ ( \
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index 70b85b8efd2..ce8734d2464 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.8 2002/03/14 01:27:02 millert Exp $	*/
+/*	$OpenBSD: be.c,v 1.9 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $	*/
 
 /*-
@@ -402,7 +402,7 @@ beattach(parent, self, aux)
 #endif
 			if (child->mii_phy != BE_PHY_EXTERNAL ||
 			    child->mii_inst > 0) {
-				printf("%s: cannot accomodate MII device %s"
+				printf("%s: cannot accommodate MII device %s"
 				    " at phy %d, instance %d\n",
 				    sc->sc_dev.dv_xname,
 				    child->mii_dev.dv_xname,
diff --git a/sys/dev/sbus/sbusvar.h b/sys/dev/sbus/sbusvar.h
index c0c00cdd002..7784d8ff847 100644
--- a/sys/dev/sbus/sbusvar.h
+++ b/sys/dev/sbus/sbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbusvar.h,v 1.5 2002/03/14 01:27:02 millert Exp $	*/
+/*	$OpenBSD: sbusvar.h,v 1.6 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: sbusvar.h,v 1.11 2000/11/01 06:18:45 eeh Exp $ */
 
 /*-
@@ -65,7 +65,7 @@ struct sbus_intr {
 	u_int32_t	sbi_vec;	/* vector (always 0?) */
 };
 
-/* Address translation accross busses */
+/* Address translation across busses */
 struct sbus_range {
 	u_int32_t	cspace;		/* Client space */
 	u_int32_t	coffset;	/* Client offset */
diff --git a/sys/dev/sbus/spifreg.h b/sys/dev/sbus/spifreg.h
index 9282565439d..17672851d24 100644
--- a/sys/dev/sbus/spifreg.h
+++ b/sys/dev/sbus/spifreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spifreg.h,v 1.2 2002/04/08 17:49:42 jason Exp $	*/
+/*	$OpenBSD: spifreg.h,v 1.3 2002/06/14 21:34:59 todd Exp $	*/
 
 /*
  * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
@@ -303,7 +303,7 @@
  *
  * The *iack registers are read/written with the IACK bit set.  When
  * the interrupt routine starts, it reads the MRAR, TRAR, and RRAR registers
- * from this mapping.  This signals an interrupt acknowlegement cycle.
+ * from this mapping.  This signals an interrupt acknowledgement cycle.
  * (NOTE: these are not really the MRAR, TRAR, and RRAR... They are copies
  * of the GSVR, I just mapped them to the same location as the mrar, trar,
  * and rrar because it seemed appropriate).
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 05efc1aa863..fe397b43ed3 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cluster.c,v 1.28 2002/05/24 08:39:15 art Exp $	*/
+/*	$OpenBSD: vfs_cluster.c,v 1.29 2002/06/14 21:34:59 todd Exp $	*/
 /*	$NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $	*/
 
 /*-
@@ -688,7 +688,7 @@ redo:
 
 		/*
 		 * Get the desired block buffer (unless it is the final
-		 * sequential block whose buffer was passed in explictly
+		 * sequential block whose buffer was passed in explicitly
 		 * as last_bp).
 		 */
 		if (last_bp == NULL || start_lbn != lbn) {
diff --git a/sys/lib/libkern/md5.c b/sys/lib/libkern/md5.c
index a332b1a836d..bdd3d84e1d4 100644
--- a/sys/lib/libkern/md5.c
+++ b/sys/lib/libkern/md5.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: md5.c,v 1.8 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: md5.c,v 1.9 2002/06/14 21:34:59 todd Exp $	*/
 
 /*
  * The rest of the code is derived from MD5C.C by RSADSI. Minor cosmetic
- * changes to accomodate it in the kernel by ji.
+ * changes to accommodate it in the kernel by ji.
  */
 
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index bc2ce348311..e21e56ba5a4 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: null_subr.c,v 1.10 2002/03/14 01:27:08 millert Exp $	*/
+/*	$OpenBSD: null_subr.c,v 1.11 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: null_subr.c,v 1.6 1996/05/10 22:50:52 jtk Exp $	*/
 
 /*
@@ -239,7 +239,7 @@ loop:
 
 
 /*
- * Try to find an existing null_node vnode refering
+ * Try to find an existing null_node vnode referring
  * to it, otherwise make a new null_node vnode which
  * contains a reference to the lower vnode.
  *
diff --git a/sys/miscfs/tcfs/tcfs_subr.c b/sys/miscfs/tcfs/tcfs_subr.c
index b5cc4533df9..e497cf9c71d 100644
--- a/sys/miscfs/tcfs/tcfs_subr.c
+++ b/sys/miscfs/tcfs/tcfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfs_subr.c,v 1.3 2002/03/14 01:27:08 millert Exp $	*/
+/*	$OpenBSD: tcfs_subr.c,v 1.4 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: tcfs_subr.c,v 1.6 1996/05/10 22:50:52 jtk Exp $	*/
 
 /*
@@ -238,7 +238,7 @@ loop:
 
 
 /*
- * Try to find an existing tcfs_node vnode refering
+ * Try to find an existing tcfs_node vnode referring
  * to it, otherwise make a new tcfs_node vnode which
  * contains a reference to the lower vnode.
  *
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 55ccfd14a66..7c5d9fffa68 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umap_subr.c,v 1.13 2002/03/14 01:27:08 millert Exp $	*/
+/*	$OpenBSD: umap_subr.c,v 1.14 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: umap_subr.c,v 1.8 1996/03/05 02:35:39 thorpej Exp $	*/
 
 /*
@@ -291,7 +291,7 @@ loop:
 
 
 /*
- * Try to find an existing umap_node vnode refering
+ * Try to find an existing umap_node vnode referring
  * to it, otherwise make a new umap_node vnode which
  * contains a reference to the target vnode.
  */
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 811b2f7f914..b7c1ddba665 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.234 2002/06/11 02:42:27 frantzen Exp $ */
+/*	$OpenBSD: pf.c,v 1.235 2002/06/14 21:35:00 todd Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -2799,7 +2799,7 @@ pf_test_state_tcp(struct pf_state **state, int direction, struct ifnet *ifp,
 		/* update max window */
 		if (src->max_win < win)
 			src->max_win = win;
-		/* syncronize sequencing */
+		/* synchronize sequencing */
 		if (SEQ_GT(end, src->seqlo))
 			src->seqlo = end;
 		/* slide the window of what the other end can send */
@@ -2889,7 +2889,7 @@ pf_test_state_tcp(struct pf_state **state, int direction, struct ifnet *ifp,
 		/* update max window */
 		if (src->max_win < win)
 			src->max_win = win;
-		/* syncronize sequencing */
+		/* synchronize sequencing */
 		if (SEQ_GT(end, src->seqlo))
 			src->seqlo = end;
 		/* slide the window of what the other end can send */
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 53dd58cab8d..5e5d0564111 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slcompress.h,v 1.5 2002/03/14 01:27:10 millert Exp $	*/
+/*	$OpenBSD: slcompress.h,v 1.6 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: slcompress.h,v 1.11 1997/05/17 21:12:11 christos Exp $	*/
 
 /*
@@ -64,7 +64,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/hd_input.c b/sys/netccitt/hd_input.c
index b7778c73089..26434e317fd 100644
--- a/sys/netccitt/hd_input.c
+++ b/sys/netccitt/hd_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd_input.c,v 1.4 2002/03/14 01:27:10 millert Exp $	*/
+/*	$OpenBSD: hd_input.c,v 1.5 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: hd_input.c,v 1.9 1996/04/13 01:34:16 cgd Exp $	*/
 
 /*
@@ -569,7 +569,7 @@ valid_nr(hdp, nr, finalbit)
 
 	/*
 	 * This section validates the frame's  N(R) value.  It's N(R) value
-	 * must be  in syncronization  with  our V(S)  value and  our "last
+	 * must be  in synchronization  with  our V(S)  value and  our "last
 	 * received nr" variable. If it is correct then we are able to send
 	 * more IFRAME's, else frame reject condition is entered.
 	 */
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index db5db0ee079..a6adc696f8c 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.h,v 1.23 2002/06/10 22:48:09 chris Exp $	*/
+/*	$OpenBSD: if_ether.h,v 1.24 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
  */
 #define	ETHER_ADDR_LEN	6	/* Ethernet address length		*/
 #define ETHER_TYPE_LEN	2	/* Ethernet type field length		*/
-#define ETHER_CRC_LEN	4	/* Ethernet CRC lenght			*/
+#define ETHER_CRC_LEN	4	/* Ethernet CRC length			*/
 #define ETHER_HDR_LEN	((ETHER_ADDR_LEN * 2) + ETHER_TYPE_LEN)
 #define ETHER_MIN_LEN	64	/* Minimum frame length, CRC included	*/
 #define ETHER_MAX_LEN	1518	/* Maximum frame length, CRC included	*/
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 6a232cf6aa6..3255c428ced 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.c,v 1.45 2002/06/11 07:36:00 itojun Exp $	*/
+/*	$OpenBSD: in6.c,v 1.46 2002/06/14 21:35:00 todd Exp $	*/
 /*	$KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $	*/
 
 /*
@@ -1371,7 +1371,7 @@ in6_purgeif(ifp)
  *	other values may be returned from in6_ioctl()
  *
  * NOTE: SIOCALIFADDR(with IFLR_PREFIX set) allows prefixlen less than 64.
- * this is to accomodate address naming scheme other than RFC2374,
+ * this is to accommodate address naming scheme other than RFC2374,
  * in the future.
  * RFC2373 defines interface id to be 64bit, but it allows non-RFC2374
  * address encoding scheme. (see figure on page 8)
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 496b3b51713..9fce82f5a39 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.50 2002/06/08 21:51:08 itojun Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.51 2002/06/14 21:35:00 todd Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -342,7 +342,7 @@ nd6_options(ndopts)
 		default:
 			/*
 			 * Unknown options must be silently ignored,
-			 * to accomodate future extension to the protocol.
+			 * to accommodate future extension to the protocol.
 			 */
 			nd6log((LOG_DEBUG,
 			    "nd6_options: unsupported option %d - "
diff --git a/sys/scsi/README b/sys/scsi/README
index 518132da090..ef3b00debf8 100644
--- a/sys/scsi/README
+++ b/sys/scsi/README
@@ -1,4 +1,4 @@
-/*	$OpenBSD: README,v 1.2 1996/10/31 01:09:19 niklas Exp $	*/
+/*	$OpenBSD: README,v 1.3 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: README,v 1.6 1995/06/02 14:04:36 mycroft Exp $	*/
 
 This release consists of the following files 
@@ -30,7 +30,7 @@ the ioctls for mag tapes (including st).
 General scsi ioctls are found in sys/scsiio.h.
 
 -----------cd-rom-----------------
-Cdrom audio is only suported at all for cdroms that use SCSI2 audio
+Cdrom audio is only supported at all for cdroms that use SCSI2 audio
 definitions.
 
 -------------media changer---------------
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 2e72fe4ad26..48571005719 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.9 2001/09/29 20:27:49 naddy Exp $	*/
+/*	$OpenBSD: unistd.h,v 1.10 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: unistd.h,v 1.10 1994/06/29 06:46:06 cgd Exp $	*/
 
 /*
@@ -54,7 +54,7 @@
 #define	_POSIX_NO_TRUNC		1
 				/* may disable terminal special characters */
 #define	_POSIX_VDISABLE		(0377)
-				/* file syncronization is available */
+				/* file synchronization is available */
 #define	_POSIX_FSYNC		1
 
 /* access function */
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index 509b93d73cd..486d40efd74 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map.c,v 1.47 2002/06/05 17:40:08 art Exp $	*/
+/*	$OpenBSD: uvm_map.c,v 1.48 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $	*/
 
 /* 
@@ -3438,7 +3438,7 @@ uvmspace_fork(vm1)
 			 *    process is sharing the amap with another 
 			 *    process.  if we do not clear needs_copy here
 			 *    we will end up in a situation where both the
-			 *    parent and child process are refering to the
+			 *    parent and child process are referring to the
 			 *    same amap with "needs_copy" set.  if the 
 			 *    parent write-faults, the fault routine will
 			 *    clear "needs_copy" in the parent by allocating
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 188b9a33a1a..f2d734666bd 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parsetime.c,v 1.11 2002/05/14 18:05:39 millert Exp $	*/
+/*	$OpenBSD: parsetime.c,v 1.12 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: parsetime.c,v 1.3 1995/03/25 18:13:36 glass Exp $	*/
 
 /* 
@@ -139,12 +139,12 @@ static char scc;	/* scanner - count of remaining arguments */
 static char *sct;	/* scanner - next char pointer in current argument */
 static int need;	/* scanner - need to advance to next argument */
 static char *sc_token;	/* scanner - token buffer */
-static size_t sc_len;   /* scanner - lenght of token buffer */
+static size_t sc_len;   /* scanner - length of token buffer */
 static int sc_tokid;	/* scanner - token id */
 static int sc_tokplur;	/* scanner - is token plural? */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: parsetime.c,v 1.11 2002/05/14 18:05:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: parsetime.c,v 1.12 2002/06/14 21:35:00 todd Exp $";
 #endif
 
 /*
diff --git a/usr.bin/error/error.h b/usr.bin/error/error.h
index a692cb6d184..c25d152143b 100644
--- a/usr.bin/error/error.h
+++ b/usr.bin/error/error.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: error.h,v 1.5 2001/07/12 05:17:01 deraadt Exp $	*/
+/*	$OpenBSD: error.h,v 1.6 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: error.h,v 1.3 1995/09/02 06:15:25 jtc Exp $	*/
 
 /*
@@ -164,7 +164,7 @@ extern struct lang_desc lang_table[];
 #define	MOD2INCOMMENT	"(*###"
 #define	MOD2OUTCOMMENT	"%%%*)\n"
 /*
- *	Defines and resources for determing if a given line
+ *	Defines and resources for determining if a given line
  *	is to be discarded because it refers to a file not to
  *	be touched, or if the function reference is to a
  *	function the user doesn't want recorded.
@@ -180,7 +180,7 @@ typedef struct edesc	Edesc;
 typedef	Edesc	*Eptr;
 
 struct edesc{
-	Eptr	error_next;		/*linked together*/
+	Eptr	error_next;		/* linked together*/
 	int	error_lgtext;		/* how many on the right hand side*/
 	char	**error_text;		/* the right hand side proper*/
 	Errorclass	error_e_class;	/* error category of this error*/
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 75aa24cc5b6..c8989ffa6b9 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: input.c,v 1.3 2001/07/12 05:17:02 deraadt Exp $	*/
+/*	$OpenBSD: input.c,v 1.4 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: input.c,v 1.4 1995/09/10 15:55:13 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: input.c,v 1.3 2001/07/12 05:17:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: input.c,v 1.4 2002/06/14 21:35:00 todd Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -89,7 +89,7 @@ eaterrors(r_errorc, r_errorv)
 	line[inbuflen] = '\0';
 	wordvbuild(line, &wordc, &wordv);
 	/*
-	 *	for convience, convert wordv to be 1 based, instead
+	 *	for convenience, convert wordv to be 1 based, instead
 	 *	of 0 based.
 	 */
 	wordv -= 1;
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index a52912f2e94..b5e03646c8b 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.7 2002/03/14 06:51:41 mpech Exp $	*/
+/*	$OpenBSD: main.c,v 1.8 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: main.c,v 1.7 2002/03/14 06:51:41 mpech Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.8 2002/06/14 21:35:00 todd Exp $";
 #endif /* not lint */
 
 #include <signal.h>
@@ -248,7 +248,7 @@ forkvi(argc, argv)
 
 	/*
 	 *	ed_agument's first argument is
-	 *	a vi/ex compatabile search argument
+	 *	a vi/ex compatible search argument
 	 *	to find the first occurance of ###
 	 */
 	try("vi", argc, argv);
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index 01cc7f5e2b1..6eeffb8303a 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pi.c,v 1.3 1998/11/16 06:22:28 deraadt Exp $	*/
+/*	$OpenBSD: pi.c,v 1.4 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: pi.c,v 1.3 1995/09/02 06:15:44 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pi.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: pi.c,v 1.3 1998/11/16 06:22:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pi.c,v 1.4 2002/06/14 21:35:00 todd Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -234,7 +234,7 @@ Errorclass pi()
 		 *	Where the | is intended to be a down arrow, so that
 		 *	the pi error messages can be inserted above the
 		 *	line in error, instead of below.  (All of the other
-		 *	language put thier messages before the source line,
+		 *	language put their messages before the source line,
 		 *	instead of after it as does pi.)
 		 *
 		 *	where the pointer to the error has been truncated
@@ -379,7 +379,7 @@ Errorclass pi()
 		return(C_IGNORE);
 	}
 	/*
-	 *	Attempt to match messages refering to a line number
+	 *	Attempt to match messages referring to a line number
 	 *
 	 *	Multiply defined label in case, lines %d and %d
 	 *	Goto %s from line %d is into a structured statement
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index d63a86f9143..4eff2996e21 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: head.c,v 1.7 2001/11/21 15:26:39 millert Exp $	*/
+/*	$OpenBSD: head.c,v 1.8 2002/06/14 21:35:00 todd Exp $	*/
 /*	$NetBSD: head.c,v 1.6 1996/12/28 07:11:03 tls Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)head.c	8.2 (Berkeley) 4/20/95";
 #else
-static const char rcsid[] = "$OpenBSD: head.c,v 1.7 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: head.c,v 1.8 2002/06/14 21:35:00 todd Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ static const char rcsid[] = "$OpenBSD: head.c,v 1.7 2001/11/21 15:26:39 millert
 /*
  * See if the passed line buffer is a mail header.
  * Return true if yes.  Note the extreme pains to
- * accomodate all funny formats.
+ * accommodate all funny formats.
  */
 int
 ishead(char *linebuf)
diff --git a/usr.bin/ssh/monitor_wrap.c b/usr.bin/ssh/monitor_wrap.c
index bcb92178abb..6bbeda14649 100644
--- a/usr.bin/ssh/monitor_wrap.c
+++ b/usr.bin/ssh/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.8 2002/06/04 23:05:49 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.9 2002/06/14 21:35:00 todd Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -423,7 +423,7 @@ mm_newkeys_from_blob(u_char *blob, int blen)
 	mac->enabled = buffer_get_int(&b);
 	mac->key = buffer_get_string(&b, &len);
 	if (len > mac->key_len)
-		fatal("%s: bad mac key lenght: %d > %d", __func__, len,
+		fatal("%s: bad mac key length: %d > %d", __func__, len,
 		    mac->key_len);
 	mac->key_len = len;
 
diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c
index 1b56ed1417c..1b429fb001c 100644
--- a/usr.bin/sup/src/supcmain.c
+++ b/usr.bin/sup/src/supcmain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmain.c,v 1.15 2002/06/12 06:07:16 mpech Exp $	*/
+/*	$OpenBSD: supcmain.c,v 1.16 2002/06/14 21:35:00 todd Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -70,7 +70,7 @@
  *	The remaining flags affect all collections unless an explicit list
  *	of collections are given with the flags.  Multiple flags may be
  *	specified together that affect the same collections.  For the sake
- *	of convience, any flags that always affect all collections can be
+ *	of convenience, any flags that always affect all collections can be
  *	specified with flags that affect only some collections.  For
  *	example, "sup -sde=coll1,coll2" would perform a system upgrade,
  *	and the first two collections would allow both file deletions and
diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c
index 9a3ab8cc83a..b365f28056e 100644
--- a/usr.bin/top/top.c
+++ b/usr.bin/top/top.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: top.c,v 1.16 2002/04/21 18:52:33 hugh Exp $	*/
+/*	$OpenBSD: top.c,v 1.17 2002/06/14 21:35:00 todd Exp $	*/
 
 const char copyright[] = "Copyright (c) 1984 through 1996, William LeFebvre";
 
@@ -544,7 +544,7 @@ restart:
 	{
 	    /* determine number of processes to actually display */
 	    /* this number will be the smallest of:  active processes,
-	       number user requested, number current screen accomodates */
+	       number user requested, number current screen accommodates */
 	    active_procs = system_info.p_active;
 	    if (active_procs > topn)
 	    {
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index a6f951f70bb..4cc0a181dca 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reader.c,v 1.10 2002/02/16 21:28:00 millert Exp $	*/
+/*	$OpenBSD: reader.c,v 1.11 2002/06/14 21:35:00 todd Exp $	*/
 
 /*	$NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $	*/
 
@@ -51,7 +51,7 @@ static char rcsid[] = "$NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $";
 /*  The line size must be a positive integer.  One hundred was chosen	*/
 /*  because few lines in Yacc input grammars exceed 100 characters.	*/
 /*  Note that if a line exceeds LINESIZE characters, the line buffer	*/
-/*  will be expanded to accomodate it.					*/
+/*  will be expanded to accommodate it.					*/
 
 #define LINESIZE 100
 
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl
index ba66d903644..1a166d4baaa 100644
--- a/usr.sbin/adduser/adduser.perl
+++ b/usr.sbin/adduser/adduser.perl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#	$OpenBSD: adduser.perl,v 1.37 2002/03/05 17:23:45 millert Exp $
+#	$OpenBSD: adduser.perl,v 1.38 2002/06/14 21:35:01 todd Exp $
 #
 # Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
@@ -89,7 +89,7 @@ sub variables {
     $group = "/etc/group";
     $pwd_mkdb = "pwd_mkdb -p";	# program for building passwd database
     $encryptionmethod = "blowfish";
-    $rcsid = '$OpenBSD: adduser.perl,v 1.37 2002/03/05 17:23:45 millert Exp $';
+    $rcsid = '$OpenBSD: adduser.perl,v 1.38 2002/06/14 21:35:01 todd Exp $';
 
     # List of directories where shells located
     @path = ('/bin', '/usr/bin', '/usr/local/bin');
@@ -239,7 +239,7 @@ sub shell_default_valid {
 }
 
 # return default home partition (f.e. "/home")
-# create base directory if nesseccary
+# create base directory if necessary 
 sub home_partition {
     local($home) = @_;
     $home = &stripdir($home);
diff --git a/usr.sbin/afs/src/ChangeLog.1999 b/usr.sbin/afs/src/ChangeLog.1999
index 47ab1c5e464..db6e77260f3 100644
--- a/usr.sbin/afs/src/ChangeLog.1999
+++ b/usr.sbin/afs/src/ChangeLog.1999
@@ -1049,7 +1049,7 @@ Mon Oct  4 01:58:56 1999  Magnus Ahltorp  <map@stacken.kth.se>
 	* arlad/inter.c (cm_symlink): return the realfid
 
 	* arlad/bsd-subr.c (write_dirent): also handle the case of `..'
- 	refering to a mount-point
+ 	referring to a mount-point
 
 	* tests/readdir-vs-lstat.c (verify_inodes): no need to check for
  	. or ..
diff --git a/usr.sbin/afs/src/lib/cmd/cmd.3 b/usr.sbin/afs/src/lib/cmd/cmd.3
index 2c5d7fef6d6..af0759496a3 100644
--- a/usr.sbin/afs/src/lib/cmd/cmd.3
+++ b/usr.sbin/afs/src/lib/cmd/cmd.3
@@ -257,7 +257,7 @@ manpage when its generated.
 .Xr mdoc 7
 .Sh HISTORY
 First written on CMU. Taken up by Transarc/IBM in their AFS
-product. Reimplmented for Arla since a lot of people missed it. When
+product. Reimplemented for Arla since a lot of people missed it. When
 it got added to arla it also got functionally like generating mdoc
 output.
 .Sh AUTHORS
@@ -268,4 +268,4 @@ Plenty of them.
 .Fn cmd_ParseLine
 and
 .Fn cmd_FreeArgv
-aren't implemented.
+isn't implemented.
diff --git a/usr.sbin/afs/src/rx/rx.c b/usr.sbin/afs/src/rx/rx.c
index 381d7189e3b..83dc803b2fb 100644
--- a/usr.sbin/afs/src/rx/rx.c
+++ b/usr.sbin/afs/src/rx/rx.c
@@ -2063,7 +2063,7 @@ rxi_ReceiveDataPacket(struct rx_call * call,
 	}
 	/*
 	 * If the sequence number is greater than what can be
-         * accomodated by the current window, then send a negative
+         * accommodated by the current window, then send a negative
          * acknowledge and drop the packet
 	 */
 	if ((call->rnext + call->rwind) <= np->header.seq) {
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index dbabc85d037..fb9939d8269 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: config.8,v 1.28 2002/03/23 13:30:24 espie Exp $
+.\"	$OpenBSD: config.8,v 1.29 2002/06/14 21:35:01 todd Exp $
 .\"	$NetBSD: config.8,v 1.10 1996/08/31 20:58:16 mycroft Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -143,7 +143,7 @@ and
 appeared in the specified kernel configuration file.
 In addition,
 .Dq .PROF
-is appended to the default compliation directory name.
+is appended to the default compilation directory name.
 .Pp
 The
 .Fl p
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index fd50958f460..f320a875158 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.26 2002/05/29 09:45:39 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.27 2002/06/14 21:35:01 todd Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $	*/
 
 /*
@@ -345,7 +345,7 @@ defoption(name)
 	(void)do_option(defopttab, &nextdefopt, n, name, "defopt");
 
 	/*
-	 * Insert a verbatum copy of the option name, as well,
+	 * Insert a verbatim copy of the option name, as well,
 	 * to speed lookups when creating the Makefile.
 	 */
 	(void)ht_insert(defopttab, name, (void *)name);
@@ -507,7 +507,7 @@ hasparent(i)
 	 *	    we search its devbase for a matching unit number.
 	 *	(2) If the device was attach to an attribute, then we
 	 *	    search all attributes the device can be attached to
-	 *	    for parents (with appropriate unit numebrs) that
+	 *	    for parents (with appropriate unit numbers) that
 	 *	    may be able to attach the device.
 	 */
 
diff --git a/usr.sbin/cron/do_command.c b/usr.sbin/cron/do_command.c
index e445e95af04..22914ff16bd 100644
--- a/usr.sbin/cron/do_command.c
+++ b/usr.sbin/cron/do_command.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: do_command.c,v 1.13 2002/02/19 18:38:02 mpech Exp $	*/
+/*	$OpenBSD: do_command.c,v 1.14 2002/06/14 21:35:01 todd Exp $	*/
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
  */
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$OpenBSD: do_command.c,v 1.13 2002/02/19 18:38:02 mpech Exp $";
+static char rcsid[] = "$OpenBSD: do_command.c,v 1.14 2002/06/14 21:35:01 todd Exp $";
 #endif
 
 #include "cron.h"
@@ -89,7 +89,7 @@ child_process(entry *e, user *u) {
 
 	/* our parent is watching for our death by catching SIGCHLD.  we
 	 * do not care to watch for our children's deaths this way -- we
-	 * use wait() explictly.  so we have to reset the signal (which
+	 * use wait() explicitly.  so we have to reset the signal (which
 	 * was inherited from the parent).
 	 */
 	(void) signal(SIGCHLD, SIG_DFL);
diff --git a/usr.sbin/cron/entry.c b/usr.sbin/cron/entry.c
index 3b1906a84d5..fceec2a91a6 100644
--- a/usr.sbin/cron/entry.c
+++ b/usr.sbin/cron/entry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: entry.c,v 1.8 2001/02/18 19:48:33 millert Exp $	*/
+/*	$OpenBSD: entry.c,v 1.9 2002/06/14 21:35:01 todd Exp $	*/
 /*
  * Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
@@ -22,7 +22,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$OpenBSD: entry.c,v 1.8 2001/02/18 19:48:33 millert Exp $";
+static char rcsid[] = "$OpenBSD: entry.c,v 1.9 2002/06/14 21:35:01 todd Exp $";
 #endif
 
 /* vix 26jan87 [RCS'd; rest of log is in RCS file]
@@ -232,7 +232,7 @@ load_entry(file, error_func, pw, envp)
 		}
 	}
 
-	/* make sundays equivilent */
+	/* make sundays equivalent */
 	if (bit_test(e->dow, 0) || bit_test(e->dow, 7)) {
 		bit_set(e->dow, 0);
 		bit_set(e->dow, 7);
@@ -515,7 +515,7 @@ get_range(bits, low, high, names, ch, file)
 	/* range. set all elements from num1 to num2, stepping
 	 * by num3.  (the step is a downward-compatible extension
 	 * proposed conceptually by bob@acornrc, syntactically
-	 * designed then implmented by paul vixie).
+	 * designed then implemented by paul vixie).
 	 */
 	for (i = num1;  i <= num2;  i += num3)
 		if (EOF == set_element(bits, low, high, i))
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index bb8efb45782..ddd91e400c2 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pac.c,v 1.14 2002/06/08 01:53:43 millert Exp $ */
+/*	$OpenBSD: pac.c,v 1.15 2002/06/14 21:35:01 todd Exp $ */
 /*	$NetBSD: pac.c,v 1.14 2000/04/27 13:40:18 msaitoh Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)pac.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: pac.c,v 1.14 2002/06/08 01:53:43 millert Exp $";
+static const char rcsid[] = "$OpenBSD: pac.c,v 1.15 2002/06/14 21:35:01 todd Exp $";
 #endif
 #endif /* not lint */
 
@@ -212,7 +212,7 @@ main(int argc, char **argv)
  * Read the entire accounting file, accumulating statistics
  * for the users that we have in the hash table.  If allflag
  * is set, then just gather the facts on everyone.
- * Note that we must accomodate both the active and summary file
+ * Note that we must accommodate both the active and summary file
  * formats here.
  * The Format of the accounting file is:
  *     feet_per_page   [runs_count] [hostname:]username
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c
index 46cf03da97e..ce9250d82fe 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.c
+++ b/usr.sbin/mopd/mopa.out/mopa.out.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: mopa.out.c,v 1.3 2001/02/07 20:17:43 todd Exp $ */
+/*	$OpenBSD: mopa.out.c,v 1.4 2002/06/14 21:35:01 todd Exp $ */
 
 /* mopa.out - Convert a Unix format kernel into something that
  * can be transferred via MOP.
  *
- * This code was written while refering to the NetBSD/vax boot
+ * This code was written while referring to the NetBSD/vax boot
  * loader. Therefore anything that can be booted by the Vax
  * should be convertable with this program.
  *
@@ -48,7 +48,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopa.out.c,v 1.3 2001/02/07 20:17:43 todd Exp $";
+static char rcsid[] = "$OpenBSD: mopa.out.c,v 1.4 2002/06/14 21:35:01 todd Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index 7c040fecf57..47c031b0f34 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Id: mtrace.c,v 1.13 2002/06/02 19:06:39 deraadt Exp $";
+    "@(#) $Id: mtrace.c,v 1.14 2002/06/14 21:35:01 todd Exp $";
 #endif
 
 #include <netdb.h>
@@ -409,7 +409,7 @@ send_recv(dst, type, code, tries, save)
     else local = INADDR_ANY;
 
     /*
-     * If the reply address was not explictly specified, start off
+     * If the reply address was not explicitly specified, start off
      * with the unicast address of this host.  Then, if there is no
      * response after trying half the tries with unicast, switch to
      * the standard multicast reply address.  If the TTL was also not
@@ -1330,7 +1330,7 @@ Usage: mtrace [-Mlnps] [-w wait] [-m max_hops] [-q nqueries] [-g gateway]\n\
     /*
      * SunOS 5.X prior to SunOS 2.6, getsockname returns 0 for udp socket.
      * This call to sysinfo will return the hostname.
-     * If the default multicast interfface (set with the route
+     * If the default multicast interface (set with the route
      * for 224.0.0.0) is not the same as the hostname,
      * mtrace -i [if_addr] will have to be used.
      */
diff --git a/usr.sbin/ppp/ppp/alias_smedia.c b/usr.sbin/ppp/ppp/alias_smedia.c
index adc2ef663eb..b7751372c63 100644
--- a/usr.sbin/ppp/ppp/alias_smedia.c
+++ b/usr.sbin/ppp/ppp/alias_smedia.c
@@ -62,7 +62,7 @@
  *          Junichi SATOH <junichi@astec.co.jp>
  *                        <junichi@junichi.org>
  *
- * $OpenBSD: alias_smedia.c,v 1.4 2001/01/29 11:41:37 brian Exp $
+ * $OpenBSD: alias_smedia.c,v 1.5 2002/06/14 21:35:01 todd Exp $
  */
 
 /*
@@ -402,7 +402,7 @@ AliasHandleRtspOut(struct ip *pip, struct alias_link *link, int maxpacketsize)
     } else {
 
       /* When aliasing a server, check for the 200 reply
-         Accomodate varying number of blanks between 200 & OK */
+         Accommodate varying number of blanks between 200 & OK */
 
       if (dlen >= strlen(str200)) {
 
diff --git a/usr.sbin/ppp/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp/ppp.8.m4
index 5d543f45468..09385853526 100644
--- a/usr.sbin/ppp/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp/ppp.8.m4
@@ -25,7 +25,7 @@ changecom(,)dnl
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ppp.8.m4,v 1.8 2002/05/19 00:00:04 brian Exp $
+.\" $OpenBSD: ppp.8.m4,v 1.9 2002/06/14 21:35:01 todd Exp $
 .\"
 .Dd September 20, 1995
 .Dt PPP 8
@@ -1587,7 +1587,7 @@ is the IP number that your route to
 .Dq ui-gate
 would normally use.
 .Pp
-When routing your connection accross a public network such as the Internet,
+When routing your connection across a public network such as the Internet,
 it is preferable to encrypt the data.
 This can be done with the help of the MPPE protocol, although currently this
 means that you will not be able to also compress the traffic as MPPE is
diff --git a/usr.sbin/ppp/ppp/slcompress.h b/usr.sbin/ppp/ppp/slcompress.h
index 425952ffa56..f7eafaead99 100644
--- a/usr.sbin/ppp/ppp/slcompress.h
+++ b/usr.sbin/ppp/ppp/slcompress.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $OpenBSD: slcompress.h,v 1.3 2000/02/27 01:38:28 brian Exp $
+ * $OpenBSD: slcompress.h,v 1.4 2002/06/14 21:35:01 todd Exp $
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
@@ -42,7 +42,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/usr.sbin/rdate/ntp.c b/usr.sbin/rdate/ntp.c
index 78cf29a7ca0..364f3f98254 100644
--- a/usr.sbin/rdate/ntp.c
+++ b/usr.sbin/rdate/ntp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntp.c,v 1.6 2002/05/16 22:00:37 ho Exp $	*/
+/*	$OpenBSD: ntp.c,v 1.7 2002/06/14 21:35:01 todd Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997 by N.M. Maclaren. All rights reserved.
@@ -205,7 +205,7 @@ sync_ntp(int fd, const struct sockaddr *peer, double *offset, double *error)
 #endif
 
 		if (a > b)
-			errx(1, "Inconsistent times recieved from NTP server");
+			errx(1, "Inconsistent times received from NTP server");
 
 		if (*error <= minerr)
 			break;
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 5bce408160e..e6b8ff1dee6 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.52 2002/06/05 17:12:52 millert Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.53 2002/06/14 21:35:01 todd Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-static char rcsid[] = "$OpenBSD: syslogd.c,v 1.52 2002/06/05 17:12:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: syslogd.c,v 1.53 2002/06/14 21:35:01 todd Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: syslogd.c,v 1.52 2002/06/05 17:12:52 millert Ex
  *
  * Defined Constants:
  *
- * MAXLINE -- the maximimum line length that can be handled.
+ * MAXLINE -- the maximum line length that can be handled.
  * DEFUPRI -- the default priority for user messages
  * DEFSPRI -- the default priority for kernel messages
  *
diff --git a/usr.sbin/user/useradd.8 b/usr.sbin/user/useradd.8
index b2342cd9256..79705b83392 100644
--- a/usr.sbin/user/useradd.8
+++ b/usr.sbin/user/useradd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: useradd.8,v 1.12 2002/03/05 17:30:15 millert Exp $
+.\" $OpenBSD: useradd.8,v 1.13 2002/06/14 21:35:01 todd Exp $
 .\" $NetBSD: useradd.8,v 1.10 2001/02/21 12:16:07 agc Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd Septemper 5, 2001
+.Dd September 5, 2001
 .Dt USERADD 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index 514a0b18cbd..456329da42c 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.11 2001/09/18 01:50:44 millert Exp $
+.\" $OpenBSD: usermod.8,v 1.12 2002/06/14 21:35:01 todd Exp $
 .\" $NetBSD: usermod.8,v 1.10 2001/02/21 12:16:07 agc Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -129,7 +129,7 @@ file - it has the format:
 .It Fl L Ar login-class
 This option sets the login class for the user being created.  See
 .Xr login.conf 5
-for more information on user login classes. Thie value can be preset
+for more information on user login classes. This value can be preset
 for all users by using the
 .Ar class
 field in the
-- 
cgit v1.2.3