* Fix a number of misspellings in the source code of Alpine. I hav only

     fixed those that belong to the source code of Alpine and do not come
     from an external source. List contributed by Jens Schleusener.

59 files changed, 93 insertions, 93 deletions

diff --git a/imap/src/c-client/c-client.h b/imap/src/c-client/c-client.h
index 7bf3710a..b279bff9 100644
--- a/imap/src/c-client/c-client.h
+++ b/imap/src/c-client/c-client.h
@@ -44,7 +44,7 @@ extern "C" {
 #include "smtp.h"		/* SMTP sending routines */
 #include "nntp.h"		/* NNTP sending routines */
 #include "utf8.h"		/* Unicode and charset routines */
-#include "utf8aux.h"		/* Unicode auxillary routines */
+#include "utf8aux.h"		/* Unicode auxiliary routines */
 #include "misc.h"		/* miscellaneous utility routines */
 
 #ifdef __cplusplus		/* undo the C++ mischief */
diff --git a/imap/src/c-client/imap4r1.c b/imap/src/c-client/imap4r1.c
index aaaa66e4..97a43a86 100644
--- a/imap/src/c-client/imap4r1.c
+++ b/imap/src/c-client/imap4r1.c
@@ -2775,7 +2775,7 @@ void imap_capability (MAILSTREAM *stream)
 /* IMAP set ACL
  * Accepts: mail stream
  *	    mailbox name
- *	    authentication identifer
+ *	    authentication identifier
  *	    new access rights
  * Returns: T on success, NIL on failure
  */
@@ -2794,7 +2794,7 @@ long imap_setacl (MAILSTREAM *stream,char *mailbox,char *id,char *rights)
 /* IMAP delete ACL
  * Accepts: mail stream
  *	    mailbox name
- *	    authentication identifer
+ *	    authentication identifier
  * Returns: T on success, NIL on failure
  */
 
@@ -2825,7 +2825,7 @@ long imap_getacl (MAILSTREAM *stream,char *mailbox)
 /* IMAP list rights
  * Accepts: mail stream
  *	    mailbox name
- *	    authentication identifer
+ *	    authentication identifier
  * Returns: T on success with data returned via callback, NIL on failure
  */
 
@@ -4450,7 +4450,7 @@ void imap_parse_unsolicited (MAILSTREAM *stream,IMAPPARSEDREPLY *reply)
       while (ac->rights && s && (*s == ' ') && s++ &&
 	     (ac = ac->next = mail_newacllist ()));
       if (!ac->rights || (s && *s)) {
-	sprintf (LOCAL->tmp,"Invalid ACL identifer/rights for %.80s",
+	sprintf (LOCAL->tmp,"Invalid ACL identifier/rights for %.80s",
 		 (char *) t);
 	mm_notify (stream,LOCAL->tmp,WARN);
 	stream->unhealthy = T;
@@ -4499,7 +4499,7 @@ void imap_parse_unsolicited (MAILSTREAM *stream,IMAPPARSEDREPLY *reply)
       fs_give ((void **) &id);	/* free identifier */
     }
     else {
-      sprintf (LOCAL->tmp,"Missing LISTRIGHTS identifer for %.80s",(char *) t);
+      sprintf (LOCAL->tmp,"Missing LISTRIGHTS identifier for %.80s",(char *) t);
       mm_notify (stream,LOCAL->tmp,WARN);
       stream->unhealthy = T;
     }
@@ -4887,7 +4887,7 @@ THREADNODE *imap_parse_thread (MAILSTREAM *stream,unsigned char **txtptr)
 				/* skip past any space */
       if (**txtptr == ' ') ++*txtptr;
     }
-    ++*txtptr;			/* skip pase end of thread */
+    ++*txtptr;			/* skip past end of thread */
     parent = NIL;		/* close this thread */
   }
   return ret;			/* return parsed thread */
diff --git a/imap/src/c-client/mail.c b/imap/src/c-client/mail.c
index adddb9d4..e591a521 100644
--- a/imap/src/c-client/mail.c
+++ b/imap/src/c-client/mail.c
@@ -5343,7 +5343,7 @@ container_t mail_thread_prune_dummy_work (container_t msg,container_t ane)
 
 /* Test that purported mother is not a child of purported daughter
  * Accepts: mother
- *	    purported daugher
+ *	    purported daughter
  * Returns: T if circular parentage exists, else NIL
  */
 
@@ -6080,7 +6080,7 @@ void mail_free_searchpgmlist (SEARCHPGMLIST **pgl)
 
 
 /* Mail garbage collect namespace
- * Accepts: poiner to namespace
+ * Accepts: pointer to namespace
  */
 
 void mail_free_namespace (NAMESPACE **n)
diff --git a/imap/src/c-client/netmsg.c b/imap/src/c-client/netmsg.c
index 4454c3be..617d7bbd 100644
--- a/imap/src/c-client/netmsg.c
+++ b/imap/src/c-client/netmsg.c
@@ -68,7 +68,7 @@ FILE *netmsg_slurp (NETSTREAM *stream,unsigned long *size,unsigned long *hsiz)
       return NIL;
     }
   }
