From 06c6ab430b223f6923fe74a4b8d11f3e626848a8 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Wed, 15 Jan 2020 21:41:39 -0700 Subject: * 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. --- NOTICE | 2 +- README | 2 +- alpine/addrbook.c | 2 +- alpine/addrbook.h | 2 +- alpine/adrbkcmd.c | 2 +- alpine/adrbkcmd.h | 2 +- alpine/alpine.c | 6 +- alpine/alpine.h | 2 +- alpine/arg.h | 2 +- alpine/busy.c | 2 +- alpine/colorconf.h | 2 +- alpine/confscroll.c | 6 +- alpine/confscroll.h | 2 +- alpine/conftype.h | 2 +- alpine/context.h | 2 +- alpine/dispfilt.h | 2 +- alpine/flagmaint.h | 2 +- alpine/folder.c | 6 +- alpine/folder.h | 2 +- alpine/help.h | 2 +- alpine/imap.c | 14 +- alpine/imap.h | 2 +- alpine/init.c | 2 +- alpine/init.h | 2 +- alpine/kblock.c | 2 +- alpine/kblock.h | 2 +- alpine/keymenu.h | 4 +- alpine/ldapconf.h | 2 +- alpine/listsel.h | 2 +- alpine/mailcmd.c | 16 +- alpine/mailcmd.h | 2 +- alpine/mailindx.c | 10 +- alpine/mailindx.h | 2 +- alpine/mailpart.c | 2 +- alpine/mailpart.h | 2 +- alpine/mailview.c | 8 +- alpine/mailview.h | 2 +- alpine/newmail.h | 2 +- alpine/newuser.h | 2 +- alpine/osdep/jobcntrl.h | 2 +- alpine/osdep/termin.gen.c | 2 +- alpine/osdep/termin.unx.c | 2 +- alpine/osdep/termout.unx.c | 8 +- alpine/osdep/termout.win | 6 +- alpine/osdep/termout.wnt.c | 4 +- alpine/pattern.h | 2 +- alpine/pipe.h | 2 +- alpine/print.h | 2 +- alpine/radio.h | 2 +- alpine/remote.h | 2 +- alpine/reply.c | 8 +- alpine/reply.h | 2 +- alpine/roleconf.h | 2 +- alpine/send.c | 4 +- alpine/send.h | 2 +- alpine/setup.c | 2 +- alpine/setup.h | 2 +- alpine/signal.c | 2 +- alpine/signal.h | 2 +- alpine/smime.h | 2 +- alpine/status.c | 2 +- alpine/status.h | 2 +- alpine/talk.h | 2 +- alpine/titlebar.h | 2 +- contrib/carmel/c-client/carmel.c | 6 +- contrib/carmel/c-client/carmel2.c | 28 +-- contrib/carmel/doc/todo | 2 +- contrib/carmel/pine/filter.c.patch | 2 +- contrib/ports/sequent_ptx_4.4.6 | 4 +- contrib/ports/vms/readme.vms | 2 +- contrib/utils/txtcc.sh | 2 +- doc/tech-notes/config-notes.html | 2 +- doc/tech-notes/config.html | 26 +-- doc/tech-notes/low-level.html | 2 +- doc/tech-notes/tech-notes.txt | 35 ++-- imap/Makefile | 4 +- imap/README | 2 +- imap/docs/FAQ.html | 16 +- imap/docs/RELNOTES | 8 +- imap/docs/bugs.txt | 2 +- imap/docs/calendar.txt | 8 +- imap/docs/commndmt.txt | 2 +- imap/docs/drivers.txt | 12 +- imap/docs/formats.txt | 6 +- imap/docs/imaprc.txt | 6 +- imap/docs/internal.txt | 20 +-- imap/docs/locking.txt | 4 +- imap/docs/md5.txt | 2 +- imap/docs/mixfmt.txt | 4 +- imap/src/c-client/c-client.h | 2 +- imap/src/c-client/imap4r1.c | 12 +- imap/src/c-client/mail.c | 4 +- imap/src/c-client/netmsg.c | 2 +- imap/src/c-client/newsrc.c | 2 +- imap/src/c-client/nntp.c | 2 +- imap/src/c-client/rfc822.c | 6 +- imap/src/c-client/utf8.c | 6 +- imap/src/c-client/utf8.h | 2 +- imap/src/c-client/utf8aux.c | 2 +- imap/src/c-client/utf8aux.h | 2 +- imap/src/imapd/imapd.c | 6 +- imap/src/ipopd/ipop3d.c | 2 +- imap/src/mtest/mtest.c | 2 +- imap/src/osdep/amiga/Makefile | 2 +- imap/src/osdep/amiga/mbx.c | 2 +- imap/src/osdep/amiga/mh.c | 6 +- imap/src/osdep/amiga/mix.c | 10 +- imap/src/osdep/amiga/mtx.c | 2 +- imap/src/osdep/amiga/mx.c | 4 +- imap/src/osdep/amiga/nl_ami.c | 2 +- imap/src/osdep/amiga/os_ami.c | 2 +- imap/src/osdep/amiga/scandir.c | 4 +- imap/src/osdep/amiga/tenex.c | 2 +- imap/src/osdep/dos/bezrkdos.c | 2 +- imap/src/osdep/dos/drivraux.bat | 2 +- imap/src/osdep/dos/mkautaux.bat | 2 +- imap/src/osdep/dos/mtxdos.c | 4 +- imap/src/osdep/nt/drivraux.bat | 2 +- imap/src/osdep/nt/kerb_w2k.c | 4 +- imap/src/osdep/nt/mbxnt.c | 2 +- imap/src/osdep/nt/mkautaux.bat | 2 +- imap/src/osdep/nt/mtxnt.c | 2 +- imap/src/osdep/nt/os_nt.h | 2 +- imap/src/osdep/nt/tenexnt.c | 2 +- imap/src/osdep/nt/yunchan.c | 4 +- imap/src/osdep/os2/mbxnt.c | 2 +- imap/src/osdep/os2/mtxnt.c | 2 +- imap/src/osdep/os2/tenexnt.c | 2 +- imap/src/osdep/unix/Makefile | 4 +- imap/src/osdep/unix/ckp_cyg.c | 2 +- imap/src/osdep/unix/ckp_pam.c | 2 +- imap/src/osdep/unix/ckp_pmb.c | 2 +- imap/src/osdep/unix/ckp_psx.c | 2 +- imap/src/osdep/unix/mbx.c | 2 +- imap/src/osdep/unix/mh.c | 6 +- imap/src/osdep/unix/mix.c | 10 +- imap/src/osdep/unix/mtx.c | 2 +- imap/src/osdep/unix/mx.c | 4 +- imap/src/osdep/unix/news.c | 6 +- imap/src/osdep/unix/nl_unix.c | 2 +- imap/src/osdep/unix/os_vu2.c | 2 +- imap/src/osdep/unix/scandir.c | 4 +- imap/src/osdep/unix/tcp_unix.c | 2 +- imap/src/osdep/unix/tenex.c | 2 +- imap/src/osdep/vms/nl_vms.c | 2 +- imap/src/osdep/wce/drivraux.bat | 2 +- imap/src/osdep/wce/mkautaux.bat | 2 +- imap/src/tmail/tmail.1 | 2 +- imap/tools/uahelper.c | 2 +- include/general.h | 2 +- include/system.h | 6 +- libressl/tls1_3.txt | 2 +- mapi/ReadmeMapi32.txt | 2 +- mapi/instmapi.c | 2 +- mapi/pmapi.c | 2 +- pico/basic.c | 12 +- pico/bind.c | 6 +- pico/browse.c | 4 +- pico/buffer.c | 4 +- pico/composer.c | 10 +- pico/display.c | 4 +- pico/ebind.h | 2 +- pico/estruct.h | 4 +- pico/file.c | 4 +- pico/osdep/altedit.c | 4 +- pico/osdep/mouse.c | 4 +- pico/osdep/msdlg.c | 12 +- pico/osdep/msmenu.h | 2 +- pico/osdep/mswin.c | 78 ++++----- pico/osdep/raw.c | 2 +- pico/pico.c | 2 +- pico/pico.h | 2 +- pico/search.c | 6 +- pith/IO.ReadMe | 2 +- pith/abdlc.h | 2 +- pith/ablookup.h | 2 +- pith/addrbook.h | 2 +- pith/addrstring.h | 2 +- pith/adjtime.h | 2 +- pith/atttype.h | 2 +- pith/busy.h | 2 +- pith/charset.c | 4 +- pith/charset.h | 4 +- pith/color.h | 2 +- pith/conf.c | 4 +- pith/conf.h | 2 +- pith/conftype.h | 2 +- pith/context.c | 2 +- pith/copyaddr.h | 2 +- pith/detach.h | 2 +- pith/detoken.h | 2 +- pith/editorial.h | 2 +- pith/escapes.h | 2 +- pith/filter.c | 30 ++-- pith/filter.h | 6 +- pith/filttype.h | 2 +- pith/flag.c | 2 +- pith/flag.h | 2 +- pith/folder.c | 6 +- pith/folder.h | 4 +- pith/foldertype.h | 4 +- pith/handle.h | 2 +- pith/help.h | 2 +- pith/help_c_gen.c | 2 +- pith/help_h_gen.c | 2 +- pith/icache.h | 2 +- pith/ical.c | 6 +- pith/imap.h | 2 +- pith/indxtype.h | 2 +- pith/init.h | 2 +- pith/keyword.h | 2 +- pith/ldap.c | 2 +- pith/ldap.h | 4 +- pith/list.h | 2 +- pith/mailcap.c | 8 +- pith/mailcap.h | 2 +- pith/mailcmd.c | 2 +- pith/mailcmd.h | 2 +- pith/mailindx.c | 2 +- pith/maillist.h | 2 +- pith/mailpart.h | 2 +- pith/mailview.c | 2 +- pith/mailview.h | 2 +- pith/margin.h | 2 +- pith/mimedesc.c | 6 +- pith/mimetype.h | 2 +- pith/msgno.h | 2 +- pith/newmail.c | 2 +- pith/newmail.h | 2 +- pith/news.h | 2 +- pith/options.h | 2 +- pith/osdep/pipe.c | 2 +- pith/osdep/pipe.h | 2 +- pith/osdep/pw_stuff.c | 2 +- pith/pattern.c | 6 +- pith/pattern.h | 2 +- pith/pine.hlp | 32 ++-- pith/pineelt.h | 2 +- pith/pipe.h | 2 +- pith/remote.h | 2 +- pith/remtype.h | 2 +- pith/repltype.h | 2 +- pith/reply.c | 6 +- pith/reply.h | 2 +- pith/rfc2231.h | 2 +- pith/save.c | 2 +- pith/save.h | 2 +- pith/savetype.h | 2 +- pith/search.h | 2 +- pith/send.c | 12 +- pith/send.h | 6 +- pith/sequence.c | 2 +- pith/sequence.h | 2 +- pith/signal.h | 2 +- pith/smime.c | 2 +- pith/smime.h | 2 +- pith/smkeys.c | 2 +- pith/smkeys.h | 2 +- pith/sort.h | 2 +- pith/sorttype.h | 2 +- pith/state.h | 6 +- pith/status.h | 2 +- pith/store.c | 4 +- pith/store.h | 2 +- pith/stream.h | 2 +- pith/string.c | 6 +- pith/string.h | 2 +- pith/strlst.h | 2 +- pith/tempfile.h | 2 +- pith/text.h | 2 +- pith/thread.h | 2 +- pith/url.c | 8 +- pith/url.h | 2 +- pith/util.h | 2 +- web/INSTALL | 4 +- web/cgi/alpine/1.0/addredit.tcl | 2 +- web/cgi/alpine/1.0/attach.tcl | 2 +- web/cgi/alpine/1.0/compose.tcl | 2 +- web/cgi/alpine/1.0/detach.tcl | 3 +- web/cgi/alpine/1.0/do_view.tcl | 4 +- web/cgi/alpine/1.0/dosend.tcl | 2 +- web/cgi/alpine/1.0/export.tcl | 2 +- web/cgi/alpine/1.0/filtedit.tcl | 4 +- web/cgi/alpine/1.0/fr_tconfig.tcl | 2 +- web/cgi/alpine/1.0/genvars.tcl | 2 +- web/cgi/alpine/1.0/help/index.html | 2 +- web/cgi/alpine/1.0/help/index.tcl.1 | 2 +- web/cgi/alpine/1.0/help/tech-notes.html | 14 +- web/cgi/alpine/1.0/index.tcl | 4 +- web/cgi/alpine/1.0/ldapresult.tcl | 4 +- web/cgi/alpine/1.0/post.tcl | 4 +- web/cgi/alpine/1.0/select2.tcl | 2 +- web/cgi/alpine/1.0/seltext.tcl | 2 +- web/cgi/alpine/1.0/spellcheck.tcl | 2 +- web/cgi/alpine/1.0/view.tcl | 4 +- web/cgi/alpine/1.0/wp.tcl | 2 +- web/cgi/alpine/2.0/browse | 6 +- web/cgi/alpine/2.0/common.tcl | 2 +- web/cgi/alpine/2.0/compose | 2 +- web/cgi/alpine/2.0/conduit/export | 2 +- web/cgi/alpine/2.0/conduit/flag.tcl | 4 +- web/cgi/alpine/2.0/detach | 2 +- web/cgi/alpine/2.0/help/contacts.html | 160 ++++++++--------- web/cgi/alpine/2.0/help/folders.html | 192 ++++++++++---------- web/cgi/alpine/2.0/help/inbox.html | 290 +++++++++++++++---------------- web/cgi/alpine/2.0/help/quick-start.html | 272 ++++++++++++++--------------- web/cgi/alpine/2.0/help/topic-list.html | 202 ++++++++++----------- web/cgi/alpine/2.0/settings | 4 +- web/cgi/alpine/2.0/view | 2 +- web/cgi/session/.htaccess | 2 +- web/cgi/session/_htaccess | 2 +- web/config/alpine.tcl | 2 +- web/src/alpined.d/alpined.c | 18 +- web/src/alpined.d/alpined.h | 2 +- web/src/alpined.d/imap.c | 6 +- web/src/alpined.d/imap.h | 2 +- web/src/alpined.d/signal.c | 2 +- web/src/alpined.d/signal.h | 2 +- web/src/cgi.tcl-1.10/HISTORY | 10 +- web/src/cgi.tcl-1.10/cgi.tcl | 2 +- web/src/cgi.tcl-1.10/cgi.tcl.in | 2 +- web/src/cgi.tcl-1.10/doc/ref.txt | 6 +- web/src/cgi.tcl-1.10/example/image.cgi | 2 +- web/src/cgi.tcl-1.10/example/img.cgi | 2 +- web/src/cgi.tcl-1.10/example/vote.cnt | 2 +- web/src/cgi.tcl-1.10/install.mac | 2 +- web/src/pubcookie/wp_gssapi_proxy.c | 2 +- 327 files changed, 1194 insertions(+), 1192 deletions(-) diff --git a/NOTICE b/NOTICE index 6e844312..bc0805b9 100644 --- a/NOTICE +++ b/NOTICE @@ -18,7 +18,7 @@ This product is in part based on MicroEMACS 3.6, written by Dave G. Conroy; modified by Steve Wilhite, and George Jones; and greatly modified by Daniel Lawrence. -Some of the code dealing with temporary files in this product was dervived +Some of the code dealing with temporary files in this product was derived from 4.3 BSD code, which was developed by the University of California. diff --git a/README b/README index 6f74a904..fa1b6ae3 100644 --- a/README +++ b/README @@ -80,7 +80,7 @@ For a list of configuration options and default Alpine settings type: Note, the included UW IMAP Toolkit used for mailbox access does not make use of GNU autotools. However, in most cases Alpine's configure script should set the appropriate make target and options. The -targetted OS can be set from Alpine's configure command line, but in +targeted OS can be set from Alpine's configure command line, but in rare cases more significant manual intervention may be required. If problems are encountered, see imap/README for more details. diff --git a/alpine/addrbook.c b/alpine/addrbook.c index ea3cf2ba..92e15f91 100644 --- a/alpine/addrbook.c +++ b/alpine/addrbook.c @@ -543,7 +543,7 @@ get_abook_display_line(long int global_row, int continuation, char **s_hilite, *retcol = 0; /* default */ if(s_hilite){ - *s_hilite = NULL; /* NULL in these means to hilight whole line */ + *s_hilite = NULL; /* NULL in these means to highlight whole line */ *e_hilite = NULL; } diff --git a/alpine/addrbook.h b/alpine/addrbook.h index 7e292bc5..b75ff13b 100644 --- a/alpine/addrbook.h +++ b/alpine/addrbook.h @@ -33,7 +33,7 @@ #define ANC_AFTERCOMMA 0x1 -/* exported protoypes */ +/* exported prototypes */ int cur_is_open(void); void init_disp_form(PerAddrBook *, char **, int); void init_abook_screen(void); diff --git a/alpine/adrbkcmd.c b/alpine/adrbkcmd.c index 66b11916..9fb58253 100644 --- a/alpine/adrbkcmd.c +++ b/alpine/adrbkcmd.c @@ -6802,7 +6802,7 @@ _("\n \"^G\" for help specific to each item. \"^X\" to make the query, or \"^C\" if(categories > 0 || *sq->custom) filter = (CUSTOM_FILT_S *)fs_get(sizeof(CUSTOM_FILT_S)); - /* combine the configed filters with this filter */ + /* combine the configured filters with this filter */ if(*sq->custom){ string = ""; filter->filt = sq->custom; diff --git a/alpine/adrbkcmd.h b/alpine/adrbkcmd.h index 470bb1a2..efbd580b 100644 --- a/alpine/adrbkcmd.h +++ b/alpine/adrbkcmd.h @@ -28,7 +28,7 @@ #define AB_COMMENT_STR _("Comment") -/* exported protoypes */ +/* exported prototypes */ void view_abook_entry(struct pine *, long); void edit_entry(AdrBk *, AdrBk_Entry *, a_c_arg_t, Tag, int, int *, char *); int ab_add_abook(int, int); diff --git a/alpine/alpine.c b/alpine/alpine.c index cd9899a5..18364a9a 100644 --- a/alpine/alpine.c +++ b/alpine/alpine.c @@ -482,7 +482,7 @@ main(int argc, char **argv) * * We can't use gettext calls before we do this stuff so it doesn't * help to translate strings that come before this in the program. - * Maybe we could rearrange things to accomodate that. + * Maybe we could rearrange things to accommodate that. */ setlocale(LC_MESSAGES, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -1242,7 +1242,7 @@ main(int argc, char **argv) /* * As with almost all the folder vars in the pinerc, * we subvert the collection "breakout" here if the - * folder name given looks like an asolute path on + * folder name given looks like an absolute path on * this system... */ cntxt = (is_absolute_path(args.data.folder)) @@ -1642,7 +1642,7 @@ here. This functions handling of new mail, redrawing, errors and such can serve as a template for the other screen that do much the same thing. -There is a loop that fetchs and executes commands until a command to leave +There is a loop that fetches and executes commands until a command to leave this screen is given. Then the name of the next screen to display is stored in next_screen member of the structure and this function is exited with a return. diff --git a/alpine/alpine.h b/alpine/alpine.h index aa42b151..4446b391 100644 --- a/alpine/alpine.h +++ b/alpine/alpine.h @@ -21,7 +21,7 @@ #include "../pith/state.h" -/* exported protoypes */ +/* exported prototypes */ void main_menu_screen(struct pine *); unsigned long pine_gets_bytes(int); void quit_screen(struct pine *); diff --git a/alpine/arg.h b/alpine/arg.h index 7d2a897a..0fadc6ce 100644 --- a/alpine/arg.h +++ b/alpine/arg.h @@ -44,7 +44,7 @@ typedef struct argdata { } ARGDATA_S; -/* exported protoypes */ +/* exported prototypes */ void pine_args(struct pine *, int, char **, ARGDATA_S *); void display_args_err(char *, char **, int); void args_help(void); diff --git a/alpine/busy.c b/alpine/busy.c index e1e1ca75..09866e11 100644 --- a/alpine/busy.c +++ b/alpine/busy.c @@ -149,7 +149,7 @@ void done_busy_cue(void *); * Returns: 0 If busy cue was already set up before we got here * 1 If busy cue was not already set up. * - * NOTE: busy_cue and cancel_busy_cue MUST be called symetrically in the + * NOTE: busy_cue and cancel_busy_cue MUST be called symmetrically in the * same lexical scope. */ int diff --git a/alpine/colorconf.h b/alpine/colorconf.h index 1595e4da..d78debb3 100644 --- a/alpine/colorconf.h +++ b/alpine/colorconf.h @@ -66,7 +66,7 @@ extern int treat_color_vars_as_text; -/* exported protoypes */ +/* exported prototypes */ void color_config_screen(struct pine *, int); int color_setting_tool(struct pine *, int, CONF_S **, unsigned); char *sampleexc_text(struct pine *, struct variable *); diff --git a/alpine/confscroll.c b/alpine/confscroll.c index 2fe034bd..d5cd6f6c 100644 --- a/alpine/confscroll.c +++ b/alpine/confscroll.c @@ -2447,7 +2447,7 @@ delete: /* * Delay setting the displayed value until "var.current_val" is set - * in case current val get's changed due to a special case above. + * in case current val gets changed due to a special case above. */ if(newval){ if(*newval) @@ -4518,7 +4518,7 @@ clear_feature(char ***l, char *f) /* * this is helpful to keep the array from growing if a feature - * get's set and unset repeatedly + * gets set and unset repeatedly */ if(!f) fs_resize((void **)l, count * sizeof(char *)); @@ -6011,7 +6011,7 @@ unexpected_pinerc_change(void) Args: cmd - what type of scroll operation. - scroll_pos - paramter for operation. + scroll_pos - parameter for operation. used as position for SCROLL_TO operation. Returns: TRUE - did the scroll operation. diff --git a/alpine/confscroll.h b/alpine/confscroll.h index c96f3036..7b7db2a3 100644 --- a/alpine/confscroll.h +++ b/alpine/confscroll.h @@ -77,7 +77,7 @@ extern OPT_SCREEN_S *opt_screen; extern EditWhich ew; -/* exported protoypes */ +/* exported prototypes */ int conf_scroll_screen(struct pine *, OPT_SCREEN_S *, CONF_S *, char *, char *, int, int *); void standard_radio_setup(struct pine *, CONF_S **, struct variable *, CONF_S **); int standard_radio_var(struct pine *, struct variable *); diff --git a/alpine/conftype.h b/alpine/conftype.h index f4ecac3f..3577bf8a 100644 --- a/alpine/conftype.h +++ b/alpine/conftype.h @@ -142,7 +142,7 @@ typedef struct conf_screen { } OPT_SCREEN_S; -/* exported protoypes */ +/* exported prototypes */ #endif /* PINE_CONFTYPE_INCLUDED */ diff --git a/alpine/context.h b/alpine/context.h index 6f779383..685b3bc8 100644 --- a/alpine/context.h +++ b/alpine/context.h @@ -44,7 +44,7 @@ typedef struct context_screen { } CONT_SCR_S; -/* exported protoypes */ +/* exported prototypes */ void context_config_screen(struct pine *, CONT_SCR_S *, int); CONTEXT_S *context_select_screen(struct pine *, CONT_SCR_S *, int); diff --git a/alpine/dispfilt.h b/alpine/dispfilt.h index c61a7a8e..bc6feb86 100644 --- a/alpine/dispfilt.h +++ b/alpine/dispfilt.h @@ -19,7 +19,7 @@ -/* exported protoypes */ +/* exported prototypes */ char *dfilter(char *, STORE_S *, gf_io_t, FILTLIST_S *); char *dfilter_trigger(BODY *, char *, size_t); char *expand_filter_tokens(char *, ENVELOPE *, char **, char **, char **, int *, int *, int *); diff --git a/alpine/flagmaint.h b/alpine/flagmaint.h index 7b9f82ae..a78044a8 100644 --- a/alpine/flagmaint.h +++ b/alpine/flagmaint.h @@ -48,7 +48,7 @@ struct flag_screen { #define CMD_FLAG_UNKN 2 -/* exported protoypes */ +/* exported prototypes */ int flag_maintenance_screen(struct pine *, struct flag_screen *); diff --git a/alpine/folder.c b/alpine/folder.c index c48536fc..6670eca4 100644 --- a/alpine/folder.c +++ b/alpine/folder.c @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: folder.c 1144 2008-08-14 16:53:34Z hubert@u.washingt This puts up a list of all the folders in the users mail directory on the screen spacing it nicely. The arrow keys move from one to another and the user can delete the folder or select it to change to or copy a -message to. The dispay lets the user scroll up or down a screen full, +message to. The display lets the user scroll up or down a screen full, or search for a folder name. ====*/ @@ -126,7 +126,7 @@ typedef struct _folder_screen { /* - * Struct mananging folder_lister metadata as it get's passed + * Struct mananging folder_lister metadata as it gets passed * in and back up thru scrolltool */ typedef struct _folder_proc { @@ -1187,7 +1187,7 @@ exit_collection_add(struct headerentry *he, void (*redraw_pico)(void), int allow * of the path so we can test for the directory existence. The * second's to make sure the server (and any requested service) * name we were given exists. It should be handled by the folder - * existence test futher below, but it doesn't work with news... + * existence test further below, but it doesn't work with news... * * Update. Now we are stripping the delimiter in the tmpnodel version * so that we can pass that to folder_exists. Cyrus does not answer diff --git a/alpine/folder.h b/alpine/folder.h index 86219f2a..6da9c766 100644 --- a/alpine/folder.h +++ b/alpine/folder.h @@ -24,7 +24,7 @@ #include "../pith/conf.h" -/* exported protoypes */ +/* exported prototypes */ void folder_screen(struct pine *); void folder_config_screen(struct pine *, int); int folders_for_goto(struct pine *, CONTEXT_S **, char *, int); diff --git a/alpine/help.h b/alpine/help.h index f2c63b20..6802b13a 100644 --- a/alpine/help.h +++ b/alpine/help.h @@ -31,7 +31,7 @@ #define HLPD_FROMHELP 0x08 -/* exported protoypes */ +/* exported prototypes */ int url_local_helper(char *); int url_local_config(char *); void init_helper_getc(char **); diff --git a/alpine/imap.c b/alpine/imap.c index fe38c06f..9d5f8ad5 100644 --- a/alpine/imap.c +++ b/alpine/imap.c @@ -353,7 +353,7 @@ void mm_login_oauth2(NETMBX *, char *, OAUTH2_S *, long int, char *, char *); * * 3. When saving this information we use the password caching facilities, * but we must do it in a different format so that old information and - * new information are not mixed. In order to accomodate this for new + * new information are not mixed. In order to accommodate this for new * authentication methods, we save the information in the same fields, * but this time we modify it slightly, so that old functions fail to * understand the new information and so not modify it nor use it. The @@ -371,7 +371,7 @@ void mm_login_oauth2(NETMBX *, char *, OAUTH2_S *, long int, char *, char *); * authenticator is "XOAUTH2\001imap.gmail.com". * In addition, the password field is not used to encode the password * anymore, it is used to save login information needed in a format that - * the caller function chooses, but that must be preceeded by the + * the caller function chooses, but that must be preceded by the * "authenticator_method separator" code as above. */ void @@ -666,9 +666,9 @@ mm_login_oauth2(NETMBX *mb, char *user, OAUTH2_S *login, long int trial, } /*---------------------------------------------------------------------- - recieve notification from IMAP + receive notification from IMAP - Args: stream -- Mail stream message is relavant to + Args: stream -- Mail stream message is relevant to string -- The message text errflg -- Set if it is a serious error @@ -1596,7 +1596,7 @@ mm_login_alt_cue(NETMBX *mb) /*---------------------------------------------------------------------- Receive notification of an error writing to disk - Args: stream -- The stream the error occured on + Args: stream -- The stream the error occurred on errcode -- The system error code (errno) serious -- Flag indicating error is serious (mail may be lost) @@ -1860,7 +1860,7 @@ pine_tcptimeout(long int elapsed, long int sincelast, char *host) flush_status_messages(0); /* make sure it's seen */ } - mark_status_dirty(); /* make sure it get's cleared */ + mark_status_dirty(); /* make sure it gets cleared */ resume_busy_cue((rv == 1) ? 3 : 0); ps_global->tcptimeout = 0; @@ -2982,7 +2982,7 @@ read_passfile(pinerc, l) } /* - * if password file is encrypted we attemtp to decrypt. We ask the + * if password file is encrypted we attempt to decrypt. We ask the * user for the password to unlock the password file. If the user * enters the password and it unlocks the file, use it and keep saving * passwords in it. If the user enters the wrong passwords and does diff --git a/alpine/imap.h b/alpine/imap.h index a78c1f0f..1b46af9e 100644 --- a/alpine/imap.h +++ b/alpine/imap.h @@ -21,7 +21,7 @@ #include "../pith/imap.h" -/* exported protoypes */ +/* exported prototypes */ void pine_parse_quota (MAILSTREAM *, unsigned char *, QUOTALIST *); QUOTALIST *pine_quotalist_copy (QUOTALIST *); void *pine_block_notify(int, void *); diff --git a/alpine/init.c b/alpine/init.c index 260b8d99..13c6c57c 100644 --- a/alpine/init.c +++ b/alpine/init.c @@ -38,7 +38,7 @@ static char rcsid[] = "$Id: init.c 101 2006-08-10 22:53:04Z mikes@u.washington.e /* these are used to report folder directory creation problems */ CONF_TXT_T init_md_exists[] = "The \"%s\" subdirectory already exists, but it is not writable by Alpine so Alpine cannot run. Please correct the permissions and restart Alpine."; -CONF_TXT_T init_md_file[] = "Alpine requires a directory called \"%s\" and usualy creates it. You already have a regular file by that name which means Alpine cannot create the directory. Please move or remove it and start Alpine again."; +CONF_TXT_T init_md_file[] = "Alpine requires a directory called \"%s\" and usually creates it. You already have a regular file by that name which means Alpine cannot create the directory. Please move or remove it and start Alpine again."; CONF_TXT_T init_md_create[] = "Creating subdirectory \"%s\" where Alpine will store its mail folders."; diff --git a/alpine/init.h b/alpine/init.h index 443aaff6..0d03c5bf 100644 --- a/alpine/init.h +++ b/alpine/init.h @@ -18,7 +18,7 @@ #define PINE_INIT_INCLUDED -/* exported protoypes */ +/* exported prototypes */ int init_mail_dir(struct pine *); int expire_sent_mail(void); diff --git a/alpine/kblock.c b/alpine/kblock.c index f99916d6..949f516a 100644 --- a/alpine/kblock.c +++ b/alpine/kblock.c @@ -112,7 +112,7 @@ lock_keyboard(void) for(i = 0; i < times; i++){ pw[0] = '\0'; - while(1){ /* input pasword to use for locking */ + while(1){ /* input password to use for locking */ int rc; char prompt[50]; diff --git a/alpine/kblock.h b/alpine/kblock.h index eb6471fb..ef332c61 100644 --- a/alpine/kblock.h +++ b/alpine/kblock.h @@ -20,7 +20,7 @@ #ifdef KEYBOARD_LOCK -/* exported protoypes */ +/* exported prototypes */ int lock_keyboard(void); #endif /* KEYBOARD_LOCK */ diff --git a/alpine/keymenu.h b/alpine/keymenu.h index 3885e443..4218ffba 100644 --- a/alpine/keymenu.h +++ b/alpine/keymenu.h @@ -242,7 +242,7 @@ struct key_menu { * label (the Save part) but the actual command (the S) will stay * the same, so it will be very difficult to come up with mnemonic * labels. The mnemonic isn't necessary, just nice. You can see that - * we have stretched to the edge of the usefullness of mnemonics with + * we have stretched to the edge of the usefulness of mnemonics with * cases like K Kolor (instead of Color) and X eXceptions (because E * already meant something else). */ @@ -674,7 +674,7 @@ extern struct key_menu cancel_keymenu, extern struct key rev_msg_keys[]; -/* exported protoypes */ +/* exported prototypes */ void draw_cancel_keymenu(void); void end_keymenu(void); int menu_command(UCS, struct key_menu *); diff --git a/alpine/ldapconf.h b/alpine/ldapconf.h index b2b7183e..1c5abd9c 100644 --- a/alpine/ldapconf.h +++ b/alpine/ldapconf.h @@ -24,7 +24,7 @@ #include "../pith/bldaddr.h" -/* exported protoypes */ +/* exported prototypes */ #ifdef ENABLE_LDAP void directory_config(struct pine *, int); int ldap_radiobutton_tool(struct pine *, int, CONF_S **, unsigned); diff --git a/alpine/listsel.h b/alpine/listsel.h index ec94848b..38057ef0 100644 --- a/alpine/listsel.h +++ b/alpine/listsel.h @@ -40,7 +40,7 @@ typedef struct list_selection { } LIST_SEL_S; -/* exported protoypes */ +/* exported prototypes */ int select_from_list_screen(LIST_SEL_S *, unsigned long, char *, char *, HelpType, char *, LIST_SEL_S *); diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c index 204c3148..778a2f3b 100644 --- a/alpine/mailcmd.c +++ b/alpine/mailcmd.c @@ -189,7 +189,7 @@ static ESCKEY_S sel_opts3[] = { static ESCKEY_S sel_opts4[] = { {'a', 'a', "A", N_("select All")}, - /* TRANSLATORS: select currrently highlighted message Thread */ + /* TRANSLATORS: select currently highlighted message Thread */ {'c', 'c', "C", N_("select Curthrd")}, {'n', 'n', "N", N_("Number")}, {'d', 'd', "D", N_("Date")}, @@ -229,7 +229,7 @@ static ESCKEY_S sel_opts5[] = { static ESCKEY_S sel_opts6[] = { {'a', 'a', "A", N_("select All")}, - /* TRANSLATORS: select currrently highlighted message Thread */ + /* TRANSLATORS: select currently highlighted message Thread */ {'c', 'c', "C", N_("select Curthrd")}, {'n', 'n', "N", N_("Number")}, {'d', 'd', "D", N_("Date")}, @@ -1240,7 +1240,7 @@ get_out: /* * Right now the way zoom is implemented is sort of silly. * There are two per-message flags where just one and a - * global "zoom mode" flag to suppress messags from the index + * global "zoom mode" flag to suppress messages from the index * should suffice. */ if(any_messages(msgmap, NULL, "to Zoom on")){ @@ -1996,7 +1996,7 @@ the_maint_screen: } } - /* reaquire the elt pointer */ + /* reacquire the elt pointer */ mc = (state->mail_stream && (rawno = mn_m2raw(msgmap, mn_get_cur(msgmap))) > 0L && rawno <= state->mail_stream->nmsgs) @@ -3807,7 +3807,7 @@ cmd_export(struct pine *state, MSGNO_S *msgmap, int qline, int aopt) if(!bezerk_delimiter(env, mc, pc, leading_nl) || !format_message(mn_m2raw(msgmap, i), env, b, NULL, FM_NEW_MESS | FM_NOWRAP, pc)){ - orig_errno = errno; /* save incase things are really bad */ + orig_errno = errno; /* save in case things are really bad */ failure = 1; /* pop out of here */ break; } @@ -3998,7 +3998,7 @@ cmd_export(struct pine *state, MSGNO_S *msgmap, int qline, int aopt) else{ if(saved) q_status_message2(SM_ORDER, 0, 3, - /* TRANSLATORS: Saved attachements to */ + /* TRANSLATORS: Saved attachments to */ _("Saved %s attachments to %s"), long2string((long) saved), dir); else @@ -5044,7 +5044,7 @@ build_updown_cmd(char *cmd, size_t cmdlen, char *prefix, char *cfg_str, char *fn int fname_found = 0; if(prefix && *prefix){ - /* loop thru replacing all occurances of _FILE_ */ + /* loop thru replacing all occurrences of _FILE_ */ p = strncpy(cmd, prefix, cmdlen); cmd[cmdlen-1] = '\0'; while((p = strstr(p, "_FILE_"))) @@ -5053,7 +5053,7 @@ build_updown_cmd(char *cmd, size_t cmdlen, char *prefix, char *cfg_str, char *fn fputs(cmd, stdout); } - /* loop thru replacing all occurances of _FILE_ */ + /* loop thru replacing all occurrences of _FILE_ */ p = strncpy(cmd, cfg_str, cmdlen); cmd[cmdlen-1] = '\0'; while((p = strstr(p, "_FILE_"))){ diff --git a/alpine/mailcmd.h b/alpine/mailcmd.h index 062fbe07..8bcd7410 100644 --- a/alpine/mailcmd.h +++ b/alpine/mailcmd.h @@ -64,7 +64,7 @@ typedef enum {DontAskPreserve, NoPreserve, Preserve, RetNoPreserve, RetPreserve} typedef enum {View, MsgIndx, ThrdIndx} CmdWhere; -/* exported protoypes */ +/* exported prototypes */ int alpine_get_data_prompt(char *, char *, size_t); int alpine_get_password(char *, char *, size_t); int alpine_smime_confirm_save(char *); diff --git a/alpine/mailindx.c b/alpine/mailindx.c index c5862c6b..60f9c1b0 100644 --- a/alpine/mailindx.c +++ b/alpine/mailindx.c @@ -2415,7 +2415,7 @@ pine_imap_envelope(MAILSTREAM *stream, long unsigned int rawno, ENVELOPE *env) /*---------------------------------------------------------------------- - Scroll to specified postion. + Scroll to specified position. Args: pos - position to scroll to. @@ -2529,8 +2529,8 @@ index_scroll_down(long int scroll_count) } /* - * If not multiple selection, see if selected message visable. if not - * set it to last visable message. + * If not multiple selection, see if selected message visible. if not + * set it to last visible message. */ if(mn_total_cur(current_index_state->msgmap) == 1L) { j = 0L; @@ -2602,8 +2602,8 @@ index_scroll_up(long int scroll_count) /* - * If not multiple selection, see if selected message visable. if not - * set it to last visable message. + * If not multiple selection, see if selected message visible. if not + * set it to last visible message. */ if(mn_total_cur(current_index_state->msgmap) == 1L) { j = 0L; diff --git a/alpine/mailindx.h b/alpine/mailindx.h index f26e512f..b68edbf8 100644 --- a/alpine/mailindx.h +++ b/alpine/mailindx.h @@ -91,7 +91,7 @@ typedef enum {MsgIndex, MultiMsgIndex, ZoomIndex, ThreadIndex} IndexType; extern struct index_state *current_index_state; -/* exported protoypes */ +/* exported prototypes */ void mail_index_screen(struct pine *); struct key_menu *do_index_border(CONTEXT_S *, char *, MAILSTREAM *, MSGNO_S *, IndexType, int *, int); void *stop_threading_temporarily(void); diff --git a/alpine/mailpart.c b/alpine/mailpart.c index de103db4..3ce1e272 100644 --- a/alpine/mailpart.c +++ b/alpine/mailpart.c @@ -910,7 +910,7 @@ attachment_screen(struct pine *ps) /*---------------------------------------------------------------------- allocate and attach a fresh attachment line struct - Args: current -- display line to attache new struct to + Args: current -- display line to attach new struct to Returns: newly alloc'd attachment display line ----*/ diff --git a/alpine/mailpart.h b/alpine/mailpart.h index f874b78a..21e9d99a 100644 --- a/alpine/mailpart.h +++ b/alpine/mailpart.h @@ -29,7 +29,7 @@ #define DA_DIDPROMPT 0x08 /* Already prompted to view att */ -/* exported protoypes */ +/* exported prototypes */ void attachment_screen(struct pine *); void write_attachment(int, long, ATTACH_S *, char *); int write_attachment_to_file(MAILSTREAM *, long, ATTACH_S *, int, char *); diff --git a/alpine/mailview.c b/alpine/mailview.c index c151a1e1..d8cf663d 100644 --- a/alpine/mailview.c +++ b/alpine/mailview.c @@ -3340,7 +3340,7 @@ scrolltool(SCROLL_S *sparms) ClearLine(1); break; } - /* else no reformatting neccessary, fall thru to repaint */ + /* else no reformatting necessary, fall thru to repaint */ /*-------------- refresh -------------*/ @@ -4157,7 +4157,7 @@ format_scroll_text(void) * of the file is the one first in the text_lines buffer. * * NOTE: talk about massive potential for tuning... - * Goes without saying this is still under constuction + * Goes without saying this is still under construction */ void ScrollFile(long int line) @@ -4180,7 +4180,7 @@ ScrollFile(long int line) * BOGUS: this is painfully crude right now, but I just want to get * it going. * - * possibly in the near furture, an array of indexes into the + * possibly in the near future, an array of indexes into the * file that are the offset for the beginning of each line will * speed things up. Of course, this * will have limits, so maybe a disk file that is an array @@ -5440,7 +5440,7 @@ mswin_readscrollbuf(n) Args: cmd - what type of scroll operation. - scroll_pos - paramter for operation. + scroll_pos - parameter for operation. used as position for SCROLL_TO operation. Returns: TRUE - did the scroll operation. diff --git a/alpine/mailview.h b/alpine/mailview.h index e1a2bd47..b1018e11 100644 --- a/alpine/mailview.h +++ b/alpine/mailview.h @@ -109,7 +109,7 @@ typedef struct scrolltool_s { } SCROLL_S; -/* exported protoypes */ +/* exported prototypes */ char *get_url_external_handler(char *, int); int do_url_launch(char *, char *); void mail_view_screen(struct pine *); diff --git a/alpine/newmail.h b/alpine/newmail.h index 07d9551e..631bd94b 100644 --- a/alpine/newmail.h +++ b/alpine/newmail.h @@ -17,7 +17,7 @@ #ifndef ALPINE_NEWMAIL_INCLUDED #define ALPINE_NEWMAIL_INCLUDED -/* exported protoypes */ +/* exported prototypes */ void newmail_status_message(MAILSTREAM *, long, long); #endif /* ALPINE_NEWMAIL_INCLUDED */ diff --git a/alpine/newuser.h b/alpine/newuser.h index 2437f6ef..9396199f 100644 --- a/alpine/newuser.h +++ b/alpine/newuser.h @@ -21,7 +21,7 @@ #include "../pith/state.h" -/* exported protoypes */ +/* exported prototypes */ void new_user_or_version(struct pine *); diff --git a/alpine/osdep/jobcntrl.h b/alpine/osdep/jobcntrl.h index 3908cce7..c89531b8 100644 --- a/alpine/osdep/jobcntrl.h +++ b/alpine/osdep/jobcntrl.h @@ -17,7 +17,7 @@ #define PINE_OSDEP_JOBCNTRL_INCLUDED -/* exported protoypes */ +/* exported prototypes */ int have_job_control(void); void stop_process(void); diff --git a/alpine/osdep/termin.gen.c b/alpine/osdep/termin.gen.c index dfea78ff..d42ba3c0 100644 --- a/alpine/osdep/termin.gen.c +++ b/alpine/osdep/termin.gen.c @@ -620,7 +620,7 @@ optionally_enter(char *utf8string, int y_base, int x_base, int utf8string_size, case ctrl('H'): /* Try and do this with by telling the terminal to delete a a character. If that fails, then repaint the rest of the - line, acheiving the same much less efficiently + line, achieving the same much less efficiently */ if(field_pos <= 0) goto bleep; diff --git a/alpine/osdep/termin.unx.c b/alpine/osdep/termin.unx.c index 9ff020a4..caf18560 100644 --- a/alpine/osdep/termin.unx.c +++ b/alpine/osdep/termin.unx.c @@ -69,7 +69,7 @@ static char rcsid[] = "$Id: termin.unx.c 1025 2008-04-08 22:59:38Z hubert@u.wash /*====================================================================== Things having to do with reading from the tty driver and keyboard - initialize tty driver and reset tty driver - - read a character from terminal with keyboard escape seqence mapping + - read a character from terminal with keyboard escape sequence mapping - initialize keyboard (keypad or such) and reset keyboard - prompt user for a line of input - read a command from keyboard with timeouts. diff --git a/alpine/osdep/termout.unx.c b/alpine/osdep/termout.unx.c index 8ef5d031..de87565b 100644 --- a/alpine/osdep/termout.unx.c +++ b/alpine/osdep/termout.unx.c @@ -74,7 +74,7 @@ static char rcsid[] = "$Id: termout.unx.c 955 2008-03-06 23:52:36Z hubert@u.wash This code used to pay attention to the "am" auto margin and "xn" new line glitch fields, but they were so often incorrect because many terminals can be configured to do either that we've taken it out. It -now assumes it dosn't know where the cursor is after outputing in the +now assumes it doesn't know where the cursor is after outputting in the 80th column. */ @@ -117,7 +117,7 @@ extern char *tgoto(char *, int, int); Result: terminal size is discovered and set in pine state termcap entry is fetched and stored - make sure terminal has adequate capabilites + make sure terminal has adequate capabilities evaluate scrolling situation returns status of indicating the state of the screen/termcap entry @@ -673,9 +673,9 @@ EndScroll(void) Args: lines -- number of lines to scroll, positive forward Result: Screen scrolls - returns 0 if scroll succesful, -1 if not + returns 0 if scroll successful, -1 if not - positive lines goes foward (new lines come in at bottom + positive lines goes forward (new lines come in at bottom Leaves cursor at the place to insert put new text 0,0 is the upper left diff --git a/alpine/osdep/termout.win b/alpine/osdep/termout.win index f3f027ee..9b32d919 100644 --- a/alpine/osdep/termout.win +++ b/alpine/osdep/termout.win @@ -34,7 +34,7 @@ NewLine() Input: character to output termcap escape sequences - Result: charcter is inserted if possible + Result: character is inserted if possible return -1 if it can't be done ----------------------------------------------------------------------*/ InsertChar(c) @@ -95,9 +95,9 @@ DeleteChar(n) Input: number of lines to scroll, positive forward Result: Screen scrolls - returns 0 if scroll succesful, -1 if not + returns 0 if scroll successful, -1 if not - positive lines goes foward (new lines come in at bottom + positive lines goes forward (new lines come in at bottom Leaves cursor at the place to insert put new text 0,0 is the upper left diff --git a/alpine/osdep/termout.wnt.c b/alpine/osdep/termout.wnt.c index 45d7be2a..3e07bcfa 100644 --- a/alpine/osdep/termout.wnt.c +++ b/alpine/osdep/termout.wnt.c @@ -150,7 +150,7 @@ end_screen(char *message, int exit_val) Result: terminal size is discovered and set pine state termcap entry is fetched and stored in local variables - make sure terminal has adequate capabilites + make sure terminal has adequate capabilities evaluate scrolling situation returns status of indicating the state of the screen/termcap entry @@ -361,7 +361,7 @@ MoveCursor(int row, int col) /*---------------------------------------------------------------------- Write a character to the screen, keeping track of cursor position - Input: charater to write + Input: character to write Result: character output cursor position variables updated diff --git a/alpine/pattern.h b/alpine/pattern.h index c1dedb51..9268db8d 100644 --- a/alpine/pattern.h +++ b/alpine/pattern.h @@ -19,7 +19,7 @@ #include "../pith/pattern.h" -/* exported protoypes */ +/* exported prototypes */ void pattern_filter_command(char **, SEARCHSET *, MAILSTREAM *, long, INTVL_S *); diff --git a/alpine/pipe.h b/alpine/pipe.h index 06bf1d95..9becc3d0 100644 --- a/alpine/pipe.h +++ b/alpine/pipe.h @@ -22,7 +22,7 @@ #include "../pith/osdep/pipe.h" -/* exported protoypes */ +/* exported prototypes */ int raw_pipe_getc(unsigned char *); void prime_raw_pipe_getc(MAILSTREAM *, long, long, long); PIPE_S *cmd_pipe_open(char *, char **, int, gf_io_t *); diff --git a/alpine/print.h b/alpine/print.h index ff80a61b..358e00dd 100644 --- a/alpine/print.h +++ b/alpine/print.h @@ -21,7 +21,7 @@ #include "../pith/state.h" -/* exported protoypes */ +/* exported prototypes */ char *printer_name(char *); #ifndef DOS void select_printer(struct pine *, int); diff --git a/alpine/radio.h b/alpine/radio.h index a86a98ad..b1ca6f51 100644 --- a/alpine/radio.h +++ b/alpine/radio.h @@ -70,7 +70,7 @@ typedef struct esckey { #define WT_SEQ_SENSITIVE 0x02 /* Sensitive to seq # changes */ -/* exported protoypes */ +/* exported prototypes */ int want_to(char *, int, int, HelpType, int); int one_try_want_to(char *, int, int, HelpType, int); int radio_buttons(char *, int, ESCKEY_S *, int, int, HelpType, int); diff --git a/alpine/remote.h b/alpine/remote.h index 2ffe410e..b1d3f6e8 100644 --- a/alpine/remote.h +++ b/alpine/remote.h @@ -21,7 +21,7 @@ #include "../pith/remote.h" -/* exported protoypes */ +/* exported prototypes */ char *rd_metadata_name(void); diff --git a/alpine/reply.c b/alpine/reply.c index 89c0d9be..57d9e2d5 100644 --- a/alpine/reply.c +++ b/alpine/reply.c @@ -242,7 +242,7 @@ reply(struct pine *pine_state, ACTION_S *role_arg) } /* - * If we're agg-replying or there's a newsgroup and the user want's + * If we're agg-replying or there's a newsgroup and the user wants * to post to news *and* via email, add relevant addresses to the * outgoing envelope... * @@ -431,7 +431,7 @@ reply(struct pine *pine_state, ACTION_S *role_arg) seq[++times] = -1L; /* mark end of sequence list */ - /*========== Other miscelaneous fields ===================*/ + /*========== Other miscellaneous fields ===================*/ outgoing->in_reply_to = reply_in_reply_to(env); outgoing->references = reply_build_refs(env); outgoing->message_id = generate_message_id(); @@ -2168,7 +2168,7 @@ signature_edit(char *sigfile, char *title) ps_global->msgmap, 0, FolderName, 0, 0, NULL); - /* NOTE: at this point, alot of pico struct fields are null'd out + /* NOTE: at this point, a lot of pico struct fields are null'd out * thanks to the leading memset; in particular "headents" which tells * pico to behave like a normal editor (though modified slightly to * let the caller dictate the file to edit and such)... @@ -2362,7 +2362,7 @@ signature_edit_lit(char *litsig, char **result, char *title, HelpType composer_h ps_global->msgmap, 0, FolderName, 0, 0, NULL); - /* NOTE: at this point, alot of pico struct fields are null'd out + /* NOTE: at this point, a lot of pico struct fields are null'd out * thanks to the leading memset; in particular "headents" which tells * pico to behave like a normal editor (though modified slightly to * let the caller dictate the file to edit and such)... diff --git a/alpine/reply.h b/alpine/reply.h index 3a88dac5..fc3dcf16 100644 --- a/alpine/reply.h +++ b/alpine/reply.h @@ -24,7 +24,7 @@ #include "../pith/store.h" -/* exported protoypes */ +/* exported prototypes */ int reply(struct pine *, ACTION_S *); int confirm_role(long, ACTION_S **); int reply_to_all_query(int *); diff --git a/alpine/roleconf.h b/alpine/roleconf.h index 3e8479f8..267276f8 100644 --- a/alpine/roleconf.h +++ b/alpine/roleconf.h @@ -24,7 +24,7 @@ #include "../pith/msgno.h" -/* exported protoypes */ +/* exported prototypes */ int role_select_screen(struct pine *, ACTION_S **, int); void role_config_screen(struct pine *, long, int); void role_take(struct pine *, MSGNO_S *, int); diff --git a/alpine/send.c b/alpine/send.c index f41bb75b..332b3dc3 100644 --- a/alpine/send.c +++ b/alpine/send.c @@ -3841,7 +3841,7 @@ pine_send(ENVELOPE *outgoing, struct mail_bodystruct **body, #if defined(BACKGROUND_POST) && defined(SIGCHLD) /* - * If requested, launch backgroud posting... + * If requested, launch background posting... */ if(background_requested && !(call_mailer_flags & CM_VERBOSE)){ ps_global->post = (POST_S *)fs_get(sizeof(POST_S)); @@ -5670,7 +5670,7 @@ outgoing2strings(METAENV *header, struct mail_bodystruct *bod, void **text, All parts in the body passed in here that are not already in the attachments list are added to the end of the attachments list. Attachment items not in the body list will be taken care - of in strings2outgoing, but they are unlikey to occur + of in strings2outgoing, but they are unlikely to occur */ for(part = bod->nested.part->next; part != NULL; part = part->next) { diff --git a/alpine/send.h b/alpine/send.h index f8d63f8b..cdf03260 100644 --- a/alpine/send.h +++ b/alpine/send.h @@ -34,7 +34,7 @@ #define PS_STICKY_TO 0x02 -/* exported protoypes */ +/* exported prototypes */ void compose_screen(struct pine *); void alt_compose_screen(struct pine *); void compose_mail(char *, char *, ACTION_S *, PATMT *, gf_io_t); diff --git a/alpine/setup.c b/alpine/setup.c index 4d6c825e..1ed8d7fe 100644 --- a/alpine/setup.c +++ b/alpine/setup.c @@ -920,7 +920,7 @@ stayopen_list_tool(struct pine *ps, int cmd, CONF_S **cl, unsigned int flags) /* * Delay setting the displayed value until "var.current_val" is set - * in case current val get's changed due to a special case above. + * in case current val gets changed due to a special case above. */ if(newval){ if(*newval) diff --git a/alpine/setup.h b/alpine/setup.h index fef722b5..5c76ba1e 100644 --- a/alpine/setup.h +++ b/alpine/setup.h @@ -22,7 +22,7 @@ #include "../pith/state.h" -/* exported protoypes */ +/* exported prototypes */ void option_screen(struct pine *, int); int litsig_text_tool(struct pine *, int, CONF_S **, unsigned); char *pretty_var_name(char *); diff --git a/alpine/signal.c b/alpine/signal.c index 950c1f43..ab715ee8 100644 --- a/alpine/signal.c +++ b/alpine/signal.c @@ -632,7 +632,7 @@ pipe_callback(PIPE_S *syspipe, int flags, void *data) if(!child_signalled){ if(setjmp(child_state) == 0){ child_jump = 1; /* prepare to wake up */ - sleep(600); /* give it 5mins to happend */ + sleep(600); /* give it 5mins to happen */ } else our_sigunblock(SIGCHLD); diff --git a/alpine/signal.h b/alpine/signal.h index f752712e..549d5cc5 100644 --- a/alpine/signal.h +++ b/alpine/signal.h @@ -28,7 +28,7 @@ #define MAX_BM 150 /* max length of busy message */ -/* exported protoypes */ +/* exported prototypes */ RETSIGTYPE hup_signal(void); RETSIGTYPE child_signal(int); void user_input_timeout_exit(int); diff --git a/alpine/smime.h b/alpine/smime.h index e6667da6..319f58a8 100644 --- a/alpine/smime.h +++ b/alpine/smime.h @@ -24,7 +24,7 @@ #include "../pith/smime.h" -/* exported protoypes */ +/* exported prototypes */ int smime_get_passphrase(void); int smime_certificate_error_ask(int error); void smime_info_screen(struct pine *ps); diff --git a/alpine/status.c b/alpine/status.c index eac42e44..146cf765 100644 --- a/alpine/status.c +++ b/alpine/status.c @@ -1107,7 +1107,7 @@ output_message_modal(SMQ_T *mq_entry, int ding) char *p, *q, *s, *t; SCROLL_S sargs; - /* Count the number of modal messsages and add up their lengths. */ + /* Count the number of modal messages and add up their lengths. */ for(m = mq_entry->next; m != mq_entry; m = m->next) if((m->flags & SM_MODAL) && !m->shown){ i++; diff --git a/alpine/status.h b/alpine/status.h index ef9fd35c..e2e9c2cd 100644 --- a/alpine/status.h +++ b/alpine/status.h @@ -21,7 +21,7 @@ #include "../pith/status.h" -/* exported protoypes */ +/* exported prototypes */ int messages_queued(long *); char *last_message_queued(void); void flush_ordered_messages(void); diff --git a/alpine/talk.h b/alpine/talk.h index a748e81a..80e515b3 100644 --- a/alpine/talk.h +++ b/alpine/talk.h @@ -32,7 +32,7 @@ #define disallow_talk(p) tty_chmod((p), TALK_BIT|GM_BIT, TMD_CLEAR) -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_TALK_INCLUDED */ diff --git a/alpine/titlebar.h b/alpine/titlebar.h index 9f273b4c..8ef7c942 100644 --- a/alpine/titlebar.h +++ b/alpine/titlebar.h @@ -34,7 +34,7 @@ typedef enum {TitleBarNone = 0, FolderName, MessageNumber, MsgTextPercent, ThrdMsgNum, ThrdMsgPercent} TitleBarType; -/* exported protoypes */ +/* exported protoyypes */ void end_titlebar(void); void push_titlebar_state(void); void pop_titlebar_state(void); diff --git a/contrib/carmel/c-client/carmel.c b/contrib/carmel/c-client/carmel.c index 5265097d..5e2ff927 100644 --- a/contrib/carmel/c-client/carmel.c +++ b/contrib/carmel/c-client/carmel.c @@ -183,7 +183,7 @@ carmel_isvalid (name) close(fd); - for(p = carmel_20k_buf; *p && !isspace(*p); p++); /* frist word */ + for(p = carmel_20k_buf; *p && !isspace(*p); p++); /* first word */ for(; *p && isspace(*p); p++); /* space */ lcase(p); /* lower case the "index" */ if(!*p || strncmp(p, "index", 5)) @@ -402,7 +402,7 @@ carmel_create(stream, mailbox) /*---------------------------------------------------------------------- Delete a carmel mailbox, and it's carmel2 index -Args: stream -- unsed here +Args: stream -- unused here mailbox -- FQN of mailbox to delete Returns: NIL -- if delete fails @@ -1042,7 +1042,7 @@ Args: local -- Fake CARMELLOCAL structure e -- envelope mc -- MESSAGECACHE entry -Retuns: -1 on failure +Returns: -1 on failure ----*/ long carmel_copy(local, mailbox, e, mc) diff --git a/contrib/carmel/c-client/carmel2.c b/contrib/carmel/c-client/carmel2.c index c56f8900..4f71a187 100644 --- a/contrib/carmel/c-client/carmel2.c +++ b/contrib/carmel/c-client/carmel2.c @@ -60,7 +60,7 @@ it and to be efficient for use by the program. Routines and data structures ---------------------------- -C-CLIENT INTERFACE FUCTIONS +C-CLIENT INTERFACE FUNCTIONS carmel2_valid - check to see if a mailbox is valid for carmel2 mail files carmel2_isvalid - actual work of checking carmel2_find - generate list of carmel2 mailboxes @@ -105,7 +105,7 @@ SUPPORT FUNCTIONS carmel_readmsg - Read a message file into memory, header text or both carmel_spool_mail - Get new mail out of spoold mail file - carmel_copy_msg_file - Make copy of messsage file when copying (unused) + carmel_copy_msg_file - Make copy of message file when copying (unused) carmel2_lock - Lock a carmel index for read or write carmel2_unlock - Unlock a carmel index @@ -749,7 +749,7 @@ carmel2_fetchflags(stream, sequence) Carmel mail fetch message structure Args: stream -- stream to get structure for msgno -- Message number to fetch data for - body -- Pointer to place to return body strucuture, may be NULL + body -- Pointer to place to return body structure, may be NULL If the request is the for the same msgno as last time, the saved copy of the envelope and/or body structure is returned. @@ -878,7 +878,7 @@ Args: stream -- msgno Returns: pointer to text of mail header. Returned string is null terminated - and consists of internel storage. It will be valid till the next + and consists of internal storage. It will be valid till the next call to mail_fetchheader() or mail_fetchtext(). An empty string is returned if the fetch fails. ----*/ @@ -906,7 +906,7 @@ Args: stream -- msgno Returns: pointer to text of mail message. Returned string is null terminated - and consists of internel storage. It will be valid till the next + and consists of internal storage. It will be valid till the next call to mail_fetchheader() or mail_fetchtext(). An empty string is returned if the fetch fails. ----*/ @@ -1964,7 +1964,7 @@ Args: stream file_size -- The file size if known (saves a stat) file -- name of the file to read -Returns buffer with text stored in internel buffer. The Carmel2 format +Returns buffer with text stored in internal buffer. The Carmel2 format buffers the text of the current message and header in an internal buffer. The buffer never shrinks and is expanded as needed, up to a maximum. The text in the buffer is in CRLF format and is read in line @@ -2560,7 +2560,7 @@ carmel2_copy_msg_file(stream, orig_file_number, new_mailbox) char *file_name; int wide, e, new_file_num, n, orig_fd, new_fd; - /*---- Open the orginal file ----*/ + /*---- Open the original file ----*/ wide = 0; file_name = (*LOCAL->calc_paths)(CalcPathCarmel2Data, new_mailbox,orig_file_number); @@ -2628,7 +2628,7 @@ Args: stream -- Mail stream we're operating on file -- Mail file name write -- Flag indicating we want write access -Retuns: -1 if lock fails, 0 if it succeeds +Returns: -1 if lock fails, 0 if it succeeds - There are two locks. Plain locks and write locks. They are created about the same way, but have different names. The time out on the write @@ -2636,13 +2636,13 @@ Retuns: -1 if lock fails, 0 if it succeeds - Hitching (links in file system) post locking is used so it will work across NFS. Flock() could be used as it has two advantages. First it - is more efficient, second the locks will disolve automatically when the + is more efficient, second the locks will dissolve automatically when the process dies. The efficiency is not of great concern, and the process should not (theoretically) die unless it crashes due to a bug or it is abnormally terminated. The advantage of locking across NFS is considered greater than the advantages of flock(). -- The mod time of the lock file is updated everytime mail_check() +- The mod time of the lock file is updated every time mail_check() or mail_ping() is called and the mod time on the lock file is recorded. This is so it can be determined that the lock file is current. @@ -2650,7 +2650,7 @@ Retuns: -1 if lock fails, 0 if it succeeds encountered it is assumed the lock is old and should be overridden (because the process crashed or was killed). -- Everytime the mod time on the lock file is updated (on calls to +- Every time the mod time on the lock file is updated (on calls to mail_check() and mail_ping()), the mod time of the lock file is checked against the record of what it was last set to. If the mod times don't match the lock has been broken and overridden. Then the original @@ -3911,10 +3911,10 @@ struct time_zone_names { /*---------------------------------------------------------------------- Parse a date string into into a structure -Args: mc -- mesage cache to with structure to receive data +Args: mc -- message cache to with structure to receive data given_date -- full header with date string somewhere to be found -This parses a number of date formats and produces a cannonical date in +This parses a number of date formats and produces a canonical date in a structure. The basic format is: dd mm yy hh:mm:ss.t tz @@ -4037,7 +4037,7 @@ carmel2_rfc822_date(mc, given_date) while(*p && (*p == '-' || *p == ',' || isspace(*p))) p++; } else { - /* Something wierd, skip it and try to resynch */ + /* Something weird, skip it and try to resynch */ while(*p && !isspace(*p) && *p != ',' && *p != '-') p++; while(*p && (isspace(*p) || *p == ',' || *p == '-')) diff --git a/contrib/carmel/doc/todo b/contrib/carmel/doc/todo index acf99f19..c161a9c4 100644 --- a/contrib/carmel/doc/todo +++ b/contrib/carmel/doc/todo @@ -21,7 +21,7 @@ Size Where What 3 c Initial account set up 10 c Kiss of death to steal write access from another running Pine 6 C Full IMAP searching in Carmel (not used by Pine yet) - 6 c Carmel driver performance enhancments (for folders > 500 msgs) + 6 c Carmel driver performance enhancements (for folders > 500 msgs) 6* ci Auto updating deleted status for folder open by several users 3 C Doesn't incorporate new mail on start up like other IMAPware 6 I/C Handling of non-FQN's via IMAP (will solve ECS problems above) diff --git a/contrib/carmel/pine/filter.c.patch b/contrib/carmel/pine/filter.c.patch index 094fc9ae..02e21166 100644 --- a/contrib/carmel/pine/filter.c.patch +++ b/contrib/carmel/pine/filter.c.patch @@ -90,7 +90,7 @@ + p += strlen(p); + stack_str[stack][0] = '\0'; + } -+ if(two_underline) { /* In case '_' occured near end of line */ ++ if(two_underline) { /* In case '_' occurred near end of line */ + strcpy(p, "<\\underline>"); + p += strlen(p); + } diff --git a/contrib/ports/sequent_ptx_4.4.6 b/contrib/ports/sequent_ptx_4.4.6 index 064ed460..c631fcd3 100644 --- a/contrib/ports/sequent_ptx_4.4.6 +++ b/contrib/ports/sequent_ptx_4.4.6 @@ -75,7 +75,7 @@ diff -cr pine.dist/pine/cmplhlp2.sh pine4.20/pine/cmplhlp2.sh ! awk ' BEGIN { printf("\n\n\t\t/*\n"); - printf("\t\t * AUTMATICALLY GENERATED FILE!\n"); + printf("\t\t * AUTOMATICALLY GENERATED FILE!\n"); printf("\t\t * DO NOT EDIT!!\n\t\t */\n\n\n"); printf("#define\tHelpType\tchar **\n"); --- 44,50 ---- @@ -83,7 +83,7 @@ diff -cr pine.dist/pine/cmplhlp2.sh pine4.20/pine/cmplhlp2.sh ! nawk ' BEGIN { printf("\n\n\t\t/*\n"); - printf("\t\t * AUTMATICALLY GENERATED FILE!\n"); + printf("\t\t * AUTOMATICALLY GENERATED FILE!\n"); printf("\t\t * DO NOT EDIT!!\n\t\t */\n\n\n"); printf("#define\tHelpType\tchar **\n"); diff -cr pine.dist/pine/mailtrfc.sh pine4.20/pine/mailtrfc.sh diff --git a/contrib/ports/vms/readme.vms b/contrib/ports/vms/readme.vms index da14481f..3c252fbe 100644 --- a/contrib/ports/vms/readme.vms +++ b/contrib/ports/vms/readme.vms @@ -30,7 +30,7 @@ Using All the user needs is the PINE.EXE; Pine reads the mail from the user's VMS/MAIL files and send outgoing mail either via mail routines using some foreign protocol or via direct SMTP to some SMTP server (I preffer this -metod). You use the latter by defining SMTP-SERVER field with some host. +method). You use the latter by defining SMTP-SERVER field with some host. If you do not set it you must define PINE_MAIL_PROTOCOL to the prefix of the foreign protocol used. For example, if you use SMTP% you have to define it to SMTP. diff --git a/contrib/utils/txtcc.sh b/contrib/utils/txtcc.sh index 0d1bb8c9..4f05c1b8 100755 --- a/contrib/utils/txtcc.sh +++ b/contrib/utils/txtcc.sh @@ -5,7 +5,7 @@ # # build CC=txtcc gul # -# As of Pine4.03, this moves about 675k per process into sharable memory +# As of Pine4.03, this moves about 675k per process into shareable memory # # Corey Satten, corey@cac.washington.edu, 9/11/98 diff --git a/doc/tech-notes/config-notes.html b/doc/tech-notes/config-notes.html index bc8e7459..6bf10359 100644 --- a/doc/tech-notes/config-notes.html +++ b/doc/tech-notes/config-notes.html @@ -1120,7 +1120,7 @@ For example, if

$VAR

appears in the value of a Alpine configuration option it is looked up in the -environent (using getenv("VAR")) and its +environment (using getenv("VAR")) and its looked-up value replaces the $VAR part of the option value. To include a literal dollar sign you may precede the dollar sign with another dollar sign. diff --git a/doc/tech-notes/config.html b/doc/tech-notes/config.html index b9354838..4b8f9246 100644 --- a/doc/tech-notes/config.html +++ b/doc/tech-notes/config.html @@ -49,7 +49,7 @@ If that is not set, PC-Alpine will look for the local file "PINERCEX" in the same local directory that the regular config file is located in. If the regular config file is remote then PC-Alpine looks in the -local directory specfied by the "-aux local_directory" command +local directory specified by the "-aux local_directory" command line argument, or the directory ${HOME}\ALPINE, or in <ALPINE.EXE directory>.

@@ -419,7 +419,7 @@ something is happening with a small animated display in the status message line near the bottom of the screen. This option sets how frequently the characters (for example, a spinning bar) in the active status message lines are updated. -At most, it can be set to be udpated 20 times per second. +At most, it can be set to be updated 20 times per second.

Setting this value to zero will prevent display of the animations @@ -448,7 +448,7 @@ If the terminal or terminal emulator you are using is capable of displaying colors, this variable controls whether or not color will be used in Alpine. If you turn color on and things are set up correctly, -you should see color appear on the screen immmediately. +you should see color appear on the screen immediately. Modern terminal emulators are usually capable of displaying colors.

This variable may be set to any of the following values: @@ -1100,7 +1100,7 @@ Message Index's "E Export" command. Normally, when a filename is supplied that lacks a leading "path" component, Alpine assumes the file exists in the user's home directory. Under Windows operating systems, this definition isn't always clear. This -feature allows you to explictly set where Alpine should look for files +feature allows you to explicitly set where Alpine should look for files without a leading path.

@@ -2171,7 +2171,7 @@ Once Alpine has opened a connection to a particular folder, it will att to keep that connection open in case you use it again. In order to do this, Alpine will attempt to use the Max-Remote-Connections (the value of -this option) IMAP connections you have alloted for this purpose. +this option) IMAP connections you have allotted for this purpose.

