typos; from Brian Poole

22 files changed, 70 insertions, 70 deletions

diff --git a/bin/ksh/BUG-REPORTS b/bin/ksh/BUG-REPORTS
index 7d1c3e5af28..dfb126d7646 100644
--- a/bin/ksh/BUG-REPORTS
+++ b/bin/ksh/BUG-REPORTS
@@ -1,4 +1,4 @@
-$OpenBSD: BUG-REPORTS,v 1.13 2002/02/14 13:41:44 deraadt Exp $
+$OpenBSD: BUG-REPORTS,v 1.14 2003/02/28 09:45:09 jmc Exp $
 
 List of reported problems (problems reported and fixed before 5.0.4 not
 included).  Unresolved problems (may or may not still exist) marked by *,
@@ -1349,7 +1349,7 @@ x pdksh 5.2.13.5, (reported by Charles M. Hannum <root@ihack.net>): An exit
   trap set in a subshell is not executed (unless explicit exit used).
   [fixed in 5.2.14: exec.c(execute): changed exit(rv) to unwind(LEXIT).]
 
-x pdksh 5.2.12, - : MAILCHECK isn't preserved from the envirnment on startup.
+x pdksh 5.2.12, - : MAILCHECK isn't preserved from the environment on startup.
   [fixed in 5.2.14: changed main's initcoms[].]
 
 x pdksh 5.2.13, (reported by Marc Olzheim): time at the end of a pipeline
diff --git a/bin/ksh/ChangeLog b/bin/ksh/ChangeLog
index 1d6a4815a67..9b5962597f0 100644
--- a/bin/ksh/ChangeLog
+++ b/bin/ksh/ChangeLog
@@ -369,7 +369,7 @@ Wed Oct 22 11:49:02 NDT 1997 Michael Rendell (michael@panda.cs.mun.ca)
 Fri Aug 15 22:06:53 NDT 1997 Michael Rendell (michael@panda.cs.mun.ca)
 
 	* eval.c(varsub,expand), lex.c(yylex): allow :%, :#, :%% and :##
-	  to be compatable with ksh88.
+	  to be compatible with ksh88.
 
 Sat Aug  2 12:13:30 NDT 1997 Michael Rendell (michael@panda.cs.mun.ca)
 
@@ -406,7 +406,7 @@ Fri May 16 11:40:22 NDT 1997 Michael Rendell (michael@panda.cs.mun.ca)
 Thu Mar 13 10:42:31 NST 1997 Michael Rendell (michael@panda.cs.mun.ca)
 
 	* mail.c(mbset): save a copy of the path so it can't get trashed
-	  (eg, by exporting a varibale).
+	  (eg, by exporting a variable).
 
 Wed Feb 26 11:24:06 NST 1997 Michael Rendell (michael@panda.cs.mun.ca)
 
@@ -527,7 +527,7 @@ Wed Oct 30 11:23:17 NST 1996 Michael Rendell (michael@panda.cs.mun.ca)
 	* exec.c(comexec): case CFUNC: set $0 to kshname if non-function
 	  function.
 
-$OpenBSD: ChangeLog,v 1.12 1999/07/14 13:37:23 millert Exp $
+$OpenBSD: ChangeLog,v 1.13 2003/02/28 09:45:09 jmc Exp $
 
 Tue Oct 29 11:34:58 NST 1996 Michael Rendell (michael@panda.cs.mun.ca)
 
@@ -795,7 +795,7 @@ Mon Aug 12 11:21:39 NDT 1996 Michael Rendell (michael@panda.cs.mun.ca)
 
 Mon Aug 12 11:03:22 NDT 1996 Michael Rendell (michael@panda.cs.mun.ca)
 
-	* exec.c(findfunc): removed redundent DEFINED check after tsearch().
+	* exec.c(findfunc): removed redundant DEFINED check after tsearch().
 
 Fri Aug  9 22:16:21 NDT 1996 Michael Rendell (michael@panda.cs.mun.ca)
 
@@ -1231,7 +1231,7 @@ Fri Feb  2 10:40:32 NST 1996 Michael Rendell (michael@panda.cs.mun.ca)
 Thu Feb  1 15:27:06 NST 1996 Michael Rendell (michael@panda.cs.mun.ca)
 
 	* c_test.h(Test_env): added end union.
-	* c_test.c(c_test): keep track of end postition using end.wp;
+	* c_test.c(c_test): keep track of end position using end.wp;
 	  don't write on wp.
 
 	* emacs.c(x_mapin): changed to dup string, then munge; return duped;
@@ -1353,7 +1353,7 @@ Wed Jan 10 10:21:06 NST 1996 Michael Rendell (michael@panda.cs.mun.ca)
 
 Tue Jan  9 11:23:36 NST 1996 Michael Rendell (michael@panda.cs.mun.ca)
 
-	* emacs.c(iscfs): make ', " seperators.
+	* emacs.c(iscfs): make ', " separators.
 	  (fix from Dale DePriest).
 
 	* conf-end.h: deleted stuff to undef HISTORY, VI, EMACS, etc if
@@ -1491,7 +1491,7 @@ Tue Nov 14 10:22:17 NST 1995 Michael Rendell (michael@angel.cs.mun.ca)
 
 	* main.c(shell): do not zero exstat at start of routine.
 
-	* exec.c(execute): removed redundent "exstat = rv" before
+	* exec.c(execute): removed redundant "exstat = rv" before
 	  unwind(LERROR).
 
 Thu Nov  9 15:01:54 NST 1995 Michael Rendell (michael@angel.cs.mun.ca)
diff --git a/bin/ksh/ChangeLog.0 b/bin/ksh/ChangeLog.0
index bf60d273291..3867056effe 100644
--- a/bin/ksh/ChangeLog.0
+++ b/bin/ksh/ChangeLog.0
@@ -1,4 +1,4 @@
-$OpenBSD: ChangeLog.0,v 1.3 1998/10/29 04:09:19 millert Exp $
+$OpenBSD: ChangeLog.0,v 1.4 2003/02/28 09:45:09 jmc Exp $
 
 Thu Jun 15 11:02:06 NDT 1995 Michael Rendell (michael@panda.cs.mun.ca)
 
@@ -265,7 +265,7 @@ Mon May  1 09:41:56 NDT 1995 Michael Rendell (michael@panda.cs.mun.ca)
 Sat Apr 29 21:10:54 NDT 1995 Michael Rendell (michael@garfield.cs.mun.ca)
 
 	* vi.c(glob_word): don't append * if there are unescaped globing
-	  characters in the last component of the filename; some redundent
+	  characters in the last component of the filename; some redundant
 	  code eliminated.
 	  (based on fix from Michael Jetzer).
 
@@ -642,7 +642,7 @@ Mon Dec 12 20:55:53 NST 1994 John Rochester (jr@panda.cs.mun.ca)
 
 Fri Dec  9 15:21:36 NST 1994 Michael Rendell (michael@panda.cs.mun.ca)
 
-	* trap.c(inittraps): OS2: don't trap SIGTERM (temproary fix).
+	* trap.c(inittraps): OS2: don't trap SIGTERM (temporary fix).
 
 	* exec.c(search_access1): OS2: fixed to check for valid suffix
 	  and change mode from X_OK to R_OK if appropriate.
@@ -745,7 +745,7 @@ Tue Nov 29 12:32:26 NST 1994 Michael Rendell (michael@panda.cs.mun.ca)
 	* ksh_dir.h(NLENGTH): new macro.
 	* eval.c(globit): use NLENGTH macro.
 
-	* alloc.c(aresize): removed redundent np and optr variables.
+	* alloc.c(aresize): removed redundant np and optr variables.
 
 Mon Nov 28 14:55:49 NST 1994 Michael Rendell (michael@panda.cs.mun.ca)
 
@@ -841,7 +841,7 @@ Tue Nov 22 10:26:13 NST 1994 Michael Rendell (michael@panda.cs.mun.ca)
 
 Mon Nov 21 10:45:34 NST 1994 Michael Rendell (michael@panda.cs.mun.ca)
 
-	* exec.c(do_selectargs): removed use of pmenu variable (redundent)
+	* exec.c(do_selectargs): removed use of pmenu variable (redundant)
 	  use isspace() instead of IFS chars; include <ctype.h>.
 
 	* aclocal.m4(KSH_TERM_CHECK): do not allow HAVE_TERMIOS_H check to
@@ -1565,7 +1565,7 @@ Fri Sep 16 11:32:01 NDT 1994 Michael Rendell (michael@panda.cs.mun.ca)
 	* eval.c(expand): set subst_exstat to return value of waitlast().
 	* c_sh.c(c_set): if !FPOSIX, return subst_exstat instead of 0.
 
-	* exec.c(execute): removed redundent "exstat = rv;" near if FERREXIT.
+	* exec.c(execute): removed redundant "exstat = rv;" near if FERREXIT.
 	* exec.c(comexec): case CFUNC: for normal function completion, set
 	  i to 0 and rv to return value of execute() (was i=LRETURN,exstat=..).
 
@@ -3189,7 +3189,7 @@ Wed Jun  1 09:17:50 NDT 1994 Michael Rendell (michael@panda.cs.mun.ca)
 	* aclocal.m4, configure.in, sh.h, tree.c, io.c, shf.c: added
 	  new config test KSH_PROTOTYPES to check for function prototypes
 	  (MIPS RICS/os 5.0 C compiler isn't STDC and it can't mix <stddef.h>
-	  with <varargs.h>).  Removed stdarg.h test (now redundent).  Changed
+	  with <varargs.h>).  Removed stdarg.h test (now redundant).  Changed
 	  all varargs functions to use HAVE_PROTOTYPES instead of
 	  HAVE_STDARG_H && STDC.
 