-  *size = 0;			/* initially emtpy */
+  *size = 0;			/* initially empty */
   if (hsiz) *hsiz = 0;
   while ((s = net_getline (stream)) != NULL) {
     if (*s == '.') {		/* possible end of text? */
diff --git a/imap/src/c-client/newsrc.c b/imap/src/c-client/newsrc.c
index 0f15264d..c3d31ca0 100644
--- a/imap/src/c-client/newsrc.c
+++ b/imap/src/c-client/newsrc.c
@@ -500,7 +500,7 @@ void newsrc_check_uid (unsigned char *state,unsigned long uid,
   while (*state) {		/* until run out of state string */
 				/* collect a number */
     for (i = 0; isdigit (*state); i = i*10 + (*state++ - '0'));
-    if (*state != '-') j = i;	/* coerce single mesage into range */
+    if (*state != '-') j = i;	/* coerce single message into range */
     else {			/* have a range */
       for (j = 0; isdigit (*++state); j = j*10 + (*state - '0'));
       if (!j) j = i;		/* guard against -0 */
diff --git a/imap/src/c-client/nntp.c b/imap/src/c-client/nntp.c
index 67a5d422..3fc2fe0d 100644
--- a/imap/src/c-client/nntp.c
+++ b/imap/src/c-client/nntp.c
@@ -585,7 +585,7 @@ long nntp_status (MAILSTREAM *stream,char *mbx,long flags)
     status.uidvalidity = stream->uid_validity;
 				/* pass status to main program */
     mm_status (stream,mbx,&status);
-    ret = T;			/* succes */
+    ret = T;			/* success */
   }
 				/* flush temporary stream */
   if (tstream) mail_close (tstream);
diff --git a/imap/src/c-client/rfc822.c b/imap/src/c-client/rfc822.c
index 6433bdbb..a1730954 100644
--- a/imap/src/c-client/rfc822.c
+++ b/imap/src/c-client/rfc822.c
@@ -1396,7 +1396,7 @@ char *rfc822_skip_comment (char **s,long trim)
     sprintf (tmp,"Unterminated comment: %.80s",*s);
     MM_LOG (tmp,PARSE);
     **s = '\0';			/* nuke duplicate messages in case reparse */
-    return NIL;			/* this is wierd if it happens */
+    return NIL;			/* this is weird if it happens */
   case ' ':			/* whitespace isn't significant */
     break;
   default:			/* random character */
@@ -1432,7 +1432,7 @@ static long rfc822_output_char (RFC822BUFFER *buf,int c)
 
 static long rfc822_output_data (RFC822BUFFER *buf,char *string,long len)
 {
-  while (len) {			/* until request satified */
+  while (len) {			/* until request satisfied */
     long i;
     if ((i = min (len,buf->end - buf->cur)) != 0L) {
       memcpy (buf->cur,string,i);
@@ -2231,7 +2231,7 @@ unsigned char *rfc822_8bit (unsigned char *src,unsigned long srcl,
  * versions of c-client prior to imap-2005, they did not provide any
  * buffer checking at all.
  *
- * As a half-hearted attempt, these new compatability functions for the
+ * As a half-hearted attempt, these new compatibility functions for the
  * legacy interfaces limit what they write to size SENDBUFLEN and will
  * fatal() if more than that is written.  However, that isn't good enough
  * since several of these functions *append* to the buffer, and return an
diff --git a/imap/src/c-client/utf8.c b/imap/src/c-client/utf8.c
index 844abefd..0a9b6566 100644
--- a/imap/src/c-client/utf8.c
+++ b/imap/src/c-client/utf8.c
@@ -347,7 +347,7 @@ static const SCRIPT utf8_scvalid[] = {
   {"Chinese Simplified","China, Singapore",SC_CHINESE_SIMPLIFIED},
   {"Chinese Traditional","Taiwan, Hong Kong, Macao",SC_CHINESE_TRADITIONAL},
   {"Cyrillic",NIL,SC_CYRILLIC},
-  {"Cyrillic Ukranian",NIL,SC_UKRANIAN},
+  {"Cyrillic Ukrainian",NIL,SC_UKRANIAN},
   {"Greek",NIL,SC_GREEK},
   {"Hebrew",NIL,SC_HEBREW},
   {"Japanese",NIL,SC_JAPANESE},
@@ -898,7 +898,7 @@ unsigned long utf8_rmapsize (SIZEDTEXT *text,unsigned short *rmap,
 
 /* Convert UCS-4 to charset using rmap
  * Accepts: source UCS-4 character(s)
- *	    numver of UCS-4 characters
+ *	    number of UCS-4 characters
  *	    conversion rmap
  *	    pointer to returned sized text
  *	    substitute character if not in rmap, else NIL to return failure
@@ -918,7 +918,7 @@ long ucs4_rmaptext (unsigned long *ucs4,unsigned long len,unsigned short *rmap,
 
 /* Return size of UCS-4 string converted to other CS via rmap
  * Accepts: source UCS-4 character(s)
- *	    numver of UCS-4 characters
+ *	    number of UCS-4 characters
  *	    conversion rmap
  *	    substitute character if not in rmap, else NIL to return failure
  * Returns: length if success, negative if failure (no-convert)
diff --git a/imap/src/c-client/utf8.h b/imap/src/c-client/utf8.h
index 8a73ef9e..0546cdf4 100644
--- a/imap/src/c-client/utf8.h
+++ b/imap/src/c-client/utf8.h
@@ -406,7 +406,7 @@
  * values.  Although this made sense, it was confusing with the "max ku" and
  * "max ten" values used in the double-byte tables; there are 1-origin, but
  * the calculated values used for "ku" and "ten" are 0-origin (derived by
- * substracting the "base").  What this all meant is that for double byte
+ * subtracting the "base").  What this all meant is that for double byte
  * characters the limit test is of the form (value < max_ku), but for single
  * byte characters (which used the same cell to hold the max ku) the limit
  * test was (value <= max_ku).
diff --git a/imap/src/c-client/utf8aux.c b/imap/src/c-client/utf8aux.c
index 746ea47e..0928db49 100644
--- a/imap/src/c-client/utf8aux.c
+++ b/imap/src/c-client/utf8aux.c
@@ -12,7 +12,7 @@
  */
 
 /*
- * Program:	UTF-8 auxillary routines (c-client and MIME2 support)
+ * Program:	UTF-8 auxiliary routines (c-client and MIME2 support)
  *
  * Author:	Mark Crispin
  *		Networks and Distributed Computing
diff --git a/imap/src/c-client/utf8aux.h b/imap/src/c-client/utf8aux.h
index beb55057..ea54217c 100644
--- a/imap/src/c-client/utf8aux.h
+++ b/imap/src/c-client/utf8aux.h
@@ -12,7 +12,7 @@
  */
 
 /*
- * Program:	UTF-8 auxillary routines (c-client and MIME2 support)
+ * Program:	UTF-8 auxiliary routines (c-client and MIME2 support)
  *
  * Author:	Mark Crispin
  *		Networks and Distributed Computing
diff --git a/imap/src/imapd/imapd.c b/imap/src/imapd/imapd.c
index f53dca82..b329278d 100644
--- a/imap/src/imapd/imapd.c
+++ b/imap/src/imapd/imapd.c
@@ -1913,7 +1913,7 @@ void trmint (void)
 
 /* The routines on this and the next page eschew the use of non-syscall libc
  * routines (especially stdio) for a reason.  Also, these hideous #if
- * condtionals need to be replaced.
+ * conditionals need to be replaced.
  */
 
 #ifndef unix
@@ -3606,7 +3606,7 @@ void pbody (BODY *body)
 }
 
 /* Print parameter list
- * Accepts: paramter
+ * Accepts: parameter
  */
 
 void pparam (PARAMETER *param)
@@ -4001,7 +4001,7 @@ long nameok (char *ref,char *name)
 /* Convert possible BBoard name to actual name
  * Accepts: command
  *	    mailbox name
- * Returns: maibox name
+ * Returns: mailbox name
  */
 
 char *bboardname (char *cmd,char *name)
diff --git a/imap/src/ipopd/ipop3d.c b/imap/src/ipopd/ipop3d.c
index 2be17afb..8589f4d6 100644
--- a/imap/src/ipopd/ipop3d.c
+++ b/imap/src/ipopd/ipop3d.c
@@ -652,7 +652,7 @@ void trmint ()
 int pass_login (char *t,int argc,char *argv[])
 {
   char tmp[MAILTMPLEN];
-				/* flush old passowrd */
+				/* flush old password */
   if (pass) fs_give ((void **) &pass);
   if (!(t && *t)) {		/* if no password given */
     PSOUT ("-ERR Missing password argument\015\012");
diff --git a/imap/src/mtest/mtest.c b/imap/src/mtest/mtest.c
index e433ba8d..4d7f9473 100644
--- a/imap/src/mtest/mtest.c
+++ b/imap/src/mtest/mtest.c
@@ -348,7 +348,7 @@ void mm (MAILSTREAM *stream,long debug)
 	for(i = 0; i < 3; ++i) {
 	  puts(nstypes[i]);
 	  for(ns = nslist[i]; ns; ns = ns->next)
-	    printf(" namespace = %s, delimeter = %c\n", ns->name, ns->delimiter);
+	    printf(" namespace = %s, delimiter = %c\n", ns->name, ns->delimiter);
 	}
       }
       break;
diff --git a/imap/src/osdep/amiga/Makefile b/imap/src/osdep/amiga/Makefile
index 60458e61..ff9e165b 100644
--- a/imap/src/osdep/amiga/Makefile
+++ b/imap/src/osdep/amiga/Makefile
@@ -62,7 +62,7 @@ CREATEPROTO=unixproto
 EMPTYPROTO=unixproto
 
 
-# Commands possibly overriden by the individual port
+# Commands possibly overridden by the individual port
 
 ARRC=ar rc
 CC=cc
diff --git a/imap/src/osdep/amiga/mbx.c b/imap/src/osdep/amiga/mbx.c
index dc902b20..3cc89c94 100644
--- a/imap/src/osdep/amiga/mbx.c
+++ b/imap/src/osdep/amiga/mbx.c
@@ -1168,7 +1168,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	  ret = NIL;		/* mark failure */
 	  break;
 	}
-	mail_date (tmp,&elt);	/* write preseved date */
+	mail_date (tmp,&elt);	/* write preserved date */
       }
       else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/amiga/mh.c b/imap/src/osdep/amiga/mh.c
index 005000d6..a7b56e8c 100644
--- a/imap/src/osdep/amiga/mh.c
+++ b/imap/src/osdep/amiga/mh.c
@@ -701,7 +701,7 @@ void mh_load_message (MAILSTREAM *stream,unsigned long msgno,long flags)
 	}
 	nlseen = T;		/* note newline seen */
 	break;
-      default:			/* ordinary chararacter */
+      default:			/* ordinary character */
 	i++;
 	nlseen = NIL;
 	break;
@@ -1200,10 +1200,10 @@ int mh_select (struct direct *name)
 }
 
 
-/* MH file name comparision
+/* MH file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
  */
 
 int mh_numsort (const void *d1,const void *d2)
diff --git a/imap/src/osdep/amiga/mix.c b/imap/src/osdep/amiga/mix.c
index 63009bb2..9ab3442c 100644
--- a/imap/src/osdep/amiga/mix.c
+++ b/imap/src/osdep/amiga/mix.c
@@ -975,7 +975,7 @@ long mix_ping (MAILSTREAM *stream)
       }
     }
     if (sysibx) mail_close (sysibx);
-				/* reenable APPENDUID/COPYUID */
+				/* re-enable APPENDUID/COPYUID */
     mail_parameters (NIL,SET_APPENDUID,(void *) au);
     mail_parameters (NIL,SET_COPYUID,(void *) cu);
     snarfing = NIL;		/* no longer snarfing */
@@ -1163,7 +1163,7 @@ int mix_select (struct direct *name)
 }
 
 
-/* MIX msg file name comparision
+/* MIX msg file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
  * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2
@@ -1884,7 +1884,7 @@ FILE *mix_parse (MAILSTREAM *stream,FILE **idxf,long iflags,long sflags)
 			return NIL;
 		      }
 		      prevuid = uid;
-		      ++nmsgs;	/* this is another mesage */
+		      ++nmsgs;	/* this is another message */
 				/* within current known range of messages? */
 		      while (nmsgs <= stream->nmsgs) {
 				/* yes, get corresponding elt */
@@ -2156,7 +2156,7 @@ char *mix_meta_slurp (MAILSTREAM *stream,unsigned long *seq)
   char *s;
   char *ret = NIL;
   if (fstat (LOCAL->mfd,&sbuf))
-    MM_LOG ("Error obtaining size of mix metatdata file",ERROR);
+    MM_LOG ("Error obtaining size of mix metadata file",ERROR);
   if (sbuf.st_size > LOCAL->buflen) {
 				/* should be just a few dozen bytes */
     if (sbuf.st_size > METAMAX) fatal ("absurd mix metadata file size");
@@ -2199,7 +2199,7 @@ long mix_meta_update (MAILSTREAM *stream)
      *
      * If more stuff gets added to the metadata, or if you change the value
      * of NUSERFLAGS, MAXUSERFLAG or CHUNKSIZE, be sure to recalculate the
-     * above assertation.
+     * above assertion.
      */
     sprintf (LOCAL->buf,SEQFMT,LOCAL->metaseq = mix_modseq (LOCAL->metaseq));
     sprintf (LOCAL->buf + strlen (LOCAL->buf),MTAFMT,
diff --git a/imap/src/osdep/amiga/mtx.c b/imap/src/osdep/amiga/mtx.c
index 8e6f76e8..4c989564 100644
--- a/imap/src/osdep/amiga/mtx.c
+++ b/imap/src/osdep/amiga/mtx.c
@@ -1035,7 +1035,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/amiga/mx.c b/imap/src/osdep/amiga/mx.c
index 45495279..7e2b022e 100644
--- a/imap/src/osdep/amiga/mx.c
+++ b/imap/src/osdep/amiga/mx.c
@@ -1119,10 +1119,10 @@ int mx_select (struct direct *name)
 }
 
 
-/* MX file name comparision
+/* MX file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
  */
 
 int mx_numsort (const void *d1,const void *d2)
diff --git a/imap/src/osdep/amiga/nl_ami.c b/imap/src/osdep/amiga/nl_ami.c
index b2d5616a..2b470d5f 100644
--- a/imap/src/osdep/amiga/nl_ami.c
+++ b/imap/src/osdep/amiga/nl_ami.c
@@ -84,7 +84,7 @@ unsigned long strcrlflen (STRING *s)
     break;
   case '\012':			/* line feed? */
     i++;
-  default:			/* ordinary chararacter */
+  default:			/* ordinary character */
     break;
   }
   SETPOS (s,pos);		/* restore old position */
diff --git a/imap/src/osdep/amiga/os_ami.c b/imap/src/osdep/amiga/os_ami.c
index 1ba3ca5f..9f0d27b0 100644
--- a/imap/src/osdep/amiga/os_ami.c
+++ b/imap/src/osdep/amiga/os_ami.c
@@ -61,7 +61,7 @@ extern char *sys_errlist[];
 
 #undef utime
 
-/* Amiga has its own wierd utime() with an incompatible struct utimbuf that
+/* Amiga has its own weird utime() with an incompatible struct utimbuf that
  * does not match with the traditional time_t [2].
  */
 
diff --git a/imap/src/osdep/amiga/scandir.c b/imap/src/osdep/amiga/scandir.c
index c5e4541b..8f6b4d46 100644
--- a/imap/src/osdep/amiga/scandir.c
+++ b/imap/src/osdep/amiga/scandir.c
@@ -68,10 +68,10 @@ int scandir (char *dirname,struct direct ***namelist,select_t select,
   return nitems;		/* and size */
 }
 
-/* Alphabetic file name comparision
+/* Alphabetic file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
  */
 
 int alphasort (void *d1,void *d2)
diff --git a/imap/src/osdep/amiga/tenex.c b/imap/src/osdep/amiga/tenex.c
index eee61fba..0982573f 100644
--- a/imap/src/osdep/amiga/tenex.c
+++ b/imap/src/osdep/amiga/tenex.c
@@ -1125,7 +1125,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
     i = GETPOS (message);	/* remember current position */
diff --git a/imap/src/osdep/dos/bezrkdos.c b/imap/src/osdep/dos/bezrkdos.c
index 81617380..ab3e9fd0 100644
--- a/imap/src/osdep/dos/bezrkdos.c
+++ b/imap/src/osdep/dos/bezrkdos.c
@@ -791,7 +791,7 @@ long bezerk_parse (MAILSTREAM *stream)
 				/* note offset of message */
     elt->private.msg.full.offset =
       (s = ((*t == '\015') ? (t + 2) : (t + 1))) - tmp;
-				/* generate plausable IMAPish date string */
+				/* generate plausible IMAPish date string */
     db[2] = db[6] = db[20] = '-'; db[11] = ' '; db[14] = db[17] = ':';
 				/* dd */
     db[0] = t[ti - 2]; db[1] = t[ti - 1];
diff --git a/imap/src/osdep/dos/drivraux.bat b/imap/src/osdep/dos/drivraux.bat
index a0b354cd..37aa0b55 100644
--- a/imap/src/osdep/dos/drivraux.bat
+++ b/imap/src/osdep/dos/drivraux.bat
@@ -11,7 +11,7 @@ REM
 REM 
 REM ========================================================================
 
-REM Program:	Driver Linkage Generator auxillary for DOS
+REM Program:	Driver Linkage Generator auxiliary for DOS
 REM
 REM Author:	Mark Crispin
 REM		Networks and Distributed Computing
diff --git a/imap/src/osdep/dos/mkautaux.bat b/imap/src/osdep/dos/mkautaux.bat
index 5d24d83b..c629ef2d 100644
--- a/imap/src/osdep/dos/mkautaux.bat
+++ b/imap/src/osdep/dos/mkautaux.bat
@@ -11,7 +11,7 @@ REM
 REM 
 REM ========================================================================
 
-REM Program:	Authenticator Linkage Generator auxillary for DOS
+REM Program:	Authenticator Linkage Generator auxiliary for DOS
 REM
 REM Author:	Mark Crispin
 REM		Networks and Distributed Computing
diff --git a/imap/src/osdep/dos/mtxdos.c b/imap/src/osdep/dos/mtxdos.c
index ad969267..6633eba6 100644
--- a/imap/src/osdep/dos/mtxdos.c
+++ b/imap/src/osdep/dos/mtxdos.c
@@ -656,7 +656,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
@@ -754,7 +754,7 @@ long mtx_parse (MAILSTREAM *stream)
     }
 
     *s++ = '\0'; *t++ = '\0';	/* tie off fields */
-				/* intantiate an elt for this message */
+				/* instantiate an elt for this message */
     (elt = mail_elt (stream,++nmsgs))->valid = T;
     elt->private.uid = ++stream->uid_last;
 				/* note file offset of header */
diff --git a/imap/src/osdep/nt/drivraux.bat b/imap/src/osdep/nt/drivraux.bat
index 30649a78..3c7dde84 100644
--- a/imap/src/osdep/nt/drivraux.bat
+++ b/imap/src/osdep/nt/drivraux.bat
@@ -11,7 +11,7 @@ REM
 REM 
 REM ========================================================================
 
-REM Program:	Driver Linkage Generator auxillary for NT/Win9x
+REM Program:	Driver Linkage Generator auxiliary for NT/Win9x
 REM
 REM Author:	Mark Crispin
 REM		Networks and Distributed Computing
diff --git a/imap/src/osdep/nt/kerb_w2k.c b/imap/src/osdep/nt/kerb_w2k.c
index 38d0ce30..e2a271b3 100644
--- a/imap/src/osdep/nt/kerb_w2k.c
+++ b/imap/src/osdep/nt/kerb_w2k.c
@@ -205,7 +205,7 @@ char *kerberos_login (char *user,char *authuser,int argc,char *argv[]);
 #define STRING WINSTRING	/* conflict with mail.h */
 #include <NTSecAPI.h>
 
-/* GSSAPI build-in object identifiers */
+/* GSSAPI built-in object identifiers */
 
 static gss_OID_desc oids[] = {	/* stupid C language makes this necessary */
   {10,"\052\206\110\206\367\022\001\002\001\004"},
@@ -230,7 +230,7 @@ static gss_cred_id_t gss_default_cred = NIL;
 
 /* GSSAPI import name (convert to full service principal name)
  * Accepts: pointer to return minor status
- *	    buffer containining input name
+ *	    buffer containing input name
  *	    type of input name
  *	    pointer to return output internal name
  * Returns: major status, always
diff --git a/imap/src/osdep/nt/mbxnt.c b/imap/src/osdep/nt/mbxnt.c
index bb3d4cc0..5ea3b57e 100644
--- a/imap/src/osdep/nt/mbxnt.c
+++ b/imap/src/osdep/nt/mbxnt.c
@@ -1046,7 +1046,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	  ret = NIL;		/* mark failure */
 	  break;
 	}
-	mail_date (tmp,&elt);	/* write preseved date */
+	mail_date (tmp,&elt);	/* write preserved date */
       }
       else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/nt/mkautaux.bat b/imap/src/osdep/nt/mkautaux.bat
index c65022d2..0e8e450c 100644
--- a/imap/src/osdep/nt/mkautaux.bat
+++ b/imap/src/osdep/nt/mkautaux.bat
@@ -11,7 +11,7 @@ REM
 REM 
 REM ========================================================================
 
-REM Program:	Authenticator Linkage Generator auxillary for NT/Win9x
+REM Program:	Authenticator Linkage Generator auxiliary for NT/Win9x
 REM
 REM Author:	Mark Crispin
 REM		Networks and Distributed Computing
diff --git a/imap/src/osdep/nt/mtxnt.c b/imap/src/osdep/nt/mtxnt.c
index 13f61586..0ca88fb7 100644
--- a/imap/src/osdep/nt/mtxnt.c
+++ b/imap/src/osdep/nt/mtxnt.c
@@ -908,7 +908,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/nt/os_nt.h b/imap/src/osdep/nt/os_nt.h
index 650bb782..be2fcff7 100644
--- a/imap/src/osdep/nt/os_nt.h
+++ b/imap/src/osdep/nt/os_nt.h
@@ -34,7 +34,7 @@
 #include <io.h>
 #include <conio.h>
 #include <process.h>
-#undef ERROR			/* quell conflicting defintion warning */
+#undef ERROR			/* quell conflicting definition warning */
 #include <windows.h>
 #include <lm.h>
 #undef ERROR
diff --git a/imap/src/osdep/nt/tenexnt.c b/imap/src/osdep/nt/tenexnt.c
index 4805b7c5..4c1d0a3b 100644
--- a/imap/src/osdep/nt/tenexnt.c
+++ b/imap/src/osdep/nt/tenexnt.c
@@ -979,7 +979,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
     i = GETPOS (message);	/* remember current position */
diff --git a/imap/src/osdep/nt/yunchan.c b/imap/src/osdep/nt/yunchan.c
index b1e374b0..6c8995fe 100644
--- a/imap/src/osdep/nt/yunchan.c
+++ b/imap/src/osdep/nt/yunchan.c
@@ -175,7 +175,7 @@ unsigned long unix_crlfcpy (char **dst,unsigned long *dstl,char *src,
     break;
   case '\012':			/* line feed? */
     *d++ ='\015';		/* yes, prepend a CR, drop into default case */
-  default:			/* ordinary chararacter */
+  default:			/* ordinary character */
     *d++ = *src++;		/* just copy character */
     break;
   }
@@ -202,7 +202,7 @@ unsigned long unix_crlflen (STRING *s)
     break;
   case '\012':			/* line feed? */
     i++;
-  default:			/* ordinary chararacter */
+  default:			/* ordinary character */
     break;
   }
   SETPOS (s,pos);		/* restore old position */
diff --git a/imap/src/osdep/os2/mbxnt.c b/imap/src/osdep/os2/mbxnt.c
index bb3d4cc0..5ea3b57e 100644
--- a/imap/src/osdep/os2/mbxnt.c
+++ b/imap/src/osdep/os2/mbxnt.c
@@ -1046,7 +1046,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	  ret = NIL;		/* mark failure */
 	  break;
 	}
-	mail_date (tmp,&elt);	/* write preseved date */
+	mail_date (tmp,&elt);	/* write preserved date */
       }
       else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/os2/mtxnt.c b/imap/src/osdep/os2/mtxnt.c
