adress -> address, and a few more; all from Jonathon Gray;

(mvme68k/mvme88k) vs.c and (vax) if_le.c ok miod@
isakmpd ones ok ho@

27 files changed, 62 insertions, 61 deletions

diff --git a/sys/arch/hp300/dev/acioctl.h b/sys/arch/hp300/dev/acioctl.h
index 1184214c7c9..ac7c7d29bed 100644
--- a/sys/arch/hp300/dev/acioctl.h
+++ b/sys/arch/hp300/dev/acioctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acioctl.h,v 1.3 2003/06/02 23:27:44 millert Exp $	*/
+/*	$OpenBSD: acioctl.h,v 1.4 2003/11/07 10:16:45 jmc Exp $	*/
 /*	$NetBSD: acioctl.h,v 1.2 1994/10/26 07:23:25 cgd Exp $	*/
 
 /*
@@ -51,7 +51,7 @@ struct acinfo {
 };
 
 struct aceltstat {
-	short	eaddr;		/* element adress */
+	short	eaddr;		/* element address */
 	char	type;		/* type of element */
 	char	flags;		/* flags */
 };
diff --git a/sys/arch/hppa/include/psl.h b/sys/arch/hppa/include/psl.h
index 39a8ffd7f2c..ead8676fd41 100644
--- a/sys/arch/hppa/include/psl.h
+++ b/sys/arch/hppa/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.7 2002/10/07 15:32:37 mickey Exp $	*/
+/*	$OpenBSD: psl.h,v 1.8 2003/11/07 10:16:45 jmc Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -93,7 +93,7 @@
 #define	PSL_R	(1 << (31-PSL_R_POS))	/* Recover Counter Enable */
 #define	PSL_Q	(1 << (31-PSL_Q_POS))	/* Interrupt State Collection Enable */
 #define	PSL_P	(1 << (31-PSL_P_POS))	/* Protection Identifier Validation Enable */
-#define	PSL_D	(1 << (31-PSL_D_POS))	/* Data Adress Translation Enable */
+#define	PSL_D	(1 << (31-PSL_D_POS))	/* Data Address Translation Enable */
 #define	PSL_I	(1 << (31-PSL_I_POS))	/* External Interrupt, Power Failure
 					   Interrupt, and Low-Priority Machine
 					   Check Interrupt unmask */
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index 6f9c70c374c..eaa6ba364a0 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.11 2003/11/03 06:54:25 david Exp $ */
+/*	$OpenBSD: vs.c,v 1.12 2003/11/07 10:16:45 jmc Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -934,9 +934,9 @@ vs_build_memory_structure(xs, iopb)
 					    trunc_page(starting_point_virt +
 						MAX_SG_BLOCK_SIZE-1);
 					/* So go back to the beginning of the
-					   last matching page and gererate the
-					   physadress of this location for the
-					   next time. */
+					   last matching page and generate the
+					   physical address of this location
+					   for the next time. */
 					point2_phys = kvtop(point_virt);
 				}
 
diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c
index e3481d15360..e6fe014696b 100644
--- a/sys/arch/mvme88k/ddb/db_interface.c
+++ b/sys/arch/mvme88k/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.30 2003/10/05 22:20:28 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.31 2003/11/07 10:16:45 jmc Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -478,7 +478,7 @@ ddb_break_trap(type, eframe)
 		/*
 		 * back up an instruction and retry the instruction
 		 * at the breakpoint address.  mc88110's exip reg
-		 * already has the adress of the exception instruction.
+		 * already has the address of the exception instruction.
 		 */
 		if (cputyp != CPU_88110) {
 		eframe->sfip = eframe->snip;
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index b87318ce70e..f5e1934faff 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.21 2003/11/03 06:54:26 david Exp $ */
+/*	$OpenBSD: vs.c,v 1.22 2003/11/07 10:16:45 jmc Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -1021,7 +1021,8 @@ vs_build_memory_structure(xs, iopb)
 				if (point_virt - starting_point_virt >= MAX_SG_BLOCK_SIZE) {	       /* We were walking too far for one scatter/gather block ... */
 					assert( MAX_SG_BLOCK_SIZE > PAGE_SIZE );
 					point_virt = trunc_page(starting_point_virt+MAX_SG_BLOCK_SIZE-1);    /* So go back to the beginning of the last matching page */
-					/* and gererate the physadress of this location for the next time. */
+					/* and generate the physical address of
+					 * this location for the next time. */
 					point2_phys = kvtop(point_virt);
 				}
 
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c
index bc03bc341d6..2cd2f047a82 100644
--- a/sys/arch/sparc/dev/p9000.c
+++ b/sys/arch/sparc/dev/p9000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9000.c,v 1.3 2003/06/28 17:05:33 miod Exp $	*/
+/*	$OpenBSD: p9000.c,v 1.4 2003/11/07 10:16:45 jmc Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  *
@@ -164,7 +164,7 @@ struct cfdriver pninek_cd = {
  * register group first.
  *
  * Register groups are 0x80 bytes long (i.e. it is necessary to force a read
- * when writing to an adress which upper 25 bit differ from the previous
+ * when writing to an address which upper 25 bit differ from the previous
  * read or write operation).
  *
  * This is specific to the Tadpole design, and not a limitation of the
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index 776944b8f9d..42dd3afd798 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.24 2003/06/28 17:05:33 miod Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.25 2003/11/07 10:16:45 jmc Exp $	*/
 
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -191,7 +191,7 @@ struct cfdriver pnozz_cd = {
  * register group first.
  *
  * Register groups are 0x80 bytes long (i.e. it is necessary to force a read
- * when writing to an adress which upper 25 bit differ from the previous
+ * when writing to an address which upper 25 bit differ from the previous
  * read or write operation).
  *
  * This is specific to the Tadpole design, and not a limitation of the
diff --git a/sys/arch/vax/boot/boot/if_le.c b/sys/arch/vax/boot/boot/if_le.c
index 2c32d88948c..5d1537d393b 100644
--- a/sys/arch/vax/boot/boot/if_le.c
+++ b/sys/arch/vax/boot/boot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.2 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: if_le.c,v 1.3 2003/11/07 10:16:45 jmc Exp $ */
 /*	$NetBSD: if_le.c,v 1.6 2000/05/20 13:30:03 ragge Exp $ */
 /*
  * Copyright (c) 1997, 1999 Ludd, University of Lule}, Sweden.
@@ -150,7 +150,7 @@ leopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
 		nireg = (void *)0x20084400;
 	} else {
 		*(int *)0x20080014 = 0; /* Be sure we do DMA in low 16MB */
-		ea = (void *)0x20090000; /* XXX ethernetadressen */
+		ea = (void *)0x20090000; /* XXX Ethernet address */
 		nireg = (void *)0x200e0000;
 	}
 	if (askname == 0) /* Override if autoboot */
diff --git a/sys/arch/vax/boot/xxboot/start.S b/sys/arch/vax/boot/xxboot/start.S
index 309b53f308e..ead88591dc4 100644
--- a/sys/arch/vax/boot/xxboot/start.S
+++ b/sys/arch/vax/boot/xxboot/start.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: start.S,v 1.1 2002/06/11 09:36:24 hugh Exp $ */
+/*	$OpenBSD: start.S,v 1.2 2003/11/07 10:16:45 jmc Exp $ */
 /*	$NetBSD: start.S,v 1.1 2002/02/24 01:04:26 matt Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -48,7 +48,7 @@ _C_LABEL(_start):
 _C_LABEL(start):
 	.globl _C_LABEL(start)	# this is the symbolic name for the start
 	.globl _C_LABEL(_start) # of code to be relocated. We can use this
-				# to get the actual/real adress (pc-rel)
+				# to get the actual/real address (pc-rel)
 				# or to get the relocated address (abs).
 
 .org	0x00			# uVAX booted from TK50 starts here
diff --git a/sys/arch/vax/if/if_ze.c b/sys/arch/vax/if/if_ze.c
index cb4b5d7b8f6..c44aa1a3f20 100644
--- a/sys/arch/vax/if/if_ze.c
+++ b/sys/arch/vax/if/if_ze.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ze.c,v 1.4 2002/03/14 01:26:48 millert Exp $	*/
+/*	$OpenBSD: if_ze.c,v 1.5 2003/11/07 10:16:45 jmc Exp $	*/
 /*      $NetBSD: if_ze.c,v 1.3 2000/01/24 02:54:03 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -56,7 +56,7 @@
 #include <arch/vax/if/sgecvar.h>
 
 /*
- * Adresses.
+ * Addresses.
  */
 #define SGECADDR        0x20008000
 #define NISA_ROM        0x20084000