@@ -3570,7 +3570,7 @@ Fri May 5 12:16:46 NDT 1994 Michael Rendell (michael@panda.cs.mun.ca)
 		(involves #defining free)
 	  - main.c(main): smart initialization of PWD (ensures it is always
 	    valid).
-	  - lex.h, table.h, tree.h: removed redundent function declarations
+	  - lex.h, table.h, tree.h: removed redundant function declarations
 	    (were also in proto.h)
 	  - sh.h: increased LINE from 256 to 1024
 	  - main.c(include), sh.h(E_INC), c_sh.c(c_return): added hack so a
@@ -3586,4 +3586,4 @@ Fri May 5 12:16:46 NDT 1994 Michael Rendell (michael@panda.cs.mun.ca)
 	  - exec.c(iosetup): don't save fd if already saved (and don't
 	    generate an error)
 	  - exec.c(findcom): in if (..ALLOC && eaccess), test for
-	    ALLOC redundent - always call afree()
+	    ALLOC redundant - always call afree()
diff --git a/bin/ksh/NEWS b/bin/ksh/NEWS
index 1fd87269d7c..51bc8ca2bd3 100644
--- a/bin/ksh/NEWS
+++ b/bin/ksh/NEWS
@@ -57,7 +57,7 @@ Version 5.2.13
     * editing: completion after "cmd " now completes files (was command).
 
 