index 13f61586..0ca88fb7 100644
--- a/imap/src/osdep/os2/mtxnt.c
+++ b/imap/src/osdep/os2/mtxnt.c
@@ -908,7 +908,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/os2/tenexnt.c b/imap/src/osdep/os2/tenexnt.c
index 4805b7c5..4c1d0a3b 100644
--- a/imap/src/osdep/os2/tenexnt.c
+++ b/imap/src/osdep/os2/tenexnt.c
@@ -979,7 +979,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
     i = GETPOS (message);	/* remember current position */
diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile
index c4e1411f..7b1bff38 100644
--- a/imap/src/osdep/unix/Makefile
+++ b/imap/src/osdep/unix/Makefile
@@ -37,7 +37,7 @@ BUNDLED=
 
 # The optimization level here for GCC ports is set here for a reason.  It's
 # to get you to read this text.
-# The general concensus seems to be that -O2 is the one to use.
+# The general consensus seems to be that -O2 is the one to use.
 # Over the years, I've been told to use many different settings, including -O6.
 # In recent versions of GCC [as of 2/2005], -O6 generates bad code that, among
 # other ill effects, causes infinite loops.
@@ -130,7 +130,7 @@ CREATEPROTO=unixproto
 EMPTYPROTO=unixproto
 
 