For example, suppose the value of this option is set to "2". If your INBOX is accessed on a remote server using the IMAP protocol, that @@ -2241,7 +2241,7 @@ HREF="config-notes.html#mime.types">MIME.Types File.

special explanatory screen to the user upon startup. This option helps control when and if that special screen appears for users that have previously run Alpine. It takes as its value a Alpine version -number. Alpine versions less than the specified value will supress this +number. Alpine versions less than the specified value will suppress this special screen while versions equal to or greater than that specified will behave normally.

@@ -2281,7 +2281,7 @@ This requirement is not universal. If the system you are using supports it, it should work. (It is often the case that your home directory is in an NFS filesystem. If that is the case, you might try using a file in the "/tmp" -filesystem, which is usually a local filesytem.) +filesystem, which is usually a local filesystem.) Even when it is possible to use an NFS-mounted filesystem as a place to name the fifo (for example, your home directory), it will still be the case that the reader (probably the "cat" command) and the @@ -3026,7 +3026,7 @@ It is not possible to have a literal backslash followed by an expanded token. open a UNIX remote shell connection. The default is "%s %s -l %s exec /etc/r%sd". All four "%s" entries MUST exist in the provided command. The first is for the command's pathname, the second is -for the host to connnect to, the third is for the user to connect as, and +for the host to connect to, the third is for the user to connect as, and the fourth is for the connection method (typically imap).

@@ -3753,7 +3753,7 @@ It will probably only be useful if the show-cursor feature is also turned on. -Setting this option to a postive number can only be used to +Setting this option to a positive number can only be used to increase the status message delay. This may be useful for Braille displays, or other non-traditional displays.

@@ -4767,7 +4767,7 @@ match what you might type if there was a role match.)

If you are using the alternate form of the Compose command called "Role", then all of your roles will be available to you, -independent of the value of this feauture and of the values set for all of +independent of the value of this feature and of the values set for all of Reply Use, Forward Use, and Compose Use.

@@ -5941,7 +5941,7 @@ This feature is displayed as "Enable Unix Pipe Command". early in the posting process intended to cause the server SMTP to provide a more detailed account of the transaction. This feature is typically only useful to system -administrators and other support personel as an aid in troublshooting +administrators and other support personnel as an aid in troublshooting problems. Note, this feature relies on a specific capability of the system's mail @@ -9265,7 +9265,7 @@ the Setup Kolor screen. This gives the score of each message. -This will be six columns wide to accomodate the widest possible score. +This will be six columns wide to accommodate the widest possible score. You will probably want to use the Index-Format fixed-field width feature to limit the width of the field to the widest score that you use (e.g. SCORE(3) if your scores are always between 0 and 999). @@ -11496,7 +11496,7 @@ Here are some samples of specific folder names:

The easiest way to fill in the "Folder" field is to use the "T" command which is available when the "Folder" line is -hilighted, or to use the "Take" command with the configuration +highlighted, or to use the "Take" command with the configuration feature "enable-rules-under-take" turned on. diff --git a/doc/tech-notes/low-level.html b/doc/tech-notes/low-level.html index ee5264ac..d0144fb8 100644 --- a/doc/tech-notes/low-level.html +++ b/doc/tech-notes/low-level.html @@ -467,7 +467,7 @@ Here is a list of many of the possible character sets: ISO-8859-15 8 bit European "Latin 9" character set ISO-8859-16 8 bit European "Latin 10" character set KOI8-R 8 bit Latin and Russian - KOI8-U 8 bit Latin and Ukranian + KOI8-U 8 bit Latin and Ukrainian WINDOWS-1251 8 bit Latin and Russian TIS-620 8 bit Latin and Thai VISCII 8 bit Latin and Vietnamese diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt index 2762c5b1..45fbf24b 100644 --- a/doc/tech-notes/tech-notes.txt +++ b/doc/tech-notes/tech-notes.txt @@ -1255,8 +1255,9 @@ Alpine Configuration that is not set, _PC-Alpine_ will look for the local file "PINERCEX" in the same local directory that the regular config file is located in. If the regular config file is remote then _PC-Alpine_ looks in the local - directory specfied by the "-aux local_directory" command line argument, - or the directory ${HOME}\ALPINE, or in . + directory specified by the "-aux local_directory" command line + argument, or the directory ${HOME}\ALPINE, or in . The syntax of a non-list configuration variable is this: @@ -1517,7 +1518,7 @@ General Configuration Variables status message line near the bottom of the screen. This option sets how frequently the characters (for example, a spinning bar) in the active status message lines are updated. At most, it can - be set to be udpated 20 times per second. + be set to be updated 20 times per second. Setting this value to zero will prevent display of the animations altogether. The option busy-cue-spinner-only can be used to remove the @@ -1533,7 +1534,7 @@ General Configuration Variables displaying colors, this variable controls whether or not color will be used in _Alpine_. If you turn color on and things are set up correctly, you should see color appear on the screen - immmediately. Modern terminal emulators are usually capable of + immediately. Modern terminal emulators are usually capable of displaying colors. This variable may be set to any of the following values: @@ -2015,7 +2016,7 @@ General Configuration Variables Normally, when a filename is supplied that lacks a leading "path" component, _Alpine_ assumes the file exists in the user's home directory. Under Windows operating systems, this definition - isn't always clear. This feature allows you to explictly set + isn't always clear. This feature allows you to explicitly set where _Alpine_ should look for files without a leading path. NOTE: this feature's value is ignored if either use-current-dir feature is set or the PINERC has a value for the operating-dir @@ -2778,8 +2779,8 @@ General Configuration Variables opened a connection to a particular folder, it will attempt to keep that connection open in case you use it again. In order to do this, _Alpine_ will attempt to use the Max-Remote-Connections - (the value of this option) IMAP connections you have alloted for - this purpose. + (the value of this option) IMAP connections you have allotted + for this purpose. For example, suppose the value of this option is set to "2". If your INBOX is accessed on a remote server using the IMAP protocol, that doesn't count as one of the remote connections @@ -2836,7 +2837,7 @@ General Configuration Variables This option helps control when and if that special screen appears for users that have previously run _Alpine_. It takes as its value a _Alpine_ version number. _Alpine_ versions less than - the specified value will supress this special screen while + the specified value will suppress this special screen while versions equal to or greater than that specified will behave normally. _newmail-fifo-path_ @@ -2869,7 +2870,7 @@ General Configuration Variables supports it, it should work. (It is often the case that your home directory is in an NFS filesystem. If that is the case, you might try using a file in the "/tmp" filesystem, which is - usually a local filesytem.) Even when it is possible to use an + usually a local filesystem.) Even when it is possible to use an NFS-mounted filesystem as a place to name the fifo (for example, your home directory), it will still be the case that the reader (probably the "cat" command) and the writer (_Alpine_) of the @@ -3390,7 +3391,7 @@ General Configuration Variables connection. The default is "%s %s -l %s exec /etc/r%sd". All four "%s" entries MUST exist in the provided command. The first is for the command's pathname, the second is for the host to - connnect to, the third is for the user to connect as, and the + connect to, the third is for the user to connect as, and the fourth is for the connection method (typically imap). _rsh-open-timeout_ Sets the time in seconds that _Alpine_ will attempt to open a @@ -3896,7 +3897,7 @@ m+4TJybNGNfAgOctSkEyY/OCb49fRRQTCBZVIhzLGGmpYmkO55HbIA== to the status line whenever a status message is printed and pause there for this many seconds. It will probably only be useful if the show-cursor feature is also turned on. Setting - this option to a postive number can only be used to _increase_ + this option to a positive number can only be used to _increase_ the status message delay. This may be useful for Braille displays, or other non-traditional displays. If it is set to a negative number the interpretation is a bit @@ -4627,7 +4628,7 @@ Configuration Features was a role match.) If you are using the alternate form of the Compose command called "Role", then all of your roles will be available to you, - independent of the value of this feauture and of the values set + independent of the value of this feature and of the values set for all of Reply Use, Forward Use, and Compose Use. _continue-tab-without-confirm_ Normally, when you use the TAB NextNew command and there is a @@ -5426,7 +5427,7 @@ John: on a job well done! early in the posting process intended to cause the server SMTP to provide a more detailed account of the transaction. This feature is typically only useful to system administrators and - other support personel as an aid in troublshooting problems. + other support personnel as an aid in troublshooting problems. Note, this feature relies on a specific capability of the system's mail transport agent or configured smtp-server. _expanded-view-of-addressbooks_ @@ -7791,7 +7792,7 @@ Tokens for Index and Replying SCORE This gives the score of each message. This will be six columns - wide to accomodate the widest possible score. You will probably + wide to accommodate the widest possible score. You will probably want to use the Index-Format fixed-field width feature to limit the width of the field to the widest score that you use (e.g. SCORE(3) if your scores are always between 0 and 999). If you @@ -9521,7 +9522,7 @@ Patterns mail/local-folder The easiest way to fill in the "Folder" field is to use the "T" command - which is available when the "Folder" line is hilighted, or to use the + which is available when the "Folder" line is highlighted, or to use the "Take" command with the configuration feature "enable-rules-under-take" turned on. @@ -11180,7 +11181,7 @@ Using Environment Variables $VAR appears in the value of a _Alpine_ configuration option it is looked up - in the environent (using getenv("VAR")) and its looked-up value + in the environment (using getenv("VAR")) and its looked-up value replaces the $VAR part of the option value. To include a literal dollar sign you may precede the dollar sign with another dollar sign. In other words, if the text @@ -12019,7 +12020,7 @@ International Character Sets ISO-8859-15 8 bit European "Latin 9" character set ISO-8859-16 8 bit European "Latin 10" character set KOI8-R 8 bit Latin and Russian - KOI8-U 8 bit Latin and Ukranian + KOI8-U 8 bit Latin and Ukrainian WINDOWS-1251 8 bit Latin and Russian TIS-620 8 bit Latin and Thai VISCII 8 bit Latin and Vietnamese diff --git a/imap/Makefile b/imap/Makefile index 46807616..d2c21448 100644 --- a/imap/Makefile +++ b/imap/Makefile @@ -231,7 +231,7 @@ IP6=6 # -DY4KBUGFIX # Turn on the Y4K bugfix (yes, that's year 4000). It isn't well-known, # but century years evenly divisible by 4000 are *not* leap years in the -# Gregorian calendar. A lot of "Y2K compilant" software does not know +# Gregorian calendar. A lot of "Y2K compliant" software does not know # about this rule. Remember to turn this on sometime in the next 2000 # years. # @@ -248,7 +248,7 @@ IP6=6 # calendar. Leap years are every 4 years, including century years. # My apologies to those in the English-speaking world who object to # the reform of September 2, 1752 -> September 14, 1752, since this -# code still uses January 1 (which Julius Ceasar decreed as the start +# code still uses January 1 (which Julius Caesar decreed as the start # of the year, which since 153 BCE was the day that Roman consuls # took office), rather than the traditional March 25 used by the # British. As of 2005, the Julian calendar and the Gregorian calendar diff --git a/imap/README b/imap/README index d412d5b6..157846c8 100644 --- a/imap/README +++ b/imap/README @@ -70,5 +70,5 @@ you a list of commands. Pine is available separately on the FTP.CAC.Washington.EDU archives. The focus of development and support is for UNIX and Win32 (including -Windows 95/98/Millenium, Windows NT, and Windows 2000). The other ports are +Windows 95/98/Millennium, Windows NT, and Windows 2000). The other ports are not frequently used or tested, and may be incomplete. diff --git a/imap/docs/FAQ.html b/imap/docs/FAQ.html index 27d42aa4..f2496b99 100644 --- a/imap/docs/FAQ.html +++ b/imap/docs/FAQ.html @@ -322,7 +322,7 @@

  • 5.1 I see that the IMAP server allows access to - arbitary files on the system, including /etc/passwd! How do I disable + arbitrary files on the system, including /etc/passwd! How do I disable this?
  • 5.2 I've heard that IMAP servers are insecure. Is @@ -1411,7 +1411,7 @@

    SSL is supported via undocumented Microsoft interfaces in Windows 9x and NT4; and via standard interfaces in Windows 2000, Windows - Millenium, and Windows XP.

    + Millennium, and Windows XP.

    @@ -1468,7 +1468,7 @@ make lnp EXTRAAUTHENTICATORS=gss -

    To build with Kerberos V5 on Windows 9x, Windows Millenium, and NT4, +

    To build with Kerberos V5 on Windows 9x, Windows Millennium, and NT4, use the "makefile.ntk" file instead of "makefile.nt":

     
