seperate -> separate, okay aaron@

51 files changed, 115 insertions, 115 deletions

diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index a1866a433e3..3acc348d900 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -62,7 +62,7 @@ static char rcsid[] = "$NetBSD: strfile.c,v 1.4 1995/04/24 12:23:09 cgd Exp $";
 # endif	/* MAXPATHLEN */
 
 /*
- *	This program takes a file composed of strings seperated by
+ *	This program takes a file composed of strings separated by
  * lines starting with two consecutive delimiting character (default
  * character is '%') and creates another file which consists of a table
  * describing the file (structure from "strfile.h"), a table of seek
diff --git a/games/monop/initdeck.c b/games/monop/initdeck.c
index 0201660691f..b33f13276ca 100644
--- a/games/monop/initdeck.c
+++ b/games/monop/initdeck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: initdeck.c,v 1.7 2000/06/30 16:00:04 millert Exp $	*/
+/*	$OpenBSD: initdeck.c,v 1.8 2000/11/10 15:33:03 provos Exp $	*/
 /*	$NetBSD: initdeck.c,v 1.3 1995/03/23 08:34:43 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)initdeck.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: initdeck.c,v 1.7 2000/06/30 16:00:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: initdeck.c,v 1.8 2000/11/10 15:33:03 provos Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,8 +57,8 @@ static char rcsid[] = "$OpenBSD: initdeck.c,v 1.7 2000/06/30 16:00:04 millert Ex
 /*
  *	This program initializes the card files for monopoly.
  * It reads in a data file with Com. Chest cards, followed by
- * the Chance card.  The two are seperated by a line of "%-".
- * All other cards are seperated by lines of "%%".  In the front
+ * the Chance card.  The two are separated by a line of "%-".
+ * All other cards are separated by lines of "%%".  In the front
  * of the file is the data for the decks in the same order.
  * This includes the seek pointer for the start of each card.
  * All cards start with their execution code, followed by the
diff --git a/kerberosIV/src/appl/telnet/telnet/telnet.c b/kerberosIV/src/appl/telnet/telnet/telnet.c
index 77bbf8cc560..1bda0caf3ef 100644
--- a/kerberosIV/src/appl/telnet/telnet/telnet.c
+++ b/kerberosIV/src/appl/telnet/telnet/telnet.c
@@ -500,7 +500,7 @@ dontoption(int option)
 
 /*
  * Given a buffer returned by tgetent(), this routine will turn
- * the pipe seperated list of names in the buffer into an array
+ * the pipe separated list of names in the buffer into an array
  * of pointers to null terminated names.  We toss out any bad,
  * duplicate, or verbose names (names with spaces).
  */
diff --git a/kerberosIV/src/appl/telnet/telnetd/termstat.c b/kerberosIV/src/appl/telnet/telnetd/termstat.c
index 9399cd4cf67..9c638a2602d 100644
--- a/kerberosIV/src/appl/telnet/telnetd/termstat.c
+++ b/kerberosIV/src/appl/telnet/telnetd/termstat.c
@@ -119,7 +119,7 @@ clientstat(int code, int parm1, int parm2)
 	    /*
 	     * Change terminal speed as requested by client.
 	     * We set the receive speed first, so that if we can't
-	     * store seperate receive and transmit speeds, the transmit
+	     * store separate receive and transmit speeds, the transmit
 	     * speed will take precedence.
 	     */
 	    tty_rspeed(parm2);
diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c
index 14e91368760..e7fa4f564ad 100644
--- a/lib/libc/gen/login_cap.c
+++ b/lib/libc/gen/login_cap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_cap.c,v 1.3 2000/09/16 18:06:01 millert Exp $	*/
+/*	$OpenBSD: login_cap.c,v 1.4 2000/11/10 15:33:03 provos Exp $	*/
 
 /*-
  * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -699,7 +699,7 @@ setuserpath(lc, home)
  *	6) A number followed by a g (mult by 1024 * 1024 * 1024).
  *	7) A number followed by a t (mult by 1024 * 1024 * 1024 * 1024).
  *	8) Two or more numbers (with/without k,b,m,g, or t).
- *	   seperated by x (also * for backwards compatibility), specifying
+ *	   separated by x (also * for backwards compatibility), specifying
  *	   the product of the indicated values.
  */
 static
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c
index ac75a4babb9..bba8cfaad16 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_init.c,v 1.19 2000/06/22 07:31:18 itojun Exp $	*/
+/*	$OpenBSD: res_init.c,v 1.20 2000/11/10 15:33:04 provos Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -64,7 +64,7 @@
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.19 2000/06/22 07:31:18 itojun Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.20 2000/11/10 15:33:04 provos Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -104,7 +104,7 @@ static char rcsid[] = "$OpenBSD: res_init.c,v 1.19 2000/06/22 07:31:18 itojun Ex
  *   "search" property.
  * - The sortlist comprised of IP address netmask pairs are stored as
  *   values of the "sortlist" property. The IP address and optional netmask
- *   should be seperated by a slash (/) or ampersand (&) character.
+ *   should be separated by a slash (/) or ampersand (&) character.
  * - Internal resolver variables can be set from the value of the "options"
  *   property.
  */
diff --git a/libexec/telnetd/termstat.c b/libexec/telnetd/termstat.c
index b196114e606..fde657b5d49 100644
--- a/libexec/telnetd/termstat.c
+++ b/libexec/telnetd/termstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: termstat.c,v 1.4 1998/04/25 04:43:04 millert Exp $	*/
+/*	$OpenBSD: termstat.c,v 1.5 2000/11/10 15:33:04 provos Exp $	*/
 /*	$NetBSD: termstat.c,v 1.5 1996/02/28 20:38:27 thorpej Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)termstat.c	8.2 (Berkeley) 5/30/95";
 static char rcsid[] = "$NetBSD: termstat.c,v 1.5 1996/02/28 20:38:27 thorpej Exp $";
 #else
-static char rcsid[] = "$OpenBSD: termstat.c,v 1.4 1998/04/25 04:43:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: termstat.c,v 1.5 2000/11/10 15:33:04 provos Exp $";
 #endif
 #endif /* not lint */
 