-# Commands possibly overriden by the individual port
+# Commands possibly overridden by the individual port
 
 ARRC=ar rc
 CC=cc
diff --git a/imap/src/osdep/unix/ckp_cyg.c b/imap/src/osdep/unix/ckp_cyg.c
index 28e07394..86fe1d0e 100644
--- a/imap/src/osdep/unix/ckp_cyg.c
+++ b/imap/src/osdep/unix/ckp_cyg.c
@@ -27,7 +27,7 @@
  */
 
 /* This module is against my better judgement.  If you want to run an imapd
- * or ipop[23]d you should use the native NT or W2K ports intead of this
+ * or ipop[23]d you should use the native NT or W2K ports instead of this
  * Cygwin port.  There is no surety that this module works right or will work
  * right in the future.
  */
diff --git a/imap/src/osdep/unix/ckp_pam.c b/imap/src/osdep/unix/ckp_pam.c
index 5bc31f3d..d6acfda3 100644
--- a/imap/src/osdep/unix/ckp_pam.c
+++ b/imap/src/osdep/unix/ckp_pam.c
@@ -117,7 +117,7 @@ struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[])
      * pam_unix.so.1
      */
     /*
-     * This pam_open_session() call is inconsistant with how we handle other
+     * This pam_open_session() call is inconsistent with how we handle other
      * platforms, where we don't write [uw]tmp records.  However, unlike our
      * code on other platforms, pam_acct_mgmt() will check those records for
      * inactivity and deny the authentication.
diff --git a/imap/src/osdep/unix/ckp_pmb.c b/imap/src/osdep/unix/ckp_pmb.c
index c8a935cd..5c098f35 100644
--- a/imap/src/osdep/unix/ckp_pmb.c
+++ b/imap/src/osdep/unix/ckp_pmb.c
@@ -109,7 +109,7 @@ struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[])
      * pam_unix.so.1
      */
     /*
-     * This pam_open_session() call is inconsistant with how we handle other
+     * This pam_open_session() call is inconsistent with how we handle other
      * platforms, where we don't write [uw]tmp records.  However, unlike our
      * code on other platforms, pam_acct_mgmt() will check those records for
      * inactivity and deny the authentication.
diff --git a/imap/src/osdep/unix/ckp_psx.c b/imap/src/osdep/unix/ckp_psx.c
index d8ebdaad..0f425bd3 100644
--- a/imap/src/osdep/unix/ckp_psx.c
+++ b/imap/src/osdep/unix/ckp_psx.c
@@ -67,7 +67,7 @@ struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[])
      *  max	number of days a password is valid if positive
      *  warn	number of days of password expiration warning
      *  expire	date account expires if positive
-     *  inact	number of days an accout can be inactive (not checked!)
+     *  inact	number of days an account can be inactive (not checked!)
      * The expiration day is the *last* day that the password or account
      * is valid.
      */
