Typos grab bag of the month, eyeballed by jmc@

25 files changed, 61 insertions, 61 deletions

diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index fddd1a7251d..19fa7cd7c62 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.45 2006/02/07 07:59:22 martin Exp $ */
+/* $OpenBSD: pmap.c,v 1.46 2006/03/04 19:33:19 miod Exp $ */
 /* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
 
 /*-
@@ -312,9 +312,9 @@ const char *pmap_pgu_strings[] = PGU_STRINGS;
  *	  by process A.  *poof*
  *
  * In the scenario above, in addition to the processor using using incorrect
- * TLB entires, the PALcode might use incorrect information to service a
+ * TLB entries, the PALcode might use incorrect information to service a
  * TLB miss.  (The PALcode uses the recursively mapped Virtual Page Table
- * to locate the PTE for a faulting address, and tagged TLB entires exist
+ * to locate the PTE for a faulting address, and tagged TLB entries exist
  * for the Virtual Page Table addresses in order to speed up this procedure,
  * as well.)
  *
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index 21839b95fff..fbe76157fee 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.6 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.7 2006/03/04 19:33:20 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -82,7 +82,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	char *msg = NULL, *cp;
 	int dospartoff, cyl, i, ourpart = -1;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secpercyl == 0) {
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index 87d51d9fbba..3efd3f0e4d1 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.6 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.7 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -81,7 +81,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	char *msg = NULL, *cp;
 	int dospartoff, cyl, i, ourpart = -1;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secpercyl == 0) {
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 6e41f509111..2b350ea8c8a 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.21 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.22 2006/03/04 19:33:21 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -243,7 +243,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	int i;
 	struct disklabel minilabel, fallbacklabel;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secperunit == 0)
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index fcbe7c5044f..6653569d70f 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.4 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.5 2006/03/04 19:33:21 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -243,7 +243,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	int i;
 	struct disklabel minilabel, fallbacklabel;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secperunit == 0)
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 3926fb03fcc..ee7f723f2c7 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.47 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.48 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -82,7 +82,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	char *msg = NULL, *cp;
 	int dospartoff, cyl, i, ourpart = -1;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secpercyl == 0) {
diff --git a/sys/arch/luna88k/dev/omrasops.c b/sys/arch/luna88k/dev/omrasops.c
index f9777c933dc..d8adf5890de 100644
--- a/sys/arch/luna88k/dev/omrasops.c
+++ b/sys/arch/luna88k/dev/omrasops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omrasops.c,v 1.1 2004/04/21 15:23:55 aoyama Exp $ */
+/* $OpenBSD: omrasops.c,v 1.2 2006/03/04 19:33:21 miod Exp $ */
 /* $NetBSD: omrasops.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
 
 /*-
@@ -41,7 +41,7 @@
  * Designed speficically for 'm68k bitorder';
  *	- most significant byte is stored at lower address,
  *	- most significant bit is displayed at left most on screen.
- * Implementation relys on;
+ * Implementation relies on;
  *	- every memory references is done in aligned 32bit chunk,
  *	- font glyphs are stored in 32bit padded.
  */
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 0b7676d496d..fcd243db339 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.14 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.15 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -84,7 +84,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 	struct part_map_entry *part;
 
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secperunit == 0)
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index 536eeaad725..1284ae3a8c9 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.10 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.11 2006/03/04 19:33:21 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -250,7 +250,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	int i;
 	struct disklabel minilabel, fallbacklabel;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secperunit == 0)
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c
index 6005ffd2fc5..eed49306e4d 100644
--- a/sys/arch/mips64/mips64/interrupt.c
+++ b/sys/arch/mips64/mips64/interrupt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interrupt.c,v 1.19 2005/12/20 06:57:52 miod Exp $ */
+/*	$OpenBSD: interrupt.c,v 1.20 2006/03/04 19:33:21 miod Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -81,7 +81,7 @@ int netisr;
 
 /*
  *  Modern versions of MIPS processors have extended interrupt
- *  capabilites. How these are handeled differs from implementation
+ *  capabilities. How these are handled differs from implementation
  *  to implementation. This code tries to hide away some of these
  *  in "higher level" interrupt code.
  *
@@ -96,7 +96,7 @@ int netisr;
  *
  *  The interrupt mechanism in this port uses a delayed masking model
  *  where interrupts are not really masked when doing an spl(). Instead
- *  a masked interrupt will be taken and validiated in the various
+ *  a masked interrupt will be taken and validated in the various
  *  handlers. If the handler finds that an interrupt is masked it will
  *  register this interrupt as pending and return a new mask to this
  *  code that will turn off the interrupt hardware wise. Later when
@@ -113,13 +113,13 @@ int netisr;
  *  in the RM7000. IPL12 extra timer is currently not used.
  *
  *  irq's maps into the software spl register to the bit corresponding
- *  to it's status/mask bit in the cause/sr register shifted right eight
+ *  to its status/mask bit in the cause/sr register shifted right eight
  *  places.
  *
  *  A well designed system uses the CPUs interrupt inputs in a way, such
  *  that masking can be done according to the IPL in the CPU status and
- *  interrupt vontrol register. However support for an external masking
- *  register is provided but will case a slightly higher overhead when
+ *  interrupt control register. However support for an external masking
+ *  register is provided but will cause a slightly higher overhead when
  *  used. When an external masking register is used, no masking in the
  *  CPU is done. Instead a fixed mask is set and used throughout.
  */