@@ -552,7 +552,7 @@ clientstat(code, parm1, parm2)
 		/*
 		 * Change terminal speed as requested by client.
 		 * We set the receive speed first, so that if we can't
-		 * store seperate receive and transmit speeds, the transmit
+		 * store separate receive and transmit speeds, the transmit
 		 * speed will take precedence.
 		 */
 		tty_rspeed(parm2);
diff --git a/sys/arch/amiga/dev/sbic.c b/sys/arch/amiga/dev/sbic.c
index 9a26fc3fcb5..12a0682bbea 100644
--- a/sys/arch/amiga/dev/sbic.c
+++ b/sys/arch/amiga/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.10 1999/01/11 05:11:07 millert Exp $	*/
+/*	$OpenBSD: sbic.c,v 1.11 2000/11/10 15:33:04 provos Exp $	*/
 /*	$NetBSD: sbic.c,v 1.28 1996/10/13 03:07:29 christos Exp $	*/
 
 /*
@@ -1042,7 +1042,7 @@ sbicselectbus(dev, regs, target, lun, our_addr)
 	SET_SBIC_cmd(regs, SBIC_CMD_SEL_ATN);
 
 	/*
-	 * wait for select (merged from seperate function may need
+	 * wait for select (merged from separate function may need
 	 * cleanup)
 	 */
 	WAIT_CIP(regs);
diff --git a/sys/arch/arm32/podulebus/sbic.c b/sys/arch/arm32/podulebus/sbic.c
index 22f8a82f252..01141849910 100644
--- a/sys/arch/arm32/podulebus/sbic.c
+++ b/sys/arch/arm32/podulebus/sbic.c
@@ -1094,7 +1094,7 @@ sbicselectbus(dev, regs, target, lun, our_addr)
 	SET_SBIC_cmd(regs, SBIC_CMD_SEL_ATN);
 
 	/*
-	 * wait for select (merged from seperate function may need
+	 * wait for select (merged from separate function may need
 	 * cleanup)
 	 */
 	WAIT_CIP(regs);
diff --git a/sys/arch/hp300/dev/grf_dv.c b/sys/arch/hp300/dev/grf_dv.c
index 85b2bcfc0d9..196ea7bf7cb 100644
--- a/sys/arch/hp300/dev/grf_dv.c
+++ b/sys/arch/hp300/dev/grf_dv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_dv.c,v 1.6 1997/04/16 11:56:02 downsj Exp $	*/
+/*	$OpenBSD: grf_dv.c,v 1.7 2000/11/10 15:33:05 provos Exp $	*/
 /*	$NetBSD: grf_dv.c,v 1.11 1997/03/31 07:34:14 scottr Exp $	*/
 
 /*
@@ -248,7 +248,7 @@ dv_init(gp, scode, addr)
 			gp->g_fbkva = addr + gi->gd_regsize;
 		} else {
 			/*
-			 * For DIO space we need to map the seperate
+			 * For DIO space we need to map the separate
 			 * framebuffer.
 			 */
 			gp->g_regkva = addr;
diff --git a/sys/arch/hp300/dev/grf_hy.c b/sys/arch/hp300/dev/grf_hy.c
index 354d12ae6cf..300d032aa0f 100644
--- a/sys/arch/hp300/dev/grf_hy.c
+++ b/sys/arch/hp300/dev/grf_hy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_hy.c,v 1.6 1997/04/16 11:56:04 downsj Exp $	*/
+/*	$OpenBSD: grf_hy.c,v 1.7 2000/11/10 15:33:05 provos Exp $	*/
 /*	$NetBSD: grf_hy.c,v 1.9 1997/03/31 07:34:16 scottr Exp $	*/
 
 /*
@@ -206,7 +206,7 @@ hy_init(gp, scode, addr)
 			gp->g_fbkva = addr + gi->gd_regsize;
 		} else {
 			/*
-			 * For DIO space we need to map the seperate
+			 * For DIO space we need to map the separate
 			 * framebuffer.
 			 */
 			gp->g_regkva = addr;
diff --git a/sys/arch/hp300/dev/grf_rb.c b/sys/arch/hp300/dev/grf_rb.c
index ff57dfb2091..9627a222c11 100644
--- a/sys/arch/hp300/dev/grf_rb.c
+++ b/sys/arch/hp300/dev/grf_rb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_rb.c,v 1.6 1997/04/16 11:56:04 downsj Exp $	*/
+/*	$OpenBSD: grf_rb.c,v 1.7 2000/11/10 15:33:05 provos Exp $	*/
 /*	$NetBSD: grf_rb.c,v 1.11 1997/03/31 07:34:17 scottr Exp $	*/
 
 /*
@@ -247,7 +247,7 @@ rb_init(gp, scode, addr)
 			gp->g_fbkva = addr + gi->gd_regsize;
 		} else {
 			/*
-			 * For DIO space we need to map the seperate
+			 * For DIO space we need to map the separate
 			 * framebuffer.
 			 */
 			gp->g_regkva = addr;