diff --git a/sys/arch/vax/stand/boot/if_le.c b/sys/arch/vax/stand/boot/if_le.c
index 2c32d88948c..5d1537d393b 100644
--- a/sys/arch/vax/stand/boot/if_le.c
+++ b/sys/arch/vax/stand/boot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.2 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: if_le.c,v 1.3 2003/11/07 10:16:45 jmc Exp $ */
 /*	$NetBSD: if_le.c,v 1.6 2000/05/20 13:30:03 ragge Exp $ */
 /*
  * Copyright (c) 1997, 1999 Ludd, University of Lule}, Sweden.
@@ -150,7 +150,7 @@ leopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
 		nireg = (void *)0x20084400;
 	} else {
 		*(int *)0x20080014 = 0; /* Be sure we do DMA in low 16MB */
-		ea = (void *)0x20090000; /* XXX ethernetadressen */
+		ea = (void *)0x20090000; /* XXX Ethernet address */
 		nireg = (void *)0x200e0000;
 	}
 	if (askname == 0) /* Override if autoboot */
diff --git a/sys/arch/vax/stand/xxboot/start.S b/sys/arch/vax/stand/xxboot/start.S
index 309b53f308e..ead88591dc4 100644
--- a/sys/arch/vax/stand/xxboot/start.S
+++ b/sys/arch/vax/stand/xxboot/start.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: start.S,v 1.1 2002/06/11 09:36:24 hugh Exp $ */
+/*	$OpenBSD: start.S,v 1.2 2003/11/07 10:16:45 jmc Exp $ */
 /*	$NetBSD: start.S,v 1.1 2002/02/24 01:04:26 matt Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -48,7 +48,7 @@ _C_LABEL(_start):
 _C_LABEL(start):
 	.globl _C_LABEL(start)	# this is the symbolic name for the start
 	.globl _C_LABEL(_start) # of code to be relocated. We can use this
-				# to get the actual/real adress (pc-rel)
+				# to get the actual/real address (pc-rel)
 				# or to get the relocated address (abs).
 
 .org	0x00			# uVAX booted from TK50 starts here
diff --git a/sys/arch/vax/vax/db_disasm.c b/sys/arch/vax/vax/db_disasm.c
index 648635c76f8..fe8daa402ee 100644
--- a/sys/arch/vax/vax/db_disasm.c
+++ b/sys/arch/vax/vax/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.12 2003/05/10 21:11:14 deraadt Exp $ */
+/*	$OpenBSD: db_disasm.c,v 1.13 2003/11/07 10:16:45 jmc Exp $ */
 /*	$NetBSD: db_disasm.c,v 1.10 1998/04/13 12:10:27 ragge Exp $ */
 /*
  * Copyright (c) 2002, Miodrag Vallat.
@@ -237,7 +237,7 @@ get_operands(ib)
 			add_off(ib, ib->addr);
 			break;
 
-		case 'a':	/* absolute adressing mode */
+		case 'a':	/* absolute addressing mode */
 			aa = 1;
 			/* FALLTHROUGH */
 