diff --git a/imap/src/osdep/unix/mbx.c b/imap/src/osdep/unix/mbx.c
index 18c4fa20..1f41efce 100644
--- a/imap/src/osdep/unix/mbx.c
+++ b/imap/src/osdep/unix/mbx.c
@@ -1168,7 +1168,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	  ret = NIL;		/* mark failure */
 	  break;
 	}
-	mail_date (tmp,&elt);	/* write preseved date */
+	mail_date (tmp,&elt);	/* write preserved date */
       }
       else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/unix/mh.c b/imap/src/osdep/unix/mh.c
index ac71b6ba..ebc930e3 100644
--- a/imap/src/osdep/unix/mh.c
+++ b/imap/src/osdep/unix/mh.c
@@ -701,7 +701,7 @@ void mh_load_message (MAILSTREAM *stream,unsigned long msgno,long flags)
 	}
 	nlseen = T;		/* note newline seen */
 	break;
-      default:			/* ordinary chararacter */
+      default:			/* ordinary character */
 	i++;
 	nlseen = NIL;
 	break;
@@ -1200,10 +1200,10 @@ int mh_select (struct direct *name)
 }
 
 
-/* MH file name comparision
+/* MH file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
  */
 
 int mh_numsort (const void *d1,const void *d2)
diff --git a/imap/src/osdep/unix/mix.c b/imap/src/osdep/unix/mix.c
index c53cabc0..20d2b012 100644
--- a/imap/src/osdep/unix/mix.c
+++ b/imap/src/osdep/unix/mix.c
@@ -975,7 +975,7 @@ long mix_ping (MAILSTREAM *stream)
       }
     }
     if (sysibx) mail_close (sysibx);
