* Many spelling errors corrected by Jens Schleusener. Thank you!

33 files changed, 47 insertions, 47 deletions

diff --git a/alpine/after.c b/alpine/after.c
index 744aca6f..961528f9 100644
--- a/alpine/after.c
+++ b/alpine/after.c
@@ -124,7 +124,7 @@ stop_after(int join)
 	}
     }
 
-    /* not literally true uless "join" set */
+    /* not literally true unless "join" set */
     after_active = 0;
 
 #else	/* !(defined(HAVE_PTHREAD) && defined(HAVE_NANOSLEEP)) */
diff --git a/alpine/alpine.c b/alpine/alpine.c
index 3831b89e..cb2c9701 100644
--- a/alpine/alpine.c
+++ b/alpine/alpine.c
@@ -3253,7 +3253,7 @@ quit_screen(struct pine *pine_state)
 
 
 /*----------------------------------------------------------------------
-    The nuts and bolts of actually cleaning up and exitting pine
+    The nuts and bolts of actually cleaning up and exiting pine
 
     Args: ps -- the usual pine structure, 
 	  exit_val -- what to tell our parent
diff --git a/alpine/folder.c b/alpine/folder.c
index a391181a..0b9fb203 100644
--- a/alpine/folder.c
+++ b/alpine/folder.c
@@ -126,7 +126,7 @@ typedef struct _folder_screen {
 
 
 /*
- * Struct mananging folder_lister metadata as it gets passed
+ * Struct managing folder_lister metadata as it gets passed
  * in and back up thru scrolltool
  */
 typedef struct _folder_proc {
diff --git a/alpine/imap.c b/alpine/imap.c
index fa7b0d7c..1d05ac3e 100644
--- a/alpine/imap.c
+++ b/alpine/imap.c
@@ -308,7 +308,7 @@ OAUTH2_S alpine_oauth2_list[] =
     0, 		/* first time indicator */
     1,		/* client secret required */
     0,		/* Cancel refresh token */
-    YANDEX_FLAGS /* defaul flags. For YANDEX this should be set to OA2_AUTHORIZE */
+    YANDEX_FLAGS /* default flags. For YANDEX this should be set to OA2_AUTHORIZE */
   },
   { NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0},
 };
@@ -1513,7 +1513,7 @@ mm_login_work(NETMBX *mb, char *user, char **pwd, long int trial,
     if(ps_global->ttyo)
       flush_status_messages(0);
 
-    /* redo app id in case we are loging in to an IMAP server that supports the IMAP ID extension */
+    /* redo app id in case we are logging in to an IMAP server that supports the IMAP ID extension */
     free_id(&ps_global->id);
     ps_global->id = set_alpine_id(PACKAGE_NAME, PACKAGE_VERSION);
     mail_parameters(NULL, SET_IDPARAMS, (void *) ps_global->id);
@@ -3942,7 +3942,7 @@ get_passfile_passwd(pinerc, passwd, user, hostlist, altflag)
 }
 
 /*
- * get_passfile_passwd_auth - return the password contained in the special passord
+ * get_passfile_passwd_auth - return the password contained in the special password
  *            cache.  The file is assumed to be in the same directory
  *            as the pinerc with the name defined above.
  */
diff --git a/alpine/osdep/jobcntrl.c b/alpine/osdep/jobcntrl.c
index 38169822..e3d790df 100644
--- a/alpine/osdep/jobcntrl.c
+++ b/alpine/osdep/jobcntrl.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$Id: jobcntrl.c 765 2007-10-23 23:51:37Z hubert@u.washing
 
 
 /*----------------------------------------------------------------------
-     This routine returns 1 if job control is available.  Note, thiis
+     This routine returns 1 if job control is available.  Note, this
      could be some type of fake job control.  It doesn't have to be
      real BSD-style job control.
   ----*/