@@ -2061,7 +2061,7 @@ mtest.c:515: the `gets' function is dangerous and should not be used.
   
    
 
   
    5.1 I see that the IMAP server allows access to
-     arbitary files on the system, including /etc/passwd! How do I disable
+     arbitrary files on the system, including /etc/passwd! How do I disable
      this?
    
 
   
    
@@ -2251,7 +2251,7 @@ for better performance.
       
    Coaxing software that uses autoconfig to build properly on platforms
       which were not specifically considered by that software wastes an
       inordinate amount of time. When (not if) autoconfig fails to do the
-      right thing, the result is an inpenetrable morass to untangle in order
+      right thing, the result is an impenetrable morass to untangle in order
       to find the problem and fix it.
    
 
       
    The concept behind autoconfig is good, but the execution is flawed.
@@ -3162,7 +3162,7 @@ looking something like:
       
      dd-mmm-yyyy hh:mm:ss +zzzz,ssss;ffffffffFFFF-UUUUUUUU
 
    The only thing that is variable is the "ssss" field, it can be as many
-digits as needed. All other fields (inluding the "dd") are fixed width. So,
+digits as needed. All other fields (including the "dd") are fixed width. So,
 the easiest thing to do is to look forward in the file for the next internal
 header, and delete everything from the error point to that internal header.
 
@@ -3520,7 +3520,7 @@ his home directory.
 
   
    
     
    
-      There are two common occurances of this problem:
+      There are two common occurrences of this problem:
 
       
      
         
    • You are running a system (e.g. certain versions of Linux) which
@@ -4147,7 +4147,7 @@ that the text part in a 334 response be a BASE64 encoded string; in other
 words, it is a protocol syntax error.
 
       
      In the case of AUTH=PLAIN, RFC 4422 (page 7) requires that the
-      encoded string have no data. In other words, the appropropiate
+      encoded string have no data. In other words, the appropriate
       standards-compliant server response is "334" followed by a SPACE and a
       CRLF.
      
 
diff --git a/imap/docs/RELNOTES b/imap/docs/RELNOTES
index 80e17967..28069698 100644
--- a/imap/docs/RELNOTES
+++ b/imap/docs/RELNOTES
@@ -335,7 +335,7 @@ broken servers use the SSLv23 server method, and this flag works around that
 problem.  WARNING: use of this flag will cause TLS negotiation to fail with
 a server which uses the proper TLSv1 server method.  Additionally, there are
 known security risks in SSLv2; so users should be suspicious if this switch
-suddenly becomes necesary.
+suddenly becomes necessary.
 
 The silly mailbox flag combination /ssl/tls is now rejected as an invalid
 remote specification.  Previous versions tried to negotiate TLS over an SSL
@@ -595,7 +595,7 @@ no longer builds on those platforms.
 
 Updated: 7 January 2003
 
-imap-2002b is a maintenace release, released concurrently with Pine 4.52,
+imap-2002b is a maintenance release, released concurrently with Pine 4.52,
 and contains only bugfixes.  Programs written for imap-2002 will build with
 this version without modification.
 
@@ -631,7 +631,7 @@ you will be asked to confirm to continue the build.
 
 ORDEREDSUBJECT threading has been changed in accordance with draft 12 of the
 IMAP threading specification.  Previously, each non-root message in an
-ORDEREDSUBJECT thread has been a child of the message immediately preceeding
+ORDEREDSUBJECT thread has been a child of the message immediately preceding
 it in the thread.  Draft 12 changes this so that the second message in the
 thread is the child of the first (root) message, and all subsequent messages
 are siblings of the first message.  This is significant in MUAs which display
@@ -810,7 +810,7 @@ by the /ssl switch in the mailbox name.
 
 With SSL connections, the server certificate is validated by the client code
 on UNIX, and Windows 2000 unless /novalidate-cert is specified.  Server
-certificates are currently is not validated on Windows 9x, Windows Millenium,
+certificates are currently is not validated on Windows 9x, Windows Millennium,
 or Windows NT 4; this is an artifact of the operating system and not the port
 (e.g. client code using the NT port will validate certificates if running on
 Windows 2000).  On UNIX, the server certificate must be signed by a trusted
diff --git a/imap/docs/bugs.txt b/imap/docs/bugs.txt
index 5f87b3ef..d8daa1a2 100644
--- a/imap/docs/bugs.txt
+++ b/imap/docs/bugs.txt
@@ -46,7 +46,7 @@ The following are known problems/deficiencies in the imap-2007 toolkit:
       DNS and/or the server's host table.  A workaround exists (see the
       top-level Makefile for details) but is not recommended and can not
       be used at all with Kerberos.
-   . At the insistance of the security gurus, SSL certification validation
+   . At the insistence of the security gurus, SSL certification validation
       is now on by default.  This means that you must now use the new
       /novalidate-cert switch if establishing an SSL connection to a server
       with a self-signed certificate; i.e. if "imap.example.com" has a
diff --git a/imap/docs/calendar.txt b/imap/docs/calendar.txt
index c1009078..63aaa68b 100644
--- a/imap/docs/calendar.txt
+++ b/imap/docs/calendar.txt
@@ -66,7 +66,7 @@ Caesar).
 
      Months in the Julian calendar were 30 or 31 days in length and
 every fourth year was made a leap year (having 366 days) by adding a day
-to the end of the year.  This leap year rule was not consistantly
+to the end of the year.  This leap year rule was not consistently
 applied until 8 CE.  The year-ending month of February, never a popular
 month, was presently shortened so that Julius Caesar and Emperor
 Augustus could each have long months named after them.
@@ -124,7 +124,7 @@ calendar.  This suggestion was adopted over the next 500 years and
 subsequently followed in the Gregorian calendar.
 
      For the benefit of those who seek religious significance to the
-calendar millenium, note that year 1 is too late by at least 4 years.
+calendar millennium, note that year 1 is too late by at least 4 years.
 Herod the Great, named in the Christian Bible as having all children in
 Bethlehem put to death in an attempt to kill the infant Jesus, died in 4
 BCE.
@@ -190,7 +190,7 @@ centuries yet.
      There is code in c-client to support the modified Gregorian
 calendar, although it is currently disabled.  Sometime in the next
 2000 years, someone will need to enable this code so that c-client is
-Y4K compiliant.  Then, 18,000 years from now, someone will have to
+Y4K compliant.  Then, 18,000 years from now, someone will have to
 tear into c-client's code to fix the Y20K bug.
 
 
@@ -237,7 +237,7 @@ adjustments will be necessary at that time.
 
      Hence my use of "or so" in predicting the years that the calendar
 will fall behind.  The actual point may be anywhere from decades (in the
-case of Y3.3K) to millenia (in the case of Y40K) off from these predictions.
+case of Y3.3K) to millennia (in the case of Y40K) off from these predictions.
 
 
 MEANINGS OF DAY NAMES
diff --git a/imap/docs/commndmt.txt b/imap/docs/commndmt.txt
index 7fd9707b..ee387311 100644
--- a/imap/docs/commndmt.txt
+++ b/imap/docs/commndmt.txt
@@ -92,7 +92,7 @@ they are such.
 
 10. Thou shalt use the LIST "*" wildcard only with great care.  If
 thou doth not fully comprehend the danger of "*", thou shalt use only
-"%" and forget about the existance of "*".
+"%" and forget about the existence of "*".
 
 Honor these commandments, and keep them holy in thy heart, so that thy
 users shalt maximize their pleasure, and the server administrators
diff --git a/imap/docs/drivers.txt b/imap/docs/drivers.txt
index de91aa53..0d4c77c9 100644
--- a/imap/docs/drivers.txt
+++ b/imap/docs/drivers.txt
@@ -114,14 +114,14 @@ prefix of the mailbox name.  On UNIX, the following rules apply:
 
 Prefix		Interpretation of Suffix
 ------		------------------------
-/		[black box] preceeds a user name; "/foo/bar" means
+/		[black box] precedes a user name; "/foo/bar" means
 		 "black box user foo's mailbox bar"
-		[not black box] preceeds an absolute path name.
-~		[not black box] preceeds a user name; "~foo/bar" means
+		[not black box] precedes an absolute path name.
+~		[not black box] precedes a user name; "~foo/bar" means
 		 "UNIX user foo's mailbox bar"
-#ftp/		preceeds UNIX user ftp's mailbox name
-#public/	preceeds UNIX user imappublic's mailbox name
-#shared/	preceeds UNIX user imapshared's mailbox name
+#ftp/		precedes UNIX user ftp's mailbox name
+#public/	precedes UNIX user imappublic's mailbox name
+#shared/	precedes UNIX user imapshared's mailbox name
 
 All other names are interpreted in the context of the UNIX user's home
 directory (not black box), the black box user's black box directory
diff --git a/imap/docs/formats.txt b/imap/docs/formats.txt
index 8dfb9dae..d1e3b353 100644
--- a/imap/docs/formats.txt
+++ b/imap/docs/formats.txt
@@ -17,7 +17,7 @@
 
 
      When a mailbox storage technology uses local files and
-directories directly, the file(s) and directories are layed out in a
+directories directly, the file(s) and directories are laid out in a
 mailbox format.
 
 I. Flat-File Formats
@@ -166,7 +166,7 @@ Soapbox on File/Message Formats
 too much effort into file/message formats, you are correct.
 
      There's a general reason why file/message formats are a bad idea.
-Just about every filesystem in existance serializes file creation and
+Just about every filesystem in existence serializes file creation and
 deletions because these manipulate the free space map.  This turns out
 to be an enormous problem when you start creating/deleting more than a
 few messages per second; you spend all your time thrashing in the
@@ -209,7 +209,7 @@ So what does this all mean?
 
      A database (such as used by Exchange) is really a much better
 approach if you want to move away from flat files.  mx and especially
-Cyrus take a tenative step in that direction; mx failed mostly because
+Cyrus take a tentative step in that direction; mx failed mostly because
 it didn't go anywhere near far enough.  Cyrus goes much further, and
 scores remarkable benefits from doing so.
 
diff --git a/imap/docs/imaprc.txt b/imap/docs/imaprc.txt
index cda153a6..82c7daa2 100644
--- a/imap/docs/imaprc.txt
+++ b/imap/docs/imaprc.txt
@@ -30,7 +30,7 @@ set keywords.
 * config file whether or not there is any need for one.		     *
 *								     *
 *  This information is subject to change without notice.  Commands   *
-* may be added, removed, or altered.  The behavior of comamnds may   *
+* may be added, removed, or altered.  The behavior of commands may   *
 * change.  Do not use any of this information without consulting me  *
 * first.  c-client's defaults have been carefully chosen to be right *
 * for general-purpose and most special-purpose configurations.  If   *
@@ -469,7 +469,7 @@ matter.  Unrecognized commands are ignored.
 
 30) set disable-automatic-shared-namespaces 
    Never look up the "ftp", "imappublic", and "imapshared" users as
-   posssible home directories for the #ftp, #public, and #shared
+   possible home directories for the #ftp, #public, and #shared
    namespaces.  On some systems (reportedly including AIX 4.3.3)
    getpwnam() of an unknown user name is horrendously slow.
 
@@ -510,7 +510,7 @@ matter.  Unrecognized commands are ignored.
    By default, the servers (ipop[23]d and imapd) will do gethostbyaddr()
    on the local and remote sockets so that imapd can identify itself
    properly (this is important when the same CPU hosts multiple virtual
-   hosts on different IP addresss) and also includes the client's name
+   hosts on different IP address) and also includes the client's name
    when it writes to the syslog.  There are also client gethostbyaddr()
    calls, used primarily by authentication mechanisms.
 
diff --git a/imap/docs/internal.txt b/imap/docs/internal.txt
index 203688e8..98d66ab6 100644
--- a/imap/docs/internal.txt
+++ b/imap/docs/internal.txt
@@ -626,7 +626,7 @@ void INIT (STRING *s,STRINGDRIVER *d,void *data,unsigned long size);
 	data	pointer to driver-dependent data, from which the
 		 driver can determine string data
 	size	size of the string
- This call initializes the string stucture.
+ This call initializes the string structure.
 
 
 unsigned long SIZE (STRING *s);
@@ -723,7 +723,7 @@ char mail_string_next (STRING *s);
 void mail_string_setpos (STRING *s,unsigned long i);
 
      These three functions are the init, next, and setpos string
-structure access methods for the build-in mail_string string driver.
+structure access methods for the built-in mail_string string driver.
 mail_string is a basic string driver for a char* string.  See the
 documentation below on "String Structures" for more information.
 
@@ -742,7 +742,7 @@ statement
 	#include "linkage.c"
 which will include the "system standard driver linkage" defined when
 c-client was built.  By using linkage.c instead of explicit mail_link()
-calls, you are guaranteed that you will have a consistant linkage among
+calls, you are guaranteed that you will have a consistent linkage among
 all software built on this system.
 
 
@@ -925,7 +925,7 @@ fetch an operational parameter and SET_xxx to set the parameter:
 	bit.  Defaults to non-NIL, since this is usually bad news.
 
  GET_LISTMAXLEVEL / SET_LISTMAXLEVEL
-	 The maximum depth of recusion that LIST will go on a *
+	 The maximum depth of recursion that LIST will go on a *
 	wildcard.  Defaults to 20.
 
  GET_ANONYMOUSHOME / SET_ANONYMOUSHOME
@@ -1143,7 +1143,7 @@ long mail_rename (MAILSTREAM *stream,char *old,char *newname);
 It returns T if successful, NIL if unsuccessful.  If unsuccessful, an
 error message is returned via the mm_log() callback.
 
-     It is an error to reanme a mailbox that does not exist, or rename
+     It is an error to rename a mailbox that does not exist, or rename
 a mailbox to a name that already exists.  It is permitted to rename
 INBOX; a new empty INBOX is created in its place.
 
@@ -1609,7 +1609,7 @@ unsigned int seen : 1;	message read
 unsigned int unseen : 1;
 			message not read
 
-     The following auxillary structures are used by search programs:
+     The following auxiliary structures are used by search programs:
 	SEARCHHEADER:	header line searching
 char *line;		header line field name
 char *text;		text header line
@@ -1725,7 +1725,7 @@ and end of the expunge to ensure synchronization.  The status of the
 expunge is passed to the application via the mm_log() facility.
 
       Note that the decrementing of msgno's for subsequent messages
-happens immediately; for example, if three consequtive messages starting
+happens immediately; for example, if three consecutive messages starting
 at msgno 5 are expunged, mm_expunged() will be called with a msgno of 5
 three times.
 
@@ -2709,7 +2709,7 @@ possibly shown to the user.
 
 	ERROR	An error event.  This event should be displayed to
 		the user, or at least logged someplace.  This is a
-		serious error condition occured that aborted the
+		serious error condition occurred that aborted the
 		requested operation and possibly also aborted the mail
 		stream.  This ranges from normal error conditions such
 		as "Can't open mailbox", "too many login failures, go
@@ -2793,7 +2793,7 @@ function has to output its own.
 			     Driver interface
 
      When writing a new driver for the c-client, you must provide a
-DRIVER stucture giving a dispatch vector between MAIL and the driver.
+DRIVER structure giving a dispatch vector between MAIL and the driver.
 The DRIVER dispatch vector is described in mail.h.
 
 char *name;
@@ -2974,7 +2974,7 @@ void mail_lock (MAILSTREAM *stream);
 lock if the stream is already locked.
 
       This is mainly used to catch errors due to a callback function
-(e.g. mm_exists) inadvertantly recursing back to the MAIL routines and
+(e.g. mm_exists) inadvertently recursing back to the MAIL routines and
 establishing an infinite recursion.  Normally, drivers will set the lock
 prior to calling one of the callback functions above or, more likely, in
 the beginning of the driver's non-reentrant "do operation" section.  In the
diff --git a/imap/docs/locking.txt b/imap/docs/locking.txt
index 32ff6c66..eb165647 100644
--- a/imap/docs/locking.txt
+++ b/imap/docs/locking.txt
@@ -61,7 +61,7 @@ writeable memory between such processes.
 
      A means of communicating this is by use of a file with a mutually
 agreed upon name.  A binary semaphore can be passed by means of the
-existance or non-existance of that file, provided that there is an
+existence or non-existance of that file, provided that there is an
 atomic means to create a file if and only if that file does not exist.
 In C terms:
 
@@ -245,7 +245,7 @@ BEZERK AND MMDF
 
      Locking in the traditional UNIX formats was largely dictated by
 the status quo in other applications; however, additional protection
-is added against inadvertantly running multiple instances of a
+is added against inadvertently running multiple instances of a
 c-client application on the same mail file.
 
      (1) c-client attempts to create a .lock file (mail file name with
diff --git a/imap/docs/md5.txt b/imap/docs/md5.txt
index c43f1023..f589c9ca 100644
--- a/imap/docs/md5.txt
+++ b/imap/docs/md5.txt
@@ -25,7 +25,7 @@ RFC 1939, the standard document for the POP3 protocol.
 challenge; the client responds with an MD5 checksum of the challenge
 plus the password; the server in compares the client's response with
 its own calculated value of the checksum.  If the client's response
-matches the server's calulated value, the client is authenticated.
+matches the server's calculated value, the client is authenticated.
 
      Unlike plaintext passwords, this form of authentication is
 believed to be secure against the session being monitored; "sniffing"
diff --git a/imap/docs/mixfmt.txt b/imap/docs/mixfmt.txt
index afe3f940..68d75836 100644
--- a/imap/docs/mixfmt.txt
+++ b/imap/docs/mixfmt.txt
@@ -136,7 +136,7 @@ A file number is set to the current modseq when it is created.  If a copy
 or append causes the file to exceed the compiled-in file size limit, a new
 file is started and the metadata is updated accordingly.
 
-Preceeding each message is per-message record with the following format:
+Preceding each message is per-message record with the following format:
    	Key	Payload
 	---	-------
 					;; per-message record
@@ -225,7 +225,7 @@ Then the index and status files are closed.
 Shared expunge presents a problem due to the requirements of the IMAP
 protocol.  You can't "burp" away a message until you are certain that
 no sharers have a pointer to any longer.  Consequently, for the nonce
-"burping" out expunged data be defered to an exclusive expunge as in
+"burping" out expunged data be deferred to an exclusive expunge as in
 mbx format.
 
 If shared burping is ever implemented, then care will be needed not to
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 
 
-/* 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 
 #include 
 #include 
-#undef ERROR			/* quell conflicting defintion warning */
+#undef ERROR			/* quell conflicting definition warning */
 #include 
 #include 
 #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
diff --git a/imap/tools/uahelper.c b/imap/tools/uahelper.c
index 114fd687..803ee86c 100644
--- a/imap/tools/uahelper.c
+++ b/imap/tools/uahelper.c
@@ -66,7 +66,7 @@ char *fndws (s)
 }
 
 
-/* Find end of commend
+/* Find end of comment
  * Accepts: string
  * Returns: -1 if end of comment found, else 0
  */
diff --git a/include/general.h b/include/general.h
index 40016ece..0ae02f08 100644
--- a/include/general.h
+++ b/include/general.h
@@ -26,7 +26,7 @@
  */
 
 
-/* Might as well be consistant */
+/* Might as well be consistent */
 #undef	FALSE
 #define FALSE   0                       /* False, no, bad, etc.         */
 #undef	TRUE
diff --git a/include/system.h b/include/system.h
index 36c87445..1ae6ad07 100644
--- a/include/system.h
+++ b/include/system.h
@@ -376,13 +376,13 @@ typedef int gid_t;
 
 
 #if defined(PASSFILE) && defined(APPLEKEYCHAIN)
-#  error "Cant define both PASSFILE and APPLEKEYCHAIN"
+#  error "Cannot define both PASSFILE and APPLEKEYCHAIN"
 #endif
 #if defined(PASSFILE) && defined(WINCRED)
-#  error "Cant define both PASSFILE and WINCRED"
+#  error "Cannot define both PASSFILE and WINCRED"
 #endif
 #if defined(APPLEKEYCHAIN) && defined(WINCRED)
-#  error "Cant define both APPLEKEYCHAIN and WINCRED"
+#  error "Cannot define both APPLEKEYCHAIN and WINCRED"
 #endif
 
 #if defined(PASSFILE) || defined(APPLEKEYCHAIN) || defined(WINCRED)
diff --git a/libressl/tls1_3.txt b/libressl/tls1_3.txt
index 06a7eb7c..e4f95847 100644
--- a/libressl/tls1_3.txt
+++ b/libressl/tls1_3.txt
@@ -1,5 +1,5 @@
 This implementation of LibreSSL does not support TLS1_3 yet. When it does, 
-we will compile with those bits to add support for this protcol. A good 
+we will compile with those bits to add support for this protocol. A good 
 read for this is
 
 https://github.com/libressl-portable/portable/issues/228
diff --git a/mapi/ReadmeMapi32.txt b/mapi/ReadmeMapi32.txt
index f2b37381..fc3582fc 100644
--- a/mapi/ReadmeMapi32.txt
+++ b/mapi/ReadmeMapi32.txt
@@ -10,7 +10,7 @@ Unicode support will have to change for that to happen.
 	         pmapi32 for Alpine 2.11
 
 This distribution comes with two other files, instmapi.exe and
-pmapi32.dll, for use with Aline.  It is recommended that these files
+pmapi32.dll, for use with Alpine.  It is recommended that these files
 be put in your pine directory (generally C:\Program Files\Alpine).
 
 pmapi32.dll - a Simple MAPI dynamically linked library.  pmapi32.dll
diff --git a/mapi/instmapi.c b/mapi/instmapi.c
index ab79f2f4..6cfdc086 100644
--- a/mapi/instmapi.c
+++ b/mapi/instmapi.c
@@ -31,7 +31,7 @@
 
 /* this program consists of two parts: 
  * (1) Updating the registry, 
- * most particulary the string of DLLPath in the key
+ * most particularly the string of DLLPath in the key
  * HKLM\Software\Clients\PC-Pine.
  * (2) Deciding whether or not to copy pmapi32.dll into the system
  * directory.  Starting with Windows 2000, Internet Explorer 5.0
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index 7628255a..b786cefd 100644
--- a/mapi/pmapi.c
+++ b/mapi/pmapi.c
@@ -2899,7 +2899,7 @@ void ErrorBoxFunc(char *msg)
 
   Result: Alloc'd unique string is returned
 
-Uniqueness is gaurenteed by using the host name, process id, date to the
+Uniqueness is guaranteed by using the host name, process id, date to the
 second and a single unique character
 *----------------------------------------------------------------------*/
 char *
diff --git a/pico/basic.c b/pico/basic.c
index 117719bb..030757eb 100644
--- a/pico/basic.c
+++ b/pico/basic.c
@@ -277,9 +277,9 @@ backline(int f, int n)
 
 
 /*
- * go back to the begining of the current paragraph
+ * go back to the beginning of the current paragraph
  * here we look for a  or  or 
- * combination to delimit the begining of a paragraph	
+ * combination to delimit the beginning of a paragraph	
  */
 int
 gotobop(int f, int n)
@@ -346,7 +346,7 @@ gotobop(int f, int n)
 /* 
  * go forword to the end of the current paragraph
  * here we look for a  or  or 
- * combination to delimit the begining of a paragraph
+ * combination to delimit the beginning of a paragraph
  */
 int
 gotoeop(int f, int n)
@@ -616,7 +616,7 @@ scrollback(int n, int movedot)
     else {
 	/* Requested not to move dot, but we do need to keep in on
 	 * the screen.  Verify that it is still in the range of lines
-	 * visable in the window.  Loop from the first line to the
+	 * visible in the window.  Loop from the first line to the
 	 * last line, until we reach the end of the buffer or the end
 	 * of the window.  If we find the dot, then we don't need
 	 * to move it. */
@@ -769,7 +769,7 @@ setmark(int f, int n)
 
 /*
  * Swap the values of "." and "mark" in the current window. This is pretty
- * easy, bacause all of the hard work gets done by the standard routine
+ * easy, because all of the hard work gets done by the standard routine
  * that moves the mark about. The only possible error is "no mark". Bound to
  * "C-X C-X".
  */
@@ -812,7 +812,7 @@ setimark(int f, int n)
 
 /*
  * Swap the values of "." and "mark" in the current window. This is pretty
- * easy, bacause all of the hard work gets done by the standard routine
+ * easy, because all of the hard work gets done by the standard routine
  * that moves the mark about. The only possible error is "no mark". Bound to
  * "C-X C-X".
  */
diff --git a/pico/bind.c b/pico/bind.c
index fda211f9..9d903ea0 100644
--- a/pico/bind.c
+++ b/pico/bind.c
@@ -187,7 +187,7 @@ static KEYMENU menu_scroll[] = {
 #define	OVERLAP	2		/* displayed page overlap */
 
 /*
- * scrollw - takes beginning row and ending row to diplay an array
+ * scrollw - takes beginning row and ending row to display an array
  *           of text lines.  returns either 0 if scrolling terminated
  *           normally or the value of a ctrl character typed to end it.
  *
@@ -210,7 +210,7 @@ wscrollw(int begrow, int endrow, char *utf8textp[], int textlen)
     dlines = endrow - begrow - 1;
     while(!done) {
         /*
-         * diplay a page loop ...
+         * display a page loop ...
          */
 	if(prevoffset != loffset){
        	    for(i = 0; i < dlines; i++){
@@ -374,7 +374,7 @@ rebindfunc(int (*a)(int, int), int (*b)(int, int))
 
     while(kp->k_fp != NULL){		/* go thru whole list, and */
 	if(kp->k_fp == a)
-	  kp->k_fp = b;			/* replace all occurances */
+	  kp->k_fp = b;			/* replace all occurrences */
 	kp++;
     }
 }
diff --git a/pico/browse.c b/pico/browse.c
index 49f9fb9b..6890a784 100644
--- a/pico/browse.c
+++ b/pico/browse.c
@@ -287,7 +287,7 @@ pico_file_browse(PICO *pdata, char *dir, size_t dirlen, char *fn, size_t fnlen,
 /*
  * FileBrowse - display contents of given directory dir
  *
- *	    intput:  
+ *	    input:  
  *		     dir points to initial dir to browse.
  *                   dirlen- buffer size of dir
  *		     fn  initial file name.
@@ -1855,7 +1855,7 @@ getfcells(char *dname, int fb_flags)
 
 	/*
 	 * Filter dot files?  Always filter ".", never filter "..",
-	 * and sometimes fitler ".*"...
+	 * and sometimes filter ".*"...
 	 */
 	if(*np == '.' && (!(*(np+1) == '.' && *(np+2) == '\0')
 			  && !(*(np+1) == '\0' && (fb_flags&FB_SAVE)))
diff --git a/pico/buffer.c b/pico/buffer.c
index 87423d28..741c969f 100644
--- a/pico/buffer.c
+++ b/pico/buffer.c
@@ -88,7 +88,7 @@ bfind(char *bname, int cflag, int bflag)
                 }
 		/* find the place in the list to insert this buffer */
 		if (bheadp == NULL || strcmp(bheadp->b_bname, bname) > 0) {
-			/* insert at the begining */
+			/* insert at the beginning */
 	                bp->b_bufp = bheadp;
         	        bheadp = bp;
         	} else {
@@ -347,7 +347,7 @@ sgetline(char **ibuf, int *nchars, char *obuf, int blen)
 	    }
 	}
     }
-    *bufp = '\0';			/* end retured line */
+    *bufp = '\0';			/* end returned line */
     *ibuf = (*cbuf == CR) ? ++cbuf : cbuf;
     *ibuf = (*cbuf == LF) ? ++cbuf : cbuf;
     return(retval);
diff --git a/pico/composer.c b/pico/composer.c
index 88be7ac2..6649da50 100644
--- a/pico/composer.c
+++ b/pico/composer.c
@@ -539,7 +539,7 @@ HeaderEditor(int f, int n)
 	     *       since we left...
 	     */
 
-	    /* fix postition */
+	    /* fix position */
 	    if(curwp->w_doto < headents[ods.cur_e].prwid)
 	      ods.p_ind = 0;
 	    else if(curwp->w_doto < ods.p_ind + headents[ods.cur_e].prwid)
@@ -3493,7 +3493,7 @@ InvertPrompt(int entry, int state)
       (*term.t_rev)(1);
 
     while(*bufp && *(bufp + 1))
-      pputc(*bufp++, 1);			/* putc upto last char */
+      pputc(*bufp++, 1);			/* putc up to last char */
 
     if(state)
       (*term.t_rev)(0);
@@ -4106,7 +4106,7 @@ KillHeaderLine(struct hdr_line *l, int append)
  *              functions.
  *
  *	returns:
- *		TRUE if something good happend
+ *		TRUE if something good happened
  *		FALSE otherwise
  */
 int
@@ -4498,7 +4498,7 @@ packheader(void)
         count = 0;
         while(line != NULL){
             /*
-             * add one for possible concatination of a ' ' character ...
+             * add one for possible concatenation of a ' ' character ...
              */
 	    p = ucs4_to_utf8_cpystr(line->text);
 	    if(p){
@@ -4816,7 +4816,7 @@ mark_sticky(struct headerentry *h)
 #undef	HeaderEditor
 
 /*
- * Wraper function for the real header editor. 
+ * Wrapper function for the real header editor. 
  * Does the important tasks of:
  *	1) verifying that we _can_ edit the headers.
  *	2) acting on the result code from the header editor.
diff --git a/pico/display.c b/pico/display.c
index 6bb62b3b..4902a49e 100644
--- a/pico/display.c
+++ b/pico/display.c
@@ -957,7 +957,7 @@ updext(void)
       lbound = w;
 
 
-    /* scan through the line outputing characters to the virtual screen
+    /* scan through the line outputting characters to the virtual screen
      * once we reach the left edge
      */
     vtmove(currow, -lbound);		/* start scanning offscreen */
@@ -3732,7 +3732,7 @@ update_scroll (void)
 	   
 	
     /*
-     * Count the number of lines in the current bufer.  Done when:
+     * Count the number of lines in the current buffer.  Done when:
      *
      *      when told to recount:           curbp->b_linecnt == -1
      *      when the top line changed:      curwp->w_linep != last_top_line
diff --git a/pico/ebind.h b/pico/ebind.h
index 4f1687b4..1a0698ea 100644
--- a/pico/ebind.h
+++ b/pico/ebind.h
@@ -25,7 +25,7 @@
  *      There are very limited number of flat ctrl-key bindings left, and 
  *      most of them are slated for yet-to-be implemented functions, like
  *      invoking an alternate editor in the composer and necessary funcs
- *      for imlementing attachment handling.  We really want to avoid 
+ *      for implementing attachment handling.  We really want to avoid 
  *      going to multiple keystroke functions. -mss
  *
  */
diff --git a/pico/estruct.h b/pico/estruct.h
index 2d0f650c..f2f41947 100644
--- a/pico/estruct.h
+++ b/pico/estruct.h
@@ -31,7 +31,7 @@
 /*	Configuration options	*/
 
 #define CVMVAS  1	/* arguments to page forward/back in pages	*/
-#define	NFWORD	1	/* forward word jumps to begining of word	*/
+#define	NFWORD	1	/* forward word jumps to beginning of word	*/
 #define	TYPEAH	0	/* type ahead causes update to be skipped	*/
 #define	REVSTA	1	/* Status line appears in reverse video		*/
 
@@ -319,7 +319,7 @@ typedef struct  {
         int     (*k_fp)();              /* Routine to handle it         */
 }       KEYTAB;
 
-/*      sturcture used for key menu painting         */
+/*      structure used for key menu painting         */
 
 typedef struct {
 	char	*name;			/* key to display (UTF-8)		*/
diff --git a/pico/file.c b/pico/file.c
index 34017fec..68c5e1d9 100644
--- a/pico/file.c
+++ b/pico/file.c
@@ -557,7 +557,7 @@ readin(char fname[],		/* name of file to read */
  * Update the remembered file name and clear the
  * buffer changed flag. This handling of file names
  * is different from the earlier versions, and
- * is more compatable with Gosling EMACS than
+ * is more compatible with Gosling EMACS than
  * with ITS EMACS. Bound to "C-X C-W".
  */
 int
@@ -795,7 +795,7 @@ filewrite(int f, int n)
 
 /*
  * Save the contents of the current
- * buffer in its associatd file. No nothing
+ * buffer in its associated file. No nothing
  * if nothing has changed (this may be a bug, not a
  * feature). Error if there is no remembered file
  * name for the buffer. Bound to "C-X C-S". May
diff --git a/pico/osdep/altedit.c b/pico/osdep/altedit.c
index 44e17fe8..8886a06f 100644
--- a/pico/osdep/altedit.c
+++ b/pico/osdep/altedit.c
@@ -574,7 +574,7 @@ child_handler(int sig)
 	 * sleep function, thus making the stack frame for the signal function
 	 * invalid, and when the ALARM handler later longjmps back into the
 	 * sleep function it does no longer have a valid stack frame.
-	 * My sugested fix is to cancel the pending alarm in the SIGCHLD
+	 * My suggested fix is to cancel the pending alarm in the SIGCHLD
 	 * handler before longjmp'ing. This shouldn't hurt as there
 	 * shouldn't be any ALARM pending at this point except possibly from
 	 * the sleep call.
@@ -586,7 +586,7 @@ child_handler(int sig)
 	 * The sleep call might have set up a signal handler which would
 	 * longjmp back into the sleep code, and that would cause a crash.
 	 */
-	signal(SIGALRM, SIG_IGN);	/* Cancel signal handeler */
+	signal(SIGALRM, SIG_IGN);	/* Cancel signal handler */
 	alarm(0);			/* might longjmp back into sleep */ 
 #endif
 	longjmp(pico_child_state, 1);
diff --git a/pico/osdep/mouse.c b/pico/osdep/mouse.c
index 4f2317a0..9e9ddce9 100644
--- a/pico/osdep/mouse.c
+++ b/pico/osdep/mouse.c
@@ -263,7 +263,7 @@ mouseexist(void)
 }
 
 /* 
- * checkmouse - Check mouse and return maped command.
+ * checkmouse - Check mouse and return mapped command.
  *
  *	EXPORTED to pico.
  *      NOTE: "down", "xxx", and "yyy" aren't used under windows.
@@ -299,7 +299,7 @@ checkmouse (unsigned long *ch, int ddd, int xxx, int yyy)
     
     /* 
      * If there is a tracking function it gets all the mouse events
-     * reguardless of where they occur.
+     * regardless of where they occur.
      */
     if (mtrack != NULL) {
 	r = mtrack (mouse.event, mrow, mcol, mouse.button, mouse.keys);
diff --git a/pico/osdep/msdlg.c b/pico/osdep/msdlg.c
index 1a262551..9c8fdc55 100644
--- a/pico/osdep/msdlg.c
+++ b/pico/osdep/msdlg.c
@@ -152,7 +152,7 @@ mswin_usedialog (void)
 	button_list -- pointer to array of mDlgButton's.  input chars matching
                        those in list return value from list.  Nearly identical
 		       to Pine's ESCKEY structure.
-        help   -- Arrary of strings for help text in bottom screen lines
+        help   -- Array of strings for help text in bottom screen lines
         flags  -- flags
 
   Result:  editing input string
@@ -359,7 +359,7 @@ mswin_dialog_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	    
 	case IDCANCEL:
 	    /*
-	     * Cancel operation.  Don't retreive new text.
+	     * Cancel operation.  Don't retrieve new text.
 	     */
 	    gOEInfo.result = 1;
 	    EndDialog (hDlg, gOEInfo.result);
@@ -387,7 +387,7 @@ mswin_dialog_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	default:
 	    /*
 	     * Search button list for button with this ID.  If found
-	     * return it's result code.  Retreive text.
+	     * return it's result code.  Retrieve text.
 	     */
 	    if (  wParam >= BTN_FIRSTID && 
 		  wParam < BTN_FIRSTID + (WPARAM) gOEInfo.button_count) {
@@ -547,7 +547,7 @@ mswin_yesno_lptstr(LPTSTR prompt)
 			   mstructure.
 	dflt		-- Value returned when "Enter" is pressed.
         on_ctrl_C	-- Value returned to cancel dialog (ESC).
-        help		-- Arrary of strings for help text in bottom screen 
+        help		-- Array of strings for help text in bottom screen 
 			   lines
         flags		-- flags
 
@@ -557,7 +557,7 @@ mswin_yesno_lptstr(LPTSTR prompt)
 	or one of the other return values defined in button_list.
 		
 		
-Note:  To prcess keyboard in put we use a custom dialog control
+Note:  To process keyboard input we use a custom dialog control
        which is invisible but always has the input focus.
 
 ----------------------------------------------------------------------*/
@@ -987,7 +987,7 @@ BuildButtonList(HWND hDlg, MDlgButton *built_in, int biCount, MDlgButton *button
 	w = bwidth;				/* Original button width. */
 	cols = 1 + ((biCount + btnCount) - 1) / rows;	/* Calc num cols. */
 
-	/* Need to srink button width? */
+	/* Need to shrink button width? */
 	if (2 * margine + bwidth * cols + BSPACE * (cols - 1) > rDlg.right) {
 	    w = ((rDlg.right - (2 * margine)) - (BSPACE * (cols-1))) / cols;
 	}
diff --git a/pico/osdep/msmenu.h b/pico/osdep/msmenu.h
index 83ca66af..01f992e7 100644
--- a/pico/osdep/msmenu.h
+++ b/pico/osdep/msmenu.h
@@ -28,7 +28,7 @@
 
 /*
  * Menu key definitions.
- * Should be same values as in resouce.h
+ * Should be same values as in resource.h
  * These are all in a range from KS_RANGESTART to KS_RANGEEND
  * with no holes.
  */
diff --git a/pico/osdep/mswin.c b/pico/osdep/mswin.c
index b51268d2..ba72747a 100644
--- a/pico/osdep/mswin.c
+++ b/pico/osdep/mswin.c
@@ -60,7 +60,7 @@
 #define FDEBUG		/* Standard file debugging. */
 
 #undef SDEBUG		/* Verbose debugging of startup and windows handling*/
-#undef CDEBUG		/* Verbose debugging of character input timeing. */
+#undef CDEBUG		/* Verbose debugging of character input timing. */
 
 #undef OWN_DEBUG_FILE	/* Define if we want to write to our own debug file,
 			 * not pine's. */
@@ -120,7 +120,7 @@
 
 /* My Timer Message */
 #define MY_TIMER_ID	33
-/* timeout period in miliseconds. */
+/* timeout period in milliseconds. */
 #define MY_TIMER_PERIOD (UINT)((IDLE_TIMEOUT + 1)*1000)
 /***** We use variable my_timer_period now instead so that we can set
        it differently when in pine and when in regular old pico.
@@ -245,7 +245,7 @@ typedef	int			(*FileDropCallBackProc)();
 typedef short			CORD;
 
 /* NOTE:  There is currently code that assumes that CHAR and CharAttrib
- *	are one byte in size.  All this code is flaged with a preceeding
+ *	are one byte in size.  All this code is flagged with a preceding
  *	assert () */
 
 /* Struct that defines command menu entries. */
@@ -274,12 +274,12 @@ typedef struct tagTTYINFO {
     CARETS	cCaretStyle;	/* Current caret's style */
     int		scrollRange;	/* Current scroll bar range. */
     long	scrollPos;	/* Current scroll position. */
-    long	scrollTo;	/* Possition of last scroll to. */
+    long	scrollTo;	/* Position of last scroll to. */
     HFONT	hTTYFont;
     LOGFONT	lfTTYFont;
-    DWORD	rgbFGColor;	/* Normal forground color. */
+    DWORD	rgbFGColor;	/* Normal foreground color. */
     DWORD	rgbBGColor;	/* Normal background color. */
-    DWORD	rgbRFGColor;	/* Reverse forground color. */
+    DWORD	rgbRFGColor;	/* Reverse foreground color. */
     DWORD	rgbRBGColor;	/* Reverse background color */
     unsigned	screenDirty:1;	/* TRUE if screen needs update. */
     unsigned	eraseScreen:1;	/* TRUE if need to erase whole screen */
@@ -822,7 +822,7 @@ wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
      */
     _set_invalid_parameter_handler (mswin_invalidparameter);
 
-#ifdef OWN_DEBUG_FILE	/* Want to write to seperate memdebug.txt file. */
+#ifdef OWN_DEBUG_FILE	/* Want to write to separate memdebug.txt file. */
     mswin_debugfile = fopen ("memdebug.txt", "w");
     fprintf (mswin_debugfile, "Beginning of mswin debug log\n");
     if (mswin_debugfile != NULL) {
@@ -1488,7 +1488,7 @@ PWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	break;
 	
     case WM_QUERYENDSESSION:
-	/* Returns non-zero if I can exit, otherwize zero, and the end
+	/* Returns non-zero if I can exit, otherwise zero, and the end
 	 * session operation stops. */
 	return ((LRESULT)ConfirmExit ());
 	
@@ -1847,7 +1847,7 @@ ResetTTYFont (HWND hWnd, PTTYINFO pTTYInfo, LOGFONT *newFont)
 
 #ifdef SDEBUG
     if (mswin_debug >= 5)
-	fprintf (mswin_debugfile, "ResetTTYFont:::  entered, curent window size X %d, Y %d\n",
+	fprintf (mswin_debugfile, "ResetTTYFont:::  entered, current window size X %d, Y %d\n",
 		pTTYInfo->xSize, pTTYInfo->ySize);
 #endif
 
@@ -2343,7 +2343,7 @@ AboutToSizeTTY (HWND hWnd, WINDOWPOS *winPos)
 	    (winPos->flags & (SWP_NOSIZE | SWP_NOMOVE)) == 0) {
 #ifdef SDEBUG
 	if (mswin_debug >= 5)
-	    fprintf (mswin_debugfile, "AboutToSizeTTY:::  substitue pos (%d, %d), size (%d, %d)\n",
+	    fprintf (mswin_debugfile, "AboutToSizeTTY:::  substitute pos (%d, %d), size (%d, %d)\n",
 		    pTTYInfo->xDesPos, pTTYInfo->yDesPos,
 		    pTTYInfo->xDesSize, pTTYInfo->yDesSize);
 #endif
@@ -2593,7 +2593,7 @@ MoveTTY (HWND hWnd, int xPos, int yPos)
  *      stream.
  *
  *	Scrolling in the TTY window is complicated by the way pine
- *      process events.  Normal windows applications are entirly event
+ *      process events.  Normal windows applications are entirely event
  *      driven.  The top level does nothing but dispatch events.  In
  *      pine, the top level implements the logic.  Events are only
  *      dispatched by the lowest levels.
@@ -3662,7 +3662,7 @@ WriteTTYChar (HWND hWnd, TCHAR ch)
  *
  *  Description:
  *     It is a simple utility function that simply performs the
- *     MPI and invokes the dialog box with a DWORD paramter.
+ *     MPI and invokes the dialog box with a DWORD parameter.
  *
  *  Parameters:
  *     similar to that of DialogBoxParam() with the exception
@@ -3936,7 +3936,7 @@ SelectTTYFont (HWND hWnd)
 
 
 /*
- * Set a specific color (forground, background, reverse, normal) to
+ * Set a specific color (foreground, background, reverse, normal) to
  * the color specified by name.
  */
 LOCAL void
@@ -4005,7 +4005,7 @@ ScanInt (char *str, int min, int max, int *val)
  * Convert a RGB string to a color ref.  The string should look like:
  *    rrr,ggg,bbb
  * where rrr, ggg, and bbb are numbers between 0 and 255 that represent
- * red, gree, and blue values.  Must be comma seperated.
+ * red, gree, and blue values.  Must be comma separated.
  * Returns:
  *	TRUE	- Successfully converted string.
  *	FALSE	- Bad format, 'cf' unchanged.
@@ -4206,7 +4206,7 @@ TBShow (HWND hWnd)
 
 
     /*
-     * Make procinstance for dialog funciton.
+     * Make procinstance for dialog function.
      */
     HideCaret (hWnd);
     if (gToolBarProc == NULL)
@@ -5559,7 +5559,7 @@ MSWIconPaint(int row, HDC hDC)
       ;
 
     if(pIcon){
-	/* Invalidate rectange covering singel character. */
+	/* Invalidate rectangle covering single character. */
 	DrawIconEx(hDC, 0, (row * gpTTYInfo->yChar) + gpTTYInfo->yOffset,
 		   pIcon->hIcon, 2 * gpTTYInfo->xChar, gpTTYInfo->yChar,
 		   0, NULL, DI_NORMAL);
@@ -5925,7 +5925,7 @@ mswin_setwindow(char *fontName_utf8, char *fontSize_utf8, char *fontStyle_utf8,
 	ppi = GetDeviceCaps(hDC, LOGPIXELSY);
 	ReleaseDC(ghTTYWnd, hDC);
 
-	/* Default height, then examin the requested fontSize. */
+	/* Default height, then examine the requested fontSize. */
 	newFont.lfHeight = -MulDiv(12, ppi, 72);
 	if(ScanInt(fontSize_utf8, FONT_MIN_SIZE, FONT_MAX_SIZE, &newHeight)){
 	    newHeight = abs(newHeight);
@@ -6114,7 +6114,7 @@ mswin_showwindow()
 
 
 /*
- * Retreive the current font name, font size, and window position
+ * Retrieve the current font name, font size, and window position
  * These get stored in the pinerc file and will be passed to
  * mswin_setwindow() when pine starts up.  See pinerc for comments
  * on the format.
@@ -6325,7 +6325,7 @@ mswin_setscrollpos (long pos)
 
 
 /*
- * retreive the current scroll postion.
+ * retrieve the current scroll position.
  */
 long
 mswin_getscrollpos (void)
@@ -6683,8 +6683,8 @@ mswin_setclosetext (char *pCloseText)
 
 
 /*
- * Called when upper layer is in a busy loop.  Allows us to yeild to
- * Windows and perhaps process some events.  Does not yeild control
+ * Called when upper layer is in a busy loop.  Allows us to yield to
+ * Windows and perhaps process some events.  Does not yield control
  * to other applications.
  */
 int
@@ -7113,7 +7113,7 @@ mswin_outc (char c)
 	gpTTYInfo->pCellWidth[offset] = wcellwidth((UCS)c) * gpTTYInfo->xChar;
 	gpTTYInfo->pAttrib[offset] = gpTTYInfo->curAttrib;
 	
-	/* Invalidate rectange covering singel character. */
+	/* Invalidate rectangle covering single character. */
 	rect.left = (gpTTYInfo->nColumn * gpTTYInfo->xChar) +
 		gpTTYInfo->xOffset;
 	rect.right = rect.left + gpTTYInfo->xChar;
@@ -7566,7 +7566,7 @@ mswin_newmailtext (char *t_utf8)
 	 * Change the appearance of minimized icon so user knows there's new
 	 * mail waiting for them.  On win 3.1 systems we redraw the icon.
 	 * on win95 systems we update the icon in the task bar,
-	 * and possibly udpate the small icon in the taskbar tool tray.
+	 * and possibly update the small icon in the taskbar tool tray.
 	 */
 	t_lptstr = utf8_to_lptstr(t_utf8);
 	UpdateTrayIcon(NIM_MODIFY, ghNewMailIcon, t_lptstr);
@@ -7820,7 +7820,7 @@ mswin_setwindowmenu (int menu)
 LOCAL HDC	P_PrintDC;	/* Printer device context. */
 LOCAL int	P_PageRows;	/* Number of rows we put on a page. */
 LOCAL int	P_PageColumns;	/* Number of columns we put on a page. */
-LOCAL int	P_RowHeight;	/* Hight of a row in printer pixels. */
+LOCAL int	P_RowHeight;	/* Height of a row in printer pixels. */
 LOCAL int	P_CurRow;	/* Current row, starting at zero */
 LOCAL int	P_CurCol;	/* Current col, starting at zero. */
 LOCAL int	P_TopOffset;	/* Top Margin offset, in pixels. */
@@ -7833,7 +7833,7 @@ LPTSTR		P_LineText;	/* Pointer to line buffer. */
 
 /*
  * Define the margin as number of lines at top and bottom of page.
- * (might be better to define as a percent of verticle page size)
+ * (might be better to define as a percent of vertical page size)
  */
 #define VERTICLE_MARGIN		3	/* lines at top and bottom of page. */
 #define HORIZONTAL_MARGIN	1	/* margine at left & right in chars */
@@ -8120,7 +8120,7 @@ mswin_print_ready(WINHAND hWnd, LPTSTR docDesc)
     /*
      * Start page.
      * Must select font for each page or it returns to default.
-     * Windows seems good about maping selected font to a font that
+     * Windows seems good about mapping selected font to a font that
      * will actually print on the printer.
      */
     StartPage (P_PrintDC);
@@ -8193,7 +8193,7 @@ mswin_print_done(void)
 
 
 /*
- * Return ponter to a text string that describes the erorr.
+ * Return pointer to a text string that describes the error.
  */
 char *
 mswin_print_error(int error_code)
@@ -8311,7 +8311,7 @@ LOCAL TCHAR gLastDir[PATH_MAX];
  * Keep track of the last dir visited.  Most of the time pine just passes us
  * the "home directory", which usually is not where the user wants to start.
  * Assume that the first time we are called we are being passed the home
- * direcory.
+ * directory.
  */
 static void
 FillInitialDir (LPCTSTR *iDir, LPTSTR targDir)
@@ -9792,7 +9792,7 @@ EditCopy (void)
 
 
 /*
- * Called in responce to "Copy Append" menu command, when there is an active
+ * Called in response to "Copy Append" menu command, when there is an active
  * Windows selection on the screen.
  */
 LOCAL void
@@ -10002,7 +10002,7 @@ EditCancelPaste (void)
 
 /*
  * Get the next byte from the paste buffer.  If all bytes have been
- * retreived, free the paste buffer.
+ * retrieved, free the paste buffer.
  * Map all CRLF sequence to a single CR.
  */
 LOCAL UCS
@@ -10502,7 +10502,7 @@ mswin_shell_exec(char *command_utf8, HINSTANCE *pChildProc)
 
 	/*
 	 * HACK -- since star is very unlikely to actually appear
-	 * in a command name thats launched via a shell command line,
+	 * in a command name that's launched via a shell command line,
 	 * a leading one indicates special handling.
 	 */
 	if(command_lpt[0] == '*'){
@@ -10659,7 +10659,7 @@ static struct mswin_reg_key mswin_pine_regs[] = {
 
 
 /*
- *  data: unitialized buffer, could be null
+ *  data: uninitialized buffer, could be null
  */
 int
 mswin_reg(int op, int tree, char *data_utf8, size_t size)
@@ -11814,7 +11814,7 @@ format_newmail_string(LPTSTR orig_lptstr, int format_len)
 
     /*
      * Fill up string till we reach the format_len, we can backtrack
-     * if we need elipses.
+     * if we need ellipsis.
      */
     for(i = 0, colLen = 0;
 	i < format_len && colLen < format_len && orig_lptstr && orig_lptstr[i];
@@ -12021,7 +12021,7 @@ CQAvailable (void)
  *		Add 'c' to the end of the character queue.
  *
  *  Parameters:
- *		return true if successfull.
+ *		return true if successful.
  *
 /*--------------------------------------------------------------------------*/
 
@@ -12048,7 +12048,7 @@ CQAdd (UCS c, BOOL fKeyControlDown)
  *		there is no other 'c' in the queue
  *
  *  Parameters:
- *		return true if successfull.
+ *		return true if successful.
  *
 /*--------------------------------------------------------------------------*/
 
@@ -12170,7 +12170,7 @@ MQAvailable (void)
  *		Add 'c' to the end of the character queue.
  *
  *  Parameters:
- *		return true if successfull.
+ *		return true if successful.
  *
 /*--------------------------------------------------------------------------*/
 
@@ -12289,10 +12289,10 @@ ExplainSystemErr()
 
 
 /*
- * Called by mswin to scroll text in window in responce to the scrollbar.
+ * Called by mswin to scroll text in window in response to the scrollbar.
  *
  *  Args: cmd - what type of scroll operation.
- * 	scroll_pos - paramter for operation.
+ * 	scroll_pos - parameter for operation.
  *			used as position for SCROLL_TO operation.
  *
  *  Returns: TRUE - did the scroll operation.
@@ -12412,7 +12412,7 @@ pscreen_offset_from_cord(int row, int col, PTTYINFO pTTYInfo)
     /*
      * Start with col (all chars single width) and go from there.
      * We need to find the offset that makes the string col wide.
-     * Hopefully we won't ever get a rectange that causes us to
+     * Hopefully we won't ever get a rectangle that causes us to
      * draw half characters, but in case we do we need to err on the
      * side of too much width instead of not enough. It's a little
      * tricky because we want to include following zero-width
diff --git a/pico/osdep/raw.c b/pico/osdep/raw.c
index a886e0b6..8a194f8f 100644
--- a/pico/osdep/raw.c
+++ b/pico/osdep/raw.c
@@ -298,7 +298,7 @@ crlf_proc(int state)
 
 
 /*
- *  Set up the tty driver to hanle interrupt char
+ *  Set up the tty driver to handle interrupt char
  *
  * Args: state -- True to turn on interrupt char, false to not
  *
diff --git a/pico/pico.c b/pico/pico.c
index c759b592..2fde4531 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -1256,7 +1256,7 @@ doubleclick = (lrow == row && lcol == col
 		       && time(0) < (lastcalled + 2));
 	lastcalled  = time(0);
 #endif
-	lheader	    = FALSE;	/* Rember mouse down position. */
+	lheader	    = FALSE;	/* Remember mouse down position. */
 	levent	    = mevent;
 	lrow	    = row;
 	lcol	    = col;
diff --git a/pico/pico.h b/pico/pico.h
index ac87e78f..100b4cbf 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -221,7 +221,7 @@ typedef struct pico_struct {
     int   (*tty_fix)();			/* Let Pine fix tty state */
     long  (*newmail)();			/* Pine's report_new_mail */
     long  (*msgntext)();		/* callback to get msg n's text */
-    int   (*upload)();			/* callback to rcv uplaoded text */
+    int   (*upload)();			/* callback to rcv uploded text */
     char *(*ckptdir)();			/* callback for checkpoint file dir */
     int   (*exittest)();		/* callback to verify exit request */
     char *(*canceltest)();		/* callback to verify cancel request */
diff --git a/pico/search.c b/pico/search.c
index 3bdcc48a..d1bba6c6 100644
--- a/pico/search.c
+++ b/pico/search.c
@@ -100,7 +100,7 @@ EXTRAKEYS    menu_srchopt[] = {
 
 /*	string search input parameters	*/
 
-#define	PTBEG	1	/* leave the point at the begining on search */
+#define	PTBEG	1	/* leave the point at the beginning on search */
 #define	PTEND	2	/* leave the point at the end on search */
 
 #define NPMT (2*NLINE+32)
@@ -394,7 +394,7 @@ forwsearch(int f, int n)
 
     /*
      * This code is kind of dumb.  What I want is successive C-W 's to 
-     * move dot to successive occurences of the pattern.  So, if dot is
+     * move dot to successive occurrences of the pattern.  So, if dot is
      * already sitting at the beginning of the pattern, then we'll move
      * forward a char before beginning the search.  We'll let the
      * automatic wrapping handle putting the dot back in the right 
@@ -1320,7 +1320,7 @@ forscan(int *wrapt,	/* boolean indicating search wrapped */
 		curwp->w_dotp = matchline;
 		curwp->w_doto = matchoff - 1;
 	    }
-	    else {		/* at begining of string */
+	    else {		/* at beginning of string */
 		curwp->w_dotp = lastline;
 		curwp->w_doto = lastoff;
 	    }
diff --git a/pith/IO.ReadMe b/pith/IO.ReadMe
index 55f98067..0a0286e8 100644
--- a/pith/IO.ReadMe
+++ b/pith/IO.ReadMe
@@ -41,7 +41,7 @@ is 32 bits wide. The superset comes about from the handling of
 escape sequences and error conditions. Besides the 21 bits of UCS-4
 characters other values that might be returned are values like KEY_UP,
 KEY_RESIZE, F1-F12, PF1-PF12, NO_OP_COMMAND, NO_OP_IDLE, BADESC, KEY_JUNK,
-and NODATA. The way that read_char and GetKey work are slightly differnt
+and NODATA. The way that read_char and GetKey work are slightly different
 from each other. GetKey has some special bits (CTRL, FUNC, MENU) that
 it might OR together with a character and some of the return values
 are possible in only one or the other function.
diff --git a/pith/abdlc.h b/pith/abdlc.h
index a2c3b642..673c9336 100644
--- a/pith/abdlc.h
+++ b/pith/abdlc.h
@@ -21,7 +21,7 @@
 #include "../pith/adrbklib.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 DL_CACHE_S    *get_dlc(long);
 void           warp_to_dlc(DL_CACHE_S *, long);
 void           warp_to_beginning(void);
diff --git a/pith/ablookup.h b/pith/ablookup.h
index 78d0aafc..21c16286 100644
--- a/pith/ablookup.h
+++ b/pith/ablookup.h
@@ -80,7 +80,7 @@ typedef struct completelist {
 } COMPLETE_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 char          *get_nickname_from_addr(ADDRESS *, char *, size_t);
 char          *get_fcc_from_addr(ADDRESS *, char *, size_t);
 int            get_contactinfo_from_addr(ADDRESS *, char **, char **, char **, char **);
diff --git a/pith/addrbook.h b/pith/addrbook.h
index 39e039d3..1cc93de2 100644
--- a/pith/addrbook.h
+++ b/pith/addrbook.h
@@ -21,7 +21,7 @@
 #include "adrbklib.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 void	addrbook_new_disp_form(PerAddrBook *, char **, int, int (*)(PerAddrBook *, int *));
 long	first_selectable_line(long);
 int	line_is_selectable(long);
diff --git a/pith/addrstring.h b/pith/addrstring.h
index 0bc9ef48..63ac934c 100644
--- a/pith/addrstring.h
+++ b/pith/addrstring.h
@@ -21,7 +21,7 @@
 #define RAWFIELD "-RAW-FIELD-"
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	     *addr_string(ADDRESS *, char *, size_t);
 char	     *addr_string_mult(ADDRESS *, char *, size_t);
 char	     *simple_addr_string(ADDRESS *, char *, size_t);
diff --git a/pith/adjtime.h b/pith/adjtime.h
index 41514be8..c2478fe2 100644
--- a/pith/adjtime.h
+++ b/pith/adjtime.h
@@ -28,7 +28,7 @@ typedef struct our_time_val {
 } TIMEVAL_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 time_t        get_adj_time(void);
 time_t        get_adj_name_file_mtime(char *);
 
diff --git a/pith/atttype.h b/pith/atttype.h
index b0eaa9a1..24b50332 100644
--- a/pith/atttype.h
+++ b/pith/atttype.h
@@ -41,7 +41,7 @@ typedef	struct parmlist {
 } PARMLIST_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_ATTTYPE_INCLUDED */
diff --git a/pith/busy.h b/pith/busy.h
index 08bd2cad..722d72de 100644
--- a/pith/busy.h
+++ b/pith/busy.h
@@ -27,7 +27,7 @@ typedef int (*percent_done_t)();    /* returns %done for progress status msg */
 #endif
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 /* currently mandatory to implement stubs */
diff --git a/pith/charset.c b/pith/charset.c
index e4d7875d..124b15fc 100644
--- a/pith/charset.c
+++ b/pith/charset.c
@@ -79,7 +79,7 @@ trans_euc_to_2022_jp(unsigned char *src)
 
     /*
      * Worst possible increase is every other character an 8-bit character.
-     * In that case, each of those gets 6 extra charactes for the escape
+     * In that case, each of those gets 6 extra characters for the escape
      * sequences. We're not too concerned about the extra length because
      * these are relatively short strings.
      */
@@ -140,7 +140,7 @@ trans_euc_to_2022_jp(unsigned char *src)
  *
  *   RFC 1522 support is *very* loosely based on code contributed
  *   by Lars-Erik Johansson .  Thanks to Lars-Erik,
- *   and appologies for taking such liberties with his code.
+ *   and apologies for taking such liberties with his code.
  */
 
 #define	RFC1522_INIT	"=?"
diff --git a/pith/charset.h b/pith/charset.h
index 7f6dbcb7..7fb79995 100644
--- a/pith/charset.h
+++ b/pith/charset.h
@@ -30,7 +30,7 @@ typedef struct conversion_table {
 } CONV_TABLE;
 
 
-/* Conversion table quality of tranlation */
+/* Conversion table quality of translation */
 #define	CV_NO_TRANSLATE_POSSIBLE	1	/* We don't know how to      */
 						/* translate this pair       */
 #define	CV_NO_TRANSLATE_NEEDED		2	/* Not necessary, no-op      */
@@ -44,7 +44,7 @@ typedef struct conversion_table {
 #define	CSET_MAX		64
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	      *body_charset(MAILSTREAM *, long, unsigned char *);
 unsigned char *trans_euc_to_2022_jp(unsigned char *);
 unsigned char *rfc1522_decode_to_utf8(unsigned char *, size_t, char *);
diff --git a/pith/color.h b/pith/color.h
index b5b9f012..f74a4ce9 100644
--- a/pith/color.h
+++ b/pith/color.h
@@ -78,7 +78,7 @@ typedef struct spec_color_s {
 #define DEFAULT_IND_OP_BACK_RGB		"255,255,255"
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	*color_embed(char *, char *);
 int	 colorcmp(char *, char *);
 int	 color_a_quote(long, char *, LT_INS_S **, void *);
diff --git a/pith/conf.c b/pith/conf.c
index 3ce1c8a2..9fc2bc4d 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -349,7 +349,7 @@ CONF_TXT_T cf_text_stat_msg_delay[] =	"The number of seconds to sleep after writ
 
 CONF_TXT_T cf_text_busy_cue_rate[] =	"Number of times per-second to update busy cue messages";
 
-CONF_TXT_T cf_text_psleep[] =	"UNIX ONLY (except MAC OSX): When an attachment is opened, this variable controls the number\n#of seconds to wait between checks if the user has ended viewing the attachment.\n#minimun value: 60 seconds, maximum value: 600 seconds (10 minutes). Default: 60 seconds";
+CONF_TXT_T cf_text_psleep[] =	"UNIX ONLY (except MAC OSX): When an attachment is opened, this variable controls the number\n#of seconds to wait between checks if the user has ended viewing the attachment.\n#minimum value: 60 seconds, maximum value: 600 seconds (10 minutes). Default: 60 seconds";
 
 CONF_TXT_T cf_text_mailcheck[] =	"The approximate number of seconds between checks for new mail";
 
@@ -2491,7 +2491,7 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **))
 	   && strncmp(VAR_LAST_VERS_USED, ps->vers_internal, 4) >= 0)){
 	ps->show_new_version = 0;
     }
-    /* Otherwise just do lexicographic comparision... */
+    /* Otherwise just do lexicographic comparison... */
     else if(VAR_LAST_VERS_USED
 	    && strcmp(VAR_LAST_VERS_USED, ps->vers_internal) >= 0){
 	ps->show_new_version = 0;
diff --git a/pith/conf.h b/pith/conf.h
index a7651145..387e851e 100644
--- a/pith/conf.h
+++ b/pith/conf.h
@@ -836,7 +836,7 @@ struct sm_folder {
 #define	CONF_TXT_T	char
 
 
-/* exported protoypes */
+/* exported prototypes */
 void       init_init_vars(struct pine *);
 void       init_pinerc(struct pine *, char **);
 void       init_vars(struct pine *, void (*)(struct pine *, char **));
diff --git a/pith/conftype.h b/pith/conftype.h
index 7a67fab8..e6f042a7 100644
--- a/pith/conftype.h
+++ b/pith/conftype.h
@@ -782,7 +782,7 @@ typedef struct smime_stuff {
 #endif /* SMIME */
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_CONFTYPE_INCLUDED */
diff --git a/pith/context.c b/pith/context.c
index 1aae6c56..ae3bfe1a 100644
--- a/pith/context.c
+++ b/pith/context.c
@@ -48,7 +48,7 @@ char    *context_percent_quote(char *);
  *            quote a literal '[' or ']' in a context name.
  *
  *         3) an empty view in context implies a view of '*', so that's 
- *            what get's put in the view string
+ *            what gets put in the view string
  *
  *   The 2nd,3rd,4th, and 5th args all have length at least len.
  *
diff --git a/pith/copyaddr.h b/pith/copyaddr.h
index 872f2fb0..e09f003b 100644
--- a/pith/copyaddr.h
+++ b/pith/copyaddr.h
@@ -18,7 +18,7 @@
 #define PITH_COPYADDR_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 ADDRESS      *copyaddr(ADDRESS *);
 ADDRESS      *copyaddrlist(ADDRESS *);
 
diff --git a/pith/detach.h b/pith/detach.h
index e117c325..98a48960 100644
--- a/pith/detach.h
+++ b/pith/detach.h
@@ -59,7 +59,7 @@ extern FETCH_READC_S *g_fr_desc;
 #define DT_NOINTR      (long) 0x20000
 #define DT_BINARY      (long) 0x40000
 
-/* exported protoypes */
+/* exported prototypes */
 char	   *detach_raw(MAILSTREAM *, long, char *, gf_io_t, int);
 char	   *detach(MAILSTREAM *, long, char *, long, long *, gf_io_t, FILTLIST_S *, long);
 int	    valid_filter_command(char **);
diff --git a/pith/detoken.h b/pith/detoken.h
index 14e6b670..7d906bd5 100644
--- a/pith/detoken.h
+++ b/pith/detoken.h
@@ -22,7 +22,7 @@
 #include "../pith/repltype.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	*detoken(ACTION_S *, ENVELOPE *, int, int, int, REDRAFT_POS_S **, int *);
 char	*detoken_src(char *, int, ENVELOPE *, ACTION_S *, REDRAFT_POS_S **, int *);
 
diff --git a/pith/editorial.h b/pith/editorial.h
index 9310a740..35fa77e7 100644
--- a/pith/editorial.h
+++ b/pith/editorial.h
@@ -22,7 +22,7 @@
 #include "../pith/filter.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	*format_editorial(char *, int, int, HANDLE_S **, gf_io_t);
 
 
diff --git a/pith/escapes.h b/pith/escapes.h
index 56907239..7c998387 100644
--- a/pith/escapes.h
+++ b/pith/escapes.h
@@ -18,7 +18,7 @@
 #define PITH_ESCAPES_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	 match_escapes(char *);
 
 
diff --git a/pith/filter.c b/pith/filter.c
index 6288606d..66abe420 100644
--- a/pith/filter.c
+++ b/pith/filter.c
@@ -976,8 +976,8 @@ gf_pipe(gf_io_t gc, gf_io_t pc)
 #ifdef	_WINDOWS
 	    if(!(gf_byte_count & 0x3ff))
 	      /* Under windows we yield to allow event processing.
-	       * Progress display is handled throught the alarm()
-	       * mechinism.
+	       * Progress display is handled through the alarm()
+	       * mechanism.
 	       */
 	      mswin_yield ();
 #endif
@@ -1017,7 +1017,7 @@ gf_bytes_piped(void)
  *	pc -- function to write filtered output with
  *	aux_filters -- additional filters to pass data thru after "cmd"
  *
- *  Returns: NULL on sucess, reason for failure (not alloc'd!) on error
+ *  Returns: NULL on success, reason for failure (not alloc'd!) on error
  */
 char *
 gf_filter(char *cmd, char *prepend, STORE_S *source_so, gf_io_t pc,
@@ -2392,7 +2392,7 @@ gf_rich2plain(FILTER_S *f, int flg)
 {
     static int rich_bold_on = 0, rich_uline_on = 0;
 
-/* BUG: qoute incoming \255 values */
+/* BUG: quote incoming \255 values */
     GF_INIT(f, f->next);
 
     if(flg == GF_DATA){
@@ -2567,7 +2567,7 @@ gf_enriched2plain(FILTER_S *f, int flg)
 {
     static int enr_uline_on = 0, enr_bold_on = 0;
 
-/* BUG: qoute incoming \255 values */
+/* BUG: quote incoming \255 values */
     GF_INIT(f, f->next);
 
     if(flg == GF_DATA){
@@ -2919,8 +2919,8 @@ typedef	struct _html_opts {
     unsigned	handles_loc:1;		/* Local handles requested? */
     unsigned	showserver:1;		/* Display server after anchors */
     unsigned	outputted:1;		/* any */
-    unsigned	no_relative_links:1;	/* Disable embeded relative links */
-    unsigned	related_content:1;	/* Embeded related content */
+    unsigned	no_relative_links:1;	/* Disable embedded relative links */
+    unsigned	related_content:1;	/* Embedded related content */
     unsigned	html:1;			/* Output content in HTML */
     unsigned	html_imgs:1;		/* Output IMG tags in HTML content */
 } HTML_OPT_S;
@@ -3609,7 +3609,7 @@ static ELPROP_S html_element_table[] = {
     {"SAMP", 4,		html_samp},		/* Sample Text (NO OP) */
     {"CITE", 4,		html_cite},		/* Citation (NO OP) */
     {"CODE", 4,		html_code},		/* Code Text (NO OP) */
-    {"INS", 3,		html_ins},		/* Text Inseted (NO OP) */
+    {"INS", 3,		html_ins},		/* Text Inserted (NO OP) */
     {"DEL", 3,		html_del},		/* Text Deleted (NO OP) */
     {"SUP", 3,		html_sup},		/* Text Superscript (NO OP) */
     {"SUB", 3,		html_sub},		/* Text Superscript (NO OP) */
@@ -3644,8 +3644,8 @@ static ELPROP_S html_element_table[] = {
     {"THEAD", 5,	html_thead},		/* Table Table Head */
     {"TBODY", 5,	html_tbody},		/* Table Table Body */
     {"TFOOT", 5,	html_tfoot},		/* Table Table Foot */
-    {"COL", 3,		html_col},		/* Table Column Attibutes */
-    {"COLGROUP", 8,	html_colgroup},		/* Table Column Group Attibutes */
+    {"COL", 3,		html_col},		/* Table Column Attributes */
+    {"COLGROUP", 8,	html_colgroup},		/* Table Column Group Attributes */
 
     {NULL, 0,		NULL}
 };
@@ -3745,7 +3745,7 @@ html_pop(FILTER_S *fd, ELPROP_S *ep)
 
 
 /*
- * Deal with data passed a hander in its GF_DATA state
+ * Deal with data passed a handler in its GF_DATA state
  */
 static void
 html_handoff(HANDLER_S *hd, int ch)
@@ -5637,7 +5637,7 @@ html_ol(HANDLER_S *hd, int ch, int cmd)
 	else{
 	    PARAMETER *p;
 	    /*
-	     * Signal that we're expecting to see 
    •  as our next elemnt
+	     * Signal that we're expecting to see 
    •  as our next element
 	     * and set the the initial ordered count.
 	     */
 	    hd->x = 1L;			/* set default */
@@ -6463,7 +6463,7 @@ html_pre(HANDLER_S *hd, int ch, int cmd)
 
 
 /*
- * HTML 
       (Centerd Text) element handler
+ * HTML 
       (Centered Text) element handler
  */
 int
 html_center(HANDLER_S *hd, int ch, int cmd)
@@ -7405,7 +7405,7 @@ html_element_collector(FILTER_S *fd, int ch)
 
 	/*
 	 * Remember the comment for possible later processing, if
-	 * it get's too long, remember first and last few chars
+	 * it gets too long, remember first and last few chars
 	 * so we know when to terminate (and throw some garbage
 	 * in between when we toss out what's between.
 	 */
@@ -7887,7 +7887,7 @@ html_entity_collector(FILTER_S *f, int ch, UCS *ucs, char **alt)
 void
 gf_html2plain(FILTER_S *f, int flg)
 {
-/* BUG: qoute incoming \255 values (see "yuml" above!) */
+/* BUG: quote incoming \255 values (see "yuml" above!) */
     if(flg == GF_DATA){
 	register int c;
 	GF_INIT(f, f->next);
diff --git a/pith/filter.h b/pith/filter.h
index 8c253686..72661963 100644
--- a/pith/filter.h
+++ b/pith/filter.h
@@ -37,7 +37,7 @@
 
 /* gf_wrap flags */
 #define	GFW_NONE		0x000	/* no flags			*/
-#define	GFW_HANDLES		0x001	/* anticpate handle data	*/
+#define	GFW_HANDLES		0x001	/* anticipate handle data	*/
 #define	GFW_ONCOMMA		0x002	/* prefer comma wrap to spaces  */
 #define	GFW_FLOWED		0x004
 #define	GFW_FLOW_RESULT		0x008
@@ -99,7 +99,7 @@ typedef struct _rss_feed_s {
 
 
 /*
- * This searchs for lines beginning with From so that we can QP-encode
+ * This searches for lines beginning with From so that we can QP-encode
  * them.  It also searches for lines consisting of only a dot.  Some mailers
  * will mangle these lines.  The reason it is ifdef'd is because most people
  * seem to prefer the >From style escape provided by a lot of mail software
@@ -156,7 +156,7 @@ typedef struct _rss_feed_s {
 			     }
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	    generic_readc_locale(unsigned char *c,
 				 int (*get_a_char)(unsigned char *, void *),
 				 void *extraarg,
diff --git a/pith/filttype.h b/pith/filttype.h
index a8bf17d1..83c57734 100644
--- a/pith/filttype.h
+++ b/pith/filttype.h
@@ -70,7 +70,7 @@ typedef struct cbuf_s {
 } CBUF_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_FILTTYPE_INCLUDED */
diff --git a/pith/flag.c b/pith/flag.c
index d4ec3c05..4a24ba23 100644
--- a/pith/flag.c
+++ b/pith/flag.c
@@ -140,7 +140,7 @@ flag_search(MAILSTREAM *stream, int flags, MsgNo set_start, MSGNO_S *set_msgmap,
 	  }
 
 	/*
-	 * No search-worthy messsages?, prod the server for
+	 * No search-worthy messages?, prod the server for
 	 * any flag updates and clear the searched bits...
 	 */
 	if(full_set){
diff --git a/pith/flag.h b/pith/flag.h
index 48c8f052..7a30f017 100644
--- a/pith/flag.h
+++ b/pith/flag.h
@@ -141,7 +141,7 @@
 typedef long MsgNo;
 
 
-/* exported protoypes */
+/* exported prototypes */
 long	    count_flagged(MAILSTREAM *, long);
 MsgNo	    first_sorted_flagged(unsigned long, MAILSTREAM *, long, int);
 MsgNo	    next_sorted_flagged(unsigned long, MAILSTREAM *, long, int *);
diff --git a/pith/folder.c b/pith/folder.c
index ee250943..64d57922 100644
--- a/pith/folder.c
+++ b/pith/folder.c
@@ -553,7 +553,7 @@ init_folders(struct pine *ps)
 
     /*
      * Build context that's a list of folders the user's defined
-     * as receiveing new messages.  At some point, this should
+     * as receiving new messages.  At some point, this should
      * probably include adding a prefix with the new message count.
      * fake new context...
      */
@@ -1529,7 +1529,7 @@ default_save_context(CONTEXT_S *cntxt)
 /*
  * folder_complete - foldername completion routine
  *
- *   Result: returns 0 if the folder doesn't have a any completetion
+ *   Result: returns 0 if the folder doesn't have a any completion
  *		     1 if the folder has a completion (*AND* "name" is
  *		       replaced with the completion)
  *
@@ -1861,7 +1861,7 @@ folder_is_target_of_nick(char *longname, CONTEXT_S *cntxt)
 
   **** WARNING ****
   DON'T count on the folder pointer being valid after this returns
-  *** ALL FOLDER ELEMENT READS SHOULD BE THRU folder_entry() ***
+  *** ALL FOLDER ELEMENT READS SHOULD BE THROUGH folder_entry() ***
 
   ----*/
 int
diff --git a/pith/folder.h b/pith/folder.h
index e15dd3c2..01d78942 100644
--- a/pith/folder.h
+++ b/pith/folder.h
@@ -58,7 +58,7 @@ typedef struct _existdata {
 #define	FEX_ISDIR	0x0002		/* file_exists: name is a dir	    */
 #define	FEX_ISMARKED	0x0004		/* file_exists: is interesting	    */
 #define	FEX_UNMARKED	0x0008		/* file_exists: known UNinteresting */
-#define	FEX_ERROR	0x1000		/* file_exists: error occured	    */
+#define	FEX_ERROR	0x1000		/* file_exists: error occurred	    */
 
 #define	BFL_NONE	0x00		/* build_folder_list: no flag */
 #define	BFL_FLDRONLY	0x01		/* ignore directories	      */
@@ -82,7 +82,7 @@ typedef struct _existdata {
 #define	UFU_ANNOUNCE	0x02		/* announce increases with q_status */
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	   *folder_lister_desc(CONTEXT_S *, FDIR_S *);
 void	    reset_context_folders(CONTEXT_S *);
 FDIR_S	   *next_folder_dir(CONTEXT_S *, char *, int, MAILSTREAM **);
diff --git a/pith/foldertype.h b/pith/foldertype.h
index 9085fc01..8ed0e87d 100644
--- a/pith/foldertype.h
+++ b/pith/foldertype.h
@@ -107,7 +107,7 @@ typedef struct selected_s {
 
 
 /*------------------------------
-    Stucture to keep track of the various folder collections being
+    Structure to keep track of the various folder collections being
     dealt with.
   ----*/
 typedef struct context {
@@ -158,7 +158,7 @@ typedef struct context {
 			  ((X)->dir->status & CNTXT_PARTFIND) == 0)
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_FOLDERTYPE_INCLUDED */
diff --git a/pith/handle.h b/pith/handle.h
index a15c67d2..afbd1373 100644
--- a/pith/handle.h
+++ b/pith/handle.h
@@ -82,7 +82,7 @@ typedef	struct handle_s {
 typedef	int	(*url_tool_t)(char *);
 
 
-/* exported protoypes */
+/* exported prototypes */
 HANDLE_S   *get_handle(HANDLE_S *, int);
 void	    init_handles(HANDLE_S **);
 HANDLE_S   *new_handle(HANDLE_S **);
diff --git a/pith/help.h b/pith/help.h
index fd3807cd..fce7b7da 100644
--- a/pith/help.h
+++ b/pith/help.h
@@ -49,7 +49,7 @@ extern int       rmhifirst, rmhilast;
 extern int       rm_not_right_now;
 
 
-/* exported protoypes */
+/* exported prototypes */
 HelpType    help_name2section(char *, int);
 void        debugjournal_to_file(FILE *);
 void	    add_review_message(char *, int);
diff --git a/pith/help_c_gen.c b/pith/help_c_gen.c
index b4c5ee9d..94e7dbc6 100644
--- a/pith/help_c_gen.c
+++ b/pith/help_c_gen.c
@@ -48,7 +48,7 @@ void
 preamble(FILE *ofp)
 {
     fprintf(ofp, "\n\t\t/*\n");
-    fprintf(ofp, "\t\t * AUTMATICALLY GENERATED FILE!\n");
+    fprintf(ofp, "\t\t * AUTOMATICALLY GENERATED FILE!\n");
     fprintf(ofp, "\t\t * DO NOT EDIT!!\n");
     fprintf(ofp, "\t\t * See help_c_gen.c.\n\t\t */\n\n\n");
     fprintf(ofp, "#include \n#include \"headers.h\"\n#include \"helptext.h\"\n\n");
diff --git a/pith/help_h_gen.c b/pith/help_h_gen.c
index 1e7b904e..8a739fce 100644
--- a/pith/help_h_gen.c
+++ b/pith/help_h_gen.c
@@ -36,7 +36,7 @@ void
 preamble(FILE *ofp)
 {
     fprintf(ofp, "\n\t\t/*\n");
-    fprintf(ofp, "\t\t * AUTMATICALLY GENERATED FILE!\n");
+    fprintf(ofp, "\t\t * AUTOMATICALLY GENERATED FILE!\n");
     fprintf(ofp, "\t\t * DO NOT EDIT!!\n");
     fprintf(ofp, "\t\t * See help_h_gen.c.\n\t\t */\n\n\n");
     fprintf(ofp, "#ifndef PITH_HELPTEXT_INCLUDED\n");
diff --git a/pith/icache.h b/pith/icache.h
index fff2a992..394dba7c 100644
--- a/pith/icache.h
+++ b/pith/icache.h
@@ -28,7 +28,7 @@
 #define IC_CLEAR_WIDTHS_DONE  0x02
 
 
-/* exported protoypes */
+/* exported prototypes */
 void	  clear_index_cache_ent(MAILSTREAM *, long, unsigned);
 void	  clear_index_cache(MAILSTREAM *, unsigned);
 void	  clear_index_cache_for_thread(MAILSTREAM *, PINETHRD_S *, MSGNO_S *);
diff --git a/pith/ical.c b/pith/ical.c
index 950f4018..e2f482fa 100644
--- a/pith/ical.c
+++ b/pith/ical.c
@@ -34,7 +34,7 @@ ICAL_PARAMETER_S *ical_parameter_cpy(ICAL_PARAMETER_S *param);
 char *ical_get_value(char **);
 unsigned char *ical_decode(char *, unsigned short);
 
-/* pase component */
+/* parse component */
 void	*ical_parse_vcalendar(char **);
 void	*ical_parse_vevent(char **);
 void	*ical_parse_vtodo(char **);
@@ -251,7 +251,7 @@ ical_decode(char *text, unsigned short encoding)
 
 /* Return code:
     0 - if no errors
-   -1 - if an error occured
+   -1 - if an error occurred
    Args: a pointer to the text. If there is an error, the text is not modified.
  */
 int
@@ -637,7 +637,7 @@ ical_cline_cpy(ICLINE_S *icl)
   return rv;
 }
 
-/* Given a \r\n-ending line (called *text), isolate the ocurrence 
+/* Given a \r\n-ending line (called *text), isolate the occurrence 
  * of the token in that line.
  * Return the token, and modify the pointer to *text to point to the
  * end of the token. Modify sep to contain the character following
diff --git a/pith/imap.h b/pith/imap.h
index c7b25b8f..979f532d 100644
--- a/pith/imap.h
+++ b/pith/imap.h
@@ -118,7 +118,7 @@ extern MMLOGIN_S  *cert_failure_list;
 #endif
 
 
-/* exported protoypes */
+/* exported prototypes */
 char   *imap_referral(MAILSTREAM *, char *, long);
 long    imap_proxycopy(MAILSTREAM *, char *, char *, long);
 char   *cached_user_name(char *);
diff --git a/pith/indxtype.h b/pith/indxtype.h
index 33ef5d95..15e451db 100644
--- a/pith/indxtype.h
+++ b/pith/indxtype.h
@@ -245,7 +245,7 @@ typedef struct index_data {
 typedef enum {NoKW, KW, KWInit} SubjKW;
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_INDXTYPE_INCLUDED */
diff --git a/pith/init.h b/pith/init.h
index 0ad07eb7..30ffb099 100644
--- a/pith/init.h
+++ b/pith/init.h
@@ -27,7 +27,7 @@
 #define	LEGAL_NOTICE \
    "For Copyright information press \"?\""
 
-/* exported protoypes */
+/* exported prototypes */
 int               init_username(struct pine *);
 int               init_userdir(struct pine *);
 int               init_hostname(struct pine *);  
diff --git a/pith/keyword.h b/pith/keyword.h
index 27e99687..3d44b831 100644
--- a/pith/keyword.h
+++ b/pith/keyword.h
@@ -29,7 +29,7 @@ typedef	struct keywords {
 } KEYWORD_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 KEYWORD_S  *init_keyword_list(char **);
 KEYWORD_S  *new_keyword_s(char *, char *);
 void	    free_keyword_list(KEYWORD_S **);
diff --git a/pith/ldap.c b/pith/ldap.c
index 6826b13c..cc0b7727 100644
--- a/pith/ldap.c
+++ b/pith/ldap.c
@@ -62,7 +62,7 @@ int              our_ldap_set_lderrno(LDAP *, int, char *, char *);
  * Args  string -- the string to use in the lookup
  *
  * Returns     NULL -- lookup failed
- *          Address -- A single address is returned if lookup was successfull.
+ *          Address -- A single address is returned if lookup was successful.
  */
 ADDRESS *
 wp_lookups(char *string, WP_ERR_S *wp_err, int recursing)
diff --git a/pith/ldap.h b/pith/ldap.h
index b7a82e0b..0bb9f2a2 100644
--- a/pith/ldap.h
+++ b/pith/ldap.h
@@ -60,7 +60,7 @@ typedef struct ldap_serv {
  *
  * We may run into the problem of LDAP databases containing non-UTF-8 data
  * because they are old. They should have all UTF-8 data and that is what
- * we are assuming. If we wanted to accomodate these servers we could
+ * we are assuming. If we wanted to accommodate these servers we could
  * translate the data when we use it. LDAP data is only used in a few
  * places so it might not be too hard to fix it. There are four calls
  * into the LDAP library that produce character strings which are
@@ -165,7 +165,7 @@ extern int wp_exit;
 extern int wp_nobail;
 
 
-/* exported protoypes */
+/* exported prototypes */
 ADDRESS       *wp_lookups(char *, WP_ERR_S *, int);
 #ifdef	ENABLE_LDAP
 int            ldap_lookup_all(char *, int, int, LDAPLookupStyle, CUSTOM_FILT_S *,
diff --git a/pith/list.h b/pith/list.h
index d7f71d6e..d8847679 100644
--- a/pith/list.h
+++ b/pith/list.h
@@ -23,7 +23,7 @@
 #define	PL_COMMAQUOTE	0x02		/* backslash quotes comma        */
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	  **parse_list(char *, int, int, char **);
 char      **copy_list_array(char **);
 void        free_list_array(char ***);
diff --git a/pith/mailcap.c b/pith/mailcap.c
index 1216e653..9fd9410e 100644
--- a/pith/mailcap.c
+++ b/pith/mailcap.c
@@ -300,7 +300,7 @@ mc_parse_line(char **line, char **tokens)
 
 
 /*
- * Retuns 1 if line is a comment, 0 otherwise
+ * Returns 1 if line is a comment, 0 otherwise
  */
 int
 mc_comment(char **line)
@@ -325,7 +325,7 @@ mc_comment(char **line)
 
 
 /*
- * Retuns 0 if EOL, 1 otherwise
+ * Returns 0 if EOL, 1 otherwise
  */
 int
 mc_token(char **token, char **line)
@@ -532,7 +532,7 @@ mc_sane_command(char *command)
 #ifdef	LATER
 	/*
 	 * NOTE: Maybe we'll do this later.  The problem is when the
-	 * mailcap's been misconfigured.  We then end up supressing
+	 * mailcap's been misconfigured.  We then end up suppressing
 	 * valuable output when the user actually tries to launch the
 	 * spec'd viewer.
 	 */
@@ -548,7 +548,7 @@ mc_sane_command(char *command)
 
 
 /*
- * Returns the mailcap entry for type/subtype from the successfull
+ * Returns the mailcap entry for type/subtype from the successful
  * mailcap entry, or NULL if none.  Command string still contains % stuff.
  */
 MailcapEntry *
diff --git a/pith/mailcap.h b/pith/mailcap.h
index 08cc39da..e4482e92 100644
--- a/pith/mailcap.h
+++ b/pith/mailcap.h
@@ -24,7 +24,7 @@ typedef struct mcap_cmd {
 } MCAP_CMD_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 char       *mc_conf_path(char *, char *, char *, int, char *);
 int	    mailcap_can_display(int, char *, BODY *, int);
 MCAP_CMD_S *mailcap_build_command(int, char *, BODY *, char *, int *, int);
diff --git a/pith/mailcmd.c b/pith/mailcmd.c
index 9a852c91..830977d9 100644
--- a/pith/mailcmd.c
+++ b/pith/mailcmd.c
@@ -1663,7 +1663,7 @@ expunge_and_close(MAILSTREAM *stream, char **final_msg, long unsigned int flags)
         }
 
 	/*
-	 * Make darn sure any mm_log fallout caused above get's seen...
+	 * Make darn sure any mm_log fallout caused above gets seen...
 	 */
 	if(!no_close){
 	    flush_status_messages(1);
diff --git a/pith/mailcmd.h b/pith/mailcmd.h
index 0e008951..560779de 100644
--- a/pith/mailcmd.h
+++ b/pith/mailcmd.h
@@ -49,7 +49,7 @@
 #define	MCMD_ISAGG(O)	((O) & (MCMD_AGG | MCMD_AGG_2))
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	   any_messages(MSGNO_S *, char *, char *);
 void	   bogus_utf8_command(char *, char *);
 int	   can_set_flag(struct pine *, char *, int);
diff --git a/pith/mailindx.c b/pith/mailindx.c
index 3d7e5c70..2faefed8 100644
--- a/pith/mailindx.c
+++ b/pith/mailindx.c
@@ -4181,7 +4181,7 @@ index_data_env(INDEXDATA_S *idata, ENVELOPE *env)
     idata->date	      = (char *) env->date;
     idata->newsgroups = env->newsgroups;
 
-    idata->valid_to = 1;	/* signal that everythings here */
+    idata->valid_to = 1;	/* signal that everything is here */
     idata->valid_cc = 1;
     idata->valid_sender = 1;
     idata->valid_news = 1;
diff --git a/pith/maillist.h b/pith/maillist.h
index 8300baae..a0e642af 100644
--- a/pith/maillist.h
+++ b/pith/maillist.h
@@ -50,7 +50,7 @@ typedef struct rfc2369_s {
 } RFC2369_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	  **rfc2369_hdrs(char **);
 int	    rfc2369_parse_fields(char *, RFC2369_S *);
 
diff --git a/pith/mailpart.h b/pith/mailpart.h
index a9350867..8ae1ddc2 100644
--- a/pith/mailpart.h
+++ b/pith/mailpart.h
@@ -51,7 +51,7 @@
 #define	MIME_VCALENDAR_A(a)	MIME_VCALENDAR((a)->body->type, (a)->body->subtype)
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_MAILPART_INCLUDED */
diff --git a/pith/mailview.c b/pith/mailview.c
index cd50e88b..a56dd1d3 100644
--- a/pith/mailview.c
+++ b/pith/mailview.c
@@ -3131,7 +3131,7 @@ pine_rfc822_cat(char *src, const char *specials, gf_io_t pc)
 
   Result: A formatted, malloced string is returned.
 
-The resuling lines formatted are 80 columns wide.
+The resulting lines formatted are 80 columns wide.
   ----------------------------------------------------------------------*/
 void
 format_newsgroup_string(char *field_name, char *newsgrps, int flags, gf_io_t pc)
diff --git a/pith/mailview.h b/pith/mailview.h
index 3495debf..9007f944 100644
--- a/pith/mailview.h
+++ b/pith/mailview.h
@@ -122,7 +122,7 @@ typedef struct header_s {
 				}
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	 format_message(long, ENVELOPE *, BODY *, HANDLE_S **, int, gf_io_t);
 int	 format_attachment_list(long int, BODY *, HANDLE_S **, int, int, gf_io_t);
 char	*format_body(long int, BODY *, HANDLE_S **, HEADER_S *, int, int, gf_io_t);
diff --git a/pith/margin.h b/pith/margin.h
index d542704b..dab09d81 100644
--- a/pith/margin.h
+++ b/pith/margin.h
@@ -18,7 +18,7 @@
 #define PITH_MARGIN_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	*format_view_margin(void);
 int	*non_messageview_margin(void);
 
diff --git a/pith/mimedesc.c b/pith/mimedesc.c
index daf6668b..c51161a2 100644
--- a/pith/mimedesc.c
+++ b/pith/mimedesc.c
@@ -487,7 +487,7 @@ static struct set_names {
     {"ISO-8859-14",		"Latin 8 (Celtic)"},
     {"ISO-8859-15",		"Latin 9 (Euro)"},
     {"KOI8-R",			"Latin & Russian"},
-    {"KOI8-U",			"Latin & Ukranian"},
+    {"KOI8-U",			"Latin & Ukrainian"},
     {"VISCII",			"Latin & Vietnamese"},
     {"GB2312",			"Latin & Simplified Chinese"},
     {"BIG5",			"Latin & Traditional Chinese"},
@@ -506,7 +506,7 @@ static struct set_names {
 
 
 /*----------------------------------------------------------------------
-  Return a nicely formatted discription of the type of the part
+  Return a nicely formatted description of the type of the part
  ----*/
 
 char *
@@ -736,7 +736,7 @@ fcc_size_guess(struct mail_bodystruct *body)
 	     * is a per-line increase in that because of the CRLFs and
 	     * because the number of characters in the line might not
 	     * be a factor of 3. So push it up by 3/2 instead. This still
-	     * won't catch all the cases. In particular, attachements with
+	     * won't catch all the cases. In particular, attachments with
 	     * lots of short lines (< 10) will expand by more than that,
 	     * but that's ok since this is an optimization. That's why
 	     * so_cs_puts uses the 3/2 factor when it does a resize, so
diff --git a/pith/mimetype.h b/pith/mimetype.h
index 36d4b2a1..06be87b0 100644
--- a/pith/mimetype.h
+++ b/pith/mimetype.h
@@ -39,7 +39,7 @@ typedef struct {
 typedef int (* MT_OPERATORPROC)(MT_MAP_T *, FILE *);
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	    set_mime_type_by_extension(BODY *, char *);
 int	    set_mime_extension_by_type(char *, char *);
 int	    check_mime_type_by_extension(char *, char *);
diff --git a/pith/msgno.h b/pith/msgno.h
index 728f4af4..4b0e922c 100644
--- a/pith/msgno.h
+++ b/pith/msgno.h
@@ -181,7 +181,7 @@ typedef struct msg_nos {
 #define	MI_CLOSING	0x04
 
 
-/* exported protoypes */
+/* exported prototypes */
 void	    msgno_init(MSGNO_S **, long, SortOrder, int);
 void        msgno_reset_isort(MSGNO_S *);
 void	    msgno_give(MSGNO_S **);
diff --git a/pith/newmail.c b/pith/newmail.c
index b896a701..43799216 100644
--- a/pith/newmail.c
+++ b/pith/newmail.c
@@ -64,7 +64,7 @@ int  check_point(MAILSTREAM *, CheckPointTime, int);
 
   Limit frequency of checks because checks use some resources. That is
   they generate an IMAP packet or require locking the local mailbox.
-  (Acutally the lock isn't required, a stat will do, but the current
+  (Actually the lock isn't required, a stat will do, but the current
    c-client mail code locks before it stats.)
 
   Returns >= 0 only if there is a change in the given mail stream. Otherwise
diff --git a/pith/newmail.h b/pith/newmail.h
index 26be9d5e..c83b7b6e 100644
--- a/pith/newmail.h
+++ b/pith/newmail.h
@@ -39,7 +39,7 @@ typedef enum {GoodTime = 0, BadTime, VeryBadTime, DoItNow} CheckPointTime;
 #define IT_MCLOSED 1
 
 
-/* exported protoypes */
+/* exported prototypes */
 long	new_mail(int, CheckPointTime, int);
 void	format_new_mail_msg(char *, long, ENVELOPE *, char *, char *, char *, char *, size_t);
 void	check_point_change(MAILSTREAM *);
diff --git a/pith/news.h b/pith/news.h
index 322a16fa..d3bb69aa 100644
--- a/pith/news.h
+++ b/pith/news.h
@@ -28,7 +28,7 @@
 #define	IS_NEWS(S)	((S) ? ns_test((S)->mailbox, "news") : 0)
 
 
-/* exported protoypes */
+/* exported prototypes */
 int         ns_test(char *, char *);
 int         news_in_folders(struct variable *);
 int	    news_grouper(char *, char **, char **, char **, void (*)(void));
diff --git a/pith/options.h b/pith/options.h
index 475a0f47..dbd0ef0a 100644
--- a/pith/options.h
+++ b/pith/options.h
@@ -59,7 +59,7 @@ extern void (*pith_opt_paint_index_hline)(MAILSTREAM *, long, ICE_S *);
 
 /*
  * optional hook in mailview.c:format_message to allow for inserting an
- * [editorial commment] in message text to indicate the message contains
+ * [editorial comment] in message text to indicate the message contains
  * list-management pointers
  */
 extern int  (*pith_opt_rfc2369_editorial)(long, HANDLE_S **, int, int, gf_io_t);
diff --git a/pith/osdep/pipe.c b/pith/osdep/pipe.c
index 25adc22f..13c5b6c7 100644
--- a/pith/osdep/pipe.c
+++ b/pith/osdep/pipe.c
@@ -89,7 +89,7 @@ RETSIGTYPE pipe_alarm(int);
 	stdout/stderr.  *NOTE*  Having neither of the above set means 
 	we're not setting up any pipes, just forking the child and exec'ing
 	the command.  Also, this takes precedence over any named outfile.
-    PIPE_STDERR means we're to tie the childs stderr to the same place
+    PIPE_STDERR means we're to tie the child's stderr to the same place
 	stdout is going.  *NOTE* This only makes sense then if PIPE_READ
 	or an outfile is provided.  Also, this takes precedence over any
 	named errfile.
diff --git a/pith/osdep/pipe.h b/pith/osdep/pipe.h
index 35e7d215..a7992758 100644
--- a/pith/osdep/pipe.h
+++ b/pith/osdep/pipe.h
@@ -72,7 +72,7 @@
 #define	OSB_POST_CLOSE	0x0008
 
 /*
- * stucture required for the pipe commands...
+ * structure required for the pipe commands...
  */
 typedef struct pipe_s {
     pid_t    pid;				/* child's process id       */
diff --git a/pith/osdep/pw_stuff.c b/pith/osdep/pw_stuff.c
index c5a8580d..8938f77c 100644
--- a/pith/osdep/pw_stuff.c
+++ b/pith/osdep/pw_stuff.c
@@ -35,7 +35,7 @@ static char *gcos_name(char *, char *);
       Pull the name out of the gcos field if we have that sort of /etc/passwd
 
    Args: gcos_field --  The long name or GCOS field to be parsed
-         logname    --  Replaces occurances of & with logname string
+         logname    --  Replaces occurences of & with logname string
 
  Result: returns pointer to buffer with name
   ----*/
diff --git a/pith/pattern.c b/pith/pattern.c
index 730a33f5..9b47d411 100644
--- a/pith/pattern.c
+++ b/pith/pattern.c
@@ -6132,7 +6132,7 @@ calc_extra_hdrs(void)
 	  pat;
 	  pat = next_pattern(&pstate)){
 	  /*
-	   * This section wouldn't be necessary if sender was retreived
+	   * This section wouldn't be necessary if sender was retrieved
 	   * from the envelope. But if not, we do need to add it.
 	   */
 	  if(pat->patgrp && pat->patgrp->sender)
@@ -7688,12 +7688,12 @@ process_filter_patterns(MAILSTREAM *stream, MSGNO_S *msgmap, long int recent)
 			if(exbits & (MSG_EX_FILTONCE | MSG_EX_FILEONCE |
 			             MSG_EX_PEND_EXLD)){
 			    if(exbits & MSG_EX_FILTONCE){
-				/* convert to permament */
+				/* convert to permanent */
 				exbits ^= MSG_EX_FILTONCE;
 				exbits |= MSG_EX_FILTERED;
 			    }
 
-			    /* convert to permament */
+			    /* convert to permanent */
 			    if(exbits & MSG_EX_FILEONCE){
 				exbits ^= MSG_EX_FILEONCE;
 				exbits |= MSG_EX_FILED;
diff --git a/pith/pattern.h b/pith/pattern.h
index c8caa84b..cc7fc8e9 100644
--- a/pith/pattern.h
+++ b/pith/pattern.h
@@ -344,7 +344,7 @@ typedef struct pat_state {
 extern PAT_HANDLE **cur_pat_h;
 
 
-/* exported protoypes */
+/* exported prototypes */
 void	    role_process_filters(void);
 int         add_to_pattern(PAT_S *, long);
 char       *add_pat_escapes(char *);
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 05b4f308..bc688725 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 385 2020-01-15 12:40:59
+Alpine Commit 386 2020-01-15 21:41:23
 ============= h_news =================
 
 
@@ -266,7 +266,7 @@ Bugs that have been addressed include:
         view certificate information of other certificate authorities.
 
    
    •  Crash in the S/MIME configuration screen when a user turned off S/MIME, and
-        then reenabled it. Also crash when attempting to enter the S/MIME 
+        then re-enabled it. Also crash when attempting to enter the S/MIME 
         configuration screen if S/MIME was turned off.
 
    
    •  Deactivate some color code from Pico (as standalone editor in the
@@ -1103,7 +1103,7 @@ Bugs addressed in the 2.00 release included:
    
    •  Make a default save folder of "inbox" always mean the real
 	inbox, not the inbox in the primary collection
    
    •  Address book entries with lots of addresses would be truncated when
-	entered in the composer with a screen size wider than 270 or so charcters
+	entered in the composer with a screen size wider than 270 or so characters
    
    •  Some fields in the index screen were truncated when the screen width was
 	wider than 256 characters
    
    •  Crash when TABing to next folder, the next folder with new mail is a POP
@@ -1193,7 +1193,7 @@ Bugs addressed in the 1.10(962) release included:
    
    •  After calling the file browser to attach a file in the composer, a resize
 	of the window when back in the composer would redraw the last screen that
 	had been shown in the browser instead of the current composer screen
-   
    •  Possible crash in index screen when encountering unparseable addresses
+   
    •  Possible crash in index screen when encountering unparsable addresses
 	or when using one of the PRIORITY tokens or the HEADER token in the
 	
    
    •  Problems with Header Color editing if the configuration option
@@ -1508,7 +1508,7 @@ username/password that users are accostumed to, and it needs to be set up
 by the user. This text will help you understand this authentication method.
 
 
      
-The most important difference between this method and other autentication
+The most important difference between this method and other authentication
 methods is what happens if someone steals your credentials. This method is
 attached to three components: Your username, your password and your email
 program.
@@ -1707,7 +1707,7 @@ a folder-collection, or a news or SMTP server).  This will
 disable certificate validation.  On the other hand, if you are attacked,
 you will get no warning if you do this.
 
-
       When you get an error indicating a self-signed certficate from the 
+
       When you get an error indicating a self-signed certificate from the 
 remote server, you can download and install the certificate for that 
 server. Avoid using the /NoValidate-Cert modifier. Alpine cannot help you 
 with this process because certificates are part of the system and are not 
@@ -15943,7 +15943,7 @@ Nickname: field.
 
 If you have registered Alpine with your service provider to use the
 XOAUTH2 authenticator, or someone has shared a client-id with you, use this
-field to input this field. Remember that in order to use the XOAUTH2 authentication
+field to input this value. Remember that in order to use the XOAUTH2 authentication
 method, you must have a pair of client-id and client-secret. You must have
 both in order for this authenticator to work.
 
@@ -15971,7 +15971,7 @@ pieces  into this field.
 
 If you have registered Alpine with your service provider to use the
 XOAUTH2 authenticator, or someone has shared a client-secret with you, use this
-field to input this field. Remember that in order to use the XOAUTH2 authentication
+field to input this value. Remember that in order to use the XOAUTH2 authentication
 method, you must have a pair of client-id and client-secret. You must have
 both in order for this authenticator to work.
 
@@ -24024,7 +24024,7 @@ Here is a list of many of the possible character sets:
  ISO-8859-15 8 bit European "Latin 9" character set 
  ISO-8859-16 8 bit European "Latin 10" character set 
  KOI8-R 8 bit Latin and Russian 
- KOI8-U 8 bit Latin and Ukranian 
+ KOI8-U 8 bit Latin and Ukrainian 
  WINDOWS-1251 8 bit Latin and Russian 
  TIS-620 8 bit Latin and Thai 
  VISCII 8 bit Latin and Vietnamese 
@@ -24248,7 +24248,7 @@ PC Alpine only.
 
      
 This option specifies a list of dictionaries you will use with
 aspell. A sample entry is "en_US" for american english, or
-"en_GB" for brittish english.
+"en_GB" for british english.
 
 
      
 
           
@@ -25896,7 +25896,7 @@ Sets the format of the command used to
 open a UNIX secure shell connection. The default is
 "%s %s -l %s exec /etc/r%sd". All four "%s" entries MUST exist in the
 provided command. The first is for the command's pathname, the second is
-for the host to connnect to, the third is for the user to connect as, and
+for the host to connect to, the third is for the user to connect as, and
 the fourth is for the connection method (typically imap).
 
        
 
             
@@ -26239,7 +26239,7 @@ Once Alpine has opened a connection to a particular folder, it will attempt
 to keep that connection open in case you use it again.
 In order to do this,
 Alpine will attempt to use the  (the value of
-this option) IMAP connections you have alloted for this purpose.
+this option) IMAP connections you have allotted for this purpose.
 
          
 For example, suppose the value of this option is set to "2".
 If your INBOX is accessed on a remote server using the IMAP protocol, that
@@ -26394,7 +26394,7 @@ displayed items are scrolled down or up by a single line.
 
 
          
 This option allows you to tell Alpine the number of lines from the top and
-bottom screen edge that line-by-line paging should occcur.  For example,
+bottom screen edge that line-by-line paging should occur.  For example,
 setting this value to one (1) will cause Alpine to scroll the display
 vertically when you move to select an item on the display's top or
 bottom edge.
@@ -27939,7 +27939,7 @@ the way to configure Alpine to recognize URLs other than the built-in set.
 It can also be used to override Alpine's built-in handlers.
 For example, you could specify "news" in the scheme-list,
 and Alpine would use (provided it passed all other criteria) the associated
-viewer when it encounterd a URL of the form "news:comp.mail.pine".
+viewer when it encountered a URL of the form "news:comp.mail.pine".
 
 
    
 
    
@@ -31043,14 +31043,14 @@ This feature controls an aspect of Alpine's message sending.  When enabled,
 Alpine will send a VERB (i.e., VERBose) command early in the posting process
 intended to cause the SMTP server to provide a more detailed account of
 the transaction.  This feature is typically only useful to system
-administrators and other support personel as an aid in troublshooting
+administrators and other support personnel as an aid in troublshooting
 problems.
 
    
 Note, this feature relies on a specific capability of the system's mail
 transport agent or configured 
 "".  
 It is possible that this
-feature will cause problems for some tranport agents, and may result in
+feature will cause problems for some transport agents, and may result in
 sending failure.  In addition, as the verbose output comes from the mail
 transport agent, it is likely to vary from one system to another. 
 
      
diff --git a/pith/pineelt.h b/pith/pineelt.h
index 6a79967d..f7d4cf9e 100644
--- a/pith/pineelt.h
+++ b/pith/pineelt.h
@@ -55,7 +55,7 @@ typedef struct pine_elt {
 } PINELT_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 void	    msgno_free_exceptions(PARTEX_S **);
 
 
diff --git a/pith/pipe.h b/pith/pipe.h
index b928869c..474a4003 100644
--- a/pith/pipe.h
+++ b/pith/pipe.h
@@ -22,7 +22,7 @@
 #include "../pith/osdep/pipe.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	 pipe_putc(int, PIPE_S *);
 int	 pipe_puts(char *, PIPE_S *);
 char	*pipe_gets(char *, int, PIPE_S *);
diff --git a/pith/remote.h b/pith/remote.h
index 4816c737..9289ac91 100644
--- a/pith/remote.h
+++ b/pith/remote.h
@@ -60,7 +60,7 @@
 extern char meta_prefix[];
 
 
-/* exported protoypes */
+/* exported prototypes */
 char       *read_remote_pinerc(PINERC_S *, ParsePinerc);
 REMDATA_S  *rd_create_remote(RemType, char *, char *, unsigned *, char *, char *);
 REMDATA_S  *rd_new_remdata(RemType, char *, char *);
diff --git a/pith/remtype.h b/pith/remtype.h
index de3747ae..2396d0b2 100644
--- a/pith/remtype.h
+++ b/pith/remtype.h
@@ -55,7 +55,7 @@ typedef struct remote_data {
 } REMDATA_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_REMTYPE_INCLUDED */
diff --git a/pith/repltype.h b/pith/repltype.h
index 9b349ee0..bd32c17e 100644
--- a/pith/repltype.h
+++ b/pith/repltype.h
@@ -75,7 +75,7 @@ typedef struct reply_s {
 #define FS_CONVERT_QUOTES 1
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_REPLTYPE_INCLUDED */
diff --git a/pith/reply.c b/pith/reply.c
index ccd45311..c94a67a2 100644
--- a/pith/reply.c
+++ b/pith/reply.c
@@ -2721,7 +2721,7 @@ Args:  stream  -- Mail stream to fetch text from
        ret_charset -- If we translate to another charset return that
                       new charset here
 
-Returns:  true if OK, false if problem occured while filtering
+Returns:  true if OK, false if problem occurred while filtering
 
 If the text is richtext, it will be converted to plain text, since there's
 no rich text editing capabilities in Pine (yet).
@@ -3258,7 +3258,7 @@ copy_body(struct mail_bodystruct *new_body, struct mail_bodystruct *old_body)
 /*----------------------------------------------------------------------
     Copy the MIME parameter list
  
- Allocates storage for new part, and returns pointer to new paramter
+ Allocates storage for new part, and returns pointer to new parameter
 list. If old_p is NULL, NULL is returned.
  ----*/
 PARAMETER *
@@ -3339,7 +3339,7 @@ reply_in_reply_to(ENVELOPE *env)
 
   Result: Alloc'd unique string is returned
 
-Uniqueness is gaurenteed by using the host name, process id, date to the
+Uniqueness is guaranteed by using the host name, process id, date to the
 second and a single unique character
 *----------------------------------------------------------------------*/
 char *
diff --git a/pith/reply.h b/pith/reply.h
index 7ab14804..cc0e6695 100644
--- a/pith/reply.h
+++ b/pith/reply.h
@@ -46,7 +46,7 @@
 #include "../pith/addrstring.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	    reply_harvest(struct pine *, long, char *, ENVELOPE *, ADDRESS **,
 			  ADDRESS **, ADDRESS **, ADDRESS **,int *);
 ADDRESS    *reply_cp_addr(struct pine *, long, char *, char *,
diff --git a/pith/rfc2231.h b/pith/rfc2231.h
index a4b82263..859cb3ea 100644
--- a/pith/rfc2231.h
+++ b/pith/rfc2231.h
@@ -22,7 +22,7 @@
 #include "../pith/store.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	   *rfc2231_get_param(PARAMETER *, char *, char **, char **);
 int	    rfc2231_output(STORE_S *, char *, char *, char *, char *);
 PARMLIST_S *rfc2231_newparmlist(PARAMETER *);
diff --git a/pith/save.c b/pith/save.c
index 77aa0fb7..1065fc5d 100644
--- a/pith/save.c
+++ b/pith/save.c
@@ -1766,7 +1766,7 @@ save_msg_stream(CONTEXT_S *context, char *folder, int *we_opened)
 
 
 /*----------------------------------------------------------------------
-    Offer to create a non-existant folder to copy message[s] into
+    Offer to create a non-existent folder to copy message[s] into
 
    Args: context -- context to create folder in
 	 folder -- name of folder to create
diff --git a/pith/save.h b/pith/save.h
index 4664552d..4ae1d941 100644
--- a/pith/save.h
+++ b/pith/save.h
@@ -39,7 +39,7 @@
 #define SSCP_ANSWER_IS_YES	0x4
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	   *save_get_default(struct pine *, ENVELOPE *, long, char *, CONTEXT_S **);
 void        save_get_fldr_from_env(char *, int, ENVELOPE *, struct pine *, long, char *);
 long	    save(struct pine *, MAILSTREAM *, CONTEXT_S *, char *, MSGNO_S *, int);
diff --git a/pith/savetype.h b/pith/savetype.h
index 35f8db95..30880456 100644
--- a/pith/savetype.h
+++ b/pith/savetype.h
@@ -33,7 +33,7 @@ typedef struct append_package {
 } APPENDPACKAGE;
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_SAVETYPE_INCLUDED */
diff --git a/pith/search.h b/pith/search.h
index 20cba1b2..783670a6 100644
--- a/pith/search.h
+++ b/pith/search.h
@@ -18,7 +18,7 @@
 #define PITH_SEARCH_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 SEARCHSET    *build_searchset(MAILSTREAM *);
 int           in_searchset(SEARCHSET *, unsigned long);
 
diff --git a/pith/send.c b/pith/send.c
index 48d93444..1be50e14 100644
--- a/pith/send.c
+++ b/pith/send.c
@@ -238,7 +238,7 @@ postponed_stream(MAILSTREAM **streamp, char *mbox, char *type, int checknmsgs)
      *
      * The "mbox" is assumed to be local if we're given what looks
      * like an absolute path.  This is different from Goto/Save
-     * where we do alot of work to interpret paths relative to the
+     * where we do a lot of work to interpret paths relative to the
      * server.  This reason is to support all the pre-4.00 pinerc'
      * that specified a path and because there's yet to be a way
      * in c-client to specify otherwise in the face of a remote
@@ -714,7 +714,7 @@ redraft_work(MAILSTREAM **streamp, long int cont_msg, ENVELOPE **outgoing,
 
 	    /*
 	     * If empty is not the normal default, make the outgoing
-	     * reply_to be an emtpy address. If it is default, leave it
+	     * reply_to be an empty address. If it is default, leave it
 	     * as NULL and the default will be used.
 	     */
 	    if(hdr_is_in_list("reply-to", *custom)){
@@ -2318,7 +2318,7 @@ wrapup_fcc(char *fcc, CONTEXT_S *fcc_cntxt, METAENV *header, struct mail_bodystr
 
 Args: fcc -- the name of the fcc to create.  It can't be NULL.
       fcc_cntxt -- Returns the context the fcc is in.
-      force -- supress user option prompt
+      force -- suppress user option prompt
 
 Returns allocated storage object on success, NULL on failure
   ----*/
@@ -2330,7 +2330,7 @@ open_fcc(char *fcc, CONTEXT_S **fcc_cntxt, int force, char *err_prefix, char *er
     ps_global->mm_log_error = 0;
 
     /* 
-     * check for fcc's existance...
+     * check for fcc's existence...
      */
     TIME_STAMP("open_fcc start", 1);
     if(!is_absolute_path(fcc) && context_isambig(fcc)
@@ -3662,7 +3662,7 @@ post_rfc822_output(char *tmp,
 
 /*
  * posting_characterset- determine what transliteration is reasonable
- *                       for posting the given non-ascii messsage data.
+ *                       for posting the given non-ascii message data.
  *
  *       preferred_charset is the charset the original data was labeled in.
  *                         If we can keep that we do.
@@ -5564,7 +5564,7 @@ mta_handoff(METAENV *header, struct mail_bodystruct *body,
      * Precedence is in that order.
      * Said differently, the order goes something like what's below.
      * 
-     * NOTE: the fixed/command-line/user precendence handling is also
+     * NOTE: the fixed/command-line/user precedence handling is also
      *	     indicated by what's pointed to by ps_global->VAR_*, but since
      *	     that also includes the global defaults, it's not sufficient.
      */
diff --git a/pith/send.h b/pith/send.h
index 6521178a..46b87713 100644
--- a/pith/send.h
+++ b/pith/send.h
@@ -79,7 +79,7 @@ typedef struct pine_field {
     unsigned  writehdr:1;		/* write rfc822 header for field    */
     unsigned  localcopy:1;		/* copy to fcc or postponed	    */
     unsigned  rcptto:1;			/* send to this if type Address	    */
-    unsigned  posterr:1;		/* posting error occured in field   */
+    unsigned  posterr:1;		/* posting error occurred in field  */
     /* the next three fields are used only for customized-hdrs and friends */
     unsigned  standard:1;		/* this hdr already in pf_template  */
     CustomType cstmtype;		/* for customized-hdrs and r->cstm  */
@@ -125,7 +125,7 @@ typedef struct {
 #define CM_DSN_NEVER	0x02	/* request NO DSN */
 #define CM_DSN_DELAY	0x04	/* DSN delay notification */
 #define CM_DSN_SUCCESS	0x08	/* DSN success notification */
-#define CM_DSN_FULL	0x10	/* DSN full notificiation */
+#define CM_DSN_FULL	0x10	/* DSN full notification */
 #define CM_DSN_SHOW	0x20	/* show DSN result (place holder) */
 
 
@@ -214,7 +214,7 @@ extern PRIORITY_S priorities[];
 extern PINEFIELD pf_template[];
 
 
-/* exported protoypes */
+/* exported prototypes */
 int         postponed_stream(MAILSTREAM **, char *, char *, int);
 int	    redraft_work(MAILSTREAM **, long, ENVELOPE **, BODY **, char **, char **,
 			 REPLY_S **, REDRAFT_POS_S **, PINEFIELD **, ACTION_S **, int, STORE_S *);
diff --git a/pith/sequence.c b/pith/sequence.c
index c9c9e4d2..5b97d8a0 100644
--- a/pith/sequence.c
+++ b/pith/sequence.c
@@ -352,7 +352,7 @@ build_sequence(MAILSTREAM *stream, MSGNO_S *msgmap, long int *count)
   Args: map -- message number struct of to build selected messages in
 
   OK folks, here's the tradeoff: either all the functions have to
-  know if the user want's to deal with the "current" hilited message
+  know if the user wants to deal with the "current" hilited message
   or the list of currently "selected" messages, *or* we just
   wrap the call to these functions with some glue that tweeks
   what these functions see as the "current" message list, and let them
diff --git a/pith/sequence.h b/pith/sequence.h
index 34a8fb62..2ee5e182 100644
--- a/pith/sequence.h
+++ b/pith/sequence.h
@@ -21,7 +21,7 @@
 #include "../pith/msgno.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	  *selected_sequence(MAILSTREAM *, MSGNO_S *, long *, int);
 char	  *currentf_sequence(MAILSTREAM *, MSGNO_S *, long, long *, int, char **, char **);
 char	  *invalid_elt_sequence(MAILSTREAM *, MSGNO_S *);
diff --git a/pith/signal.h b/pith/signal.h
index 32716c88..127d4135 100644
--- a/pith/signal.h
+++ b/pith/signal.h
@@ -18,7 +18,7 @@
 #define PITH_SIGNAL_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 /* currently mandatory to implement stubs */
 
diff --git a/pith/smime.c b/pith/smime.c
index ec9aa6f0..021407d3 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -302,7 +302,7 @@ setup_pwdcert(void **pwdcert)
 	     }
 	   }
 	 }
-	 if(pc->keytext != NULL)	/* we should go straigth here */
+	 if(pc->keytext != NULL)	/* we should go straight here */
 	   text = pc->keytext;
     } else if (ps_global->smime->privatetype == Keychain){
 	   pathkey[0] = '\0';	/* no apple key chain support yet */
diff --git a/pith/smime.h b/pith/smime.h
index 216d1a6a..f78f8cba 100644
--- a/pith/smime.h
+++ b/pith/smime.h
@@ -36,7 +36,7 @@
 #define OUR_PKCS7_ENCLOSURE_SUBTYPE "x-pkcs7-enclosure"
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	       smime_validate_cert(X509 *cert, long *error);
 int	       encrypt_file(char *fp, char *text, PERSONAL_CERT *pc);
 char 	      *decrypt_file(char *fp, int *rv, PERSONAL_CERT *pc);
diff --git a/pith/smkeys.c b/pith/smkeys.c
index 9d8b1d18..a9f1e9df 100644
--- a/pith/smkeys.c
+++ b/pith/smkeys.c
@@ -877,7 +877,7 @@ load_key(PERSONAL_CERT *pc, char *pass, int flag)
 /*
  * This newer version is from Adrian Vogel. It looks for the email
  * address not only in the email address field, but also in an
- * X509v3 extension field, Subject Altenative Name.
+ * X509v3 extension field, Subject Alternative Name.
  */
 char **
 get_x509_subject_email(X509 *x)
diff --git a/pith/smkeys.h b/pith/smkeys.h
index 3258105a..d3db4ce1 100644
--- a/pith/smkeys.h
+++ b/pith/smkeys.h
@@ -69,7 +69,7 @@ typedef struct personal_cert {
 #define SM_NORMALCERT	0x1	/* look in normal user defined directory */
 #define SM_BACKUPCERT	0x2	/* look in backup directory */
 
-/* exported protoypes */
+/* exported prototypes */
 int	       add_certs_in_dir(X509_LOOKUP *lookup, char *path, char *ext, CertList **cdata);
 X509_STORE    *get_ca_store(void);
 void	       free_x509_store(X509_STORE **);
diff --git a/pith/sort.h b/pith/sort.h
index af658259..fdf8c07e 100644
--- a/pith/sort.h
+++ b/pith/sort.h
@@ -40,7 +40,7 @@ struct global_sort_data {
 extern struct global_sort_data g_sort;
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	*sort_name(SortOrder);
 void	 sort_folder(MAILSTREAM *, MSGNO_S *, SortOrder, int, unsigned);
 int	 decode_sort(char *, SortOrder *, int *);
diff --git a/pith/sorttype.h b/pith/sorttype.h
index 3fde564d..2e3653aa 100644
--- a/pith/sorttype.h
+++ b/pith/sorttype.h
@@ -27,7 +27,7 @@ typedef enum {SortSubject = 0, SortArrival, SortFrom, SortTo,
 	      SortSubject2, SortScore, SortThread, EndofList}   SortOrder;
 
 
-/* exported protoypes */
+/* exported prototypes */
 
 
 #endif /* PITH_SORTTYPE_INCLUDED */
diff --git a/pith/state.h b/pith/state.h
index cae43d4c..c5f58407 100644
--- a/pith/state.h
+++ b/pith/state.h
@@ -249,8 +249,8 @@ struct pine {
     bitmap_t     feature_list;		/* a bitmap of all the features */
     char       **feat_list_back_compat;
 
-    SPEC_COLOR_S *hdr_colors;		/* list of configed colors for view */
-    SPEC_COLOR_S *index_token_colors;	/* list of configed colors for index */
+    SPEC_COLOR_S *hdr_colors;		/* list of configured colors for view */
+    SPEC_COLOR_S *index_token_colors;	/* list of configured colors for index */
 
     short	 init_context;
 
@@ -389,7 +389,7 @@ extern struct pine *ps_global;
 extern char         tmp_20k_buf[];
 
 
-/* exported protoypes */
+/* exported prototypes */
 struct pine  *new_pine_struct(void);
 void          free_pine_struct(struct pine **);
 void          free_pinerc_strings(struct pine **);
diff --git a/pith/status.h b/pith/status.h
index 6999cd6b..72e25a8a 100644
--- a/pith/status.h
+++ b/pith/status.h
@@ -31,7 +31,7 @@
 #define	SM_INFO		0x10			/* Handy, but discardable    */
 
 
-/* exported protoypes */
+/* exported prototypes */
 void	q_status_message1(int, int, int, char *, void *);
 void	q_status_message2(int, int, int, char *, void *, void *);
 void	q_status_message3(int, int, int, char *, void *, void *, void *);
diff --git a/pith/store.c b/pith/store.c
index 1ff57967..ee0fe5e5 100644
--- a/pith/store.c
+++ b/pith/store.c
@@ -353,7 +353,7 @@ so_file_open(STORE_S *so)
 
 /*
  * put a character into the specified storage object,
- * expanding if neccessary
+ * expanding if necessary
  *
  * return 1 on success and 0 on failure
  */
@@ -659,7 +659,7 @@ so_file_puts_locale(STORE_S *so, char *s)
 #ifdef SMIME
 /*
  * put a character into the specified storage object,
- * expanding if neccessary
+ * expanding if necessary
  *
  * return 1 on success and 0 on failure
  */
diff --git a/pith/store.h b/pith/store.h
index c9e1af3a..9b721d87 100644
--- a/pith/store.h
+++ b/pith/store.h
@@ -56,7 +56,7 @@ typedef struct store_object {
 #define	so_puts(so, s)		((*(so)->puts)((so), (s)))
 
 
-/* exported protoypes */
+/* exported prototypes */
 STORE_S	*so_get(SourceType, char *, int);
 int	 so_give(STORE_S **);
 int	 so_nputs(STORE_S *, char *, long);
diff --git a/pith/stream.h b/pith/stream.h
index f8e86544..bb1b76e1 100644
--- a/pith/stream.h
+++ b/pith/stream.h
@@ -407,7 +407,7 @@ extern MAILSTATUS *pine_cached_status;
 #define	pine_fetchheader_lines_not(S,N,M,F)  pine_fetch_header(S,N,M,F,FT_NOT)
 
 
-/* exported protoypes */
+/* exported prototypes */
 MAILSTREAM    *pine_mail_open(MAILSTREAM *, char *, long, long *);
 long	       pine_mail_create(MAILSTREAM *, char *);
 long	       pine_mail_delete(MAILSTREAM *, char *);
diff --git a/pith/string.c b/pith/string.c
index 8707485a..92a9a65c 100644
--- a/pith/string.c
+++ b/pith/string.c
@@ -520,7 +520,7 @@ srchstr(char *haystack, char *needle)
           ss -- The string to search for, the smaller string
 
    Search for last occurrence of ss in the is, and return a pointer
-   into the string is when it is found. The search is case indepedent.
+   into the string is when it is found. The search is case independent.
   ----*/
 
 char *	    
@@ -1223,7 +1223,7 @@ parse_date(char *given_date, struct date *d)
         while(*p && (*p == '-' || *p == ',' || isspace((unsigned char)*p)))
           p++;
     } else {
-        /* Something wierd, skip it and try to resynch */
+        /* Something weird, skip it and try to resynch */
         while(*p && !isspace((unsigned char)*p) && *p != ',' && *p != '-')
           p++;
         while(*p && (isspace((unsigned char)*p) || *p == ',' || *p == '-'))
@@ -2819,7 +2819,7 @@ copy_quoted_string_asis(char *src)
 
 /*
  * isxpair -- return true if the first two chars in string are
- *	      hexidecimal characters
+ *	      hexadecimal characters
  */
 int
 isxpair(char *s)
diff --git a/pith/string.h b/pith/string.h
index 4263249e..65306085 100644
--- a/pith/string.h
+++ b/pith/string.h
@@ -85,7 +85,7 @@ struct date {
 #define BUILDER_FOOTER_MANGLED		0x4
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	   *rplstr(char *, size_t, int, char *);
 void	    sqzspaces(char *);
 void	    sqznewlines(char *);
diff --git a/pith/strlst.h b/pith/strlst.h
index c4c1ff57..f4046b3e 100644
--- a/pith/strlst.h
+++ b/pith/strlst.h
@@ -18,7 +18,7 @@
 #define PITH_STRLST_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 STRINGLIST *new_strlst(char **);
 void	    free_strlst(STRINGLIST **);
 
diff --git a/pith/tempfile.h b/pith/tempfile.h
index f29dbf40..ad2c7856 100644
--- a/pith/tempfile.h
+++ b/pith/tempfile.h
@@ -18,7 +18,7 @@
 #define PITH_TEMPFILE_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	     *tempfile_in_same_dir(char *, char *, char **);
 int	      in_dir(char *, char *);
 
diff --git a/pith/text.h b/pith/text.h
index b6470690..4450fd7d 100644
--- a/pith/text.h
+++ b/pith/text.h
@@ -49,7 +49,7 @@ typedef struct del_q_s {
 } DELQ_S;
 
 
-/* exported protoypes */
+/* exported prototypes */
 int	decode_text(ATTACH_S *, long, gf_io_t, HANDLE_S **, DetachErrStyle, int);
 int	translate_utf8_to_2022_jp(long, char *, LT_INS_S **, void *);
 int	delete_quotes(long, char *, LT_INS_S **, void *);
diff --git a/pith/thread.h b/pith/thread.h
index 63573bcd..4258b286 100644
--- a/pith/thread.h
+++ b/pith/thread.h
@@ -85,7 +85,7 @@ typedef struct pine_thrd {
 	 && ps_global->thread_disp_style != THREAD_NONE)
 
 
-/* exported protoypes */
+/* exported prototypes */
 PINETHRD_S   *fetch_thread(MAILSTREAM *, unsigned long);
 PINETHRD_S   *fetch_head_thread(MAILSTREAM *);
 void	      set_flags_for_thread(MAILSTREAM *, MSGNO_S *, int, PINETHRD_S *, int);
diff --git a/pith/url.c b/pith/url.c
index 126b3b30..a25304ee 100644
--- a/pith/url.c
+++ b/pith/url.c
@@ -79,7 +79,7 @@ rfc1738_scan(char *line, int *len)
 	    break;
 
 	/*
-	 * Make sure everyhing up to the colon is a known scheme...
+	 * Make sure everything up to the colon is a known scheme...
 	 */
 	if(start && (n = colon - start) && !isdigit((unsigned char) *start)
 	   && (((n == 2
@@ -173,7 +173,7 @@ rfc1738_scan(char *line, int *len)
  *
  * NOTE: we have a problem matching closing parens when users 
  *       bracket the url in parens.  So, lets try terminating our
- *	 match on any closing paren that doesn't have a coresponding
+ *	 match on any closing paren that doesn't have a corresponding
  *       open-paren.
  */
 char *
@@ -496,7 +496,7 @@ web_host_scan(char *line, int *len)
 /*
  * mail_addr_scan -- Scan the given line for possible RFC822 addr-spec's
  *
- * NOTE: Well, OK, not strictly addr-specs since there's alot of junk
+ * NOTE: Well, OK, not strictly addr-specs since there's a lot of junk
  *	 we're tying to sift thru and we'd like to minimize false-pos
  *	 matches.
  */
@@ -538,7 +538,7 @@ mail_addr_scan(char *line, int *len)
 	    break;
 
 	/*
-	 * Make sure everyhing up to the colon is a known scheme...
+	 * Make sure everything up to the colon is a known scheme...
 	 */
 	if(start && (amp - start) > 0){
 	    /*
diff --git a/pith/url.h b/pith/url.h
index 15e95a64..40c5bfe4 100644
--- a/pith/url.h
+++ b/pith/url.h
@@ -18,7 +18,7 @@
 #define PITH_URL_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 char	   *rfc1738_scan(char *, int *);
 char	   *rfc1738_str(char *);
 unsigned long rfc1738_num(char **);
diff --git a/pith/util.h b/pith/util.h
index 7a9a7f79..1fa346ad 100644
--- a/pith/util.h
+++ b/pith/util.h
@@ -51,7 +51,7 @@ typedef struct screen_position {
 #define SCREEN_FUN_NULL ((void (*)(struct pine *)) NULL)
 
 
-/* exported protoypes */
+/* exported prototypes */
 int           *cpyint(int);
 
 /* currently mandatory to implement stubs */
diff --git a/web/INSTALL b/web/INSTALL
index f6e3482b..b6063542 100644
--- a/web/INSTALL
+++ b/web/INSTALL
@@ -70,7 +70,7 @@ directory arranged, for the most part, by function.
 
       session/
 	Alpine session management scripts used to login, establish
-	an alpine session, logout and aquire IMAP server credentials
+	an alpine session, logout and acquire IMAP server credentials
 	as needed.  These scripts are distinct from the alpine/
 	scripts in order to properly scope the session key.
 
@@ -164,7 +164,7 @@ configurations, Web Alpine installation must be done by hand and
 requires several steps.  To illustrate the procedure, a generic Fedora
 Core 8 system with standard httpd package installed is used as an
 example.  On other systems, the general ideas are the same but the
-specific file locations and server configuation settings will likely
+specific file locations and server configuration settings will likely
 vary.  Note also that your system may have an additional security
 layer installed, such as selinux, that may require extra configuration
 that is beyond the scope of this explanation.
diff --git a/web/cgi/alpine/1.0/addredit.tcl b/web/cgi/alpine/1.0/addredit.tcl
index 8aecda2e..d0fb3865 100755
--- a/web/cgi/alpine/1.0/addredit.tcl
+++ b/web/cgi/alpine/1.0/addredit.tcl
@@ -135,7 +135,7 @@ WPEval $ae_vars {
 
 
 		if {$take == 1} {
-		  lappend tmptxt "Edit the new entry below as neccessary (note, some are required).  To create a list entry, simply add each desired address to the [cgi_italic Addresses] field separated by a comma."
+		  lappend tmptxt "Edit the new entry below as necessary (note, some are required).  To create a list entry, simply add each desired address to the [cgi_italic Addresses] field separated by a comma."
 		  lappend tmptxt "When finished, click [cgi_italic Save] to update your address book, or [cgi_italic Cancel] to return to the message view."
 		} elseif {$add == 1} {
 		  lappend tmptxt "The address book entry editor is used to create a new address book entry.  Fill in the fields as desired below (note, some are required).  To create a list entry, simply add each desired address to the [cgi_italic Addresses] field separated by a comma."
diff --git a/web/cgi/alpine/1.0/attach.tcl b/web/cgi/alpine/1.0/attach.tcl
index e0423171..9e83c8fd 100755
--- a/web/cgi/alpine/1.0/attach.tcl
+++ b/web/cgi/alpine/1.0/attach.tcl
@@ -82,7 +82,7 @@ if {$cancel == 1 || [string compare cancel [string tolower $cancel]] == 0 || [st
 
       set fsize [file size [lindex $file 0]]
       if {$fsize <= 0} {
-	WPCmd PEInfo statmsg "Attachment $jsnative empty or nonexistant"
+	WPCmd PEInfo statmsg "Attachment $jsnative empty or nonexistent"
       }
     } else {
       WPCmd PEInfo statmsg "Requested attachment does not exist"
diff --git a/web/cgi/alpine/1.0/compose.tcl b/web/cgi/alpine/1.0/compose.tcl
index d5a6af3d..b6a38a45 100755
--- a/web/cgi/alpine/1.0/compose.tcl
+++ b/web/cgi/alpine/1.0/compose.tcl
@@ -676,7 +676,7 @@ WPEval $compose_vars {
 
 		      if {0 && [info exists charset]} {
 			cgi_text "form_charset=$charset" type=hidden notab
-			# character encoding suport: the idea is to plant a known
+			# character encoding support: the idea is to plant a known
 			# char in the given charset and see what comes back to
 			# post.tcl from the browser.  Why is it again the @#*$!
 			# browser can't just tell us?
diff --git a/web/cgi/alpine/1.0/detach.tcl b/web/cgi/alpine/1.0/detach.tcl
index d53ef313..2758e380 100755
--- a/web/cgi/alpine/1.0/detach.tcl
+++ b/web/cgi/alpine/1.0/detach.tcl
@@ -164,7 +164,8 @@ WPEval $detach_vars {
 
   close $cfd
 
-  # prepare to clean up if the brower never redirects
+
+  # prepare to clean up if the browser never redirects
 
   cgi_http_head {
     # redirect to the place we stuffed the detach info.  use the ip address
diff --git a/web/cgi/alpine/1.0/do_view.tcl b/web/cgi/alpine/1.0/do_view.tcl
index fb8c5af6..2413a68f 100755
--- a/web/cgi/alpine/1.0/do_view.tcl
+++ b/web/cgi/alpine/1.0/do_view.tcl
@@ -117,7 +117,7 @@ if {[string compare save [string tolower $op]] == 0} {
 		source [WPTFScript auth]
 		set nopage 1
 	      } else {
-		statmsg "Existance test failed: $reason"
+		statmsg "Existence test failed: $reason"
 	      }
 	    } elseif {$reason == 0} {
 	      if {$create == 1 || [string compare create [string tolower $create]] == 0} {
@@ -157,7 +157,7 @@ if {[string compare save [string tolower $op]] == 0} {
 	}
       }
     } else {
-      statmsg "Cannot Save to emtpy folder name"
+      statmsg "Cannot Save to empty folder name"
     }
   }
 }
diff --git a/web/cgi/alpine/1.0/dosend.tcl b/web/cgi/alpine/1.0/dosend.tcl
index 44130572..77d2503f 100755
--- a/web/cgi/alpine/1.0/dosend.tcl
+++ b/web/cgi/alpine/1.0/dosend.tcl
@@ -55,7 +55,7 @@ if {[catch {WPCmd PEInfo set suspended_composition} msgdata] == 0} {
     if {[string compare BADPASSWD [string range $errstr 0 8]] == 0
 	&& [catch {WPCmd PEInfo set suspended_composition $msgdata} errstr] == 0} {
 	set oncancel "page=compose&restore=1&cid=$cid"
-	set conftext "Send Messsage?"
+	set conftext "Send Message?"
 	set reason "The server used to send this message requires authentication.[cgi_nl][cgi_nl]Enter Username and Password to connect to $server"
 	_cgi_set_uservar params [WPPercentQuote [list [list server $server] [list page dosend] [list postpost $postpost]]]
 	set src auth
diff --git a/web/cgi/alpine/1.0/export.tcl b/web/cgi/alpine/1.0/export.tcl
index 338e928c..9070bd46 100755
--- a/web/cgi/alpine/1.0/export.tcl
+++ b/web/cgi/alpine/1.0/export.tcl
@@ -140,7 +140,7 @@ WPEval $export_vars {
     exec /bin/chmod [cgi_tmpfile_permissions] $dfile
   }
 
-  # prepare to clean up if the brower never redirects
+  # prepare to clean up if the browser never redirects
   if {[info exists redirect]} {
     set redirect "${redirect}${safegivenname}?h=${rhandle}"
   } else {
diff --git a/web/cgi/alpine/1.0/filtedit.tcl b/web/cgi/alpine/1.0/filtedit.tcl
index 34b9bd0f..3c55b567 100755
--- a/web/cgi/alpine/1.0/filtedit.tcl
+++ b/web/cgi/alpine/1.0/filtedit.tcl
@@ -661,11 +661,11 @@ cgi_html {
 			  }
 			  cgi_table_row {
 			    wpGetVarAs setkeywords setkeywords
-			    freetext_cell "Set these Keywoards" setkeywords $setkeywords
+			    freetext_cell "Set these Keywords" setkeywords $setkeywords
 			  }
 			  cgi_table_row {
 			    wpGetVarAs clearkeywords clearkeywords
-			    freetext_cell "Clear these Keywoards" clearkeywords $clearkeywords
+			    freetext_cell "Clear these Keywords" clearkeywords $clearkeywords
 			  }
 			}
 		      }
diff --git a/web/cgi/alpine/1.0/fr_tconfig.tcl b/web/cgi/alpine/1.0/fr_tconfig.tcl
index a7d62244..149bd383 100755
--- a/web/cgi/alpine/1.0/fr_tconfig.tcl
+++ b/web/cgi/alpine/1.0/fr_tconfig.tcl
@@ -17,7 +17,7 @@
 #	     in webpine-lite pages.
 #            This page assumes that it was loaded by conf_process.tcl
 
-#  Intput:
+#  Input:
 set frame_vars {
 }
 
diff --git a/web/cgi/alpine/1.0/genvars.tcl b/web/cgi/alpine/1.0/genvars.tcl
index b982aee9..6b86e6e7 100755
--- a/web/cgi/alpine/1.0/genvars.tcl
+++ b/web/cgi/alpine/1.0/genvars.tcl
@@ -86,7 +86,7 @@ set folder_vars {
     {feat enable-dot-folders "Enable Hidden Folders"}
     {feat enable-lame-list-mode "Enable Lame List Mode"}
     {feat try-alternative-authentication-driver-first "Try Alternative Authentication First"}
-    {feat quell-empty-directories "Do Not Display Empty Directores"}
+    {feat quell-empty-directories "Do Not Display Empty Directories"}
 }
 
 set address_vars {
diff --git a/web/cgi/alpine/1.0/help/index.html b/web/cgi/alpine/1.0/help/index.html
index 58bcd323..b8c1c305 100644
--- a/web/cgi/alpine/1.0/help/index.html
+++ b/web/cgi/alpine/1.0/help/index.html
@@ -200,7 +200,7 @@ button to initiate saving.  Once saved, the chosen messages will be marked for d
 
 
 Setting status flags
      
-By default, the area immediatly to the left of the message numbers is reserved for the following status flags:
+By default, the area immediately to the left of the message numbers is reserved for the following status flags:
 
diff --git a/web/cgi/alpine/1.0/help/index.tcl.1 b/web/cgi/alpine/1.0/help/index.tcl.1
index 67cc941d..d20bb2c1 100644
--- a/web/cgi/alpine/1.0/help/index.tcl.1
+++ b/web/cgi/alpine/1.0/help/index.tcl.1
@@ -150,7 +150,7 @@ The set of aggregate operations are either hidden or exposed.  When
 hidden you will see a  tab on the left edge of the line
 containing the sort names. Click the tab to expose the aggregate
 commands and the checkboxes next to each message.  Similarly, when aggregate operations are visible, you will see a 
- tab on the line containg the sort names.  You can click this
+ tab on the line containing the sort names.  You can click this
 tab to hide aggregate operations.
 
 cgi_p
diff --git a/web/cgi/alpine/1.0/help/tech-notes.html b/web/cgi/alpine/1.0/help/tech-notes.html
index 7f275620..2de3dae7 100644
--- a/web/cgi/alpine/1.0/help/tech-notes.html
+++ b/web/cgi/alpine/1.0/help/tech-notes.html
@@ -23,7 +23,7 @@
 
      Why Web Alpine
      
 
 Web Alpine was originally conceived as a means of providing reliable,
-ubiquitous, and consistent access to UW email facilites via the Interactive
+ubiquitous, and consistent access to UW email facilities via the Interactive
 Message Access Protocol (IMAP).  As with Pine, it is intended to present a
 simple, approachable interface that can be easily navigated with
 minimal familiarity.  It is also intended to be as efficient as
@@ -101,7 +101,7 @@ built into Alpine, as well as many of the features and functions.
 
      
 The Web Alpine application consists of three main components; the CGI scripts that generate pages containing the user's email data,
 a serverette running on the http server spanning the life of the user's session, and a couple of libraries
-to aid page generation and serverette communciation.
+to aid page generation and serverette communication.
 
 
      
 Web Alpine is packaged as part of the Alpine Distribution and it's source resides
@@ -166,7 +166,7 @@ the provide, and breakdown as follows:
  
      
@@ -231,7 +231,7 @@ that defines where the Web Alpine application was unpacked on your system, and
 
      
 which defines where browsers can find Web Alpine's CGI scripts.  This is set to
 the null string if the server's DocumentRoot is synonymous with the root of
-Web Alpine's CGI directory.  Othewise, it's typically set to the Alias accessed
+Web Alpine's CGI directory.  Otherwise, it's typically set to the Alias accessed
 subdirectory in the web server's configuration.
 
 
      
@@ -264,7 +264,7 @@ a particular user.
 
      User Configuration
      
 Since no user-initiated local file or mailbox access is permitted by (much less compiled into) the alpined,
-user configuration and data files are stored using Pine's remote pinerc and address book capabilites.  The configuration
+user configuration and data files are stored using Pine's remote pinerc and address book capabilities.  The configuration
 settings in web/config/ are used to set per-user defaults and direct Web Alpine toward the user's configuration
 settings on the IMAP server.  Similarly, the default addressbook is stored as an IMAP folder on the server as well.
 Concurrent Web Alpine, Unix Pine and PC-Pine users that would like a consistent mail environment can easily configure their
@@ -324,7 +324,7 @@ templates which were fleshed out via requests to the alpined serverette
 may draw on its cache of IMAP data, make new requests of the IMAP server, post messages via SMTP or
 the local mail queue, formulate LDAP queries, or perform other tasks as required.
  
      
  
      
   +
  
  Contains source files for Web Alpine's binary components which will be linked
- against the pith/ libarary components.
+ against the pith/ library components.
  
  
 
      
 
      
-Note: Web Alpine sessions run as long as the user's browser requests pages.  In the absense of user interaction
+Note: Web Alpine sessions run as long as the user's browser requests pages.  In the absence of user interaction
 Web Alpine will self-refresh every few minutes to mainain the session.  Sessions only end when the user logs out
 or closes the browser.
  
      
@@ -440,7 +440,7 @@ loop as we roll in many of the features Pine users have come to appreciate.
 Performance in terms of both user perceived response time and users per web server are 
 always a concern, but must, of course, be balanced against additional maintenance and complexity costs.
 Less obvious complicating factors must be considered, such as alpined process partitioning
-and session-key containing cookie exposure in the face of malicous HTML attachments.
+and session-key containing cookie exposure in the face of malicious HTML attachments.
 We plan, of course, to continue exploring various methods to improve performance.
 
 
      Appendix: Installation Tests
      
diff --git a/web/cgi/alpine/1.0/index.tcl b/web/cgi/alpine/1.0/index.tcl
index 6a0fa543..44cf9014 100755
--- a/web/cgi/alpine/1.0/index.tcl
+++ b/web/cgi/alpine/1.0/index.tcl
@@ -475,7 +475,7 @@ if {$queryexpunge == 1 || [string compare [string tolower $queryexpunge] expunge
 		source [WPTFScript auth]
 		set nopage 1
 	      } else {
-		lappend newmail [list "Existance test failed: $reason"]
+		lappend newmail [list "Existence test failed: $reason"]
 	      }
 	    } elseif {$reason == 0} {
 	      if {$create == 1 || [string compare create [string tolower $create]] == 0} {
@@ -1486,7 +1486,7 @@ if {![info exists nopage]} {
 
 	cgi_table cellspacing=0 cellpadding=0 width="100%" class="itable" {
 	  if {$messagecount < 1} {
-	    # special case for mailbox with no messges
+	    # special case for mailbox with no messages
 	    cgi_table_row {
 	      cgi_table_data class=body valign=middle height=[expr {($ppg + 1) * $indexheight}] {
 		cgi_center {
diff --git a/web/cgi/alpine/1.0/ldapresult.tcl b/web/cgi/alpine/1.0/ldapresult.tcl
index efdce665..e7e91812 100755
--- a/web/cgi/alpine/1.0/ldapresult.tcl
+++ b/web/cgi/alpine/1.0/ldapresult.tcl
@@ -211,7 +211,7 @@ WPEval $ldap_vars {
 
 	    if {$qn == -1 && [catch {WPCmd PELdap query $dir $srchstr $ldapfilt} qn]} {
 	      cgi_division align=center "style=\"background-color:white; border: 1px solid goldenrod; margin: 10; padding: 4\"" {
-		cgi_puts "A problem has occured while trying to search the directory server."
+		cgi_puts "A problem has occurred while trying to search the directory server."
 		cgi_br
 		cgi_br
 		cgi_puts [cgi_italic [cgi_bold "$qn"]]
@@ -244,7 +244,7 @@ WPEval $ldap_vars {
 	      }
 	    } elseif {[catch {WPCmd PELdap results $qn} results]} {
 	      cgi_division align=center "style=\"background-color:white; border: 1px solid goldenrod; margin: 10; padding: 4\"" {
-		cgi_puts "A problem has occured while trying to retrieve the results of your directory search."
+		cgi_puts "A problem has occurred while trying to retrieve the results of your directory search."
 		cgi_br
 		cgi_br
 		cgi_puts [cgi_italic [cgi_bold "$results"]]
diff --git a/web/cgi/alpine/1.0/post.tcl b/web/cgi/alpine/1.0/post.tcl
index dcd7c37b..26428730 100755
--- a/web/cgi/alpine/1.0/post.tcl
+++ b/web/cgi/alpine/1.0/post.tcl
@@ -227,7 +227,7 @@ switch -exact -- $fccattach {
 if {0 && [string length $form_charset]} {
   # messy charset heuristics
   # idea is to look for planted HTML entities and see if known
-  # encoding transliterations have occured. inspired by:
+  # encoding transliterations have occurred. inspired by:
   # 
 
   # test for:
@@ -288,7 +288,7 @@ if {0 && [string length $form_charset]} {
   lappend msgdata [list postoption [list charset "UTF-8"]]
 }
 
-# pass on text fomat=flowed?
+# pass on text format=flowed?
 if {[string length $form_flowed]} {
   lappend msgdata [list postoption [list flowed yes]]
 }
diff --git a/web/cgi/alpine/1.0/select2.tcl b/web/cgi/alpine/1.0/select2.tcl
index 745254e7..4d4cce2c 100755
--- a/web/cgi/alpine/1.0/select2.tcl
+++ b/web/cgi/alpine/1.0/select2.tcl
@@ -68,7 +68,7 @@ WPEval $select_vars {
 		cgi_table_row {
 		  cgi_table_data {
 		    cgi_center {
-		      cgi_puts "[cgi_nl][cgi_nl]This page provides a way to search for specific messsages within the currently open folder, [cgi_bold [WPCmd PEMailbox mailboxname]].  Simply fill in the criteria below and click the assoicated [cgi_italic Search] button. All messages matching the criteria will be marked with a check in the box next to their line in the Message List.[cgi_nl][cgi_nl]"
+		      cgi_puts "[cgi_nl][cgi_nl]This page provides a way to search for specific messages within the currently open folder, [cgi_bold [WPCmd PEMailbox mailboxname]].  Simply fill in the criteria below and click the associated [cgi_italic Search] button. All messages matching the criteria will be marked with a check in the box next to their line in the Message List.[cgi_nl][cgi_nl]"
 		      cgi_puts "Click [cgi_italic Cancel] to return to the Message List without searching.[cgi_nl]"
 		    }
 		  }
diff --git a/web/cgi/alpine/1.0/seltext.tcl b/web/cgi/alpine/1.0/seltext.tcl
index e0ce33bb..462d48fa 100755
--- a/web/cgi/alpine/1.0/seltext.tcl
+++ b/web/cgi/alpine/1.0/seltext.tcl
@@ -68,7 +68,7 @@ WPEval $select_vars {
 		cgi_table_row {
 		  cgi_table_data {
 		    cgi_center {
-		      cgi_puts "[cgi_nl][cgi_nl]This page provides a way to search for specific text in the messsages contained in [cgi_bold [WPCmd PEMailbox mailboxname]].  Enter your selection criteria below, and click [cgi_italic Search].  All messages matching the criteria will be marked with a check in the box next to their line in the Message List."
+		      cgi_puts "[cgi_nl][cgi_nl]This page provides a way to search for specific text in the messages contained in [cgi_bold [WPCmd PEMailbox mailboxname]].  Enter your selection criteria below, and click [cgi_italic Search].  All messages matching the criteria will be marked with a check in the box next to their line in the Message List."
 		      cgi_br
 		      cgi_br
 		      cgi_puts "Click [cgi_italic Cancel] to return to the Message List without searching.[cgi_nl][cgi_nl]"
diff --git a/web/cgi/alpine/1.0/spellcheck.tcl b/web/cgi/alpine/1.0/spellcheck.tcl
index ac1f9fe5..da4dd565 100755
--- a/web/cgi/alpine/1.0/spellcheck.tcl
+++ b/web/cgi/alpine/1.0/spellcheck.tcl
@@ -243,7 +243,7 @@ WPEval $query_vars {
 	      if {[info exists problem] || $badcount <= 0} {
 		cgi_table align=center valign=top height="100%" {
 		  cgi_table_row {
-		    cgi_table_data align=center valign=bottom heigh="20%" {
+		    cgi_table_data align=center valign=bottom height="20%" {
 		      if {[info exists problem]} {
 			cgi_puts "Problem detected: $problem"
 		      } else {
diff --git a/web/cgi/alpine/1.0/view.tcl b/web/cgi/alpine/1.0/view.tcl
index cf290e43..e4f454b1 100755
--- a/web/cgi/alpine/1.0/view.tcl
+++ b/web/cgi/alpine/1.0/view.tcl
@@ -364,7 +364,7 @@ if {[info exists errstr]} {
   if {![info exists nopage]} {
     switch -exact -- [WPCmd PEMailbox state] {
       readonly {
-	lappend newmail [list [cgi_span "style=color: black; margin: 2 ; border: 1px solid red; background-color: pink; font-weight: bold" "Deleted messages may reapper because [WPCmd PEMailbox mailboxname] is Read Only"]]
+	lappend newmail [list [cgi_span "style=color: black; margin: 2 ; border: 1px solid red; background-color: pink; font-weight: bold" "Deleted messages may reappear because [WPCmd PEMailbox mailboxname] is Read Only"]]
       }
       closed {
 	lappend newmail [list [cgi_span "style=color: black; border: 1px solid red; background-color: pink; font-weight: bold" "Message body may be blank because [WPCmd PEMailbox mailboxname] is Closed"]]
@@ -917,4 +917,4 @@ if {[info exists errstr]} {
 	}
       }
     }
-  }
\ No newline at end of file
+  }
diff --git a/web/cgi/alpine/1.0/wp.tcl b/web/cgi/alpine/1.0/wp.tcl
index f649ca0a..dc523e1a 100755
--- a/web/cgi/alpine/1.0/wp.tcl
+++ b/web/cgi/alpine/1.0/wp.tcl
@@ -90,7 +90,7 @@ WPEval $wp_vars {
     WPCmd PEMessage $uid select [expr [lsearch $uidList $uid] >= 0]
   }
 
-  # sourced "page" get's CGI parms from environment
+  # sourced "page" gets CGI parms from environment
   if {[catch {WPTFScript $page} source]} {
     switch -regexp -- $page {
       addredit {
diff --git a/web/cgi/alpine/2.0/browse b/web/cgi/alpine/2.0/browse
index 9669fd8c..054e72f3 100755
--- a/web/cgi/alpine/2.0/browse
+++ b/web/cgi/alpine/2.0/browse
@@ -158,8 +158,8 @@ WPEval $browse_args {
     }
   }
 
-  # preform actions specfied in browse_args
-  # NOTE: basic stuff only to be executed in absense of JS
+  # perform actions specified in browse_args
+  # NOTE: basic stuff only to be executed in absence of JS
   if {[string length $pageFirst]} {
     set n 1
     set u [WPCmd PEMailbox uid 1]
@@ -240,7 +240,7 @@ WPEval $browse_args {
       # local libraries
       cgi_script type=text/javascript language="JavaScript" src="lib/common.js" {}
       cgi_script type=text/javascript language="JavaScript" src="lib/mailbox.js" {}
-      # page specfic JS
+      # page specific JS
       cgi_javascript {
 	cgi_puts "YAHOO.alpine.cgi_root = '$_wp(serverpath)';"
 	cgi_puts "YAHOO.alpine.app_root = '$_wp(serverpath)/$_wp(appdir)/$_wp(ui2dir)';"
diff --git a/web/cgi/alpine/2.0/common.tcl b/web/cgi/alpine/2.0/common.tcl
index 41e58a7a..76cd7293 100644
--- a/web/cgi/alpine/2.0/common.tcl
+++ b/web/cgi/alpine/2.0/common.tcl
@@ -742,7 +742,7 @@ proc setCurrentFolder {_c _f _u} {
     # verify $c $f (and $u if present) exists
     if {!($c == 0 && 0 == [string compare -nocase inbox $f])} {
       if {[catch {WPCmd PEFolder exists $c $f} result]} {
-	WPCmd PEInfo statmsg "Cannot test $f for existance: $result"
+	WPCmd PEInfo statmsg "Cannot test $f for existence: $result"
       } elseif {$result <= 0} {
 	WPCmd PEInfo statmsg "Folder $f in collection $c does not exist"
       }
diff --git a/web/cgi/alpine/2.0/compose b/web/cgi/alpine/2.0/compose
index bf6ce9ec..16cd437f 100755
--- a/web/cgi/alpine/2.0/compose
+++ b/web/cgi/alpine/2.0/compose
@@ -253,7 +253,7 @@ WPEval $compose_args {
 	cgi_exit
       }
 
-      # process action specfied by compose_args
+      # process action specified by compose_args
       switch $mode {
 	reply -
 	replyall {
diff --git a/web/cgi/alpine/2.0/conduit/export b/web/cgi/alpine/2.0/conduit/export
index 42a9f82b..2abf8ebd 100755
--- a/web/cgi/alpine/2.0/conduit/export
+++ b/web/cgi/alpine/2.0/conduit/export
@@ -141,7 +141,7 @@ WPEval $export_vars {
     exec /bin/chmod [cgi_tmpfile_permissions] $dfile
   }
 
-  # prepare to clean up if the brower never redirects
+  # prepare to clean up if the browser never redirects
   if {[info exists redirect]} {
     set redirect "${redirect}${safegivenname}?h=${rhandle}"
   } else {
diff --git a/web/cgi/alpine/2.0/conduit/flag.tcl b/web/cgi/alpine/2.0/conduit/flag.tcl
index 63018125..a20225cd 100755
--- a/web/cgi/alpine/2.0/conduit/flag.tcl
+++ b/web/cgi/alpine/2.0/conduit/flag.tcl
@@ -59,7 +59,7 @@ WPEval $flag_args {
 
 	foreach eu $u {
 	  if {[catch {WPCmd PEMessage $eu flag $flag $state} result]} {
-	    set result "FALURE: setting $eu to $setting : $result"
+	    set result "FAILURE: setting $eu to $setting : $result"
 	    break
 	  }
 	}
@@ -69,7 +69,7 @@ WPEval $flag_args {
 	}
       }
     } else {
-      set result "FAILURE: unkown flag ($f) or state ($s)"
+      set result "FAILURE: unknown flag ($f) or state ($s)"
     }
 
     cgi_puts $result
diff --git a/web/cgi/alpine/2.0/detach b/web/cgi/alpine/2.0/detach
index 780560cd..542038d2 100755
--- a/web/cgi/alpine/2.0/detach
+++ b/web/cgi/alpine/2.0/detach
@@ -153,7 +153,7 @@ WPEval $detach_vars {
 
   close $cfd
 
-  # prepare to clean up if the brower never redirects
+  # prepare to clean up if the browser never redirects
 
   cgi_http_head {
     # redirect to the place we stuffed the detach info.  use the ip address
diff --git a/web/cgi/alpine/2.0/help/contacts.html b/web/cgi/alpine/2.0/help/contacts.html
index 690dd76c..d2175c94 100644
--- a/web/cgi/alpine/2.0/help/contacts.html
+++ b/web/cgi/alpine/2.0/help/contacts.html
@@ -1,80 +1,80 @@
-
-
-
-
-
-Contacts: your address book
-
-
-
-
      
-
-
      Contacts: your address book
      
-
-
-
-
      Contacts allow you to store names, email addresses, and other information in a contact list, which serves as an address book. You can quickly send mail to a contact by retreiving information from your contact list.
      
-
-
      Adding a contact
      
-
-
      To add a contact
      
-
        
-  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
-  
      2. On the menu bar, click New Contact.
        3. 
-  
      3. Fill in the contact information:
        4. 
-  
          
-  
        • Nickname. A short name that you can use for quick addressing. If you type the nickname instead of the full display name or email address, Alpine will offer a list of matching choices from your contacts list and the University of Washington directory. You can select the contact from the list.
          • 
-  
        • Display Name. The name that appears in the message header.
          • 
-  
        • Email. The contact's email address.
          • 
-  
        • Notes. Any text you want. Used only by you.
          • 
-  
        • Fcc Folder. A folder that will receive copies of all messages that you send directly to this contact.
          • 
-  
        
-  
      4. Click Add.
        5. 
-

      
-
      To add a contact from a message
      
-
        
-
      • Drag the contact's email address from the From field to the Contacts folder.
-
        or
        • 
-
      • To the right of the From field, click Add.
        • 
-

      
-
      To add multiple contacts from a message
      
-
        
-  
      • On the menu bar, click More Actions, and then select Extract. Alpine extracts everything in the message that is in the format of an email address and presents a list of contacts. You can confirm each contact.
        • 
-

      
-
      Removing a contact
      
-
        
-  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
-  
      2. Select the contacts you wish to remove by checking the boxes to the left of the Display Names.
        3. 
-  
      3. On the menu bar, click Delete.
        4. 
-  
      4. Confirm that you want to Delete the contacts Forever.
        5. 
-

      
-
-
      Editing a contact
      
-
-
      To edit a contact
      
-
        
-  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
-  
      2. Click on the Display Name to edit the corresponding entry.
        3. 
-

      
-
-
      Creating a group contact
      
-
      A group contact is simply a contact with more than one email address.
      
-
      To add a group contact
      
-
        
-  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
-  
      2. On the menu bar, click New Group.
        3. 
-  
      3. Fill in the contact information like you would for a regular contact, except
        4. 
-  
      4. Group Email. Enter all of the addresses or nicknames separated by commas.
        5. 
-  
      5. Click Add.
        6. 
-

      
-
      
-
-
+
+
+
+
+
+Contacts: your address book
+
+
+
+
      
+
+
      Contacts: your address book
      
+
+
+
+
      Contacts allow you to store names, email addresses, and other information in a contact list, which serves as an address book. You can quickly send mail to a contact by retrieving information from your contact list.
      
+
+
      Adding a contact
      
+
+
      To add a contact
      
+
        
+  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
+  
      2. On the menu bar, click New Contact.
        3. 
+  
      3. Fill in the contact information:
        4. 
+  
          
+  
        • Nickname. A short name that you can use for quick addressing. If you type the nickname instead of the full display name or email address, Alpine will offer a list of matching choices from your contacts list and the University of Washington directory. You can select the contact from the list.
          • 
+  
        • Display Name. The name that appears in the message header.
          • 
+  
        • Email. The contact's email address.
          • 
+  
        • Notes. Any text you want. Used only by you.
          • 
+  
        • Fcc Folder. A folder that will receive copies of all messages that you send directly to this contact.
          • 
+  
        
+  
      4. Click Add.
        5. 
+

      
+
      To add a contact from a message
      
+
        
+
      • Drag the contact's email address from the From field to the Contacts folder.
+
        or
        • 
+
      • To the right of the From field, click Add.
        • 
+

      
+
      To add multiple contacts from a message
      
+
        
+  
      • On the menu bar, click More Actions, and then select Extract. Alpine extracts everything in the message that is in the format of an email address and presents a list of contacts. You can confirm each contact.
        • 
+

      
+
      Removing a contact
      
+
        
+  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
+  
      2. Select the contacts you wish to remove by checking the boxes to the left of the Display Names.
        3. 
+  
      3. On the menu bar, click Delete.
        4. 
+  
      4. Confirm that you want to Delete the contacts Forever.
        5. 
+

      
+
+
      Editing a contact
      
+
+
      To edit a contact
      
+
        
+  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
+  
      2. Click on the Display Name to edit the corresponding entry.
        3. 
+

      
+
+
      Creating a group contact
      
+
      A group contact is simply a contact with more than one email address.
      
+
      To add a group contact
      
+
        
+  
      1. In the left pane, click Contacts. Your contact list appears in the right pane.
        2. 
+  
      2. On the menu bar, click New Group.
        3. 
+  
      3. Fill in the contact information like you would for a regular contact, except
        4. 
+  
      4. Group Email. Enter all of the addresses or nicknames separated by commas.
        5. 
+  
      5. Click Add.
        6. 
+

      
+
      
+
+
diff --git a/web/cgi/alpine/2.0/help/folders.html b/web/cgi/alpine/2.0/help/folders.html
index dc05df0b..55c98346 100644
--- a/web/cgi/alpine/2.0/help/folders.html
+++ b/web/cgi/alpine/2.0/help/folders.html
@@ -1,96 +1,96 @@
-
-
-
-
-
-Folders: organizing your mail
-
-
-
-
      
-
-
      Folders: organizing your mail
      
-
-
-
-
      You can organize your mail into folders. Folders are displayed in the left pane. Some folders are provided by default:
      
-
        
-  
      • Inbox. Stores and displays your mail messages when they arrive, unless you have routed messages to another folder. You can drag and drop messages from the Inbox to other folders.
        • 
-  
      • Drafts. Stores any messages that have been saved during an editing session.
        • 
-  
      • Sent. By default, stores copies of all of your sent mail.
        • 
-  
      • Junk. Stores messages that have been caught by spam filtering and messages that you add by clicking Report Spam on the menu bar. On a weekly basis, Alpine deletes everything in the Junk folder that is dated before the previous week.
        • 
-  
      • Trash. Stores deleted messages, where thay can be recovered until they are permanently removed. For more information, see Trash.
        • 
-  
      • Recent Folders. This is a listing of the folders that you have opened recently. You can set the number of recent folders displayed in the left pane. For more information, see Settings.
        
-  

        • 
-  
      
-
      
-
      Note:
      
-
       When viewed in the folder list displayed by clicking View/Manage Folders, the default folders named Junk and Sent in the left pane appear under the names sent-mail and junk-mail.
      
-
      
-
-
      
-
-
      Viewing your list of folders
      
-
        
-  
      • In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.


        • 
-
      
-
      Viewing the messages in a folder
      
-
      To view the messages contained in a folder
      
-
        
-  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
-  
      2. Select the folder that you want to view by clicking its name. On the menu bar, click View Messages.
        3. 
-  
      3. Alternatively, double click the folder name.
        4. 
-

      
-
      Adding folders
      
-
        
-  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
-  
      2. On the menu bar, click New Folder.
        3. 
-  
      3. Enter a name for the new folder and click New Folder. If you want this new folder to be a subfolder within an existing folder, enter the name of the parent folder, followed by a slash ( / ), followed by the new folder name. For example, subdir/foldername.
        4. 
-  
      4. The new folder appears in the list.
        5. 
-

      
-
      Deleting folders
      
-
      
-
      Note:
      
-
      Unlike deleted messages, deleted folders are not moved to the Trash, and they cannot be retrieved.
      
-
      
-
      To delete a folder
      
-
        
-  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
-  
      2. Click the folder that you want to delete. On the menu bar, click Delete.
        3. 
-  
      3. Click Delete Forever to confirm.
        4. 
-

      
-
      Renaming folders
      
-
-
        
-  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
-  
      2. Click the folder that you want to rename. On the menu bar, click Rename.
        3. 
-  
      3. Enter the new name.
        4. 
-  
      4. Click Rename Folder to confirm.
        5. 
-

      
-
-
      Routing mail to folders
      
-
-
      You can set up Alpine to route incoming and outgoing messages to designated folders.
      
-
      To route a copy of an outgoing message to a folder
      
-
        
-  
      • Enter the folder name in the Fcc field in the composer.
        • 
-
      
-
-
      To route incoming messages to a folder
      
-
-
-
      
-
-
+
+
+
+
+
+Folders: organizing your mail
+
+
+
+
      
+
+
      Folders: organizing your mail
      
+
+
+
+
      You can organize your mail into folders. Folders are displayed in the left pane. Some folders are provided by default:
      
+
        
+  
      • Inbox. Stores and displays your mail messages when they arrive, unless you have routed messages to another folder. You can drag and drop messages from the Inbox to other folders.
        • 
+  
      • Drafts. Stores any messages that have been saved during an editing session.
        • 
+  
      • Sent. By default, stores copies of all of your sent mail.
        • 
+  
      • Junk. Stores messages that have been caught by spam filtering and messages that you add by clicking Report Spam on the menu bar. On a weekly basis, Alpine deletes everything in the Junk folder that is dated before the previous week.
        • 
+  
      • Trash. Stores deleted messages, where they can be recovered until they are permanently removed. For more information, see Trash.
        • 
+  
      • Recent Folders. This is a listing of the folders that you have opened recently. You can set the number of recent folders displayed in the left pane. For more information, see Settings.
        
+  

        • 
+  
      
+
      
+
      Note:
      
+
       When viewed in the folder list displayed by clicking View/Manage Folders, the default folders named Junk and Sent in the left pane appear under the names sent-mail and junk-mail.
      
+
      
+
+
      
+
+
      Viewing your list of folders
      
+
        
+  
      • In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.


        • 
+
      
+
      Viewing the messages in a folder
      
+
      To view the messages contained in a folder
      
+
        
+  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
+  
      2. Select the folder that you want to view by clicking its name. On the menu bar, click View Messages.
        3. 
+  
      3. Alternatively, double click the folder name.
        4. 
+

      
+
      Adding folders
      
+
        
+  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
+  
      2. On the menu bar, click New Folder.
        3. 
+  
      3. Enter a name for the new folder and click New Folder. If you want this new folder to be a subfolder within an existing folder, enter the name of the parent folder, followed by a slash ( / ), followed by the new folder name. For example, subdir/foldername.
        4. 
+  
      4. The new folder appears in the list.
        5. 
+

      
+
      Deleting folders
      
+
      
+
      Note:
      
+
      Unlike deleted messages, deleted folders are not moved to the Trash, and they cannot be retrieved.
      
+
      
+
      To delete a folder
      
+
        
+  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
+  
      2. Click the folder that you want to delete. On the menu bar, click Delete.
        3. 
+  
      3. Click Delete Forever to confirm.
        4. 
+

      
+
      Renaming folders
      
+
+
        
+  
      1. In the left pane, click View/Manage Folders. A list of your folders appears in the right pane.
        2. 
+  
      2. Click the folder that you want to rename. On the menu bar, click Rename.
        3. 
+  
      3. Enter the new name.
        4. 
+  
      4. Click Rename Folder to confirm.
        5. 
+

      
+
+
      Routing mail to folders
      
+
+
      You can set up Alpine to route incoming and outgoing messages to designated folders.
      
+
      To route a copy of an outgoing message to a folder
      
+
        
+  
      • Enter the folder name in the Fcc field in the composer.
        • 
+
      
+
+
      To route incoming messages to a folder
      
+
+
+
      
+
+
diff --git a/web/cgi/alpine/2.0/help/inbox.html b/web/cgi/alpine/2.0/help/inbox.html
index 716a19f1..45923639 100644
--- a/web/cgi/alpine/2.0/help/inbox.html
+++ b/web/cgi/alpine/2.0/help/inbox.html
@@ -1,145 +1,145 @@
-
-
-
-
-
-
-Your Inbox
-
-
-
-
      
-
-
-
      Your Inbox
      
-
-
-
-
      When you first log in to your mail account, you see your Inbox. Your Inbox stores and displays your mail messages.
      
-
      The main body of the display consists of one line per message. By default, your Inbox displays 25 messages on each page. Use the arrows at the right end of the menu bar or at the bottom of the browser window to move from page to page in the list.
      
-
      To change the number of messages displayed per page, see Settings.
      
-
      There is a checkbox at the start of each message line. To select a set of messages on which to perform an action (for example, Deleting) click in the checkbox. The checkbox at the top of the column selects/unselects all of the messages on the page.
      
-
      Viewing messages
      
-
      To read a message
      
-
        
-  
      • Click the Subject of the message.
        • 
-
      
-
      To read messages in other folders
      
-
        
-  
      • Click the desired folder in the left pane.
        • 
-

      
-
      Sorting messages
      
-
      By default the message index is sorted by Date, with the most recent messages coming first and the oldest messages at the bottom of the index. You can change this default sort order in Settings
      
-
        
-	
      • Sort by columns on the list. Click a column heading, such as From, Subject, or Date to sort by that field. Click on the small triangle next to the sort heading to reverse the sort order.
        • 
-
-	
      • Group by Thread. Groups all messages in the same conversation together, in a a tree view. This option is available in the Arrange menu bar above the column headings.
        • 
-
-	
      • Group by Subject. Groups all messages with the same subject together. This option is also only available in the Arrange menu.
        • 
-
-	
      • Sort by Arrival. Sometimes it is convenient to sort in the order that the messages were added to the folder instead of by the Date, which is usually similar but a little different. Select this option from the Arrange menu.
        • 
-

      
-
-
      Deleting messages
      
-
        
-	
      1. Select the messages you wish to delete by checking the boxes to the left of the messages.
        2. 
-	
      2. On the menu bar, click Delete.
        3. 
-
      
-
-
      When you click Delete, the selected messages are moved to the Trash, where you can delete them later. 
      
-
-
      Saving messages to a folder
      
-
      You can move or copy messages from the Inbox to a folder. Moving a message removes it from the Inbox while creating a copy in the designated folder. Copying a message leaves the message in the Inbox while creating a copy in the designated folder.
      
-
        
-  
      1. Select the box to the left of the message or messages that you wish to put in a folder.
        2. 
-  
      2. On the menu bar, locate the Move or Copy button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select Move or Copy.
        3. 
-  
      3. On the menu bar, click to Folder and select the target folder from the list, or select More Folders to see a list of all folders. If you select More Folders, click the target folder in the list, and then click Copy or Move.
        4. 
-

      
-
-
      Icons
      
-
      Several informative icons may appear to the left of the From column.
      
-
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
      IconMeaning
       New message
       The message includes an attachment
       You have replied to the message
       You have forwarded the message
       The message is addressed directly to you
       The message is cc'd to you
      
-
      In addition, messages that have not been read are displayed in bold text.
      
-
      Marking messages with stars
      
-
      You can mark messages with stars  Star  that appear in the far right column of the list. The stars can indicate anything that you like. For example, you might mark the most important messages with a star.
      
-
-
      To mark a message with a star
      
-
        
-  
      • Click in the rightmost column of the list on the row for that message or select Set Star from the More Actions menu in the menu bar.
        • 
-

      
-
      Reporting messages as spam
      
-
      If you get a message that you think should have been identified by the spam detection processes but wasn't, you may submit it for review, which may help improve the effectiveness of spam detection. 
      
-
      To report spam
      
-
        
-  
      1. Select the message or messages that you wish to report as spam by checking the boxes in the left column.
        2. 
-  
      2. On the menu bar, click Report Spam. A copy of the message is sent to the University of Washington spam detection process and the message is moved to your Junk folder.
        3. 
-

      
-
      Emptying trash
      
-
      When messages are deleted they are actually moved to the Trash folder and not immediately deleted. To permanently remove the messages you must empty the trash.
      
-
      To empty the entire contents of the trash
      
-
        
-  
      • Find the Trash folder in the left pane. If there are messages in the Trash folder you may click on the word Empty next to the Trash folder to empty it. This is also true of the Junk folder, which may be emptied in the same way.
        • 
-
      
-
      To permanently delete selected messages from the trash
      
-
        
-  
      1. In the  left pane, click Trash.
        2. 
-  
      2. Select the box to the left of the messages that you want to delete.
        3. 
-  
      3. On the menu bar, click Delete Forever. Be sure that you have selected the right messages; there is no confirmation screen for this action.
        4. 
-
      
-
      To recover messages from the trash
      
-
        
-  
      1. In the  left pane, click Trash.
        2. 
-  
      2. Select the box to the left of the messages that you want to recover.
        3. 
-  
      3. On the menu bar, locate the Move or Copy button. Skip this step if the one you want is already dislayed. If necessary, click the button and pull down the menu to select Move or Copy.
        4. 
-  
      4. On the menu bar, click to Folder and select the target folder from the list, or select More Folders to see a list of all folders. If you select More Folders, click the target folder in the list, and then click Copy or Move.
        5. 
-

      
-
      Drag and Drop Shortcuts
      
-
      You may grab a message by its From field and drag it over a folder in the left pane in order to move it to the folder. Alternatively, if you drag it to the Contacts list in the left pane and drop it there the From address will be added to your list of Contacts.
      
-
-
-
      
-
-
+
+
+
+
+
+
+Your Inbox
+
+
+
+
      
+
+
+
      Your Inbox
      
+
+
+
+
      When you first log in to your mail account, you see your Inbox. Your Inbox stores and displays your mail messages.
      
+
      The main body of the display consists of one line per message. By default, your Inbox displays 25 messages on each page. Use the arrows at the right end of the menu bar or at the bottom of the browser window to move from page to page in the list.
      
+
      To change the number of messages displayed per page, see Settings.
      
+
      There is a checkbox at the start of each message line. To select a set of messages on which to perform an action (for example, Deleting) click in the checkbox. The checkbox at the top of the column selects/unselects all of the messages on the page.
      
+
      Viewing messages
      
+
      To read a message
      
+
        
+  
      • Click the Subject of the message.
        • 
+
      
+
      To read messages in other folders
      
+
        
+  
      • Click the desired folder in the left pane.
        • 
+

      
+
      Sorting messages
      
+
      By default the message index is sorted by Date, with the most recent messages coming first and the oldest messages at the bottom of the index. You can change this default sort order in Settings
      
+
        
+	
      • Sort by columns on the list. Click a column heading, such as From, Subject, or Date to sort by that field. Click on the small triangle next to the sort heading to reverse the sort order.
        • 
+
+	
      • Group by Thread. Groups all messages in the same conversation together, in a a tree view. This option is available in the Arrange menu bar above the column headings.
        • 
+
+	
      • Group by Subject. Groups all messages with the same subject together. This option is also only available in the Arrange menu.
        • 
+
+	
      • Sort by Arrival. Sometimes it is convenient to sort in the order that the messages were added to the folder instead of by the Date, which is usually similar but a little different. Select this option from the Arrange menu.
        • 
+

      
+
+
      Deleting messages
      
+
        
+	
      1. Select the messages you wish to delete by checking the boxes to the left of the messages.
        2. 
+	
      2. On the menu bar, click Delete.
        3. 
+
      
+
+
      When you click Delete, the selected messages are moved to the Trash, where you can delete them later. 
      
+
+
      Saving messages to a folder
      
+
      You can move or copy messages from the Inbox to a folder. Moving a message removes it from the Inbox while creating a copy in the designated folder. Copying a message leaves the message in the Inbox while creating a copy in the designated folder.
      
+
        
+  
      1. Select the box to the left of the message or messages that you wish to put in a folder.
        2. 
+  
      2. On the menu bar, locate the Move or Copy button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select Move or Copy.
        3. 
+  
      3. On the menu bar, click to Folder and select the target folder from the list, or select More Folders to see a list of all folders. If you select More Folders, click the target folder in the list, and then click Copy or Move.
        4. 
+

      
+
+
      Icons
      
+
      Several informative icons may appear to the left of the From column.
      
+
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
      IconMeaning
       New message
       The message includes an attachment
       You have replied to the message
       You have forwarded the message
       The message is addressed directly to you
       The message is cc'd to you
      
+
      In addition, messages that have not been read are displayed in bold text.
      
+
      Marking messages with stars
      
+
      You can mark messages with stars  Star  that appear in the far right column of the list. The stars can indicate anything that you like. For example, you might mark the most important messages with a star.
      
+
+
      To mark a message with a star
      
+
        
+  
      • Click in the rightmost column of the list on the row for that message or select Set Star from the More Actions menu in the menu bar.
        • 
+

      
+
      Reporting messages as spam
      
+
      If you get a message that you think should have been identified by the spam detection processes but wasn't, you may submit it for review, which may help improve the effectiveness of spam detection. 
      
+
      To report spam
      
+
        
+  
      1. Select the message or messages that you wish to report as spam by checking the boxes in the left column.
        2. 
+  
      2. On the menu bar, click Report Spam. A copy of the message is sent to the University of Washington spam detection process and the message is moved to your Junk folder.
        3. 
+

      
+
      Emptying trash
      
+
      When messages are deleted they are actually moved to the Trash folder and not immediately deleted. To permanently remove the messages you must empty the trash.
      
+
      To empty the entire contents of the trash
      
+
        
+  
      • Find the Trash folder in the left pane. If there are messages in the Trash folder you may click on the word Empty next to the Trash folder to empty it. This is also true of the Junk folder, which may be emptied in the same way.
        • 
+
      
+
      To permanently delete selected messages from the trash
      
+
        
+  
      1. In the  left pane, click Trash.
        2. 
+  
      2. Select the box to the left of the messages that you want to delete.
        3. 
+  
      3. On the menu bar, click Delete Forever. Be sure that you have selected the right messages; there is no confirmation screen for this action.
        4. 
+
      
+
      To recover messages from the trash
      
+
        
+  
      1. In the  left pane, click Trash.
        2. 
+  
      2. Select the box to the left of the messages that you want to recover.
        3. 
+  
      3. On the menu bar, locate the Move or Copy button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select Move or Copy.
        4. 
+  
      4. On the menu bar, click to Folder and select the target folder from the list, or select More Folders to see a list of all folders. If you select More Folders, click the target folder in the list, and then click Copy or Move.
        5. 
+

      
+
      Drag and Drop Shortcuts
      
+
      You may grab a message by its From field and drag it over a folder in the left pane in order to move it to the folder. Alternatively, if you drag it to the Contacts list in the left pane and drop it there the From address will be added to your list of Contacts.
      
+
+
+
      
+
+
diff --git a/web/cgi/alpine/2.0/help/quick-start.html b/web/cgi/alpine/2.0/help/quick-start.html
index 68ce79b3..1f6b431f 100644
--- a/web/cgi/alpine/2.0/help/quick-start.html
+++ b/web/cgi/alpine/2.0/help/quick-start.html
@@ -1,136 +1,136 @@
-
-
-
-
-
-Alpine Help Pages
-
-
-
-
      
-
-
-
      Alpine Quick Start
      
-
-
-
      This page provides a quick overview of basic Alpine features and how to access them.
      
-
-
      Main parts of the Alpine screen
      
-
      The following figure shows a portion of the Alpine screen with the main parts identified. 
      
-
      Main parts of the screen
      
-
      Screen header

      
-
      Screen header
      
-
        
-  
      • The top portion provides links to University of Washington news and local weather. The top portion also displays error messages and comfirmation messages, such as confirming that you have moved or copied a message to a folder.
        • 
-  
      • The right side provides a bar graph representing the portion of your account's disk space allocation that is currently used.
        • 
-  
      • Below the bar graph are links for Settings (for customizing your mail),  Help (for displaying this Help system), and Sign out.
        • 
-
      
-
      Menu bar

      
-
      The menu bar provides commands needed for each Alpine screen. The two leftmost commands, Check Mail and Compose, are the same in all Alpine screens. The other commands change according to which Alpine screen is dislayed.
      
-
      Left pane

      
-
      The left pane displays:
      
-
        
-  
      • Search. For a basic search, type a word in the search box and click the search icon. For more search options, click Advanced Search.
        • 
-  
      • Inbox and other default folders. Your inbox contains your mail as it arrives, you can use other folders to organize your mail.
        • 
-  
      • Contacts. Click  to view and manage your contacts.
        • 
-  
      • Recent Folders. A list of the folders that you have recently accessed. You can control how many recent folders are listed (see Settings).
        • 
-  
      • View/Manage Folders. Click to view a list of all of your folders. From this list, you can add, delete, and rename folders.
        • 
-  
      
-    
      Right pane

      
-    
      
-
-
-
      Depending on what you are doing, the right pane displays one of five things:
      
-
        
-  
      •  Message lists. Display the contents of the folders in the left pane: Inbox, Drafts, Sent, and so forth. The message lists share a common format that allows you to view and manage your messages.
        • 
-  
      • The Compose window. Allows you to write and reply to messages.
        • 
-  
      • Your  folder list. A list of all Alpine folders, both the standard Alpine folders such as Inbox, and any folders that you create. You can manage your folders from this list.
        • 
-  
      • Your contacts list. A list of all of the contacts that you have created. The contacts list functions as your address book.
        • 
-  
      • The Settings window. Allows you to customize the appearance and behavior of Alpine for your account.


        • 
-
      
-
-
      Parts of the Compose window
      
-
      In the Compose window, you can write, send, and reply to messages. The following figure shows the main parts of the Compose window. 
      
-
      Compose screen
      
-
        
-  
      •  Header section (at the top). You use the header section to address the mail and control the text format.  
        • 
-  
-  
      • Message section (below the header). The message section is where you enter and format message text. 


        • 
-  
-
      
-
      Basic Alpine Features
      
-
      Viewing messages
      
-
      When you first log in, your Inbox is displayed in the right pane, showing a list of your mail messages. 
      
-
        
-  
      • By default, the list contains 25 messages per page. Click the arrows on the right side of the menu bar to move from page to page.
        • 
-  
      • You can sort messages in the list by clicking the column headings.
        • 
-  
      • You can drag and drop messages from the right pane to the folders in the left pane or to your contacts: click and hold on the name or email address in the From column to drag a message.
        • 
-  
      
-
      For more information, see Your Inbox.
      
-
      Reading mail
      
-
-
      To read a message, click on its Subject. For more information, see Reading mail.
      
-
-
      Sending mail
      
-
-To send a message, click Compose (or Reply or Forward) on the menu bar. For more information, see Compose: sending mail.
-
-
      Search
      
-
-
      To search for a message, type a search string in the Search box, at the top of the left pane. Click Advanced Search for more search options. For more information, see Search.
      
-
-
      Folders
      
-
-
      Folders help you keep your mail organized. Default folders, such as Inbox and Junk, are always there. You can also create your own folders by clicking View/Manage Folders. For more information, see Folders.
      
-
-
-
      Contacts
      
-
-
      You can create a contact list,which is a list of addresses that are important or that you frequently use. Click Contacts to add items to your contact list. For more information, click Contacts.
      
-
-
-
      Checking for new mail
      
-
-
      You can check for new mail from any Alpine window or folder without returning to your Inbox.
      
-
-
      To check for new mail  
      
-
        
-  
      • On the menu bar, click Check Mail. Alpine checks for new mail. If you have any new mail, a message appears in the middle of the screen header.
        • 
-  
      
-  
-
      Settings
      
-
      You can control the appearance and behavior of many parts of the Alpine screen. For more information, see Settings.
      
-
        
- 
-
      
-
      Trash
      
-
      When you delete a message, it is moved to the trash.  When you empty the trash or delete selected messages from the trash, they are removed permanently. You can also recover messages from the trash.
      
-
      To empty the entire contents of the trash
      
-
        
-  
      1. In the left pane, next to Trash, click [Empty]. 
        2. 
-  
      2. Click Empty Trash to confirm.
        3. 
-
      
-
      This permanently deletes all of the messages in the trash.
      
-
      To permanently delete selected messages from the trash
      
-
        
-  
      1. In the  left pane, click Trash.
        2. 
-  
      2. Select the box to the left of the messages that you want to delete.
        3. 
-  
      3. On the menu bar, click Delete Forever. Be sure that you have selected the right messages; there is no confirmation screen for this action.
        4. 
-
      
-
      To recover messages from the trash
      
-
        
-  
      1. In the  left pane, click Trash.
        2. 
-  
      2. Select the box to the left of the messages that you want to recover.
        3. 
-  
      3. On the menu bar, locate the Move or Copy button. Skip this step if the one you want is already dislayed. If necessary, click the button and pull down the menu to select Move or Copy.
        4. 
-  
      4. On the menu bar, click to Folder and select the target folder from the list, or select More Folders to see a list of all folders. If you select More Folders, click the target folder in the list, and then click Copy or Move.
        5. 
-
      
-
      
-
-
+
+
+
+
+
+Alpine Help Pages
+
+
+
+
      
+
+
+
      Alpine Quick Start
      
+
+
+
      This page provides a quick overview of basic Alpine features and how to access them.
      
+
+
      Main parts of the Alpine screen
      
+
      The following figure shows a portion of the Alpine screen with the main parts identified. 
      
+
      Main parts of the screen
      
+
      Screen header

      
+
      Screen header
      
+
        
+  
      • The top portion provides links to University of Washington news and local weather. The top portion also displays error messages and comfirmation messages, such as confirming that you have moved or copied a message to a folder.
        • 
+  
      • The right side provides a bar graph representing the portion of your account's disk space allocation that is currently used.
        • 
+  
      • Below the bar graph are links for Settings (for customizing your mail),  Help (for displaying this Help system), and Sign out.
        • 
+
      
+
      Menu bar

      
+
      The menu bar provides commands needed for each Alpine screen. The two leftmost commands, Check Mail and Compose, are the same in all Alpine screens. The other commands change according to which Alpine screen is displayed.
      
+
      Left pane

      
+
      The left pane displays:
      
+
        
+  
      • Search. For a basic search, type a word in the search box and click the search icon. For more search options, click Advanced Search.
        • 
+  
      • Inbox and other default folders. Your inbox contains your mail as it arrives, you can use other folders to organize your mail.
        • 
+  
      • Contacts. Click  to view and manage your contacts.
        • 
+  
      • Recent Folders. A list of the folders that you have recently accessed. You can control how many recent folders are listed (see Settings).
        • 
+  
      • View/Manage Folders. Click to view a list of all of your folders. From this list, you can add, delete, and rename folders.
        • 
+  
      
+    
      Right pane

      
+    
      
+
+
+
      Depending on what you are doing, the right pane displays one of five things:
      
+
        
+  
      •  Message lists. Display the contents of the folders in the left pane: Inbox, Drafts, Sent, and so forth. The message lists share a common format that allows you to view and manage your messages.
        • 
+  
      • The Compose window. Allows you to write and reply to messages.
        • 
+  
      • Your  folder list. A list of all Alpine folders, both the standard Alpine folders such as Inbox, and any folders that you create. You can manage your folders from this list.
        • 
+  
      • Your contacts list. A list of all of the contacts that you have created. The contacts list functions as your address book.
        • 
+  
      • The Settings window. Allows you to customize the appearance and behavior of Alpine for your account.


        • 
+
      
+
+
      Parts of the Compose window
      
+
      In the Compose window, you can write, send, and reply to messages. The following figure shows the main parts of the Compose window. 
      
+
      Compose screen
      
+
        
+  
      •  Header section (at the top). You use the header section to address the mail and control the text format.  
        • 
+  
+  
      • Message section (below the header). The message section is where you enter and format message text. 


        • 
+  
+
      
+
      Basic Alpine Features
      
+
      Viewing messages
      
+
      When you first log in, your Inbox is displayed in the right pane, showing a list of your mail messages. 
      
+
        
+  
      • By default, the list contains 25 messages per page. Click the arrows on the right side of the menu bar to move from page to page.
        • 
+  
      • You can sort messages in the list by clicking the column headings.
        • 
+  
      • You can drag and drop messages from the right pane to the folders in the left pane or to your contacts: click and hold on the name or email address in the From column to drag a message.
        • 
+  
      
+
      For more information, see Your Inbox.
      
+
      Reading mail
      
+
+
      To read a message, click on its Subject. For more information, see Reading mail.
      
+
+
      Sending mail
      
+
+To send a message, click Compose (or Reply or Forward) on the menu bar. For more information, see Compose: sending mail.
+
+
      Search
      
+
+
      To search for a message, type a search string in the Search box, at the top of the left pane. Click Advanced Search for more search options. For more information, see Search.
      
+
+
      Folders
      
+
+
      Folders help you keep your mail organized. Default folders, such as Inbox and Junk, are always there. You can also create your own folders by clicking View/Manage Folders. For more information, see Folders.
      
+
+
+
      Contacts
      
+
+
      You can create a contact list,which is a list of addresses that are important or that you frequently use. Click Contacts to add items to your contact list. For more information, click Contacts.
      
+
+
+
      Checking for new mail
      
+
+
      You can check for new mail from any Alpine window or folder without returning to your Inbox.
      
+
+
      To check for new mail  
      
+
        
+  
      • On the menu bar, click Check Mail. Alpine checks for new mail. If you have any new mail, a message appears in the middle of the screen header.
        • 
+  
      
+  
+
      Settings
      
+
      You can control the appearance and behavior of many parts of the Alpine screen. For more information, see Settings.
      
+
        
+ 
+
      
+
      Trash
      
+
      When you delete a message, it is moved to the trash.  When you empty the trash or delete selected messages from the trash, they are removed permanently. You can also recover messages from the trash.
      
+
      To empty the entire contents of the trash
      
+
        
+  
      1. In the left pane, next to Trash, click [Empty]. 
        2. 
+  
      2. Click Empty Trash to confirm.
        3. 
+
      
+
      This permanently deletes all of the messages in the trash.
      
+
      To permanently delete selected messages from the trash
      
+
        
+  
      1. In the  left pane, click Trash.
        2. 
+  
      2. Select the box to the left of the messages that you want to delete.
        3. 
+  
      3. On the menu bar, click Delete Forever. Be sure that you have selected the right messages; there is no confirmation screen for this action.
        4. 
+
      
+
      To recover messages from the trash
      
+
        
+  
      1. In the  left pane, click Trash.
        2. 
+  
      2. Select the box to the left of the messages that you want to recover.
        3. 
+  
      3. On the menu bar, locate the Move or Copy button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select Move or Copy.
        4. 
+  
      4. On the menu bar, click to Folder and select the target folder from the list, or select More Folders to see a list of all folders. If you select More Folders, click the target folder in the list, and then click Copy or Move.
        5. 
+
      
+
      
+
+
diff --git a/web/cgi/alpine/2.0/help/topic-list.html b/web/cgi/alpine/2.0/help/topic-list.html
index 6b75bf07..7c2643aa 100644
--- a/web/cgi/alpine/2.0/help/topic-list.html
+++ b/web/cgi/alpine/2.0/help/topic-list.html
@@ -1,101 +1,101 @@
-
-
-
-
-
-All Help Topics
-
-
-
-
      
-
-
-  
      All Help Topics
      
-  
      
-    
      Alpine Quick Start
      
-    
      
-      Main parts of the Alpine screen - 
-  Parts of the Compose window - 
- Basic Alpine Features
-    
      
-    
      Your Inbox
      
-    
      Viewing messages -
-	Sorting messages -
-	Deleting messages -
-	Saving messages to a folder -
-	Icons -
-	Marking messages with stars -
-	Reporting messages as spam -
-	Emptying trash -
-	Drag and Drop Shortcuts
-    
      
-    
      Reading mail
      
-    
      
-
-	Viewing a message - 
-	Viewing and downloading attachments - 
-	Displaying full headers - 
-	Replying  - 
-	Forwarding  - 
-	Adding contacts - 
-	Saving messages to a folder - 
-	Printing  -
-	Deleting a message  -
-	Reporting a message as spam
-    
      
-    
      Compose: sending mail
      
-    
      
-     
-	Writing messages - 
-	Including attachments - 
-	Sending, canceling, and saving drafts - 
-	Resuming drafts -
-	Headers - 
-	Automatic saves
-     
-    
      
-    
      Search
      
-    
      
-      
- 	Basic Index Search - 
-	Advanced Index Search -
-	Example -
-	Other Searches (Contacts and Folder List)
-      
-    
      
-    
      Folders: organizing your mail
      
-    
      
-      
-	Viewing your list of folders - 
-	Viewing the messages in a folder - 
-	Adding folders - 
-	Deleting folders - 
-	Renaming folders - 
-	Routing mail to folders
-    
-    
      
-
      Settings: customizing Alpine
      
-    
      
-	Message Display - 
-	Folders - 
-	Reply Options - 
-	Forwarding Options - 
-	Sent Message Options - 
-	Personal Preferences - 
-	News and Weather - 
-	Message List -
-	Message View -
-	Folders -
-	Compose -
-	Mail Servers -
-	Direcory Servers
-    
      
-
      Index
      
-    
           
      
-  
      
-
      
-
-
+
+
+
+
+
+All Help Topics
+
+
+
+
      
+
+
+  
      All Help Topics
      
+  
      
+    
      Alpine Quick Start
      
+    
      
+      Main parts of the Alpine screen - 
+  Parts of the Compose window - 
+ Basic Alpine Features
+    
      
+    
      Your Inbox
      
+    
      Viewing messages -
+	Sorting messages -
+	Deleting messages -
+	Saving messages to a folder -
+	Icons -
+	Marking messages with stars -
+	Reporting messages as spam -
+	Emptying trash -
+	Drag and Drop Shortcuts
+    
      
+    
      Reading mail
      
+    
      
+
+	Viewing a message - 
+	Viewing and downloading attachments - 
+	Displaying full headers - 
+	Replying  - 
+	Forwarding  - 
+	Adding contacts - 
+	Saving messages to a folder - 
+	Printing  -
+	Deleting a message  -
+	Reporting a message as spam
+    
      
+    
      Compose: sending mail
      
+    
      
+     
+	Writing messages - 
+	Including attachments - 
+	Sending, canceling, and saving drafts - 
+	Resuming drafts -
+	Headers - 
+	Automatic saves
+     
+    
      
+    
      Search
      
+    
      
+      
+ 	Basic Index Search - 
+	Advanced Index Search -
+	Example -
+	Other Searches (Contacts and Folder List)
+      
+    
      
+    
      Folders: organizing your mail
      
+    
      
+      
+	Viewing your list of folders - 
+	Viewing the messages in a folder - 
+	Adding folders - 
+	Deleting folders - 
+	Renaming folders - 
+	Routing mail to folders
+    
+    
      
+
      Settings: customizing Alpine
      
+    
      
+	Message Display - 
+	Folders - 
+	Reply Options - 
+	Forwarding Options - 
+	Sent Message Options - 
+	Personal Preferences - 
+	News and Weather - 
+	Message List -
+	Message View -
+	Folders -
+	Compose -
+	Mail Servers -
+	Directory Servers
+    
      
+
      Index
      
+    
           
      
+  
      
+
      
+
+
diff --git a/web/cgi/alpine/2.0/settings b/web/cgi/alpine/2.0/settings
index dc69487d..1821c6df 100755
--- a/web/cgi/alpine/2.0/settings
+++ b/web/cgi/alpine/2.0/settings
@@ -289,10 +289,10 @@ WPEval $settings_args {
 	      cgi_table_data class="body" {
 		set as_attach [WPCmd PEInfo feature forward-as-attachment]
 		cgi_radio_button forwardAs=inline id="forward_inline" [set_checked [expr {$as_attach == 0}]]
-		cgi_put " "
+		cgi_put " "
 		cgi_br
 		cgi_radio_button forwardAs=attached id="forward_attachment" [set_checked $as_attach]
-		cgi_put " "
+		cgi_put " "
 	      }
 	    }
 	    cgi_table_row {
diff --git a/web/cgi/alpine/2.0/view b/web/cgi/alpine/2.0/view
index 0466c2e2..469ba053 100755
--- a/web/cgi/alpine/2.0/view
+++ b/web/cgi/alpine/2.0/view
@@ -165,7 +165,7 @@ WPEval $view_args {
       # local libraries
       cgi_script type=text/javascript language="JavaScript" src="lib/common.js" {}
       cgi_script type=text/javascript language="JavaScript" src="lib/mailbox.js" {}
-      # page specfic JS
+      # page specific JS
       cgi_javascript {
 	cgi_puts "YAHOO.alpine.cgi_root = '$_wp(serverpath)';"
 	cgi_puts "YAHOO.alpine.app_root = '$_wp(serverpath)/$_wp(appdir)/$_wp(ui2dir)';"
diff --git a/web/cgi/session/.htaccess b/web/cgi/session/.htaccess
index a4f615c2..eb852fb7 100644
--- a/web/cgi/session/.htaccess
+++ b/web/cgi/session/.htaccess
@@ -21,7 +21,7 @@ RewriteEngine on
 RewriteCond %{SERVER_PORT} !=443
 
 #
-# Include SCRIPT_URL incase webpine package isn't in the
+# Include SCRIPT_URL in case webpine package isn't in the
 # root of the server's data
 #
 RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=permanent,L]
diff --git a/web/cgi/session/_htaccess b/web/cgi/session/_htaccess
index a4f615c2..eb852fb7 100644
--- a/web/cgi/session/_htaccess
+++ b/web/cgi/session/_htaccess
@@ -21,7 +21,7 @@ RewriteEngine on
 RewriteCond %{SERVER_PORT} !=443
 
 #
-# Include SCRIPT_URL incase webpine package isn't in the
+# Include SCRIPT_URL in case webpine package isn't in the
 # root of the server's data
 #
 RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=permanent,L]
diff --git a/web/config/alpine.tcl b/web/config/alpine.tcl
index 6d68ef76..8199c002 100644
--- a/web/config/alpine.tcl
+++ b/web/config/alpine.tcl
@@ -64,7 +64,7 @@ set _wp(defconf)	$_wp(conffile)
 # place for library files used by CGI scripts
 set _wp(lib)		[file join $_wp(fileroot) lib]
 
-# directory used temporarily to stage attatched and detached files
+# directory used temporarily to stage attached and detached files
 # this directory is owned by wwwrun:www
 set _wp(detachpath)	[file join $_wp(fileroot) detach]
 
diff --git a/web/src/alpined.d/alpined.c b/web/src/alpined.d/alpined.c
index 3d043d51..fc1834b6 100644
--- a/web/src/alpined.d/alpined.c
+++ b/web/src/alpined.d/alpined.c
@@ -100,7 +100,7 @@ static char rcsid[] = "$Id: alpined.c 1266 2009-07-14 18:39:12Z hubert@u.washing
 #define	FAKE_SCREEN_LENGTH	24
 
 /*
- * Aribtrary minimum display width (in characters)
+ * Arbitrary minimum display width (in characters)
  */
 #define	MIN_SCREEN_COLS		20
 
@@ -120,7 +120,7 @@ static char rcsid[] = "$Id: alpined.c 1266 2009-07-14 18:39:12Z hubert@u.washing
 
 
 /*
- * Posting error lenght max
+ * Posting error length max
  */
 #define	WP_MAX_POST_ERROR	128
 
@@ -5596,7 +5596,7 @@ PEMailboxCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
 	     * Returns: list of lists where:
 	     *		*  the first element is the name of the
 	     *		   field which may be "From", "Subject"
-	     *		   "Date" or the emtpy string.
+	     *		   "Date" or the empty string.
 	     *		*  the second element which is either
 	     *		   the percentage width or empty string
 	     */
@@ -5721,7 +5721,7 @@ PEMailboxCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
 
 			if(tomove && pseudo_selected(stream, msgmap)){
 
-			    /* save delted to Trash */
+			    /* save deleted to Trash */
 			    n = save(ps_global, stream,
 				     cp, ps_global->VAR_TRASH_FOLDER,
 				     msgmap, SV_FOR_FILT | SV_FIX_DELS);
@@ -5893,7 +5893,7 @@ PEMailboxCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
 		    /*
 		     * CMD: messagecount
 		     *
-		     * Returns: count of messsages in open mailbox
+		     * Returns: count of messages in open mailbox
 		     */
 		    Tcl_SetResult(interp,
 				  long2string(mn_get_total(sp_msgmap(ps_global->mail_stream))),
@@ -5919,7 +5919,7 @@ PEMailboxCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
 		    /*
 		     * CMD: selected
 		     *
-		     * Returns: count of selected messsages in open mailbox
+		     * Returns: count of selected messages in open mailbox
 		     */
 
 		    Tcl_SetResult(interp,
@@ -5931,7 +5931,7 @@ PEMailboxCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
 		    /*
 		     * CMD: searched
 		     *
-		     * Returns: count of searched messsages in open mailbox
+		     * Returns: count of searched messages in open mailbox
 		     */
 
 		    Tcl_SetResult(interp,
@@ -8098,7 +8098,7 @@ peMessageStatus(Tcl_Interp *interp, imapuid_t uid, int objc, Tcl_Obj **objv)
 int
 peMessageCharset(Tcl_Interp *interp, imapuid_t uid, int objc, Tcl_Obj **objv)
 {
-    /* everthing coming out of pith better be utf-8 */
+    /* everything coming out of pith better be utf-8 */
     Tcl_SetResult(interp, "UTF-8", TCL_STATIC);
     return(TCL_OK);
 }
@@ -14558,7 +14558,7 @@ PEClistCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST o
 			sh_ctxt->var.i = 1;
 			/* this for loop assumes that there are only two variable lists,
 			 * folder-collections and news-collections, a little more will
-			 * have to be done if we want to accomodate for the INHERIT
+			 * have to be done if we want to accommodate for the INHERIT
 			 * option introduced in 4.30.
 			 */
 			for(tctxt = nsh_ctxt->next; tctxt; tctxt = tctxt->next)
diff --git a/web/src/alpined.d/alpined.h b/web/src/alpined.d/alpined.h
index b16fd5bc..e3de5b30 100644
--- a/web/src/alpined.d/alpined.h
+++ b/web/src/alpined.d/alpined.h
@@ -41,7 +41,7 @@ extern char	 *peSocketName;
 extern STRLIST_S *peCertHosts;
 
 /*
- * Protoypes for various functions
+ * Prototypes for various functions
  */
 
 /* alpined.c */
diff --git a/web/src/alpined.d/imap.c b/web/src/alpined.d/imap.c
index a57e769d..be7bcb85 100644
--- a/web/src/alpined.d/imap.c
+++ b/web/src/alpined.d/imap.c
@@ -153,9 +153,9 @@ mm_log(char *string, long errflg)
 
 
 /*----------------------------------------------------------------------
-         recieve notification from IMAP
+         receive notification from IMAP
 
-  Args: stream  --  Mail stream message is relavant to 
+  Args: stream  --  Mail stream message is relevant to 
         string  --  The message text
         errflag --  Set if it is a serious error
 
@@ -344,7 +344,7 @@ mm_login_work(NETMBX *mb, char *user, char **passwd, long trial, char *usethispr
 /*----------------------------------------------------------------------
        Receive notification of an error writing to disk
       
-  Args: stream  -- The stream the error occured on
+  Args: stream  -- The stream the error occurred on
         errcode -- The system error code (errno)
         serious -- Flag indicating error is serious (mail may be lost)
 
diff --git a/web/src/alpined.d/imap.h b/web/src/alpined.d/imap.h
index 024e1781..471041b3 100644
--- a/web/src/alpined.d/imap.h
+++ b/web/src/alpined.d/imap.h
@@ -9,7 +9,7 @@
 #include "../../../pith/imap.h"
 
 
-/* exported protoypes */
+/* exported prototypes */
 long    alpine_tcptimeout(long, long);
 long    alpine_sslcertquery(char *, char *, char *);
 void    alpine_sslfailure(char *, char *, unsigned long);
diff --git a/web/src/alpined.d/signal.c b/web/src/alpined.d/signal.c
index 52d8e600..2f914fab 100644
--- a/web/src/alpined.d/signal.c
+++ b/web/src/alpined.d/signal.c
@@ -54,7 +54,7 @@ init_signals(void)
     signal(SIGHUP,  hup_signal);
     signal(SIGTERM, term_signal);
 
-    /* prepare for unforseen problems */
+    /* prepare for unforeseen problems */
     signal(SIGILL,  auger_in_signal);
     signal(SIGTRAP, auger_in_signal);
 #ifdef	SIGEMT
diff --git a/web/src/alpined.d/signal.h b/web/src/alpined.d/signal.h
index 3ae6bd50..f8cf014d 100644
--- a/web/src/alpined.d/signal.h
+++ b/web/src/alpined.d/signal.h
@@ -6,7 +6,7 @@
 #define _WEB_ALPINE_SIGNAL_INCLUDED
 
 
-/* exported protoypes */
+/* exported prototypes */
 void	init_signals(void);
 
 
diff --git a/web/src/cgi.tcl-1.10/HISTORY b/web/src/cgi.tcl-1.10/HISTORY
index 3fc80020..7e44d51c 100644
--- a/web/src/cgi.tcl-1.10/HISTORY
+++ b/web/src/cgi.tcl-1.10/HISTORY
@@ -45,7 +45,7 @@ Date	Version	Description
 		Added utf.cgi example to demonstrate UTF works for
 		mel@redolive.com.
 
-10/16/02 1.8.0	To accomodate open-ended forms in echo, modified cgi_input so
+10/16/02 1.8.0	To accommodate open-ended forms in echo, modified cgi_input so
 		that it accepts multiple values even in variables that don't
 		end with "List".  This opens a possible ambiguity (see
 		documentation) but only one that would've existed before had
@@ -91,7 +91,7 @@ Date	Version	Description
 		Added end tags for XHTML support.
 
 		Added cgi_link_url/label per John Koontz and rewrote cgi_link
-		to accomodate them.  Also added his cgi_button_link
+		to accommodate them.  Also added his cgi_button_link
 		temporarily.  Will experiment with this to test merit.
 
 11/3/00 1.4.3   Removed HTML formatted manual.  It lags the text version and
@@ -569,7 +569,7 @@ Date	Version	Description
 		Added support to suppress binary upload when using Expect.
 
 1/31/97 0.4.8	Andreas Kupries  needed dynamic control
-		of ouput.  Added user-defineable cgi_puts.
+		of output.  Added user-defineable cgi_puts.
 
 		Josh Lubell  reported binary file upload
 		was losing chars on large files.  Fixed.
@@ -583,7 +583,7 @@ Date	Version	Description
 
 		Add some more bulletproofing to catch broken boundary defns...
 
-		Evidentally QUERY_STRING doesn't have to be set even with GET.
+		Evidently QUERY_STRING doesn't have to be set even with GET.
 		CGI spec is vague enough to permit this.
 
 12/16/96 0.4.6	Giorgetti Federico  noted text file upload
@@ -592,7 +592,7 @@ Date	Version	Description
 12/10/96 0.4.5	Added support for binary file upload if using Expect extension.
 
 		Removed check for missing filenames in file upload.  This
-		can evidentally happen.  It is now the programmer's
+		can evidently happen.  It is now the programmer's
 		reptysponsibility to check for the length if null filenames are
 		unwanted.
 
diff --git a/web/src/cgi.tcl-1.10/cgi.tcl b/web/src/cgi.tcl-1.10/cgi.tcl
index 81667179..629bf239 100644
--- a/web/src/cgi.tcl-1.10/cgi.tcl
+++ b/web/src/cgi.tcl-1.10/cgi.tcl
@@ -2327,7 +2327,7 @@ proc cgi_cookie_get {args} {
 
 proc cgi_cookie_encode {in} {
     regsub -all " " $in "+" in
-    regsub -all "%" $in "%25" in   ;# must preceed other subs that produce %
+    regsub -all "%" $in "%25" in   ;# must precede other subs that produce %
     regsub -all ";" $in "%3B" in
     regsub -all "," $in "%2C" in
     regsub -all "\n" $in "%0D%0A" in
diff --git a/web/src/cgi.tcl-1.10/cgi.tcl.in b/web/src/cgi.tcl-1.10/cgi.tcl.in
index df426c08..b355c90f 100644
--- a/web/src/cgi.tcl-1.10/cgi.tcl.in
+++ b/web/src/cgi.tcl-1.10/cgi.tcl.in
@@ -2327,7 +2327,7 @@ proc cgi_cookie_get {args} {
 
 proc cgi_cookie_encode {in} {
     regsub -all " " $in "+" in
-    regsub -all "%" $in "%25" in   ;# must preceed other subs that produce %
+    regsub -all "%" $in "%25" in   ;# must precede other subs that produce %
     regsub -all ";" $in "%3B" in
     regsub -all "," $in "%2C" in
     regsub -all "\n" $in "%0D%0A" in
diff --git a/web/src/cgi.tcl-1.10/doc/ref.txt b/web/src/cgi.tcl-1.10/doc/ref.txt
index 79ddd721..de1e219f 100644
--- a/web/src/cgi.tcl-1.10/doc/ref.txt
+++ b/web/src/cgi.tcl-1.10/doc/ref.txt
@@ -338,7 +338,7 @@ HTTP HEADERS
 cgi_http_head cmds
 
 CGI scripts must produce various headers to explain how the remainder
-of the output is to be interpreted.  No other output may preceed this!
+of the output is to be interpreted.  No other output may precede this!
 
 With no argument, an HTML content type is produced if the script is
 running in the CGI environment.  This means that most people need not
@@ -963,7 +963,7 @@ The present implementation supports binary upload if you are using Tcl
 using a version of Tcl earlier than 8.1 with Expect but want to
 suppress binary loading, create the global variable
 _cgi(no_binary_upload).  (The reason you might want to suppress binary
-loading is that it is noticably slower.)
+loading is that it is noticeably slower.)
 
 **************************************************
 EXPORT
@@ -1187,7 +1187,7 @@ cgi_term text
 cgi_term_definition text
 
 cgi_term and cgi_term_definition are usually paired up (although they
-need not be) to creates terms and defintions.  They do not have to
+need not be) to creates terms and definitions.  They do not have to
 appear in a list container, but usually appear in a cgi_definition_list.
 
 ** List containers
diff --git a/web/src/cgi.tcl-1.10/example/image.cgi b/web/src/cgi.tcl-1.10/example/image.cgi
index e1321523..d23ec344 100755
--- a/web/src/cgi.tcl-1.10/example/image.cgi
+++ b/web/src/cgi.tcl-1.10/example/image.cgi
@@ -13,7 +13,7 @@ cgi_eval {
     Prototype Kilogram. It is made of 90% platinum, 10% iridium. It
     was assigned to the US in 1889 and is periodically recertified and
     traceable to [italic "The Kilogram"] held at
-    [url "Bureau International des Poids et Mesures" http://www.bipm.fr" $TOP]
+    [url "Bureau International des Poids et Measures" http://www.bipm.fr" $TOP]
     in France.)"
 
     # ignore the junk above this line - the crucial stuff is below
diff --git a/web/src/cgi.tcl-1.10/example/img.cgi b/web/src/cgi.tcl-1.10/example/img.cgi
index 4c84787d..38b980e5 100755
--- a/web/src/cgi.tcl-1.10/example/img.cgi
+++ b/web/src/cgi.tcl-1.10/example/img.cgi
@@ -13,7 +13,7 @@ cgi_eval {
 
     cgi_imglink ball $NIST_IMAGES/ball.gif alt=ball
     cgi_imglink birdies $NIST_IMAGES/brd-ln.gif alt=birdies
-    cgi_imglink daemon $NIST_IMAGES/bsd_daemon.gif "alt=Kirk McKusick's BSD deamon"
+    cgi_imglink daemon $NIST_IMAGES/bsd_daemon.gif "alt=Kirk McKusick's BSD daemon"
 
     # use white background because some of these images require it
     cgi_body bgcolor=#ffffff text=#00b0b0 {
diff --git a/web/src/cgi.tcl-1.10/example/vote.cnt b/web/src/cgi.tcl-1.10/example/vote.cnt
index 73bc9061..64d2007f 100644
--- a/web/src/cgi.tcl-1.10/example/vote.cnt
+++ b/web/src/cgi.tcl-1.10/example/vote.cnt
@@ -3,7 +3,7 @@
 2
 {it's got potential, needs more work} {Tcl/Tk: Saving the world one proc at a time} {Michael McLennan} mmc
 3
-24 {Tcl/Tk: Programmers by day, heros by the end of the quarter} {Michael McLennan} mmc
+24 {Tcl/Tk: Programmers by day, heroes by the end of the quarter} {Michael McLennan} mmc
 4
 39 {Tcl/Tk: The struggle between good and eval} {Michael McLennan} mmc
 6
diff --git a/web/src/cgi.tcl-1.10/install.mac b/web/src/cgi.tcl-1.10/install.mac
index a79c6b72..c0ab13e9 100644
--- a/web/src/cgi.tcl-1.10/install.mac
+++ b/web/src/cgi.tcl-1.10/install.mac
@@ -39,7 +39,7 @@ elaboration of this step:
 
       pkg_mkIndex cgi.tcl*
 
-  1c) Test if the package comand works by trying:
+  1c) Test if the package command works by trying:
 
       package require cgi
 
diff --git a/web/src/pubcookie/wp_gssapi_proxy.c b/web/src/pubcookie/wp_gssapi_proxy.c
index f23d6098..4fd6dca4 100644
--- a/web/src/pubcookie/wp_gssapi_proxy.c
+++ b/web/src/pubcookie/wp_gssapi_proxy.c
@@ -147,7 +147,7 @@ int cmd_write_nil() {
 
 /*
  * service principal in argv[1]
- * reqested username in argv[2]
+ * requested username in argv[2]
  */
   
 int main(int argc,char *argv[])
-- 
cgit v1.2.3-70-g09d2