diff --git a/sys/arch/hp300/dev/grf_tc.c b/sys/arch/hp300/dev/grf_tc.c
index 3e721a9b831..4b1c59cc684 100644
--- a/sys/arch/hp300/dev/grf_tc.c
+++ b/sys/arch/hp300/dev/grf_tc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_tc.c,v 1.7 1999/05/28 09:36:19 downsj Exp $	*/
+/*	$OpenBSD: grf_tc.c,v 1.8 2000/11/10 15:33:05 provos Exp $	*/
 /*	$NetBSD: grf_tc.c,v 1.11 1997/03/31 07:34:18 scottr Exp $	*/
 
 /*
@@ -317,7 +317,7 @@ tc_init(gp, scode, addr)
 			gp->g_fbkva = addr + gi->gd_regsize;
 		} else {
 			/*
-			 * For DIO space we need to map the seperate
+			 * For DIO space we need to map the separate
 			 * framebuffer.
 			 */
 			gp->g_regkva = addr;
diff --git a/sys/arch/i386/include/specialreg.h b/sys/arch/i386/include/specialreg.h
index 69d56cb97de..0848bc8015e 100644
--- a/sys/arch/i386/include/specialreg.h
+++ b/sys/arch/i386/include/specialreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specialreg.h,v 1.8 1999/11/20 11:18:59 matthieu Exp $	*/
+/*	$OpenBSD: specialreg.h,v 1.9 2000/11/10 15:33:06 provos Exp $	*/
 /*	$NetBSD: specialreg.h,v 1.7 1994/10/27 04:16:26 cgd Exp $	*/
 
 /*-
@@ -173,7 +173,7 @@
 
 /*
  * the following four 3-byte registers control the non-cacheable regions.
- * These registers must be written as three seperate bytes.
+ * These registers must be written as three separate bytes.
  *
  * NCRx+0: A31-A24 of starting address
  * NCRx+1: A23-A16 of starting address
diff --git a/sys/arch/kbus/dev/sbic.c b/sys/arch/kbus/dev/sbic.c
index 35caf51c4e6..676c9e40f72 100644
--- a/sys/arch/kbus/dev/sbic.c
+++ b/sys/arch/kbus/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.3 2000/01/10 03:55:36 millert Exp $	*/
+/*	$OpenBSD: sbic.c,v 1.4 2000/11/10 15:33:06 provos Exp $	*/
 /*	$NetBSD: sbic.c,v 1.28 1996/10/13 03:07:29 christos Exp $	*/
 
 /*
@@ -1056,7 +1056,7 @@ sbicselectbus(dev, regs, target, lun, our_addr)
 	SET_SBIC_cmd(regs, SBIC_CMD_SEL_ATN);
 
 	/*
-	 * wait for select (merged from seperate function may need
+	 * wait for select (merged from separate function may need
 	 * cleanup)
 	 */
 	WAIT_CIP(regs);
diff --git a/sys/arch/kbus/dev/xd.c b/sys/arch/kbus/dev/xd.c
index c4c8a9793c9..2235fb64a40 100644
--- a/sys/arch/kbus/dev/xd.c
+++ b/sys/arch/kbus/dev/xd.c
@@ -1262,7 +1262,7 @@ xdc_rqtopb(iorq, iopb, cmd, subfun)
 /*
  * xdc_cmd: front end for POLL'd and WAIT'd commands.  Returns rqno.
  * If you've already got an IORQ, you can call submit directly (currently
- * there is no need to do this).    NORM requests are handled seperately.
+ * there is no need to do this).    NORM requests are handled separately.
  */
 int
 xdc_cmd(xdcsc, cmd, subfn, unit, block, scnt, dptr, fullmode)
diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c
index 1bc820b882c..ba6609b0340 100644
--- a/sys/arch/mac68k/dev/if_sn.c
+++ b/sys/arch/mac68k/dev/if_sn.c
@@ -713,7 +713,7 @@ camprogram(sc)
 			 * addresses. It has no way to specify a range.
 			 * (Well, thats not exactly true. If the
 			 * range is small one could program each addr
-			 * within the range as a seperate CAM entry)
+			 * within the range as a separate CAM entry)
 			 */
 			ifp->if_flags |= IFF_ALLMULTI;
 			break;
diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c
index d17f94f47b2..0e085d4f475 100644
--- a/sys/arch/mvme68k/dev/sbic.c
+++ b/sys/arch/mvme68k/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.5 1997/11/24 01:13:51 mickey Exp $ */
+/*	$OpenBSD: sbic.c,v 1.6 2000/11/10 15:33:07 provos Exp $ */
 /*	$NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $	*/
 
 /*
@@ -1014,7 +1014,7 @@ sbicselectbus(dev)
     SET_SBIC_cmd(regs, SBIC_CMD_SEL_ATN);
 
     /*
-     * wait for select (merged from seperate function may need
+     * wait for select (merged from separate function may need
      * cleanup)
      */
     WAIT_CIP(regs);
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index 6158e0f9a94..32b4e0ce490 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xd.c,v 1.15 2000/07/04 13:15:12 art Exp $	*/
+/*	$OpenBSD: xd.c,v 1.16 2000/11/10 15:33:07 provos Exp $	*/
 /*	$NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $	*/
 
 /*
@@ -1309,7 +1309,7 @@ xdc_rqtopb(iorq, iopb, cmd, subfun)
 /*
  * xdc_cmd: front end for POLL'd and WAIT'd commands.  Returns rqno.
  * If you've already got an IORQ, you can call submit directly (currently
- * there is no need to do this).    NORM requests are handled seperately.
+ * there is no need to do this).    NORM requests are handled separately.
  */
 int
 xdc_cmd(xdcsc, cmd, subfn, unit, block, scnt, dptr, fullmode)
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index bfc8f5efc8f..f39044c9a06 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xy.c,v 1.13 1999/07/09 21:34:46 art Exp $	*/
+/*	$OpenBSD: xy.c,v 1.14 2000/11/10 15:33:07 provos Exp $	*/
 /*	$NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $	*/
 
 /*
@@ -1196,7 +1196,7 @@ int del;
 
 /*
  * xyc_cmd: front end for POLL'd and WAIT'd commands.  Returns 0 or error.
- * note that NORM requests are handled seperately.
+ * note that NORM requests are handled separately.
  */
 int
 xyc_cmd(xycsc, cmd, subfn, unit, block, scnt, dptr, fullmode)