-				/* reenable APPENDUID/COPYUID */
+				/* re-enable APPENDUID/COPYUID */
     mail_parameters (NIL,SET_APPENDUID,(void *) au);
     mail_parameters (NIL,SET_COPYUID,(void *) cu);
     snarfing = NIL;		/* no longer snarfing */
@@ -1163,7 +1163,7 @@ int mix_select (struct direct *name)
 }
 
 
-/* MIX msg file name comparision
+/* MIX msg file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
  * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2
@@ -1884,7 +1884,7 @@ FILE *mix_parse (MAILSTREAM *stream,FILE **idxf,long iflags,long sflags)
 			return NIL;
 		      }
 		      prevuid = uid;
-		      ++nmsgs;	/* this is another mesage */
+		      ++nmsgs;	/* this is another message */
 				/* within current known range of messages? */
 		      while (nmsgs <= stream->nmsgs) {
 				/* yes, get corresponding elt */
@@ -2156,7 +2156,7 @@ char *mix_meta_slurp (MAILSTREAM *stream,unsigned long *seq)
   char *s;
   char *ret = NIL;
   if (fstat (LOCAL->mfd,&sbuf))
-    MM_LOG ("Error obtaining size of mix metatdata file",ERROR);
+    MM_LOG ("Error obtaining size of mix metadata file",ERROR);
   if (sbuf.st_size > LOCAL->buflen) {
 				/* should be just a few dozen bytes */
     if (sbuf.st_size > METAMAX) fatal ("absurd mix metadata file size");
@@ -2199,7 +2199,7 @@ long mix_meta_update (MAILSTREAM *stream)
      *
      * If more stuff gets added to the metadata, or if you change the value
      * of NUSERFLAGS, MAXUSERFLAG or CHUNKSIZE, be sure to recalculate the
-     * above assertation.
+     * above assertion.
      */
     sprintf (LOCAL->buf,SEQFMT,LOCAL->metaseq = mix_modseq (LOCAL->metaseq));
     sprintf (LOCAL->buf + strlen (LOCAL->buf),MTAFMT,
diff --git a/imap/src/osdep/unix/mtx.c b/imap/src/osdep/unix/mtx.c
index 4346eceb..bc7f296e 100644
--- a/imap/src/osdep/unix/mtx.c
+++ b/imap/src/osdep/unix/mtx.c
@@ -1036,7 +1036,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
 				/* write header */
diff --git a/imap/src/osdep/unix/mx.c b/imap/src/osdep/unix/mx.c
index 10d56b0a..3f90ab9e 100644
--- a/imap/src/osdep/unix/mx.c
+++ b/imap/src/osdep/unix/mx.c
@@ -1119,10 +1119,10 @@ int mx_select (struct direct *name)
 }
 
 
-/* MX file name comparision
+/* MX file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
  */
 
 int mx_numsort (const void *d1,const void *d2)
diff --git a/imap/src/osdep/unix/news.c b/imap/src/osdep/unix/news.c
index 1af24273..51eb2e61 100644
--- a/imap/src/osdep/unix/news.c
+++ b/imap/src/osdep/unix/news.c
@@ -411,10 +411,10 @@ int news_select (struct direct *name)
 }
 
 
-/* News file name comparision
+/* News file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
  */
 
 int news_numsort (const void *d1,const void *d2)
@@ -533,7 +533,7 @@ void news_load_message (MAILSTREAM *stream,unsigned long msgno,long flags)
 	}
 	nlseen = T;		/* note newline seen */
 	break;