-$OpenBSD: NEWS,v 1.11 1999/07/14 13:37:23 millert Exp $
+$OpenBSD: NEWS,v 1.12 2003/02/28 09:45:09 jmc Exp $
 
 Version 5.2.12
 
@@ -653,7 +653,7 @@ Version 4.9+mun.2 (versus 4.9)
 
 * has array support (needs work but is pretty functional).
 
-* ulimit command now more functional on more machines. Compatable with at&t ksh.
+* ulimit command now more functional on more machines. Compatible with at&t ksh.
 
 * command line and set option parsing cleaned up, POSIXized.
 
diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c
index 9459ae037d2..818b3c2686f 100644
--- a/bin/ksh/c_ksh.c
+++ b/bin/ksh/c_ksh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_ksh.c,v 1.15 2002/06/09 05:47:27 todd Exp $	*/
+/*	$OpenBSD: c_ksh.c,v 1.16 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * built-in Korn commands: c_*
@@ -361,7 +361,7 @@ c_print(wp)
 				case '0':
 					/* Look for an octal number: can have
 					 * three digits (not counting the
-					 * leading 0).  Truely burnt.
+					 * leading 0).  Truly burnt.
 					 */
 					c = 0;
 					for (i = 0; i < 3; i++) {
@@ -653,7 +653,7 @@ c_typeset(wp)
 			break;
 		  case 'p': /* posix export/readonly -p flag.
 			     * typset -p is the same as typeset (in pdksh);
-			     * here for compatability with ksh93.
+			     * here for compatibility with ksh93.
 			     */
 			pflag = 1;
 			break;
diff --git a/bin/ksh/c_sh.c b/bin/ksh/c_sh.c
index 98242e7c486..3d8b16c5839 100644
--- a/bin/ksh/c_sh.c
+++ b/bin/ksh/c_sh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_sh.c,v 1.15 2003/01/04 22:36:07 deraadt Exp $	*/
+/*	$OpenBSD: c_sh.c,v 1.16 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * built-in Bourne commands
@@ -305,7 +305,7 @@ c_read(wp)
 	 * make sure the other side of the pipe is closed first.  This allows
 	 * the detection of eof.
 	 *
-	 * This is not compatiable with at&t ksh... the fd is kept so another
+	 * This is not compatible with at&t ksh... the fd is kept so another
 	 * coproc can be started with same output, however, this means eof
 	 * can't be detected...  This is why it is closed here.
 	 * If this call is removed, remove the eof check below, too.
diff --git a/bin/ksh/c_test.c b/bin/ksh/c_test.c
index f27a23269d3..4ac5db54ae1 100644
--- a/bin/ksh/c_test.c
+++ b/bin/ksh/c_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_test.c,v 1.8 2002/06/09 05:47:27 todd Exp $	*/
+/*	$OpenBSD: c_test.c,v 1.9 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * test(1); version 7-like  --  author Erik Baalbergen
@@ -129,7 +129,7 @@ c_test(wp)
 	/*
 	 * Handle the special cases from POSIX.2, section 4.62.4.
 	 * Implementation of all the rules isn't necessary since
-	 * our parser does the right thing for the ommited steps.
+	 * our parser does the right thing for the omitted steps.
 	 */
 	if (argc <= 5) {
 		char **owp = wp;
diff --git a/bin/ksh/config.h b/bin/ksh/config.h
index 3d4533ccb01..d484db7b3d2 100644
--- a/bin/ksh/config.h
+++ b/bin/ksh/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.6 2002/08/11 21:44:58 marc Exp $	*/
+/*	$OpenBSD: config.h,v 1.7 2003/02/28 09:45:09 jmc Exp $	*/
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -186,7 +186,7 @@
 /* Define if you arg running OS2 with the EMX library */
 /* #undef OS2 */
 
-/* Define if you have a POSIX.1 compatiable <sys/wait.h> */
+/* Define if you have a POSIX.1 compatible <sys/wait.h> */
 #define POSIX_SYS_WAIT 1
 
 /* Define if your OS maps references to /dev/fd/n to file descriptor n */
diff --git a/bin/ksh/emacs.c b/bin/ksh/emacs.c
index 35669fb0923..feaeb7f9159 100644
--- a/bin/ksh/emacs.c
+++ b/bin/ksh/emacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emacs.c,v 1.17 2002/10/16 00:13:53 millert Exp $	*/
+/*	$OpenBSD: emacs.c,v 1.18 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  *  Emacs-like command line editing and history
@@ -1127,7 +1127,7 @@ x_transpose(c)
 
 	/* What transpose is meant to do seems to be up for debate. This
 	 * is a general summary of the options; the text is abcd with the
-	 * upper case character or underscore indicating the cursor positiion:
+	 * upper case character or underscore indicating the cursor position:
 	 *     Who			Before	After  Before	After
 	 *     at&t ksh in emacs mode:	abCd	abdC   abcd_	(bell)
 	 *     at&t ksh in gmacs mode:	abCd	baCd   abcd_	abdc_
@@ -2102,7 +2102,7 @@ x_fold_capitialize(c)
 }
 
 /* NAME:
- *      x_fold_case - convert word to UPPER/lower/Capitial case
+ *      x_fold_case - convert word to UPPER/lower/Capital case
  *
  * DESCRIPTION:
  *      This function is used to implement M-U,M-u,M-L,M-l,M-C and M-c
diff --git a/bin/ksh/eval.c b/bin/ksh/eval.c
index af33e973127..fea8cc0c4fc 100644
--- a/bin/ksh/eval.c
+++ b/bin/ksh/eval.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eval.c,v 1.10 2002/06/09 05:47:27 todd Exp $	*/
+/*	$OpenBSD: eval.c,v 1.11 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -169,7 +169,7 @@ expand(cp, wp, f)
 	XString ds;		/* destination string */
 	register char *dp, *sp;	/* dest., source */
 	int fdo, word;		/* second pass flags; have word */
-	int doblank;		/* field spliting of parameter/command subst */
+	int doblank;		/* field splitting of parameter/command subst */
 	Expand x;		/* expansion variables */
 	SubType st_head, *st;
 	int UNINITIALIZED(newlines); /* For trailing newlines in COMSUB */
@@ -445,7 +445,7 @@ expand(cp, wp, f)
 				c = *sp++ + 0x80;
 				break;
 
-			  case SPAT: /* pattern seperator (|) */
+			  case SPAT: /* pattern separator (|) */
 				make_magic = 1;
 				c = '|';
 				break;
@@ -898,7 +898,7 @@ trimsub(str, pat, how)
 	register char *p, c;
 
 	switch (how&0xff) {	/* UCHAR_MAX maybe? */
-	  case '#':		/* shortest at begining */
+	  case '#':		/* shortest at beginning */
 		for (p = str; p <= end; p++) {
 			c = *p; *p = '\0';
 			if (gmatch(str, pat, FALSE)) {
@@ -908,7 +908,7 @@ trimsub(str, pat, how)
 			*p = c;
 		}
 		break;
-	  case '#'|0x80:	/* longest match at begining */
+	  case '#'|0x80:	/* longest match at beginning */
 		for (p = end; p >= str; p--) {
 			c = *p; *p = '\0';
 			if (gmatch(str, pat, FALSE)) {
diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c
index 87d318b424c..de722b326a9 100644
--- a/bin/ksh/exec.c
+++ b/bin/ksh/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.26 2002/06/09 05:47:27 todd Exp $	*/
+/*	$OpenBSD: exec.c,v 1.27 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * execute command tree
@@ -832,7 +832,7 @@ scriptexec(tp, ap)
 		} else {
 		        /* Use ksh documented shell default if present
 			 * else use OS2_SHELL which is assumed to need
-			 * the /c option and '\' as dir separater.
+			 * the /c option and '\' as dir separator.
 			 */
 		         char *p = shell;
 
diff --git a/bin/ksh/expr.c b/bin/ksh/expr.c
index ddfcb53a04a..3ef1fc64130 100644
--- a/bin/ksh/expr.c
+++ b/bin/ksh/expr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expr.c,v 1.7 1999/06/15 01:18:34 millert Exp $	*/
+/*	$OpenBSD: expr.c,v 1.8 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * Korn expression evaluation
@@ -63,7 +63,7 @@ enum prec {
 struct opinfo {
 	char		name[4];
 	int		len;	/* name length */
-	enum prec	prec;	/* precidence: lower is higher */
+	enum prec	prec;	/* precedence: lower is higher */
 };
 
 /* Tokens in this table must be ordered so the longest are first
diff --git a/bin/ksh/history.c b/bin/ksh/history.c
index be170cfad05..4ec7d6b2e8a 100644
--- a/bin/ksh/history.c
+++ b/bin/ksh/history.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: history.c,v 1.16 2002/11/27 20:53:25 pvalchev Exp $	*/
+/*	$OpenBSD: history.c,v 1.17 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * command history
@@ -67,7 +67,7 @@ static char   **hist_get_newest ARGS((int allow_cur));
 static char   **hist_get_oldest ARGS(());
 static void	histbackup ARGS((void));
 
-static char   **current;	/* current postition in history[] */
+static char   **current;	/* current position in history[] */
 static int	curpos;		/* current index in history[] */
 static char    *hname;		/* current name of history file */
 static int	hstarted;	/* set after hist_init() called */
@@ -493,7 +493,7 @@ histnum(n)
 }
 
 /*
- * This will become unecessary if hist_get is modified to allow
+ * This will become unnecessary if hist_get is modified to allow
  * searching from positions other than the end, and in either
  * direction.
  */
diff --git a/bin/ksh/jobs.c b/bin/ksh/jobs.c
index 99b857f5472..1437279b2e7 100644
--- a/bin/ksh/jobs.c
+++ b/bin/ksh/jobs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: jobs.c,v 1.17 2002/06/09 05:47:27 todd Exp $	*/
+/*	$OpenBSD: jobs.c,v 1.18 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * Process and job control
@@ -1077,7 +1077,7 @@ j_notify()
 #endif /* JOB_SIGS */
 }
 
-/* Return pid of last process in last asynchornous job */
+/* Return pid of last process in last asynchronous job */
 pid_t
 j_async()
 {
@@ -1221,7 +1221,7 @@ j_waitj(j, flags, where)
 			 * a fork/exec instead of an exec (the fork means
 			 * the execed shell gets a different pid from its
 			 * pgrp, so naturally it sets its pgrp and gets hosed
-			 * when it gets forgrounded by the parent shell, which
+			 * when it gets foregrounded by the parent shell, which
 			 * has restored the tty's pgrp to that of the su
 			 * process).
 			 */
diff --git a/bin/ksh/lex.c b/bin/ksh/lex.c
index 46e957dd43e..11f065797f9 100644
--- a/bin/ksh/lex.c
+++ b/bin/ksh/lex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.c,v 1.16 2002/06/09 05:47:27 todd Exp $	*/
+/*	$OpenBSD: lex.c,v 1.17 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * lexical analysis and source input
@@ -730,7 +730,7 @@ Done:
 	/* copy word to unprefixed string ident */
 	for (sp = yylval.cp, dp = ident; dp < ident+IDENT && (c = *sp++) == CHAR; )
 		*dp++ = *sp++;
-	/* Make sure the ident array stays '\0' paded */
+	/* Make sure the ident array stays '\0' padded */
 	memset(dp, 0, (ident+IDENT) - dp + 1);
 	if (c != EOS)
 		*ident = '\0';	/* word is not unquoted */
diff --git a/bin/ksh/lex.h b/bin/ksh/lex.h
index 83e9e941c6b..35af4977421 100644
--- a/bin/ksh/lex.h
+++ b/bin/ksh/lex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.h,v 1.6 2001/09/19 10:58:07 mpech Exp $	*/
+/*	$OpenBSD: lex.h,v 1.7 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * Source input, lexer and parser
@@ -37,7 +37,7 @@ struct source {
 #define	SSTRING		3	/* string */
 #define	SWSTR		4	/* string without \n */
 #define	SWORDS		5	/* string[] */
-#define	SWORDSEP	6	/* string[] seperator */
+#define	SWORDSEP	6	/* string[] separator */
 #define	SALIAS		7	/* alias expansion */
 #define SREREAD		8	/* read ahead to be re-scanned */
 
diff --git a/bin/ksh/main.c b/bin/ksh/main.c
index 539847d556c..a4afdcabf22 100644
--- a/bin/ksh/main.c
+++ b/bin/ksh/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.21 2002/06/09 05:47:27 todd Exp $	*/
+/*	$OpenBSD: main.c,v 1.22 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
@@ -759,7 +759,7 @@ cleanup_parents_env()
 
 	/* Don't clean up temporary files - parent will probably need them.
 	 * Also, can't easily reclaim memory since variables, etc. could be
-	 * anywyere.
+	 * anywhere.
 	 */
 
 	/* close all file descriptors hiding in savefd */
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index 7de3ac2c98c..19f16ab8840 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.12 2001/02/19 09:49:53 camield Exp $	*/
+/*	$OpenBSD: misc.c,v 1.13 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * Miscellaneous functions
@@ -542,7 +542,7 @@ gmatch(s, p, isfile)
  * if it contains no pattern characters or if there is a syntax error.
  * Syntax errors are:
  *	- [ with no closing ]
- *	- imballenced $(...) expression
+ *	- imbalanced $(...) expression
  *	- [...] and *(...) not nested (eg, [a$(b|]c), *(a[b|c]d))
  */
 /*XXX
@@ -1026,11 +1026,11 @@ ksh_getopt(argv, go, options)
 		}
 		go->p = 0;
 	} else if (*o == ',') {
-		/* argument is attatched to option character, even if null */
+		/* argument is attached to option character, even if null */
 		go->optarg = argv[go->optind - 1] + go->p;
 		go->p = 0;
 	} else if (*o == '#') {
-		/* argument is optional and may be attatched or unattatched
+		/* argument is optional and may be attached or unattached
 		 * but must start with a digit.  optarg is set to 0 if the
 		 * argument is missing.
 		 */
diff --git a/bin/ksh/path.c b/bin/ksh/path.c
index c49567b298c..645a2ccc2d1 100644
--- a/bin/ksh/path.c
+++ b/bin/ksh/path.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: path.c,v 1.7 2000/03/01 23:10:58 todd Exp $	*/
+/*	$OpenBSD: path.c,v 1.8 2003/02/28 09:45:09 jmc Exp $	*/
 
 #include "sh.h"
 #include "ksh_stat.h"
 
 /*
  *	Contains a routine to search a : separated list of
- *	paths (a la CDPATH) and make appropiate file names.
+ *	paths (a la CDPATH) and make appropriate file names.
  *	Also contains a routine to simplify .'s and ..'s out of
  *	a path name.
  *
diff --git a/bin/ksh/shf.c b/bin/ksh/shf.c
index fc507a6e2a5..2947858fbca 100644
--- a/bin/ksh/shf.c
+++ b/bin/ksh/shf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shf.c,v 1.7 2000/11/21 23:12:04 millert Exp $	*/
+/*	$OpenBSD: shf.c,v 1.8 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  *  Shell file I/O routines
@@ -839,7 +839,7 @@ shf_smprintf(fmt, va_alist)
  *  this out...
  *
  *	For shorts, we want sign extend for %d but not for %[oxu] - on 16 bit
- *  machines it don't matter.  Assmumes C compiler has converted shorts to
+ *  machines it don't matter.  Assumes C compiler has converted shorts to
  *  ints before pushing them.
  */
 #define POP_INT(f, s, a) (((f) & FL_LONG) ?				\
@@ -922,7 +922,7 @@ shf_vfprintf(shf, fmt, args)
 		 *	This will accept flags/fields in any order - not
 		 *  just the order specified in printf(3), but this is
 		 *  the way _doprnt() seems to work (on bsd and sysV).
-		 *  The only resriction is that the format character must
+		 *  The only restriction is that the format character must
 		 *  come last :-).
 		 */
 		flags = field = precision = 0;
@@ -1083,7 +1083,7 @@ shf_vfprintf(shf, fmt, args)
 			char *p;
 
 			/*
-			 *	This could proabably be done better,
+			 *	This could probably be done better,
 			 *  but it seems to work.  Note that gcvt()
 			 *  is not used, as you cannot tell it to
 			 *  not strip the zeros.
@@ -1103,7 +1103,7 @@ shf_vfprintf(shf, fmt, args)
 			 *  This is the same as
 			 *	expo = ceil(log10(fpnum))
 			 *  but doesn't need -lm.  This is an
-			 *  aproximation as expo is rounded up.
+			 *  approximation as expo is rounded up.
 			 */
 			(void) frexp(fpnum, &expo);
 			expo = my_ceil(expo / LOG2_10);
diff --git a/bin/ksh/trap.c b/bin/ksh/trap.c
index e8f94ef11ee..010e79e98f2 100644
--- a/bin/ksh/trap.c
+++ b/bin/ksh/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.12 2001/12/18 01:47:06 deraadt Exp $	*/
+/*	$OpenBSD: trap.c,v 1.13 2003/02/28 09:45:09 jmc Exp $	*/
 
 /*
  * signal handling
@@ -48,7 +48,7 @@ inittraps()
 	sigtraps[SIGHUP].flags |= TF_FATAL;
 	sigtraps[SIGCHLD].flags |= TF_SHELL_USES;
 
-	/* these are always caught so we can clean up any temproary files. */
+	/* these are always caught so we can clean up any temporary files. */
 	setsig(&sigtraps[SIGINT], trapsig, SS_RESTORE_ORIG);
 	setsig(&sigtraps[SIGQUIT], trapsig, SS_RESTORE_ORIG);
 	setsig(&sigtraps[SIGTERM], trapsig, SS_RESTORE_ORIG);
diff --git a/bin/ksh/var.c b/bin/ksh/var.c
index 4ce18214597..668b6bdcf9c 100644
--- a/bin/ksh/var.c
+++ b/bin/ksh/var.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.c,v 1.11 2000/11/21 23:12:04 millert Exp $	*/
+/*	$OpenBSD: var.c,v 1.12 2003/02/28 09:45:09 jmc Exp $	*/
 
 #include "sh.h"
 #include "ksh_time.h"
@@ -437,7 +437,7 @@ getint(vp, nump)
 		return vp->type;
 	}
 	s = vp->val.s + vp->type;
-	if (s == NULL)	/* redundent given initial test */
+	if (s == NULL)	/* redundant given initial test */
 		s = null;
 	base = 10;
 	num = 0;
@@ -625,7 +625,7 @@ typeset(var, set, clr, field, base)
 	if (*val == '=')
 		tvar = str_nsave(var, val++ - var, ATEMP);
 	else {
-		/* Importing from original envirnment: must have an = */
+		/* Importing from original environment: must have an = */
 		if (set & IMPORT)
 			return NULL;
 		tvar = (char *) var;
@@ -696,7 +696,7 @@ typeset(var, set, clr, field, base)
 			if (fake_assign) {
 				if (!setstr(t, s, KSH_RETURN_ERROR)) {
 					/* Somewhat arbitrary action here:
-					 * zap contents of varibale, but keep
+					 * zap contents of variable, but keep
 					 * the flag settings.
 					 */
 					ok = 0;