diff --git a/sys/arch/sun3/dev/xd.c b/sys/arch/sun3/dev/xd.c
index 1df712217ce..590da706f57 100644
--- a/sys/arch/sun3/dev/xd.c
+++ b/sys/arch/sun3/dev/xd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xd.c,v 1.12 1998/10/03 21:18:58 millert Exp $	*/
+/*	$OpenBSD: xd.c,v 1.13 2000/11/10 15:33:08 provos Exp $	*/
 /*	$NetBSD: xd.c,v 1.10 1996/10/13 03:47:39 christos Exp $	*/
 
 /*
@@ -1271,7 +1271,7 @@ xdc_rqtopb(iorq, iopb, cmd, subfun)
 /*
  * xdc_cmd: front end for POLL'd and WAIT'd commands.  Returns rqno.
  * If you've already got an IORQ, you can call submit directly (currently
- * there is no need to do this).    NORM requests are handled seperately.
+ * there is no need to do this).    NORM requests are handled separately.
  */
 int 
 xdc_cmd(xdcsc, cmd, subfn, unit, block, scnt, dptr, fullmode)
diff --git a/sys/arch/sun3/dev/xy.c b/sys/arch/sun3/dev/xy.c
index b1082d7e3fb..122b3f52e2c 100644
--- a/sys/arch/sun3/dev/xy.c
+++ b/sys/arch/sun3/dev/xy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xy.c,v 1.12 1999/01/11 05:12:02 millert Exp $	*/
+/*	$OpenBSD: xy.c,v 1.13 2000/11/10 15:33:08 provos Exp $	*/
 /* $NetBSD: xy.c,v 1.11 1996/10/13 03:47:40 christos Exp $ */
 
 /*
@@ -1163,7 +1163,7 @@ int del;
 
 /*
  * xyc_cmd: front end for POLL'd and WAIT'd commands.  Returns 0 or error.
- * note that NORM requests are handled seperately.
+ * note that NORM requests are handled separately.
  */
 int 
 xyc_cmd(xycsc, cmd, subfn, unit, block, scnt, dptr, fullmode)
diff --git a/sys/arch/vax/uba/qv.c b/sys/arch/vax/uba/qv.c
index 66b8371b851..563d40c8b04 100644
--- a/sys/arch/vax/uba/qv.c
+++ b/sys/arch/vax/uba/qv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qv.c,v 1.3 2000/07/19 13:53:00 art Exp $	*/
+/*	$OpenBSD: qv.c,v 1.4 2000/11/10 15:33:09 provos Exp $	*/
 /*	$NetBSD: qv.c,v 1.2 1996/09/02 06:44:28 mycroft Exp $	*/
 
 /*-
@@ -220,7 +220,7 @@ struct qv_info qv_scn_defaults[] = {
  * Screen controller initialization parameters. The definations and use
  * of these parameters can be found in the Motorola 68045 crtc specs. In
  * essence they set the display parameters for the chip. The first set is
- * for the 15" screen and the second is for the 19" seperate sync. There
+ * for the 15" screen and the second is for the 19" separate sync. There
  * is also a third set for a 19" composite sync monitor which we have not
  * tested and which is not supported.
  */