-      default:			/* ordinary chararacter */
+      default:			/* ordinary character */
 	i++;
 	nlseen = NIL;
 	break;
diff --git a/imap/src/osdep/unix/nl_unix.c b/imap/src/osdep/unix/nl_unix.c
index 5ae96b08..7b900c6b 100644
--- a/imap/src/osdep/unix/nl_unix.c
+++ b/imap/src/osdep/unix/nl_unix.c
@@ -84,7 +84,7 @@ unsigned long strcrlflen (STRING *s)
     break;
   case '\012':			/* line feed? */
     i++;
-  default:			/* ordinary chararacter */
+  default:			/* ordinary character */
     break;
   }
   SETPOS (s,pos);		/* restore old position */
diff --git a/imap/src/osdep/unix/os_vu2.c b/imap/src/osdep/unix/os_vu2.c
index be574e07..0b9c026a 100644
--- a/imap/src/osdep/unix/os_vu2.c
+++ b/imap/src/osdep/unix/os_vu2.c
@@ -52,7 +52,7 @@ extern int errno;		/* just in case */
 #define FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
 
 
-/* Old Ultrix has its own wierd inet_addr() that returns a in_addr struct. */
+/* Old Ultrix has its own weird inet_addr() that returns a in_addr struct. */
 
 /* Portable inet_addr () that returns a u_long
  * Accepts: dotted host string
diff --git a/imap/src/osdep/unix/scandir.c b/imap/src/osdep/unix/scandir.c
index c5e4541b..8f6b4d46 100644
--- a/imap/src/osdep/unix/scandir.c
+++ b/imap/src/osdep/unix/scandir.c
@@ -68,10 +68,10 @@ int scandir (char *dirname,struct direct ***namelist,select_t select,
   return nitems;		/* and size */
 }
 