diff --git a/alpine/reply.c b/alpine/reply.c
index d7875a92..7ec610a6 100644
--- a/alpine/reply.c
+++ b/alpine/reply.c
@@ -1494,7 +1494,7 @@ get_signature_file(char *file, int prenewlines, int postnewlines, int is_sig)
    Create the outgoing envelope for the mail being forwarded, which is 
 not much more than filling in the subject, and create the message body
 of the outgoing message which requires formatting the header from the
-envelope of the original messasge.
+envelope of the original message.
   ----------------------------------------------------------------------*/
 int
 forward(struct pine *ps, ACTION_S *role_arg)
@@ -1873,7 +1873,7 @@ forward(struct pine *ps, ACTION_S *role_arg)
    Create the outgoing envelope for the mail being forwarded, which is 
 not much more than filling in the subject, and create the message body
 of the outgoing message which requires formatting the header from the
-envelope of the original messasge.
+envelope of the original message.
   ----------------------------------------------------------------------*/
 void
 forward_text(struct pine *pine_state, void *text, SourceType source)
@@ -1963,7 +1963,7 @@ forward_text(struct pine *pine_state, void *text, SourceType source)
    Create the outgoing envelope for the mail being resent, which is 
 not much more than filling in the subject, and create the message body
 of the outgoing message which requires formatting the header from the
-envelope of the original messasge.
+envelope of the original message.
   ----------------------------------------------------------------------*/
 int
 bounce(struct pine *pine_state, ACTION_S *role)
diff --git a/contrib/carmel/c-client/carmel.c b/contrib/carmel/c-client/carmel.c
index 5e2ff927..93342f14 100644
--- a/contrib/carmel/c-client/carmel.c
+++ b/contrib/carmel/c-client/carmel.c
@@ -11,7 +11,7 @@
 
   Last Edited: Aug 31, 1994
 
-The "Carmel" mail format is cutsom mail file format that has messages
+The "Carmel" mail format is custom mail file format that has messages
 saved in individual files and an index file that references them. It
 has also been called the "pod" or "vmail" format. This is probably not
 of interest to anyone away from it's origin, though the Carmel2 format
diff --git a/imap/NOTICE b/imap/NOTICE
index c9915813..b5b5b947 100644
--- a/imap/NOTICE
+++ b/imap/NOTICE
@@ -1,4 +1,4 @@
-PANDA IMAP tookit notices:
+PANDA IMAP toolkit notices:
 
 The Panda IMAP Toolkit (c-client API, dmail, imapd, ipop2d, ipop3d,
 mailutil, mlock, mtest, and tmail software; and its included text) was
diff --git a/imap/docs/FAQ.html b/imap/docs/FAQ.html
index f2496b99..58d8c5a6 100644
--- a/imap/docs/FAQ.html
+++ b/imap/docs/FAQ.html
@@ -2371,7 +2371,7 @@ for better performance.
       <p>The IMAP server also doesn't know whether your preferred
       subdirectory for mailbox files is "mail/", ".mail/", "Mail/",
       "Mailboxes/", or any of a zillion other possibilities. If one such name
-      were chosen, it would undoubtably anger the partisans of all the other
+      were chosen, it would undoubtedly anger the partisans of all the other
       names.</p>
 
       <p>It is possible to modify the software so that the default connected