diff --git a/sys/compat/hpux/hpux.h b/sys/compat/hpux/hpux.h
index 66409ebdafa..6a8e8d9142c 100644
--- a/sys/compat/hpux/hpux.h
+++ b/sys/compat/hpux/hpux.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hpux.h,v 1.6 1997/09/15 06:05:51 millert Exp $	*/
+/*	$OpenBSD: hpux.h,v 1.7 2000/11/10 15:33:09 provos Exp $	*/
 /*	$NetBSD: hpux.h,v 1.11 1997/04/01 19:58:58 scottr Exp $	*/
 
 /*
@@ -317,7 +317,7 @@ struct hpux_sigaction {
 
 /*
  * In BSD EAGAIN and EWOULDBLOCK are the same error code.
- * However, for HP-UX we must split them out to seperate codes.
+ * However, for HP-UX we must split them out to separate codes.
  * The easiest way to do this was to check the return value of
  * BSD routines which are known to return EAGAIN (but never
  * EWOULDBLOCK) and change it to the pseudo-code OEAGAIN when
diff --git a/sys/compat/linux/linux_exec.c b/sys/compat/linux/linux_exec.c
index c16b4ad72f1..a71748d38d0 100644
--- a/sys/compat/linux/linux_exec.c
+++ b/sys/compat/linux/linux_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_exec.c,v 1.13 1999/11/26 16:44:28 art Exp $	*/
+/*	$OpenBSD: linux_exec.c,v 1.14 2000/11/10 15:33:09 provos Exp $	*/
 /*	$NetBSD: linux_exec.c,v 1.13 1996/04/05 00:01:10 christos Exp $	*/
 
 /*
@@ -414,7 +414,7 @@ linux_elf_probe(p, epp, itp, pos, os)
  *
  * Yes, both text and data are mapped at once, so we're left with
  * writeable text for the shared libs. The Linux crt0 seemed to break
- * sometimes when data was mapped seperately. It munmapped a uselib()
+ * sometimes when data was mapped separately. It munmapped a uselib()
  * of ld.so by hand, which failed with shared text and data for ld.so
  * Yuck.
  *
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 7f1ae5c2a5d..45c2eddd210 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_file.c,v 1.15 2000/09/07 17:52:23 ericj Exp $	*/
+/*	$OpenBSD: linux_file.c,v 1.16 2000/11/10 15:33:09 provos Exp $	*/
 /*	$NetBSD: linux_file.c,v 1.15 1996/05/20 01:59:09 fvdl Exp $	*/
 
 /*
@@ -638,7 +638,7 @@ linux_sys_mknod(p, v, retval)
 	LINUX_CHECK_ALT_CREAT(p, &sg, SCARG(uap, path));
 
 	/*
-	 * BSD handles FIFOs seperately
+	 * BSD handles FIFOs separately
 	 */
 	if (SCARG(uap, mode) & S_IFIFO) {
 		SCARG(&bma, path) = SCARG(uap, path);
diff --git a/sys/dev/pci/if_lmcioctl.h b/sys/dev/pci/if_lmcioctl.h
index 74a91aeb5c5..7c3c2bbd14a 100644
--- a/sys/dev/pci/if_lmcioctl.h
+++ b/sys/dev/pci/if_lmcioctl.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: if_lmcioctl.h,v 1.3 2000/02/01 18:01:42 chris Exp $ */
-/*	$Id: if_lmcioctl.h,v 1.3 2000/02/01 18:01:42 chris Exp $	*/
+/*	$OpenBSD: if_lmcioctl.h,v 1.4 2000/11/10 15:33:09 provos Exp $ */
+/*	$Id: if_lmcioctl.h,v 1.4 2000/11/10 15:33:09 provos Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -230,7 +230,7 @@ struct lmc___ctl {
 
 /*
  * Some of the MII16 bits are mirrored in the MII17 register as well,
- * but let's keep thing seperate for now, and get only the cable from
+ * but let's keep thing separate for now, and get only the cable from
  * the MII17.
  */
 #define LMC_MII17_SSI_CABLE_MASK	0x0038	/* mask to extract the cable type */
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index f022492bb72..696371e28f4 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_process.c,v 1.8 2000/06/08 22:25:24 niklas Exp $	*/
+/*	$OpenBSD: sys_process.c,v 1.9 2000/11/10 15:33:10 provos Exp $	*/
 /*	$NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $	*/
 
 /*-
@@ -215,10 +215,10 @@ sys_ptrace(p, v, retval)
 		t->p_oppid = t->p_pptr->p_pid;
 		return (0);
 
-	case  PT_WRITE_I:		/* XXX no seperate I and D spaces */
+	case  PT_WRITE_I:		/* XXX no separate I and D spaces */
 	case  PT_WRITE_D:
 		write = 1;
-	case  PT_READ_I:		/* XXX no seperate I and D spaces */
+	case  PT_READ_I:		/* XXX no separate I and D spaces */
 	case  PT_READ_D:
 		/* write = 0 done above. */
 		iov.iov_base =
diff --git a/sys/msdosfs/bootsect.h b/sys/msdosfs/bootsect.h
index d806713da44..806062ee95e 100644
--- a/sys/msdosfs/bootsect.h
+++ b/sys/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootsect.h,v 1.3 1998/01/11 20:39:02 provos Exp $	*/
+/*	$OpenBSD: bootsect.h,v 1.4 2000/11/10 15:33:10 provos Exp $	*/
 /*	$NetBSD: bootsect.h,v 1.8 1997/10/17 11:23:29 ws Exp $	*/
 
 /*
@@ -74,7 +74,7 @@ struct bootsector710 {
 #ifdef	atari
 /*
  * The boot sector on a gemdos fs is a little bit different from the msdos fs
- * format. Currently there is no need to declare a seperate structure, the
+ * format. Currently there is no need to declare a separate structure, the
  * bootsector33 struct will do.
  */
 #if 0
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index b72172ad612..53e8cc91415 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_mroute.c,v 1.19 2000/01/21 03:15:05 angelos Exp $	*/
+/*	$OpenBSD: ip_mroute.c,v 1.20 2000/11/10 15:33:10 provos Exp $	*/
 /*	$NetBSD: ip_mroute.c,v 1.27 1996/05/07 02:40:50 thorpej Exp $	*/
 
 /*
@@ -1238,7 +1238,7 @@ ip_mdq(m, ifp, rt)
 /*
  * Macro to send packet on vif.  Since RSVP packets don't get counted on
  * input, they shouldn't get counted on output, so statistics keeping is
- * seperate.
+ * separate.
  */
 #define MC_SEND(ip,vifp,m) {                             \
                 if ((vifp)->v_flags & VIFF_TUNNEL)	 \
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index d53efd932d7..24d4d1c2eab 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_mroute.c,v 1.7 2000/10/19 03:14:02 itojun Exp $	*/
+/*	$OpenBSD: ip6_mroute.c,v 1.8 2000/11/10 15:33:11 provos Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.33 2000/10/19 02:23:43 jinmei Exp $	*/
 
 /*
@@ -1259,7 +1259,7 @@ ip6_mdq(m, ifp, rt)
 /*
  * Macro to send packet on mif.  Since RSVP packets don't get counted on
  * input, they shouldn't get counted on output, so statistics keeping is
- * seperate.
+ * separate.
  */
 
 #define MC6_SEND(ip6, mifp, m) do {				\
diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index ab11fb14d17..c3d35e9060b 100644
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -843,7 +843,7 @@ ReStart:
 }
 
 /*
- * amap_splitref: split a single reference into two seperate references
+ * amap_splitref: split a single reference into two separate references
  *
  * => called from uvm_map's clip routines
  * => origref's map should be locked
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index e4fb861dd92..dc21c395304 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -957,7 +957,7 @@ uvm_unmap_remove(map, start, end, entry_list)
 	 * list headed by "first_entry".  once we remove them from the map
 	 * the caller should unlock the map and drop the references to the
 	 * backing objects [c.f. uvm_unmap_detach].  the object is to
-	 * seperate unmapping from reference dropping.  why?
+	 * separate unmapping from reference dropping.  why?
 	 *   [1] the map has to be locked for unmapping
 	 *   [2] the map need not be locked for reference dropping
 	 *   [3] dropping references may trigger pager I/O, and if we hit
@@ -2017,7 +2017,7 @@ uvm_map_pageable(map, start, end, new_pageable)
 	entry = start_entry;
 
 	/* 
-	 * handle wiring and unwiring seperately.
+	 * handle wiring and unwiring separately.
 	 */
 
 	if (new_pageable) {               /* unwire */
diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c
index b3788da4d09..deb4fa6b0b7 100644
--- a/sys/uvm/uvm_pdaemon.c
+++ b/sys/uvm/uvm_pdaemon.c
@@ -337,7 +337,7 @@ uvmpd_scan_inactive(pglst)
 	UVMHIST_FUNC("uvmpd_scan_inactive"); UVMHIST_CALLED(pdhist);
 
 	/*
-	 * note: we currently keep swap-backed pages on a seperate inactive
+	 * note: we currently keep swap-backed pages on a separate inactive
 	 * list from object-backed pages.   however, merging the two lists
 	 * back together again hasn't been ruled out.   thus, we keep our
 	 * swap cluster in "swpps" rather than in pps (allows us to mix
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 335b1986def..eee0ff4fa51 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_page.h,v 1.10 1999/12/30 18:21:56 provos Exp $	*/
+/*	$OpenBSD: vm_page.h,v 1.11 2000/11/10 15:33:11 provos Exp $	*/
 /*	$NetBSD: vm_page.h,v 1.24 1998/02/10 14:09:03 mrg Exp $	*/
 
 /* 
@@ -104,7 +104,7 @@
  * fields were dumped and all the flags were lumped into one short.
  * that is fine for a single threaded uniprocessor OS, but bad if you
  * want to actual make use of locking (simple_lock's).  so, we've
- * seperated things back out again.
+ * separated things back out again.
  *
  * note the page structure has no lock of its own.
  */
diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c
index 1225626546f..04cc41c9e8f 100644
--- a/usr.bin/encrypt/encrypt.c
+++ b/usr.bin/encrypt/encrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: encrypt.c,v 1.11 1999/09/03 18:13:37 deraadt Exp $	*/
+/*	$OpenBSD: encrypt.c,v 1.12 2000/11/10 15:33:12 provos Exp $	*/
 
 /*
  * Copyright (c) 1996, Jason Downs.  All rights reserved.
@@ -84,7 +84,7 @@ void print_passwd(char *string, int operation, void *extra)
      switch(operation) {
      case DO_MAKEKEY:
 	  /*
-	   * makekey mode: parse string into seperate DES key and salt.
+	   * makekey mode: parse string into separate DES key and salt.
 	   */
 	  if (strlen(string) != 10) {
 	       /* To be compatible... */
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 1cbfb3a4f91..7f7d904ad3e 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nm.c,v 1.8 1999/05/10 16:14:07 espie Exp $	*/
+/*	$OpenBSD: nm.c,v 1.9 2000/11/10 15:33:12 provos Exp $	*/
 /*	$NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)nm.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: nm.c,v 1.8 1999/05/10 16:14:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: nm.c,v 1.9 2000/11/10 15:33:12 provos Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -450,7 +450,7 @@ print_symbol(objname, sym)
 		(void)printf("%s:", objname);
 
 	/*
-	 * handle undefined-only format seperately (no space is
+	 * handle undefined-only format separately (no space is
 	 * left for symbol values, no type field is printed)
 	 */
 	if (print_only_undefined_symbols) {
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 197abac2e75..b4f955c40a1 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pr.c,v 1.7 1999/12/03 23:43:02 deraadt Exp $	*/
+/*	$OpenBSD: pr.c,v 1.8 2000/11/10 15:33:12 provos Exp $	*/
 
 /*-
  * Copyright (c) 1991 Keith Muller.
@@ -45,7 +45,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)pr.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.7 1999/12/03 23:43:02 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.8 2000/11/10 15:33:12 provos Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -66,7 +66,7 @@ static char *rcsid = "$OpenBSD: pr.c,v 1.7 1999/12/03 23:43:02 deraadt Exp $";
 /*
  * pr:	a printing and pagination filter. If multiple input files
  *	are specified, each is read, formatted, and written to standard
- *	output. By default, input is seperated into 66-line pages, each
+ *	output. By default, input is separated into 66-line pages, each
  *	with a header that includes the page number, date, time and the
  *	files pathname.
  *
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index 66847afd134..acda69d8315 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.9 1999/05/14 20:19:11 aaron Exp $	*/
+/*	$OpenBSD: common.c,v 1.10 2000/11/10 15:33:12 provos Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: common.c,v 6.82 1998/03/23 23:27:33 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: common.c,v 1.9 1999/05/14 20:19:11 aaron Exp $";
+"$OpenBSD: common.c,v 1.10 2000/11/10 15:33:12 provos Exp $";
 #endif
 
 static char sccsid[] = "@(#)common.c";
@@ -964,7 +964,7 @@ extern char *xbasename(path)
 }
 
 /*
- * Take a colon (':') seperated path to a file and
+ * Take a colon (':') separated path to a file and
  * search until a component of that path is found and
  * return the found file name.
  */
diff --git a/usr.bin/rdist/message.c b/usr.bin/rdist/message.c
index 50e3182d4e4..5a960ee2df9 100644
--- a/usr.bin/rdist/message.c
+++ b/usr.bin/rdist/message.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: message.c,v 1.8 1999/02/04 23:18:57 millert Exp $	*/
+/*	$OpenBSD: message.c,v 1.9 2000/11/10 15:33:12 provos Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: message.c,v 6.24 1996/07/19 17:00:35 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: message.c,v 1.8 1999/02/04 23:18:57 millert Exp $";
+"$OpenBSD: message.c,v 1.9 2000/11/10 15:33:12 provos Exp $";
 #endif
 
 static char sccsid[] = "@(#)common.c";
@@ -282,7 +282,7 @@ extern char *msgparseopts(msgstr, doset)
 	(void) strcpy(msgbuf, msgstr);
 
 	/*
-	 * Each <facility>=<types> list is seperated by ":".
+	 * Each <facility>=<types> list is separated by ":".
 	 */
 	for (optstr = strtok(msgbuf, ":"); optstr;
 	     optstr = strtok(NULL, ":")) {
diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c
index dc0a1e79a7a..6860dcd40d9 100644
--- a/usr.bin/telnet/telnet.c
+++ b/usr.bin/telnet/telnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: telnet.c,v 1.10 2000/10/24 21:52:38 millert Exp $	*/
+/*	$OpenBSD: telnet.c,v 1.11 2000/11/10 15:33:13 provos Exp $	*/
 /*	$NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $	*/
 
 /*
@@ -533,7 +533,7 @@ dontoption(option)
 }
 
 /*
- * This routine will turn a pipe seperated list of names in the buffer
+ * This routine will turn a pipe separated list of names in the buffer
  * into an array of pointers to NUL terminated names.  We toss out any
  * bad, duplicate, or verbose names (names with spaces).
  */
diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c
index ba4c3deef2e..2c15f2bd161 100644
--- a/usr.sbin/amd/amd/amq_subr.c
+++ b/usr.sbin/amd/amd/amq_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq_subr.c	8.1 (Berkeley) 6/6/93
- *	$Id: amq_subr.c,v 1.4 1999/08/26 14:57:19 millert Exp $
+ *	$Id: amq_subr.c,v 1.5 2000/11/10 15:33:13 provos Exp $
  */
 
 /*
@@ -175,7 +175,7 @@ extern qelem mfhead;
 
 #if 0
 /*
- * amd does not allocate a seperate socket to distinguish local
+ * amd does not allocate a separate socket to distinguish local
  * connects so this "security" check is useless.
  */
 static int ok_security(rqstp)
diff --git a/usr.sbin/dhcp/common/dns.c b/usr.sbin/dhcp/common/dns.c
index 1d61b827862..c57b7d0f219 100644
--- a/usr.sbin/dhcp/common/dns.c
+++ b/usr.sbin/dhcp/common/dns.c
@@ -48,7 +48,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dns.c,v 1.1 1998/08/18 03:43:25 deraadt Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dns.c,v 1.2 2000/11/10 15:33:13 provos Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -123,7 +123,7 @@ static int skipname (label)
 }
 
 /* copy_out_name copies out the name appearing at the specified location
-   into a string, stored as fields seperated by dots rather than lengths
+   into a string, stored as fields separated by dots rather than lengths
    and labels.   The length of the label-formatted name is returned. */
 
 static int copy_out_name (base, name, buf)
diff --git a/usr.sbin/dhcp/common/options.c b/usr.sbin/dhcp/common/options.c
index 0935c888328..61064a97673 100644
--- a/usr.sbin/dhcp/common/options.c
+++ b/usr.sbin/dhcp/common/options.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.1 1998/08/18 03:43:26 deraadt Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.2 2000/11/10 15:33:13 provos Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -152,7 +152,7 @@ void parse_option_buffer (packet, buffer, length)
 }
 
 /* cons options into a big buffer, and then split them out into the
-   three seperate buffers if needed.  This allows us to cons up a set
+   three separate buffers if needed.  This allows us to cons up a set
    of vendor options using the same routine. */
 
 int cons_options (inpacket, outpacket, options, overload, terminate, bootpp)
diff --git a/usr.sbin/dhcp/common/parse.c b/usr.sbin/dhcp/common/parse.c
index 374e2b6e6ec..ca955cfa263 100644
--- a/usr.sbin/dhcp/common/parse.c
+++ b/usr.sbin/dhcp/common/parse.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: parse.c,v 1.1 1998/08/18 03:43:26 deraadt Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: parse.c,v 1.2 2000/11/10 15:33:13 provos Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -280,18 +280,18 @@ void parse_lease_time (cfile, timep)
 }
 
 /* No BNF for numeric aggregates - that's defined by the caller.  What
-   this function does is to parse a sequence of numbers seperated by
-   the token specified in seperator.  If max is zero, any number of
+   this function does is to parse a sequence of numbers separated by
+   the token specified in separator.  If max is zero, any number of
    numbers will be parsed; otherwise, exactly max numbers are
    expected.  Base and size tell us how to internalize the numbers
    once they've been tokenized. */
 
 unsigned char *parse_numeric_aggregate (cfile, buf,
-					max, seperator, base, size)
+					max, separator, base, size)
 	FILE *cfile;
 	unsigned char *buf;
 	int *max;