@@ -128,7 +128,7 @@ void interrupt (struct trap_frame *);
 void softintr (void);
 
 /*
- * Handle an interrupt. Both kernel and user mode is handeled here.
+ * Handle an interrupt. Both kernel and user mode is handled here.
  *
  * The interrupt handler is called with the CR_INT bits set that
  * was given when the handlers was registred that needs servicing.
diff --git a/sys/arch/mips64/mips64/sendsig.c b/sys/arch/mips64/mips64/sendsig.c
index 326abbc652d..698697f2aad 100644
--- a/sys/arch/mips64/mips64/sendsig.c
+++ b/sys/arch/mips64/mips64/sendsig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sendsig.c,v 1.8 2005/12/20 06:58:19 miod Exp $ */
+/*	$OpenBSD: sendsig.c,v 1.9 2006/03/04 19:33:21 miod Exp $ */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -210,7 +210,7 @@ bail:
  * Return to previous pc and psl as specified by
  * context left by sendsig. Check carefully to
  * make sure that the user has not modified the
- * psl to gain improper priviledges or to cause
+ * psl to gain improper privileges or to cause
  * a machine fault.
  */
 /* ARGSUSED */
diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S
index 13efe4d25e8..cedf1938507 100644
--- a/sys/arch/mips64/mips64/tlbhandler.S
+++ b/sys/arch/mips64/mips64/tlbhandler.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tlbhandler.S,v 1.12 2005/12/20 07:06:26 miod Exp $ */
+/*	$OpenBSD: tlbhandler.S,v 1.13 2006/03/04 19:33:21 miod Exp $ */
 
 /*
  * Copyright (c) 1995-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -179,7 +179,7 @@ tlb_miss_nopt:
 	.set	at
 
 /*
- * Trampolines copied to exception vectors when code is to big.
+ * Trampolines copied to exception vectors when code is too big.
  */
 	.globl	tlb_miss_tramp
 tlb_miss_tramp:
@@ -464,7 +464,7 @@ LEAF(tlb_flush_addr, 0)
 	mtc0	v0, COP_0_STATUS_REG	# Disable interrupts
 	ITLBNOPFIX
 	li	v0, (PG_HVPN | PG_ASID)
-	and	a0, a0, v0		# Make shure valid hi value.
+	and	a0, a0, v0		# Make sure valid hi value.
 	dmfc0	ta0, COP_0_TLB_HI	# Get current PID
 	dmtc0	a0, COP_0_TLB_HI	# look for addr & PID
 	nop
@@ -582,9 +582,9 @@ LEAF(tlb_update, 0)
 	nop
 	li	v0, 0
 
-4:					# Make shure pipeline
+4:					# Make sure pipeline
 	nop				# advances before we
-	nop				# uses the tlb.
+	nop				# use the tlb.
 	dmtc0	ta0, COP_0_TLB_HI	# restore PID
 	mtc0	v1, COP_0_STATUS_REG	# Restore the status register
 	ITLBNOPFIX
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index da0ea10300f..f6a3ca3b2ba 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.10 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.11 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -85,7 +85,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	char *msg = NULL, *cp;
 	int dospartoff, cyl, i, ourpart = -1;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secperunit == 0)
diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c
index 983e0a4dded..a236b85ea00 100644
--- a/sys/arch/sparc64/sparc64/disksubr.c
+++ b/sys/arch/sparc64/sparc64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.15 2005/12/22 02:51:25 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.16 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */
 
 /*
@@ -90,7 +90,7 @@ readdisklabel(dev, strat, lp, clp, spoofonly)
 	struct sun_disklabel *slp;
 	int error, i;
 
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secsize < DEV_BSIZE)
 		lp->d_secsize = DEV_BSIZE;
 	if (lp->d_secperunit == 0)
diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c
index fc1ded254fb..9f1e1afc10e 100644
--- a/sys/arch/sparc64/stand/ofwboot/ofdev.c
+++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdev.c,v 1.6 2003/05/13 01:48:55 jason Exp $	*/
+/*	$OpenBSD: ofdev.c,v 1.7 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $	*/
 
 /*
@@ -344,7 +344,7 @@ search_label(devp, off, buf, lp, off0)
 	struct sun_disklabel *slp;
 	int error;
 	
-	/* minimal requirements for archtypal disk label */
+	/* minimal requirements for archetypal disk label */
 	if (lp->d_secperunit == 0)
 		lp->d_secperunit = 0x1fffffff;
 	lp->d_npartitions = 1;