diff --git a/sys/arch/vax/vax/db_disasm.h b/sys/arch/vax/vax/db_disasm.h
index f37ff38bcaa..e8e6dbdb292 100644
--- a/sys/arch/vax/vax/db_disasm.h
+++ b/sys/arch/vax/vax/db_disasm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.h,v 1.3 2002/05/16 07:37:44 miod Exp $ */
+/*	$OpenBSD: db_disasm.h,v 1.4 2003/11/07 10:16:45 jmc Exp $ */
 /*	$NetBSD: db_disasm.h,v 1.1 1996/01/28 11:31:27 ragge Exp $ */
 /*
  * Copyright (c) 2002, Miodrag Vallat.
@@ -63,7 +63,7 @@
  *	w: operand is written only
  *	m: operand is modified (both R and W)
  *	b: no operand reference. Branch displacement is specified. 
- *	a: calculate the adress of the specified operand
+ *	a: calculate the address of the specified operand
  *	v: if not "Rn", same as a. If "RN," R[n+1]R[n]
  * Arguments (Data-Types):
  *	b: Byte
diff --git a/sys/arch/vax/vax/intvec.s b/sys/arch/vax/vax/intvec.s
index f9f37766c09..cd0e19e8e09 100644
--- a/sys/arch/vax/vax/intvec.s
+++ b/sys/arch/vax/vax/intvec.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intvec.s,v 1.16 2003/11/06 21:09:35 mickey Exp $   */
+/*	$OpenBSD: intvec.s,v 1.17 2003/11/07 10:16:45 jmc Exp $   */
 /*	$NetBSD: intvec.s,v 1.39 1999/06/28 08:20:48 itojun Exp $   */
 
 /*
@@ -189,7 +189,7 @@ L4:	addl2	(sp)+,sp	# remove info pushed on stack
 	brb	2f
 
 3:	mtpr	$0xF,$PR_MCESR	# clear the bus error bit
-2:	movl	_memtest,(sp)	# REI to new adress
+2:	movl	_memtest,(sp)	# REI to new address
 	rei
 
 	TRAPCALL(invkstk, T_KSPNOTVAL)
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index bb9d0d30052..b10ece186df 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.68 2003/06/26 13:06:26 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.69 2003/11/07 10:16:45 jmc Exp $ */
 /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $	 */
 
 /*
@@ -872,7 +872,7 @@ skip_opcode(ib)
 			}
 			break;
 
-		case 'a':	/* absolute adressing mode */
+		case 'a':	/* absolute addressing mode */
 			/* FALLTHROUGH */
 		default:
 			switch (*(++argp)) {
diff --git a/sys/arch/vax/vax/subr.s b/sys/arch/vax/vax/subr.s
index 6ffa5a25556..89d6e993326 100644
--- a/sys/arch/vax/vax/subr.s
+++ b/sys/arch/vax/vax/subr.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr.s,v 1.18 2003/01/09 22:27:11 miod Exp $     */
+/*	$OpenBSD: subr.s,v 1.19 2003/11/07 10:16:45 jmc Exp $     */
 /*	$NetBSD: subr.s,v 1.32 1999/03/25 00:41:48 mrg Exp $	   */
 
 /*
@@ -315,7 +315,7 @@ xxd:
 	addl3	r0,$IFTRAP,pcbtrap	# Save for copy* functions.
 
 #
-# Nice routine to get physical from virtual adresses.
+# Nice routine to get physical from virtual addresses.
 #
 	extzv	$9,$21,r0,r1		# extract offset
 	movl	*_Sysmap[r1],r2		# get pte
diff --git a/sys/arch/vax/vsa/hdc9224.h b/sys/arch/vax/vsa/hdc9224.h
index 7fcaa7bdd98..4ec22fef206 100644
--- a/sys/arch/vax/vsa/hdc9224.h
+++ b/sys/arch/vax/vsa/hdc9224.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hdc9224.h,v 1.1 1996/07/20 18:55:12 ragge Exp $ */
-/*	$OpenBSD: hdc9224.h,v 1.4 2003/11/03 07:06:17 david Exp $ */
+/*	$OpenBSD: hdc9224.h,v 1.5 2003/11/07 10:16:45 jmc Exp $ */
 
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -103,9 +103,9 @@ struct hdc9224_DKCreg {
  * the Disk-Register-Data-Access-Port DKC_REG
  */
 struct hdc9224_UDCreg { /* internal disk controller registers */
-	u_char udc_dma7;	/*  0: DMA adress bits	0 -  7 */
-	u_char udc_dma15;	/*  1: DMA adress bits	8 - 15 */
-	u_char udc_dma23;	/*  2: DMA adress bits 16 - 23 */
+	u_char udc_dma7;	/*  0: DMA address bits	0 -  7 */
+	u_char udc_dma15;	/*  1: DMA address bits	8 - 15 */
+	u_char udc_dma23;	/*  2: DMA address bits 16 - 23 */
 	u_char udc_dsect;	/*  3: desired/starting sector number */
 #define udc_csect udc_dsect	/*     current sector number */
 	u_char udc_dhead;	/*  4: cyl-bits 8-10, desired head number */
diff --git a/sys/arch/vax/vsa/if_ze_vsbus.c b/sys/arch/vax/vsa/if_ze_vsbus.c
index 34d6ccb6156..66fd54b3563 100644
--- a/sys/arch/vax/vsa/if_ze_vsbus.c
+++ b/sys/arch/vax/vsa/if_ze_vsbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ze_vsbus.c,v 1.2 2001/08/25 13:33:37 hugh Exp $	*/
+/*	$OpenBSD: if_ze_vsbus.c,v 1.3 2003/11/07 10:16:45 jmc Exp $	*/
 /*      $NetBSD: if_ze_vsbus.c,v 1.5 2000/07/26 21:50:49 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -57,7 +57,7 @@
 #include <arch/vax/if/sgecvar.h>
 
 /*
- * Adresses.
+ * Addresses.
  */
 #define SGECADDR        0x20008000
 #define NISA_ROM        0x27800000
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index d037d884724..7537fe7b8c4 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ed.c,v 1.50 2002/06/03 20:01:37 deraadt Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.51 2003/11/07 10:16:45 jmc Exp $	*/
 /*	$NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $	*/
 
 /*
@@ -316,7 +316,7 @@ struct pcmciadevs pcmcia_ed_devs[]={
       { "ed", 0, "Ethernet", "Adapter", "2.0", NULL, (void *) -1,
 	(void *)&pcmcia_dlink },
 #if 0
-      /* not quite right for ethernet adress */
+      /* not quite right for ethernet address */
       { "ed", 0, "PMX   ", "PE-200", "ETHERNET", "R01", (void *)-1,
         (void *)&pcmcia_dlink },
 #endif
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 9cc2f7fe1e9..1ba109d538c 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emuxki.c,v 1.14 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: emuxki.c,v 1.15 2003/11/07 10:16:45 jmc Exp $	*/
 /*	$NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $	*/
 
 /*-
@@ -1639,7 +1639,7 @@ emuxki_open(void *addr, int flags)
 	/*
 	 * I did this because i have problems identifying the selected
 	 * recording source(s) which is necessary when setting recording
-	 * params This will be adressed very soon
+	 * params. This will be addressed very soon.
 	 */
 	if (flags & AUOPEN_READ)
 		return (EOPNOTSUPP);
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index edb0b51b323..7b5368878e3 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr.c,v 1.67 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: ncr.c,v 1.68 2003/11/07 10:16:45 jmc Exp $	*/
 /*	$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $	*/
 
 /**************************************************************************
@@ -1466,7 +1466,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$OpenBSD: ncr.c,v 1.67 2003/04/27 11:22:53 ho Exp $\n";
+	"\n$OpenBSD: ncr.c,v 1.68 2003/11/07 10:16:45 jmc Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -5902,7 +5902,7 @@ static void ncr_timeout (void *arg)
 **		scntl3:	(see the manual)
 **
 **	current script command:
-**		dsp:	script adress (relative to start of script).
+**		dsp:	script address (relative to start of script).
 **		dbc:	first word of script command.
 **
 **	First 16 register of the chip:
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 797daf25efb..01c1e9ca130 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.148 2003/10/31 04:11:41 drahn Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.149 2003/11/07 10:16:45 jmc Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -2842,7 +2842,7 @@ cmd_chip_map(sc, pa)
 	pcireg_t interface = PCI_INTERFACE(pa->pa_class);
 	/*
  	 * For a CMD PCI064x, the use of PCI_COMMAND_IO_ENABLE
-	 * and base adresses registers can be disabled at
+	 * and base address registers can be disabled at
  	 * hardware level. In this case, the device is wired
 	 * in compat mode and its first channel is always enabled,
 	 * but we can't rely on PCI_COMMAND_IO_ENABLE.
@@ -2897,7 +2897,7 @@ cmd0643_9_chip_map(sc, pa)
 
 	/*
 	 * For a CMD PCI064x, the use of PCI_COMMAND_IO_ENABLE
-	 * and base adresses registers can be disabled at
+	 * and base address registers can be disabled at
 	 * hardware level. In this case, the device is wired
 	 * in compat mode and its first channel is always enabled,
  	 * but we can't rely on PCI_COMMAND_IO_ENABLE.
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index b6a3d8ec95d..e09cc0c52bd 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.h,v 1.6 2002/04/03 20:35:58 angelos Exp $ */
+/*      $OpenBSD: if_gre.h,v 1.7 2003/11/07 10:16:46 jmc Exp $ */
 /*	$NetBSD: if_gre.h,v 1.5 1999/11/19 20:41:19 thorpej Exp $ */
 
 /*
@@ -101,7 +101,7 @@ struct greip {
  */
 
 struct gre_sre {
-	u_int16_t sre_family;	/* adress family */
+	u_int16_t sre_family;	/* address family */
 	u_char  sre_offset;	/* offset to first octet of active entry */
 	u_char  sre_length;	/* number of octets in the SRE. 
                                sre_lengthl==0 -> last entry. */
diff --git a/sys/net/if_token.h b/sys/net/if_token.h
index 820c847645e..666cc45fb1d 100644
--- a/sys/net/if_token.h
+++ b/sys/net/if_token.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_token.h,v 1.4 2003/06/02 23:28:12 millert Exp $	*/
+/*	$OpenBSD: if_token.h,v 1.5 2003/11/07 10:16:46 jmc Exp $	*/
 /*	$NetBSD: if_token.h,v 1.6 1999/11/19 20:41:19 thorpej Exp $	*/
 
 /*
@@ -53,7 +53,7 @@ struct token_rif {
 	u_int16_t tr_rdf[TOKEN_MAX_BRIDGE];	/* route-designator fields */
 } __attribute__((__packed__));
 
-/* standard values for adress control and frame control field */
+/* standard values for address control and frame control field */
 #define TOKEN_AC		0x10
 #define TOKEN_FC		0x40
 
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index bc297d4fa2e..d703e4b8f7c 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: at_control.c,v 1.5 2003/09/02 16:57:29 tedu Exp $	*/
+/*	$OpenBSD: at_control.c,v 1.6 2003/11/07 10:16:46 jmc Exp $	*/
 
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -552,7 +552,7 @@ at_broadcast( sat )
  * between the two addresses, makes it's transition
  * Each of the upper and lower ranges might not exist, or might be 
  * representable by 1 or more netmasks. In addition, if both
- * ranges can be represented by the same netmask, then teh can be merged
+ * ranges can be represented by the same netmask, then they can be merged
  * by using the next higher netmask..
  */
 
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 1aec46b32f7..6736c67350e 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.72 2003/07/30 16:57:54 tedu Exp $	*/
+/*	$OpenBSD: cd.c,v 1.73 2003/11/07 10:16:46 jmc Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -774,8 +774,8 @@ cdwrite(dev, uio, ioflag)
 }
 
 /*
- * conversion between minute-seconde-frame and logical block adress
- * adresses format
+ * conversion between minute-seconde-frame and logical block address
+ * addresses format
  */
 void
 lba2msf (lba, m, s, f)