-	int seperator;
+	int separator;
 	int base;
 	int size;
 {
@@ -311,7 +311,7 @@ unsigned char *parse_numeric_aggregate (cfile, buf,
 	do {
 		if (count) {
 			token = peek_token (&val, cfile);
-			if (token != seperator) {
+			if (token != separator) {
 				if (!*max)
 					break;
 				if (token != RBRACE && token != LBRACE)
@@ -519,10 +519,10 @@ TIME parse_date (cfile)
 	if (tm.tm_year > 1900)
 		tm.tm_year -= 1900;
 
-	/* Slash seperating year from month... */
+	/* Slash separating year from month... */
 	token = next_token (&val, cfile);
 	if (token != SLASH) {
-		parse_warn ("expected slash seperating year from month.");
+		parse_warn ("expected slash separating year from month.");
 		if (token != SEMI)
 			skip_to_semi (cfile);
 		return (TIME)0;
@@ -538,10 +538,10 @@ TIME parse_date (cfile)
 	}
 	tm.tm_mon = atoi (val) - 1;
 
-	/* Slash seperating month from day... */
+	/* Slash separating month from day... */
 	token = next_token (&val, cfile);
 	if (token != SLASH) {
-		parse_warn ("expected slash seperating month from day.");
+		parse_warn ("expected slash separating month from day.");
 		if (token != SEMI)
 			skip_to_semi (cfile);
 		return (TIME)0;
@@ -567,10 +567,10 @@ TIME parse_date (cfile)
 	}
 	tm.tm_hour = atoi (val);
 
-	/* Colon seperating hour from minute... */
+	/* Colon separating hour from minute... */
 	token = next_token (&val, cfile);
 	if (token != COLON) {
-		parse_warn ("expected colon seperating hour from minute.");
+		parse_warn ("expected colon separating hour from minute.");
 		if (token != SEMI)
 			skip_to_semi (cfile);
 		return (TIME)0;
@@ -586,10 +586,10 @@ TIME parse_date (cfile)
 	}
 	tm.tm_min = atoi (val);
 
-	/* Colon seperating minute from second... */
+	/* Colon separating minute from second... */
 	token = next_token (&val, cfile);
 	if (token != COLON) {
-		parse_warn ("expected colon seperating hour from minute.");
+		parse_warn ("expected colon separating hour from minute.");
 		if (token != SEMI)
 			skip_to_semi (cfile);
 		return (TIME)0;
diff --git a/usr.sbin/dhcp/includes/cf/sample.h b/usr.sbin/dhcp/includes/cf/sample.h
index 892303b977e..e50d8b17b0e 100644
--- a/usr.sbin/dhcp/includes/cf/sample.h
+++ b/usr.sbin/dhcp/includes/cf/sample.h
@@ -255,13 +255,13 @@ char *strerror PROTO ((int));
 
 /* #define HAVE_SA_LEN */
 
-/* Every operating system has its own way of seperating lines in a
+/* Every operating system has its own way of separating lines in a
    sequential text file.  Most modern systems use a single character,
    either an ASCII Newline (10) or an ASCII Carriage Return (13).
 
    The most notable exception is MS-DOS (and consequently, Windows),
    which uses an ASCII Carriage Return followed by a Newline to
-   seperate each line.  Fortunately, MS-DOS C compiler libraries
+   separate each line.  Fortunately, MS-DOS C compiler libraries
    typically hide this from the programmer, returning just a Newline.
 
    Define EOL to be whatever getc() returns for a newline. */
diff --git a/usr.sbin/dhcp/server/confpars.c b/usr.sbin/dhcp/server/confpars.c
index c595680ce6f..14cd539949a 100644
--- a/usr.sbin/dhcp/server/confpars.c
+++ b/usr.sbin/dhcp/server/confpars.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.1 1998/08/18 03:43:34 deraadt Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.2 2000/11/10 15:33:14 provos Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1158,7 +1158,7 @@ struct lease *parse_lease_declaration (cfile)
 			}
 		} else {
 			switch (token) {
-				/* Colon-seperated hexadecimal octets... */
+				/* Colon-separated hexadecimal octets... */
 			      case UID:
 				seenbit = 8;
 				token = peek_token (&val, cfile);
diff --git a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
index d22cde9d8f4..d62cd50e907 100644
--- a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
+++ b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
@@ -1077,7 +1077,7 @@ static client_entry *gen_client(const request_rec *r) { return NULL; }
  * You must implement this yourself, and will probably consist of code
  * contacting the password server and retrieving the hash from it.
  *
- * TBD: This function should probably be in a seperate source file so that
+ * TBD: This function should probably be in a separate source file so that
  * people need not modify mod_auth_digest.c each time they install a new version
  * of apache.
  */
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.c b/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.c
index 5ed60d05e6e..18f894e32c0 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.c
@@ -146,7 +146,7 @@ register int mode;
         if (file == NULL || !*file)
                 return errno = EINVAL, (DBM *) NULL;
 /*
- * need space for two seperate filenames
+ * need space for two separate filenames
  */
         n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
 
diff --git a/usr.sbin/named/libresolv/res_init.c b/usr.sbin/named/libresolv/res_init.c
index 8629d5370e9..cbdcc2e284e 100644
--- a/usr.sbin/named/libresolv/res_init.c
+++ b/usr.sbin/named/libresolv/res_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_init.c,v 1.3 1998/05/22 00:47:24 millert Exp $	*/
+/*	$OpenBSD: res_init.c,v 1.4 2000/11/10 15:33:15 provos Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.8 1997/06/01 20:34:37 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.3 1998/05/22 00:47:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.4 2000/11/10 15:33:15 provos Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -101,7 +101,7 @@ static char rcsid[] = "$OpenBSD: res_init.c,v 1.3 1998/05/22 00:47:24 millert Ex
  *   "search" property.
  * - The sortlist comprised of IP address netmask pairs are stored as
  *   values of the "sortlist" property. The IP address and optional netmask
- *   should be seperated by a slash (/) or ampersand (&) character.
+ *   should be separated by a slash (/) or ampersand (&) character.
  * - Internal resolver variables can be set from the value of the "options"
  *   property.
  */
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index 8f08317118d..cad20968ab6 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -33,7 +33,7 @@ static char copright[] =
 "@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
  All rights reserved.\n";
 
-static char rcsid[] = "$Id: main.c,v 1.4 1999/05/24 21:24:00 deraadt Exp $";
+static char rcsid[] = "$Id: main.c,v 1.5 2000/11/10 15:33:15 provos Exp $";
 #endif
 
 /*
@@ -130,7 +130,7 @@ main(argc, argv)
 			Kflag = 1;
 			break;
 		case 'l':
-			/* seperate system and user time */
+			/* separate system and user time */
 			lflag = 1;
 			break;
 		case 'm':