diff --git a/sys/arch/vax/include/ka48.h b/sys/arch/vax/include/ka48.h
index 2da6beba2d2..fc38726d75e 100644
--- a/sys/arch/vax/include/ka48.h
+++ b/sys/arch/vax/include/ka48.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka48.h,v 1.2 2001/02/25 15:55:28 hugh Exp $	*/
+/*	$OpenBSD: ka48.h,v 1.3 2006/03/04 19:33:21 miod Exp $	*/
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -56,7 +56,7 @@
 
 /* From OpenVMS $IO440DEF & $KA440DEF */
 #define	KA48_PARCTL	0x20080014
-#define	KA48_PARCTL_CPEN	0x00000001	/* CPU Parity Eanble? */
+#define	KA48_PARCTL_CPEN	0x00000001	/* CPU Parity Enable? */
 #define	KA48_PARCTL_NPEN	0x00000100	/* ?? Parity Enable */
 #define	KA48_PARCTL_INVENA	0x01000000	/* Invalid ? Enable */
 #define	KA48_PARCTL_AGS		0x02000000	/* ??? */
diff --git a/sys/arch/vax/include/sid.h b/sys/arch/vax/include/sid.h
index f60e42a0a1c..5e4d0657076 100644
--- a/sys/arch/vax/include/sid.h
+++ b/sys/arch/vax/include/sid.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sid.h,v 1.13 2002/05/25 04:29:53 hugh Exp $	*/
+/*	$OpenBSD: sid.h,v 1.14 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: sid.h,v 1.12 1999/12/11 17:55:13 ragge Exp $	*/
 
 /*
@@ -32,9 +32,9 @@
  */
 
 /*
- * Board-Type (?_BTYP_?) and Sub-Type (?_STYP_?) are synonima.
+ * Board-Type (?_BTYP_?) and Sub-Type (?_STYP_?) are synonyms.
  * Michael Kukat changed this 01/27/2001, STYP is relly a subtype now.
- * other synonima are:
+ * other synonyms are:
  */
 #define cpudata	    vax_cpudata
 #define cputype	    vax_cputype
diff --git a/sys/compat/osf1/osf1_mmap.c b/sys/compat/osf1/osf1_mmap.c
index c42ff6eaf4a..d480b06d420 100644
--- a/sys/compat/osf1/osf1_mmap.c
+++ b/sys/compat/osf1/osf1_mmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: osf1_mmap.c,v 1.5 2001/11/07 01:18:00 art Exp $ */
+/* $OpenBSD: osf1_mmap.c,v 1.6 2006/03/04 19:33:21 miod Exp $ */
 /* $NetBSD: osf1_mmap.c,v 1.5 2000/04/11 05:26:27 chs Exp $ */
 
 /*
@@ -142,7 +142,7 @@ osf1_sys_mmap(p, v, retval)
 	 *
 	 * The OSF/1 mmap() function attempts to map non-fixed entries
 	 * near the address that the user specified.  Therefore, for
-	 * non-fixed entires we try to find space in the address space
+	 * non-fixed entries we try to find space in the address space
 	 * starting at that address.  If the user specified zero, we
 	 * start looking at at least NBPG, so that programs can't
 	 * accidentally live through deferencing NULL.
diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h
index 584f9e27492..053df04bdb8 100644
--- a/sys/dev/ic/aic7xxxvar.h
+++ b/sys/dev/ic/aic7xxxvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxxvar.h,v 1.21 2005/12/28 03:00:07 krw Exp $	*/
+/*	$OpenBSD: aic7xxxvar.h,v 1.22 2006/03/04 19:33:21 miod Exp $	*/
 /*
  * Core definitions and data structures shareable across OS platforms.
  *
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxxvar.h,v 1.21 2005/12/28 03:00:07 krw Exp $
+ * $Id: aic7xxxvar.h,v 1.22 2006/03/04 19:33:21 miod Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $
  */