-/* Alphabetic file name comparision
+/* Alphabetic file name comparison
  * Accepts: first candidate directory entry
  *	    second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
  */
 
 int alphasort (void *d1,void *d2)
diff --git a/imap/src/osdep/unix/tcp_unix.c b/imap/src/osdep/unix/tcp_unix.c
index c98b479c..bc5fe33a 100644
--- a/imap/src/osdep/unix/tcp_unix.c
+++ b/imap/src/osdep/unix/tcp_unix.c
@@ -208,7 +208,7 @@ TCPSTREAM *tcp_open (char *host,char *service,unsigned long port)
 				&cleanup)) && !silent)
 	  mm_log (tmp,WARN);
 	(*bn) (BLOCK_NONE,NIL);
-      } while ((sock < 0) && s);/* repeat until success or no more addreses */
+      } while ((sock < 0) && s);/* repeat until success or no more addresses */
     }
     ip_nametoaddr (NIL,NIL,NIL,NIL,NIL,&cleanup);
   }
diff --git a/imap/src/osdep/unix/tenex.c b/imap/src/osdep/unix/tenex.c
index 8815fee1..2e1a5790 100644
--- a/imap/src/osdep/unix/tenex.c
+++ b/imap/src/osdep/unix/tenex.c
@@ -1128,7 +1128,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
 	ret = NIL;		/* mark failure */
 	break;
       }
-      mail_date (tmp,&elt);	/* write preseved date */
+      mail_date (tmp,&elt);	/* write preserved date */
     }
     else internal_date (tmp);	/* get current date in IMAP format */
     i = GETPOS (message);	/* remember current position */
diff --git a/imap/src/osdep/vms/nl_vms.c b/imap/src/osdep/vms/nl_vms.c
index b2d5616a..2b470d5f 100644
--- a/imap/src/osdep/vms/nl_vms.c
+++ b/imap/src/osdep/vms/nl_vms.c
@@ -84,7 +84,7 @@ unsigned long strcrlflen (STRING *s)
     break;
   case '\012':			/* line feed? */
     i++;
-  default:			/* ordinary chararacter */
+  default:			/* ordinary character */
     break;
   }
   SETPOS (s,pos);		/* restore old position */
diff --git a/imap/src/osdep/wce/drivraux.bat b/imap/src/osdep/wce/drivraux.bat
index 30649a78..3c7dde84 100644
--- a/imap/src/osdep/wce/drivraux.bat
+++ b/imap/src/osdep/wce/drivraux.bat
@@ -11,7 +11,7 @@ REM
 REM 
 REM ========================================================================
 
-REM Program:	Driver Linkage Generator auxillary for NT/Win9x
+REM Program:	Driver Linkage Generator auxiliary for NT/Win9x
 REM
 REM Author:	Mark Crispin
 REM		Networks and Distributed Computing
diff --git a/imap/src/osdep/wce/mkautaux.bat b/imap/src/osdep/wce/mkautaux.bat
index c65022d2..0e8e450c 100644
--- a/imap/src/osdep/wce/mkautaux.bat
+++ b/imap/src/osdep/wce/mkautaux.bat
@@ -11,7 +11,7 @@ REM
 REM 
 REM ========================================================================
 
-REM Program:	Authenticator Linkage Generator auxillary for NT/Win9x
+REM Program:	Authenticator Linkage Generator auxiliary for NT/Win9x
 REM
 REM Author:	Mark Crispin
 REM		Networks and Distributed Computing
diff --git a/imap/src/tmail/tmail.1 b/imap/src/tmail/tmail.1
index a34d4bb9..bf84f6e9 100644
--- a/imap/src/tmail/tmail.1
+++ b/imap/src/tmail/tmail.1
@@ -99,7 +99,7 @@ this will write to the specified file on the user's home directory in
 the specified format.  However, certain names are special.  These are:
 .PP
 .nf
-  value       equivalant to
+  value       equivalent to
   -----       -------------
   INBOX.MTX   #driver.mtx/INBOX.MTX
   mbox        #driver.unix/mbox