diff --git a/imap/docs/FAQ.txt b/imap/docs/FAQ.txt
index 2fac001f..f8418120 100644
--- a/imap/docs/FAQ.txt
+++ b/imap/docs/FAQ.txt
@@ -1650,7 +1650,7 @@ mtest.c:515: the `gets' function is dangerous and should not be used.
           The IMAP server also doesn't know whether your preferred
           subdirectory for mailbox files is "mail/", ".mail/", "Mail/",
           "Mailboxes/", or any of a zillion other possibilities. If one
-          such name were chosen, it would undoubtably anger the partisans
+          such name were chosen, it would undoubtedly anger the partisans
           of all the other names.
 
           It is possible to modify the software so that the default
diff --git a/imap/docs/internal.txt b/imap/docs/internal.txt
index cc3def1d..7ccd356b 100644
--- a/imap/docs/internal.txt
+++ b/imap/docs/internal.txt
@@ -2690,7 +2690,7 @@ possibly shown to the user.
 
 	PARSE	An RFC 822 parsing error.  Since bogus headers are
 		all-too-common in the real world, these can often be
-		ignored on the "garbage in, garbage out" princple.
+		ignored on the "garbage in, garbage out" principle.
 		However, since surprising results can be yielded when
 		trying to parse garbage, this message should be logged
 		somewhere so it can be figured out what happened.
diff --git a/imap/src/c-client/misc.c b/imap/src/c-client/misc.c
index 0f26a9c3..0ddab9cc 100644
--- a/imap/src/c-client/misc.c
+++ b/imap/src/c-client/misc.c
@@ -43,7 +43,7 @@
 unsigned char *ucase (unsigned char *s)
 {
   unsigned char *t;
-				/* if lowercase covert to upper */
+				/* if lowercase convert to upper */
   for (t = s; *t; t++) if ((*t >= 'a') && (*t <= 'z')) *t -= ('a' - 'A');
   return s;			/* return string */
 }
@@ -59,7 +59,7 @@ unsigned char *ucase (unsigned char *s)
 unsigned char *lcase (unsigned char *s)
 {
   unsigned char *t;
-				/* if uppercase covert to lower */
+				/* if uppercase convert to lower */
   for (t = s; *t; t++) if ((*t >= 'A') && (*t <= 'Z')) *t += ('a' - 'A');
   return s;			/* return string */
 }
diff --git a/imap/src/mailutil/mailutil.1 b/imap/src/mailutil/mailutil.1
index c33bb53b..a0063d5f 100644
--- a/imap/src/mailutil/mailutil.1
+++ b/imap/src/mailutil/mailutil.1
@@ -141,7 +141,7 @@ or
 .B -merge MODE
 is specified, a merging transfer is performed.  The
 .B MODE
-argument indicats the type of merge:
+argument indicates the type of merge:
 .PP
 .B -m[erge] prompt
 indicates that the user should be asked for an alternative name to create.
diff --git a/imap/src/osdep/amiga/tcp_ami.c b/imap/src/osdep/amiga/tcp_ami.c
index c0666bd3..cb3198da 100644
--- a/imap/src/osdep/amiga/tcp_ami.c
+++ b/imap/src/osdep/amiga/tcp_ami.c
@@ -152,7 +152,7 @@ TCPSTREAM *tcp_open (char *host,char *service,unsigned long port)
       sin.sin_family = he->h_addrtype;
 				/* copy host name */
       strcpy (hostname,he->h_name);
-#ifdef HOST_NOT_FOUND		/* muliple addresses only on DNS systems */
+#ifdef HOST_NOT_FOUND		/* multiple addresses only on DNS systems */
       for (sock = -1,i = 0; (sock < 0) && (s = he->h_addr_list[i]); i++) {
 	if (i && !silent) mm_log (tmp,WARN);
 	memcpy (&sin.sin_addr,s,he->h_length);
diff --git a/imap/src/osdep/nt/yunchan.c b/imap/src/osdep/nt/yunchan.c
index 6c8995fe..05c0326a 100644
--- a/imap/src/osdep/nt/yunchan.c
+++ b/imap/src/osdep/nt/yunchan.c
@@ -209,7 +209,7 @@ unsigned long unix_crlflen (STRING *s)
   return i;
 }
 
-/* Undoubtably, I'm going to regret these two routines in the future.  I
+/* Undoubtedly, I'm going to regret these two routines in the future.  I
  * regret them now.  Their purpose is to work around two problems in the
  * VC++ 6.0 C library:
  *  (1) tmpfile() creates the file in the current directory instead of a
diff --git a/pico/attach.c b/pico/attach.c
index 302947a6..ec4b2b8f 100644
--- a/pico/attach.c
+++ b/pico/attach.c
@@ -780,7 +780,7 @@ ParseAttach(struct hdr_line **lp,		/* current header line      */
 		utf8 = ucs4_to_utf8_cpystr(tmp);
 		*no = atoi(utf8);		/* and the old place in list */
 		if(strcmp(number, utf8)){
-		    if(p-tmp > *off){		/* where to begin replacemnt */
+		    if(p-tmp > *off){		/* where to begin replacement */
 			UCS uu[1];
 
 			uu[0] = '\0';
@@ -1118,7 +1118,7 @@ process_tag:					/* enclosed in []         */
 		if(strcmp(sz, (lblsz) ? lblsz : prettysz(attsz))){
 		    strncpy(sz, (lblsz) ? lblsz : prettysz(attsz), szlen);
 		    sz[szlen-1] = '\0';
-		    if(p-tmp > *off){		/* where to begin replacemnt */
+		    if(p-tmp > *off){		/* where to begin replacement */
 			UCS uu[1];
 
 			uu[0] = '\0';
diff --git a/pico/main.c b/pico/main.c
index cfce3064..1001edd1 100644
--- a/pico/main.c
+++ b/pico/main.c
@@ -427,7 +427,7 @@ main(int argc, char *argv[])
 
 #ifdef	MOUSE
 #ifdef  EX_MOUSE
-	/* New mouse function for real mouse text seletion. */
+	/* New mouse function for real mouse text selection. */
 	register_mfunc(mouse_in_pico, 2, 0, term.t_nrow - (term.t_mrow + 1),
 		       term.t_ncol);
 #else
@@ -1093,7 +1093,7 @@ pico_set_global_colors(int nc, int ntfg, int ntbg, int rtfg, int rtbg,
   memset((void *)pcolors, 0, sizeof(PCOLORS));
   /* ignore bad pair settings, also we set tbcp backwards because it will
    * be reversed later in the modeline function, so tbcp->fg is actually 
-   * tbcp->bg and viceversa.
+   * tbcp->bg and vice versa.
    */
   if(ntfg >= 0 && ntbg >= 0){	/* set normal text color */
         fg = colorx(ntfg); bg = colorx(ntbg);
diff --git a/pico/osdep/mswin.h b/pico/osdep/mswin.h
index 6482b525..f5ff23ad 100644
--- a/pico/osdep/mswin.h
+++ b/pico/osdep/mswin.h
@@ -324,7 +324,7 @@ int             struncmp(char *, char *, int);
 #ifdef	MSC_MALLOC
 /*
  * These definitions will disable the SEGHEAP allocation routines, in
- * favor of the compliler libraries usual allocators.  This is useful
+ * favor of the compiler libraries usual allocators.  This is useful
  * when external debugging tools and the SEGHEAP debugging routines step
  * on each other...
  */
diff --git a/pico/osdep/truncate.c b/pico/osdep/truncate.c
index 8330338e..6c8e5f59 100644
--- a/pico/osdep/truncate.c
+++ b/pico/osdep/truncate.c
@@ -13,7 +13,7 @@
  *
  *	Tim Rice	tim@trr.metro.net	Mon Jun  3 16:57:26 PDT 1996
  *
- *	a quick and dirty trancate()
+ *	a quick and dirty truncate()
  *	Altos System V (5.3.1) does not have one
  *	neither does SCO Open Server Enterprise 3.0
  *
diff --git a/pico/pico.c b/pico/pico.c
index 020f7c05..7179d516 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -359,7 +359,7 @@ pico(PICO *pm)
 
 #ifdef	MOUSE
 #ifdef  EX_MOUSE
-	/* New mouse function for real mouse text seletion. */
+	/* New mouse function for real mouse text selection. */
 	register_mfunc(mouse_in_pico, 2, 0, term.t_nrow - (term.t_mrow+1),
 		       term.t_ncol);
 #else
diff --git a/pith/adrbklib.h b/pith/adrbklib.h
index a66d45b7..2498e60c 100644
--- a/pith/adrbklib.h
+++ b/pith/adrbklib.h
@@ -271,7 +271,7 @@ typedef struct adrbk {
  *         Text -- A ptr to text. For example, the ----- lines and
  *		   whitespace lines.
  *    NoAbooks  -- There are no address books at all.
- *   Beginnning -- The (imaginary) elements before the first real element
+ *   Beginning  -- The (imaginary) elements before the first real element
  *          End -- The (imaginary) elements after the last real element
  */
 typedef enum {DlNotSet, Empty, ZoomEmpty, AddFirstPers, AddFirstGlob,
diff --git a/pith/icaltype.h b/pith/icaltype.h
index 0ccea92d..77ca3079 100644
--- a/pith/icaltype.h
+++ b/pith/icaltype.h
@@ -1,7 +1,7 @@
 #ifndef ICALTYPE_INCLUDED
 #define ICALTYPE_INCLUDED
 
-/* Due to the line by line processing algorithm, not all informatio
+/* Due to the line by line processing algorithm, not all information
  * is available when process some lines. In particular, when we
  * process anything that has to do with time, we do not know if
  * we are processing a date in daylight savings time or not. We
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 5b0078e3..7148d9b1 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -180,7 +180,7 @@ Alpine's privacy policy is a living, online only, document, which can be found a
 By following the previous link,  Alpine
 will connect to an external server, and will download it and display
 it for you. Please take some time to read it and understand it.
-Since the Privacy Policy could be ammended to take into consideration
+Since the Privacy Policy could be amended to take into consideration
 new additions to Alpine, please check it periodically.
 
 <P> These changes were made after the release of version 2.24.
@@ -1897,7 +1897,7 @@ program.
 At the beginning of this process, the developer of the email program 
 registers the email program with the email service provider (Gmail, 
 Outlook, etc.) In return, the email service provider creates a client-id.
-In addition, some services provice a client-secret.
+In addition, some services provide a client-secret.
 Since Alpine is an open source program, these values are part
 of the source code, and are known to everyone, and cannot be obfuscated.
 
@@ -2012,7 +2012,7 @@ on the configuration you want to delete and press ^D.
 <P> When you have more than one client-id for the same service, is is convenient
 to fill up the username field. This will tell Alpine that that specific configuration
 is to be used with the username(s) specified in that variable. If Alpine cannot
-detemine which configuration to use, it will ask you to select the correct
+determine which configuration to use, it will ask you to select the correct
 Client-ID for your connection. This could happen when you are trying to login to
 your account. The client-id you select will be used by Alpine for that and future
 connections to that server.
@@ -2825,7 +2825,7 @@ Alpine's privacy policy is a living, online only, document, which can be found a
 By following the previous link,  Alpine
 will connect to an external server, and will download it and display
 it for you. Please take some time to read it and understand it.
-Since the Privacy Policy could be ammended to take into consideration
+Since the Privacy Policy could be amended to take into consideration
 new additions to Alpine, please check it periodically. You can always
 find a link to the Privacy Policy in the <A href="h_news">Release Notes</A>.
 
@@ -2860,7 +2860,7 @@ Alpine's privacy policy is a living, online only, document, which can be found a
 By following the previous link,  Alpine
 will connect to an external server, and will download it and display
 it for you. Please take some time to read it and understand it.
-Since the Privacy Policy could be ammended to take into consideration
+Since the Privacy Policy could be amended to take into consideration
 new additions to Alpine, please check it periodically. You can always
 find a link to the Privacy Policy in the <A href="h_news">Release Notes</A>.
 
@@ -2893,7 +2893,7 @@ Alpine's privacy policy is a living, online only, document, which can be found a
 By following the previous link,  Alpine
 will connect to an external server, and will download it and display
 it for you. Please take some time to read it and understand it.
-Since the Privacy Policy could be ammended to take into consideration
+Since the Privacy Policy could be amended to take into consideration
 new additions to Alpine, please check it periodically. You can always
 find a link to the Privacy Policy in the <A href="h_news">Release Notes</A>.
 
@@ -18889,7 +18889,7 @@ to see the available Editing and Navigation commands.
 This option gives you a limited ability to take different actions depending on whether
 this is the first time Alpine has been run this month or not.
 Though it would be nice to have such an option available, this is not the
-same as whether or not this is the first time a paricular folder has been
+same as whether or not this is the first time a particular folder has been
 opened this month.
 If you want some action (probably Filtering) to take place in a folder each
 month, then you will need to be sure that the folder is opened during the
@@ -18931,7 +18931,7 @@ to see the available Editing and Navigation commands.
 This option gives you a limited ability to take different actions depending on whether
 this is the first time Alpine has been run this year or not.
 Though it would be nice to have such an option available, this is not the
-same as whether or not this is the first time a paricular folder has been
+same as whether or not this is the first time a particular folder has been
 opened this year.
 If you want some action (probably Filtering) to take place in a folder each
 year, then you will need to be sure that the folder is opened during the
diff --git a/pith/reply.c b/pith/reply.c
index 534497de..32dc7937 100644
--- a/pith/reply.c
+++ b/pith/reply.c
@@ -1503,7 +1503,7 @@ get_addr_data(ENVELOPE *env, IndexColType type, char *buf, size_t maxlen)
 	break;
 
       /*
-       * Recips is To and Cc togeter. We hook the two adrlists together
+       * Recips is To and Cc together. We hook the two adrlists together
        * temporarily.
        */
       case iRecips:
diff --git a/pith/stream.c b/pith/stream.c
index 822f6404..06890b5a 100644
--- a/pith/stream.c
+++ b/pith/stream.c
@@ -249,7 +249,7 @@ pine_mail_open(MAILSTREAM *stream, char *mailbox, long int openflags, long int *
      * mistakes caused by conflicts between the two styles. In particular, we
      * don't want to have a new-style cached stream re-opened because of the
      * old-style caching code. This can happen if a stream is passed in that
-     * is not useable, and then a new stream is opened because the passed in
+     * is not usable, and then a new stream is opened because the passed in
      * stream causes us to bypass the new caching code. Play it safe. If it
      * is an IMAP stream, just close it. This should leave it in the new-style
      * cache anyway, causing no loss. Maybe not if the cache wasn't large
diff --git a/scripts/README b/scripts/README
index b2d07bc8..ccf73542 100644
--- a/scripts/README
+++ b/scripts/README
@@ -16,7 +16,7 @@ server.
 
    The script will give you a url and a code. Open the url with a browser and enter
    the code where requested. You will be redirected to login with your username
-   and password. After a succesful login, you will be asked to authorize
+   and password. After a successful login, you will be asked to authorize
    the app. Once you have authorized the app, close that window and return to
    this script. Press "ENTER" and you will see your refresh-token, access-token
    and total amount of time (in seconds) that your token is valid. This is typically
diff --git a/scripts/ooauth2.py b/scripts/ooauth2.py
index d11d925d..8492c2cb 100755
--- a/scripts/ooauth2.py
+++ b/scripts/ooauth2.py
@@ -29,7 +29,7 @@ IMAP or SMTP server.
 
    The script will give you a url and a code. Open the url with a browser and enter
    the code where requested. You will be redirected to login with your username
-   and password. After a succesful login, you will be asked to authorize
+   and password. After a successful login, you will be asked to authorize
    the app. Once you have authorized the app, close that window and return to
    this script. Press "ENTER" and you will see your refresh-token, access-token
    and total amount of time (in seconds) that your token is valid. This is typically
diff --git a/web/README b/web/README
index 293f6211..d2be6c48 100644
--- a/web/README
+++ b/web/README
@@ -53,7 +53,7 @@ REQUIRED SOFTWARE
 
  
 
-BUILING AND INSTALLING WEB ALPINE
+BUILDING AND INSTALLING WEB ALPINE
 ---------------------------------
 
 See the INSTALL file for basic instructions.
diff --git a/web/cgi/alpine/1.0/fldrbrowse.tcl b/web/cgi/alpine/1.0/fldrbrowse.tcl
index b9021a4d..58d6d8fb 100755
--- a/web/cgi/alpine/1.0/fldrbrowse.tcl
+++ b/web/cgi/alpine/1.0/fldrbrowse.tcl
@@ -170,7 +170,7 @@ if {[catch {WPNewMail $reload} newmail]} {
 # preserve vars that my have been overridden with cgi parms
 
 if {[catch {WPCmd PEFolder collections} collections]} {
-  error [list _action "Collectoin list" $collections]
+  error [list _action "Collection list" $collections]
 }
 
 set shown [split $show ,]
diff --git a/web/cgi/alpine/1.0/fr_queryauth.tcl b/web/cgi/alpine/1.0/fr_queryauth.tcl
index ad5d13d1..d361baa8 100755
--- a/web/cgi/alpine/1.0/fr_queryauth.tcl
+++ b/web/cgi/alpine/1.0/fr_queryauth.tcl
@@ -23,7 +23,7 @@
 #  Input:
 set frame_vars {
   {cid		"Missing Command ID"}
-  {authcol	"Missing Authenticaion Collection"}
+  {authcol	"Missing Authentication Collection"}
   {authfolder	"Missing Authentication Folder"}
   {authpage	"Missing Post Authorization Instructions"}
   {authcancel	"Missing Auth Cancel Instructions"}
diff --git a/web/cgi/alpine/2.0/common.tcl b/web/cgi/alpine/2.0/common.tcl
index 76cd7293..4d78024b 100644
--- a/web/cgi/alpine/2.0/common.tcl
+++ b/web/cgi/alpine/2.0/common.tcl
@@ -734,7 +734,7 @@ proc setCurrentFolder {_c _f _u} {
 	}
 
 	if {[catch {WPCmd PEMailbox trashdeleted current} result]} {
-	  WPCmd PEInfo statmsg "Detete FAILURE: $result"
+	  WPCmd PEInfo statmsg "Delete FAILURE: $result"
 	}
       }
     }
diff --git a/web/cgi/alpine/2.0/conduit/mark.tcl b/web/cgi/alpine/2.0/conduit/mark.tcl
index 2ac5a2d7..ffbe443b 100755
--- a/web/cgi/alpine/2.0/conduit/mark.tcl
+++ b/web/cgi/alpine/2.0/conduit/mark.tcl
@@ -69,7 +69,7 @@ WPEval $mark_args {
 	}
       }
     } else {
-      set reult "FAILURE: Unknown mark value: $mark"
+      set result "FAILURE: Unknown mark value: $mark"
     }
 
     cgi_puts $result
diff --git a/web/cgi/session/queryauth.tcl b/web/cgi/session/queryauth.tcl
index 27e10c97..450674a4 100755
--- a/web/cgi/session/queryauth.tcl
+++ b/web/cgi/session/queryauth.tcl
@@ -19,7 +19,7 @@
 # input:
 set query_vars {
   {cid		"Missing Command ID"}
-  {authcol	"Missing Authenticaion Collection"}
+  {authcol	"Missing Authentication Collection"}
   {authfolder	"Missing Authentication Folder"}
   {authpage	"No Post Authorization Instructions"}
   {authcancel	"No Auth Cancel Instructions"}