@@ -1022,7 +1022,7 @@ struct ahc_softc {
 
 	/*
 	 * Device instance currently on the bus awaiting a continue TIO
-	 * for a command that was not given the disconnect priviledge.
+	 * for a command that was not given the disconnect privilege.
 	 */
 	struct ahc_tmode_lstate  *pending_device;
 
diff --git a/sys/dev/isa/if_edreg.h b/sys/dev/isa/if_edreg.h
index 603a5f8eca2..42c9b544b9f 100644
--- a/sys/dev/isa/if_edreg.h
+++ b/sys/dev/isa/if_edreg.h
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_edreg.h,v 1.6 2002/06/03 20:01:37 deraadt Exp $      */
+/*    $OpenBSD: if_edreg.h,v 1.7 2006/03/04 19:33:21 miod Exp $      */
 /*    $NetBSD: if_edreg.h,v 1.15 1996/01/10 16:49:22 chuck Exp $      */
 
 /*
@@ -180,7 +180,7 @@
 
 /*
  * General Control Register (GCR)
- * Eanbled with SWH bit == 1 in HWR register
+ * Enabled with SWH bit == 1 in HWR register
  */
 #define	ED_WD790_GCR	0x0d
 
diff --git a/sys/dev/isa/if_wereg.h b/sys/dev/isa/if_wereg.h
index e5b64024821..6cfa4c27d52 100644
--- a/sys/dev/isa/if_wereg.h
+++ b/sys/dev/isa/if_wereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wereg.h,v 1.2 2002/06/03 20:01:37 deraadt Exp $	*/
+/*	$OpenBSD: if_wereg.h,v 1.3 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: if_wereg.h,v 1.1 1997/11/03 21:22:50 thorpej Exp $	*/
 
 /*
@@ -163,7 +163,7 @@
 
 /*
  * General Control Register (GCR)
- * Eanbled with SWH bit == 1 in HWR register
+ * Enabled with SWH bit == 1 in HWR register
  */
 #define	WE790_GCR	0x0d
 
diff --git a/sys/dev/pci/alipm.c b/sys/dev/pci/alipm.c
index ef362351b88..4a6446bfafa 100644
--- a/sys/dev/pci/alipm.c
+++ b/sys/dev/pci/alipm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alipm.c,v 1.8 2006/02/26 20:39:16 kettenis Exp $	*/
+/*	$OpenBSD: alipm.c,v 1.9 2006/03/04 19:33:21 miod Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -39,7 +39,7 @@
 
 /* PCI configuration registers. */
 #define ALIPM_CONF	0xd0		/* general configuration */
-#define ALIPM_CONF_SMBEN	0x0400		/* emanble SMBus */
+#define ALIPM_CONF_SMBEN	0x0400		/* enable SMBus */
 #define ALIPM_BASE	0xe0		/* ACPI and SMBus base address */
 #define ALIPM_SMB_HOSTC	0xf0		/* host configuration */
 #define ALIPM_SMB_HOSTC_HSTEN	0x00000001	/* enable host controller */
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index ead1aa8cebf..e7105ce0709 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_pty.c,v 1.32 2006/01/18 23:42:12 miod Exp $	*/
+/*	$OpenBSD: tty_pty.c,v 1.33 2006/03/04 19:33:21 miod Exp $	*/
 /*	$NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $	*/
 
 /*
@@ -811,7 +811,7 @@ ptyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		    }
 #endif
 			/*
-			 * We aviod calling ttioctl on the controller since,
+			 * We avoid calling ttioctl on the controller since,
 			 * in that case, tp must be the controlling terminal.
 			 */
 			*(int *)data = tp->t_pgrp ? tp->t_pgrp->pg_id : 0;
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 750429f9418..1ac999d766d 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.104 2006/01/21 12:18:49 miod Exp $	*/
+/*	$OpenBSD: cd.c,v 1.105 2006/03/04 19:33:22 miod Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -697,7 +697,7 @@ cdminphys(bp)
 	 *
 	 * XXX Note that the SCSI-I spec says that 256-block transfers
 	 * are allowed in a 6-byte read/write, and are specified
-	 * by settng the "length" to 0.  However, we're conservative
+	 * by setting the "length" to 0.  However, we're conservative
 	 * here, allowing only 255-block transfers in case an
 	 * ancient device gets confused by length == 0.  A length of 0
 	 * in a 10-byte read/write actually means 0 blocks.
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index c2c13b249ea..b53941b688b 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.101 2006/01/21 12:18:49 miod Exp $	*/
+/*	$OpenBSD: sd.c,v 1.102 2006/03/04 19:33:22 miod Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -764,7 +764,7 @@ sdminphys(bp)
 	 *
 	 * XXX Note that the SCSI-I spec says that 256-block transfers
 	 * are allowed in a 6-byte read/write, and are specified
-	 * by settng the "length" to 0.  However, we're conservative
+	 * by setting the "length" to 0.  However, we're conservative
 	 * here, allowing only 255-block transfers in case an
 	 * ancient device gets confused by length == 0.  A length of 0
 	 * in a 10-byte read/write actually means 0 blocks.