* 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.

53 files changed, 640 insertions, 639 deletions

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
 <!---Config option for Collection lists?-->
 
 <a name="flags"><b>Setting status flags</b></a><p>
-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:
 <table border=0 cellpadding=4 style="margin-left:24">
  <tr>
   <td><font face=Courier><b>+</b></font></td>
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 <img src=../../images/slideout.gif style="vertical-align:middle"> 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 
-<img src=../../images/slidein.gif style="vertical-align:middle"> tab on the line containg the sort names.  You can click this
+<img src=../../images/slidein.gif style="vertical-align:middle"> 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 @@
 <h2>Why Web Alpine</h2>
 
 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.
 <p>
 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.
 
 <p>
 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:
  <td></td>
  <td></td>
  <td valign=top>Contains source files for Web Alpine's binary components which will be linked
- against the <tt>pith/</tt> libarary components.
+ against the <tt>pith/</tt> library components.
  </td>
  </td>
 </tr>
@@ -231,7 +231,7 @@ that defines where the Web Alpine application was unpacked on your system, and
 <dd>
 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.
 
 </dd>
@@ -264,7 +264,7 @@ a particular user.
 <h3>User Configuration</h3>
 <p>
 Since no user-initiated local file or mailbox access is permitted by (much less compiled into) the <tt>alpined</tt>,
-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 <tt>web/config/</tt> 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 <tt>alpined</tt> 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.
  <table width="75%" align=center bgcolor="#dddddd"><tr><td>
-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.
  </td></tr></table>
@@ -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 <tt>alpined</tt> 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.
 
 <h2>Appendix: Installation Tests</h2>
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:
   # <http://www.cs.tut.fi/~jkorpela/chars.html#encinfo>
 
   # 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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">

-<link type="text/css" rel="stylesheet" href="../css/help.css">

-<title>Contacts: your address book</title>

-</head>

-<body>

-<div id="header">

-  <div class="logo"> </div>

-  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>

-</div>

-<div id="content">

-

-<h1>Contacts: your address book</h1>

-

-<ul>

-	<li><a href="#add">Adding a contact</a></li>

-	<li><a href="#remove">Removing a contact</a></li>

-	<li><a href="#edit">Editing a contact</a></li>

-	<li><a href="#group">Creating a group contact</a></li>

-<br /><br /></ul>

-

-<p>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.</p>

-

-<h2><a name="add" id="add"></a>Adding a contact</h2>

-

-<p><strong>To add a contact</strong></p>

-<ol>

-  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>

-  <li>On the menu bar, click <strong>New Contact</strong>.</li>

-  <li>Fill in the contact information:</li>

-  <ul>

-  <li><strong>Nickname.</strong> 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.</li>

-  <li><strong>Display Name.</strong> The name that appears in the message header.</li>

-  <li><strong>Email.</strong> The contact's email address.</li>

-  <li><strong>Notes.</strong> Any text you want. Used only by you.</li>

-  <li><strong>Fcc Folder.</strong> A folder that will receive copies of all messages that you send directly to this contact.</li>

-  </ul>

-  <li>Click <strong>Add</strong>.</li>

-<br /><br /></ol>

-<p><strong>To add a contact from a message</strong></p>

-<ul>

-<li>Drag the contact's email address from the<strong> From</strong> field to the <strong>Contacts</strong> folder.

-<p><em>or</em></p></li>

-<li>To the right of the <strong>From</strong> field, click <strong>Add</strong>.</li>

-<br /><br /></ul>

-<p><strong>To add multiple contacts from a message</strong></p>

-<ul>

-  <li>On the menu bar, click <strong>More Actions</strong>, and then select <strong>Extract</strong>. 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.</li>

-<br /><br /></ul>

-<h2><a name="remove" id="remove"></a>Removing a contact</h2>

-<ol>

-  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>

-  <li>Select the contacts you wish to remove by checking the boxes to the left of the Display Names.</li>

-  <li>On the menu bar, click <strong>Delete</strong>.</li>

-  <li>Confirm that you want to <strong>Delete</strong> the contacts <strong>Forever</strong>.</li>

-<br /><br /></ol>

-

-<h2><a name="edit" id="edit"></a>Editing a contact</h2>

-

-<p><strong>To edit a contact</strong></p>

-<ol>

-  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>

-  <li>Click on the <strong>Display Name</strong> to edit the corresponding entry.</li>

-<br /><br /></ol>

-

-<h2><a name="group" id="group"></a>Creating a group contact</h2>

-<p>A group contact is simply a contact with more than one email address.</p>

-<p><strong>To add a group contact</strong></p>

-<ol>

-  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>

-  <li>On the menu bar, click <strong>New Group</strong>.</li>

-  <li>Fill in the contact information like you would for a regular contact, except</li>

-  <li><strong>Group Email.</strong> Enter all of the addresses or nicknames separated by commas.</li>

-  <li>Click <strong>Add</strong>.</li>

-<br /><br /></ol>

-</div>

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">
+<link type="text/css" rel="stylesheet" href="../css/help.css">
+<title>Contacts: your address book</title>
+</head>
+<body>
+<div id="header">
+  <div class="logo"> </div>
+  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>
+</div>
+<div id="content">
+
+<h1>Contacts: your address book</h1>
+
+<ul>
+	<li><a href="#add">Adding a contact</a></li>
+	<li><a href="#remove">Removing a contact</a></li>
+	<li><a href="#edit">Editing a contact</a></li>
+	<li><a href="#group">Creating a group contact</a></li>
+<br /><br /></ul>
+
+<p>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.</p>
+
+<h2><a name="add" id="add"></a>Adding a contact</h2>
+
+<p><strong>To add a contact</strong></p>
+<ol>
+  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>
+  <li>On the menu bar, click <strong>New Contact</strong>.</li>
+  <li>Fill in the contact information:</li>
+  <ul>
+  <li><strong>Nickname.</strong> 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.</li>
+  <li><strong>Display Name.</strong> The name that appears in the message header.</li>
+  <li><strong>Email.</strong> The contact's email address.</li>
+  <li><strong>Notes.</strong> Any text you want. Used only by you.</li>
+  <li><strong>Fcc Folder.</strong> A folder that will receive copies of all messages that you send directly to this contact.</li>
+  </ul>
+  <li>Click <strong>Add</strong>.</li>
+<br /><br /></ol>
+<p><strong>To add a contact from a message</strong></p>
+<ul>
+<li>Drag the contact's email address from the<strong> From</strong> field to the <strong>Contacts</strong> folder.
+<p><em>or</em></p></li>
+<li>To the right of the <strong>From</strong> field, click <strong>Add</strong>.</li>
+<br /><br /></ul>
+<p><strong>To add multiple contacts from a message</strong></p>
+<ul>
+  <li>On the menu bar, click <strong>More Actions</strong>, and then select <strong>Extract</strong>. 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.</li>
+<br /><br /></ul>
+<h2><a name="remove" id="remove"></a>Removing a contact</h2>
+<ol>
+  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>
+  <li>Select the contacts you wish to remove by checking the boxes to the left of the Display Names.</li>
+  <li>On the menu bar, click <strong>Delete</strong>.</li>
+  <li>Confirm that you want to <strong>Delete</strong> the contacts <strong>Forever</strong>.</li>
+<br /><br /></ol>
+
+<h2><a name="edit" id="edit"></a>Editing a contact</h2>
+
+<p><strong>To edit a contact</strong></p>
+<ol>
+  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>
+  <li>Click on the <strong>Display Name</strong> to edit the corresponding entry.</li>
+<br /><br /></ol>
+
+<h2><a name="group" id="group"></a>Creating a group contact</h2>
+<p>A group contact is simply a contact with more than one email address.</p>
+<p><strong>To add a group contact</strong></p>
+<ol>
+  <li>In the left pane, click <strong>Contacts</strong>. Your contact list appears in the right pane.</li>
+  <li>On the menu bar, click <strong>New Group</strong>.</li>
+  <li>Fill in the contact information like you would for a regular contact, except</li>
+  <li><strong>Group Email.</strong> Enter all of the addresses or nicknames separated by commas.</li>
+  <li>Click <strong>Add</strong>.</li>
+<br /><br /></ol>
+</div>
+</body>
+</html>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">

-<link type="text/css" rel="stylesheet" href="../css/help.css">

-<title>Folders: organizing your mail</title>

-</head>

-<body>

-<div id="header">

-  <div class="logo"> </div>

-  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>

-</div>

-<div id="content">

-

-<h2>Folders: organizing your mail</h2>

-

-<ul>	

-	<li><a href="#view">Viewing your list of folders</a></li>

-	<li><a href="#viewing">Viewing the messages in a folder</a></li>

-	<li><a href="#add">Adding folders</a></li>

-	<li><a href="#delete">Deleting folders</a></li>

-	<li><a href="#rename">Renaming folders</a></li>

-    	<li><a href="#route">Routing mail to folders</a></li>

-</ul>

-

-<p>You can organize your mail into folders. Folders are displayed in the left pane. Some folders are provided by default:</p>

-<ul>

-  <li><strong>Inbox.</strong> 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.</li>

-  <li><strong>Drafts.</strong> Stores any messages that have been saved during an editing session.</li>

-  <li><strong>Sent.</strong> By default, stores copies of all of your sent mail.</li>

-  <li><strong>Junk.</strong> Stores messages that have been caught by spam filtering and messages that you add by clicking <strong>Report Spam</strong> on the menu bar. On a weekly basis, Alpine deletes everything in the Junk folder that is dated before the previous week.</li>

-  <li><strong>Trash.</strong> Stores deleted messages, where thay can be recovered until they are permanently removed. For more information, see <a href="quick-start.html#trash">Trash</a>.</li>

-  <li><strong>Recent Folders.</strong> 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 <a href="settings.html#folders">Settings</a>.<br />

-  </li><br />

-  </ul>

-<div class="note">

-<h4>Note:</h4>

-<div> When viewed in the folder list displayed by clicking <strong>View/Manage Folders</strong>, the default folders named Junk and Sent in the left pane appear under the names sent-mail and junk-mail.</div>

-</div>

-

-<br />

-

-<h2><a name="view" id="view"></a>Viewing your list of folders</h2>

-<ul>

-  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li><br /><br />

-</ul>

-<h2><a name="viewing" id="viewing"></a>Viewing the messages in a folder</h2>

-<p><strong>To view the messages contained in a folder</strong></p>

-<ol>

-  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>

-  <li>Select the folder that you want to view by clicking its name. On the menu bar, click <strong>View Messages</strong>.</li>

-  <li>Alternatively, double click the folder name.</li>

-<br /><br /></ol>

-<h2><a name="add" id="add"></a>Adding folders</h2>

-<ol>

-  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>

-  <li>On the menu bar, click <strong>New Folder</strong>.</li>

-  <li>Enter a name for the new folder and click <strong>New Folder</strong>. 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, <strong>subdir/foldername</strong>.</li>

-  <li>The new folder appears in the list.</li>

-<br /><br /></ol>

-<h2><a name="delete" id="delete"></a>Deleting folders</h2>

-<div class="note">

-<h4>Note:</h4>

-<div>Unlike deleted <strong>messages</strong>, deleted <strong>folders</strong> are not moved to the Trash, and they cannot be retrieved.</div>

-</div>

-<p><strong>To delete a folder</strong></p>

-<ol>

-  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>

-  <li>Click the folder that you want to delete. On the menu bar, click <strong>Delete</strong>.</li>

-  <li>Click <strong>Delete Forever</strong> to confirm.</li>

-<br /><br /></ol>

-<h2><a name="rename" id="rename"></a>Renaming folders</h2>

-

-<ol>

-  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>

-  <li>Click the folder that you want to rename. On the menu bar, click <strong>Rename</strong>.</li>

-  <li>Enter the new name.</li>

-  <li>Click <strong>Rename Folder</strong> to confirm.</li>

-<br /><br /></ol>

-

-<h2><a name="route" id="route"></a>Routing mail to folders</h2>

-

-<p>You can set up Alpine to route incoming and outgoing messages to designated folders.</p>

-<p><strong>To route a copy of an outgoing message to a folder</strong></p>

-<ul>

-  <li>Enter the folder name in the <strong>Fcc</strong> field in the composer.</li>

-</ul>

-

-<p><strong>To route incoming messages to a folder</strong></p>

-<ul>

-  <li>See <a href="settings.html">Settings</a>. </li>

-<br /><br /></ul>

-

-</div>

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">
+<link type="text/css" rel="stylesheet" href="../css/help.css">
+<title>Folders: organizing your mail</title>
+</head>
+<body>
+<div id="header">
+  <div class="logo"> </div>
+  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>
+</div>
+<div id="content">
+
+<h2>Folders: organizing your mail</h2>
+
+<ul>	
+	<li><a href="#view">Viewing your list of folders</a></li>
+	<li><a href="#viewing">Viewing the messages in a folder</a></li>
+	<li><a href="#add">Adding folders</a></li>
+	<li><a href="#delete">Deleting folders</a></li>
+	<li><a href="#rename">Renaming folders</a></li>
+    	<li><a href="#route">Routing mail to folders</a></li>
+</ul>
+
+<p>You can organize your mail into folders. Folders are displayed in the left pane. Some folders are provided by default:</p>
+<ul>
+  <li><strong>Inbox.</strong> 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.</li>
+  <li><strong>Drafts.</strong> Stores any messages that have been saved during an editing session.</li>
+  <li><strong>Sent.</strong> By default, stores copies of all of your sent mail.</li>
+  <li><strong>Junk.</strong> Stores messages that have been caught by spam filtering and messages that you add by clicking <strong>Report Spam</strong> on the menu bar. On a weekly basis, Alpine deletes everything in the Junk folder that is dated before the previous week.</li>
+  <li><strong>Trash.</strong> Stores deleted messages, where they can be recovered until they are permanently removed. For more information, see <a href="quick-start.html#trash">Trash</a>.</li>
+  <li><strong>Recent Folders.</strong> 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 <a href="settings.html#folders">Settings</a>.<br />
+  </li><br />
+  </ul>
+<div class="note">
+<h4>Note:</h4>
+<div> When viewed in the folder list displayed by clicking <strong>View/Manage Folders</strong>, the default folders named Junk and Sent in the left pane appear under the names sent-mail and junk-mail.</div>
+</div>
+
+<br />
+
+<h2><a name="view" id="view"></a>Viewing your list of folders</h2>
+<ul>
+  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li><br /><br />
+</ul>
+<h2><a name="viewing" id="viewing"></a>Viewing the messages in a folder</h2>
+<p><strong>To view the messages contained in a folder</strong></p>
+<ol>
+  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>
+  <li>Select the folder that you want to view by clicking its name. On the menu bar, click <strong>View Messages</strong>.</li>
+  <li>Alternatively, double click the folder name.</li>
+<br /><br /></ol>
+<h2><a name="add" id="add"></a>Adding folders</h2>
+<ol>
+  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>
+  <li>On the menu bar, click <strong>New Folder</strong>.</li>
+  <li>Enter a name for the new folder and click <strong>New Folder</strong>. 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, <strong>subdir/foldername</strong>.</li>
+  <li>The new folder appears in the list.</li>
+<br /><br /></ol>
+<h2><a name="delete" id="delete"></a>Deleting folders</h2>
+<div class="note">
+<h4>Note:</h4>
+<div>Unlike deleted <strong>messages</strong>, deleted <strong>folders</strong> are not moved to the Trash, and they cannot be retrieved.</div>
+</div>
+<p><strong>To delete a folder</strong></p>
+<ol>
+  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>
+  <li>Click the folder that you want to delete. On the menu bar, click <strong>Delete</strong>.</li>
+  <li>Click <strong>Delete Forever</strong> to confirm.</li>
+<br /><br /></ol>
+<h2><a name="rename" id="rename"></a>Renaming folders</h2>
+
+<ol>
+  <li>In the left pane, click <strong>View/Manage Folders</strong>. A list of your folders appears in the right pane.</li>
+  <li>Click the folder that you want to rename. On the menu bar, click <strong>Rename</strong>.</li>
+  <li>Enter the new name.</li>
+  <li>Click <strong>Rename Folder</strong> to confirm.</li>
+<br /><br /></ol>
+
+<h2><a name="route" id="route"></a>Routing mail to folders</h2>
+
+<p>You can set up Alpine to route incoming and outgoing messages to designated folders.</p>
+<p><strong>To route a copy of an outgoing message to a folder</strong></p>
+<ul>
+  <li>Enter the folder name in the <strong>Fcc</strong> field in the composer.</li>
+</ul>
+
+<p><strong>To route incoming messages to a folder</strong></p>
+<ul>
+  <li>See <a href="settings.html">Settings</a>. </li>
+<br /><br /></ul>
+
+</div>
+</body>
+</html>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">

-<link type="text/css" rel="stylesheet" href="../css/cbn/screen.css">

-<link type="text/css" rel="stylesheet" href="../css/help.css">

-<title>Your Inbox</title>

-</head>

-<body>

-<div id="header">

-  <div class="logo"> </div>

-  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>

-</div>

-<div id="content">

-

-

-<h2>Your Inbox</h2>

-

-<ul>

-	<li><a href="#view">Viewing messages</a></li>

-	<li><a href="#sort">Sorting messages</a></li>

-	<li><a href="#delete">Deleting messages</a></li>

-	<li><a href="#folder">Saving messages to a folder</a></li>

-	<li><a href="#icons">Icons</a></li>

-	<li><a href="#stars">Marking messages with stars</a></li>

-	<li><a href="#spam">Reporting messages as spam</a></li>

-	<li><a href="#trash">Emptying trash</a></li>

-	<li><a href="#drag">Drag and Drop Shortcuts</a></li>

-</ul>

-

-<p>When you first log in to your mail account, you see your Inbox. Your Inbox stores and displays your mail messages.</p>

-<p>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.</p>

-<p>To change the number of messages displayed per page, see <a href="settings.html#display">Settings</a>.</p>

-<p>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.</p>

-<h2><a name="view" id="view"></a>Viewing messages</h2>

-<p><strong>To read a message</strong></p>

-<ul>

-  <li>Click the <b>Subject</b> of the message.</li>

-</ul>

-<p><strong>To read messages in other folders</strong></p>

-<ul>

-  <li>Click the desired folder in the left pane.</li>

-<br /><br /></ul>

-<h2><a name="sort" id="sort"></a>Sorting messages</h2>

-<p>By default the message index is sorted by <strong>Date</strong>, 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 <a href="settings.html">Settings</a></p>

-<ul>

-	<li><strong>Sort by columns on the list.</strong> Click a column heading, such as <strong>From</strong>, <strong>Subject</strong>, or <strong>Date</strong> to sort by that field. Click on the small triangle next to the sort heading to reverse the sort order.</li>

-

-	<li><strong>Group by Thread.</strong> Groups all messages in the same conversation together, in a a tree view. This option is available in the <strong>Arrange</strong> menu bar above the column headings.</li>

-

-	<li><strong>Group by Subject.</strong> Groups all messages with the same subject together. This option is also only available in the <strong>Arrange</strong> menu.</li>

-

-	<li><strong>Sort by Arrival.</strong> 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 <strong>Arrange</strong> menu.</li>

-<br /><br /></ul>

-

-<h2><a name="delete" id="delete"></a>Deleting messages</h2>

-<ol>

-	<li>Select the messages you wish to delete by checking the boxes to the left of the messages.</li>

-	<li>On the menu bar, click <strong>Delete</strong>.</li>

-</ol>

-

-<p>When you click <strong>Delete</strong>, the selected messages are moved to the Trash<a href="#trash"></a>, where you can delete them later. </p>

-

-<h2><a name="folder" id="folder"></a>Saving messages to a folder</h2>

-<p>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.</p>

-<ol>

-  <li>Select the box to the left of the message or messages that you wish to put in a folder.</li>

-  <li>On the menu bar, locate the <strong>Move</strong> or <strong>Copy</strong> button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select <strong>Move</strong> or <strong>Copy</strong>.</li>

-  <li>On the menu bar, click <strong>to Folder</strong> and select the target folder from the list, or select <strong>More Folders</strong> to see a list of all folders. If you select <strong>More Folders</strong>, click the target folder in the list, and then click <strong>Copy</strong> or <strong>Move</strong>.</li>

-<br /><br /></ol>

-

-<h2><a name="icons" id="icon"></a>Icons</h2>

-<p>Several informative icons may appear to the left of the <strong>From</strong> column.</p>

-

-<table  border="1">

-  <tr>

-    <th width="15%" >Icon</th>

-    <th width="80%" >Meaning</th>

-  </tr>

-  <tr>

-    <td><span class="sp spml spml1">&nbsp;</span></div></td>

-    <td>New message</td>

-  </tr>

-  <tr>

-    <td><span class="sp spml spml6">&nbsp;</span></div></td>

-    <td>The message includes an attachment</td>

-  </tr>

-  <tr>

-    <td><span class="sp spml spml2">&nbsp;</span></div></td>

-    <td>You have replied to the message</td>

-  </tr>

-  <tr>

-    <td><span class="sp spml spml3">&nbsp;</span></div></td>

-    <td>You have forwarded the message</td>

-  </tr>

-  <tr>

-    <td><span class="sp spml spml4">&nbsp;</span></div></td>

-    <td>The message is addressed directly to you</td>

-  </tr>

-  <tr>

-    <td><span class="sp spml spml5">&nbsp;</span></div></td>

-    <td>The message is cc'd to you</td>

-  </tr>

-</table>

-<p>In addition, messages that have not been read are displayed in bold text.</p>

-<h2><a name="stars" id="stars"></a>Marking messages with stars</h2>

-<p>You can mark messages with stars &nbsp;<img src="graphics/star.gif" alt="Star" width="17" height="17" />&nbsp; 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.</p>

-

-<p><strong>To mark a message with a star</strong></p>

-<ul>

-  <li>Click in the rightmost column of the list on the row for that message or select <strong>Set Star</strong> from the <strong>More Actions</strong> menu in the menu bar.</li>

-<br /><br /></ul>

-<h2><a name="spam" id="spam"></a>Reporting messages as spam</h2>

-<p>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. </p>

-<p><strong>To report spam</strong></p>

-<ol>

-  <li>Select the message or messages that you wish to report as spam by checking the boxes in the left column.</li>

-  <li>On the menu bar, click <strong>Report Spam</strong>. A copy of the message is sent to the University of Washington spam detection process and the message is moved to your <strong>Junk</strong> folder.</li>

-<br /><br /></ol>

-<h2><a name="trash" id="trash"></a>Emptying trash</h2>

-<p>When messages are deleted they are actually moved to the <strong>Trash</strong> folder and not immediately deleted. To permanently remove the messages you must empty the trash.</p>

-<p><strong>To empty the entire contents of the trash</strong></p>

-<ul>

-  <li>Find the <strong>Trash</strong> folder in the left pane. If there are messages in the Trash folder you may click on the word <strong>Empty</strong> next to the Trash folder to empty it. This is also true of the <strong>Junk</strong> folder, which may be emptied in the same way.</li>

-</ul>

-<p><strong>To permanently delete selected messages from the trash</strong></p>

-<ol>

-  <li>In the  left pane, click <strong>Trash</strong>.</li>

-  <li>Select the box to the left of the messages that you want to delete.</li>

-  <li>On the menu bar, click <strong>Delete Forever</strong>. Be sure that you have selected the right messages; there is no confirmation screen for this action.</li>

-</ol>

-<p><strong>To recover messages from the trash</strong></p>

-<ol>

-  <li>In the  left pane, click Trash.</li>

-  <li>Select the box to the left of the messages that you want to recover.</li>

-  <li>On the menu bar, locate the <strong>Move</strong> or <strong>Copy</strong> button. Skip this step if the one you want is already dislayed. If necessary, click the button and pull down the menu to select <strong>Move</strong> or <strong>Copy</strong>.</li>

-  <li>On the menu bar, click <strong>to Folder</strong> and select the target folder from the list, or select <strong>More Folders</strong> to see a list of all folders. If you select <strong>More Folders</strong>, click the target folder in the list, and then click <strong>Copy</strong> or <strong>Move</strong>.</li>

-<br /><br /></ol>

-<h2><a name="drag" id="drag"></a>Drag and Drop Shortcuts</h2>

-<p>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.</p>

-

-

-</div>

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">
+<link type="text/css" rel="stylesheet" href="../css/cbn/screen.css">
+<link type="text/css" rel="stylesheet" href="../css/help.css">
+<title>Your Inbox</title>
+</head>
+<body>
+<div id="header">
+  <div class="logo"> </div>
+  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>
+</div>
+<div id="content">
+
+
+<h2>Your Inbox</h2>
+
+<ul>
+	<li><a href="#view">Viewing messages</a></li>
+	<li><a href="#sort">Sorting messages</a></li>
+	<li><a href="#delete">Deleting messages</a></li>
+	<li><a href="#folder">Saving messages to a folder</a></li>
+	<li><a href="#icons">Icons</a></li>
+	<li><a href="#stars">Marking messages with stars</a></li>
+	<li><a href="#spam">Reporting messages as spam</a></li>
+	<li><a href="#trash">Emptying trash</a></li>
+	<li><a href="#drag">Drag and Drop Shortcuts</a></li>
+</ul>
+
+<p>When you first log in to your mail account, you see your Inbox. Your Inbox stores and displays your mail messages.</p>
+<p>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.</p>
+<p>To change the number of messages displayed per page, see <a href="settings.html#display">Settings</a>.</p>
+<p>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.</p>
+<h2><a name="view" id="view"></a>Viewing messages</h2>
+<p><strong>To read a message</strong></p>
+<ul>
+  <li>Click the <b>Subject</b> of the message.</li>
+</ul>
+<p><strong>To read messages in other folders</strong></p>
+<ul>
+  <li>Click the desired folder in the left pane.</li>
+<br /><br /></ul>
+<h2><a name="sort" id="sort"></a>Sorting messages</h2>
+<p>By default the message index is sorted by <strong>Date</strong>, 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 <a href="settings.html">Settings</a></p>
+<ul>
+	<li><strong>Sort by columns on the list.</strong> Click a column heading, such as <strong>From</strong>, <strong>Subject</strong>, or <strong>Date</strong> to sort by that field. Click on the small triangle next to the sort heading to reverse the sort order.</li>
+
+	<li><strong>Group by Thread.</strong> Groups all messages in the same conversation together, in a a tree view. This option is available in the <strong>Arrange</strong> menu bar above the column headings.</li>
+
+	<li><strong>Group by Subject.</strong> Groups all messages with the same subject together. This option is also only available in the <strong>Arrange</strong> menu.</li>
+
+	<li><strong>Sort by Arrival.</strong> 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 <strong>Arrange</strong> menu.</li>
+<br /><br /></ul>
+
+<h2><a name="delete" id="delete"></a>Deleting messages</h2>
+<ol>
+	<li>Select the messages you wish to delete by checking the boxes to the left of the messages.</li>
+	<li>On the menu bar, click <strong>Delete</strong>.</li>
+</ol>
+
+<p>When you click <strong>Delete</strong>, the selected messages are moved to the Trash<a href="#trash"></a>, where you can delete them later. </p>
+
+<h2><a name="folder" id="folder"></a>Saving messages to a folder</h2>
+<p>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.</p>
+<ol>
+  <li>Select the box to the left of the message or messages that you wish to put in a folder.</li>
+  <li>On the menu bar, locate the <strong>Move</strong> or <strong>Copy</strong> button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select <strong>Move</strong> or <strong>Copy</strong>.</li>
+  <li>On the menu bar, click <strong>to Folder</strong> and select the target folder from the list, or select <strong>More Folders</strong> to see a list of all folders. If you select <strong>More Folders</strong>, click the target folder in the list, and then click <strong>Copy</strong> or <strong>Move</strong>.</li>
+<br /><br /></ol>
+
+<h2><a name="icons" id="icon"></a>Icons</h2>
+<p>Several informative icons may appear to the left of the <strong>From</strong> column.</p>
+
+<table  border="1">
+  <tr>
+    <th width="15%" >Icon</th>
+    <th width="80%" >Meaning</th>
+  </tr>
+  <tr>
+    <td><span class="sp spml spml1">&nbsp;</span></div></td>
+    <td>New message</td>
+  </tr>
+  <tr>
+    <td><span class="sp spml spml6">&nbsp;</span></div></td>
+    <td>The message includes an attachment</td>
+  </tr>
+  <tr>
+    <td><span class="sp spml spml2">&nbsp;</span></div></td>
+    <td>You have replied to the message</td>
+  </tr>
+  <tr>
+    <td><span class="sp spml spml3">&nbsp;</span></div></td>
+    <td>You have forwarded the message</td>
+  </tr>
+  <tr>
+    <td><span class="sp spml spml4">&nbsp;</span></div></td>
+    <td>The message is addressed directly to you</td>
+  </tr>
+  <tr>
+    <td><span class="sp spml spml5">&nbsp;</span></div></td>
+    <td>The message is cc'd to you</td>
+  </tr>
+</table>
+<p>In addition, messages that have not been read are displayed in bold text.</p>
+<h2><a name="stars" id="stars"></a>Marking messages with stars</h2>
+<p>You can mark messages with stars &nbsp;<img src="graphics/star.gif" alt="Star" width="17" height="17" />&nbsp; 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.</p>
+
+<p><strong>To mark a message with a star</strong></p>
+<ul>
+  <li>Click in the rightmost column of the list on the row for that message or select <strong>Set Star</strong> from the <strong>More Actions</strong> menu in the menu bar.</li>
+<br /><br /></ul>
+<h2><a name="spam" id="spam"></a>Reporting messages as spam</h2>
+<p>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. </p>
+<p><strong>To report spam</strong></p>
+<ol>
+  <li>Select the message or messages that you wish to report as spam by checking the boxes in the left column.</li>
+  <li>On the menu bar, click <strong>Report Spam</strong>. A copy of the message is sent to the University of Washington spam detection process and the message is moved to your <strong>Junk</strong> folder.</li>
+<br /><br /></ol>
+<h2><a name="trash" id="trash"></a>Emptying trash</h2>
+<p>When messages are deleted they are actually moved to the <strong>Trash</strong> folder and not immediately deleted. To permanently remove the messages you must empty the trash.</p>
+<p><strong>To empty the entire contents of the trash</strong></p>
+<ul>
+  <li>Find the <strong>Trash</strong> folder in the left pane. If there are messages in the Trash folder you may click on the word <strong>Empty</strong> next to the Trash folder to empty it. This is also true of the <strong>Junk</strong> folder, which may be emptied in the same way.</li>
+</ul>
+<p><strong>To permanently delete selected messages from the trash</strong></p>
+<ol>
+  <li>In the  left pane, click <strong>Trash</strong>.</li>
+  <li>Select the box to the left of the messages that you want to delete.</li>
+  <li>On the menu bar, click <strong>Delete Forever</strong>. Be sure that you have selected the right messages; there is no confirmation screen for this action.</li>
+</ol>
+<p><strong>To recover messages from the trash</strong></p>
+<ol>
+  <li>In the  left pane, click Trash.</li>
+  <li>Select the box to the left of the messages that you want to recover.</li>
+  <li>On the menu bar, locate the <strong>Move</strong> or <strong>Copy</strong> button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select <strong>Move</strong> or <strong>Copy</strong>.</li>
+  <li>On the menu bar, click <strong>to Folder</strong> and select the target folder from the list, or select <strong>More Folders</strong> to see a list of all folders. If you select <strong>More Folders</strong>, click the target folder in the list, and then click <strong>Copy</strong> or <strong>Move</strong>.</li>
+<br /><br /></ol>
+<h2><a name="drag" id="drag"></a>Drag and Drop Shortcuts</h2>
+<p>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.</p>
+
+
+</div>
+</body>
+</html>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">

-<link type="text/css" rel="stylesheet" href="../css/help.css">

-<title>Alpine Help Pages</title>

-</head>

-<body>

-<div id="header">

-  <div class="logo"> </div>

-  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>

-</div>

-<div id="content">

-

-

-<h2>Alpine Quick Start</h2>

-

-

-<p>This page provides a quick overview of basic Alpine features and how to access them.</p>

-<ul>

-  <li><a href="#main">Main parts of the Alpine screen</a></li>

-  <li><a href="#compose">Parts of the Compose window</a></li>

-  <li><a href="#basic">Basic Alpine Features</a></li><br /><br />

-</ul>

-<h2><a name="main" id="main"></a>Main parts of the Alpine screen</h2>

-<p>The following figure shows a portion of the Alpine screen with the main parts identified. </p>

-<p><img src="graphics/parts.gif" alt="Main parts of the screen" width="426" height="186" /></p>

-<h3>Screen header<br /><br /><hr /></h3>

-<p><img src="graphics/screen-header.gif" alt="Screen header" width="445" height="54" /></p>

-<ul>

-  <li>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.</li>

-  <li>The right side provides a bar graph representing the portion of your account's disk space allocation that is currently used.</li>

-  <li>Below the bar graph are links for Settings (for customizing your mail),  Help (for displaying this Help system), and Sign out.</li>

-</ul>

-<h3>Menu bar<br /><br /><hr /></h3>

-<p>The menu bar provides commands needed for each Alpine screen. The two leftmost commands, <a href="#check">Check Mail</a> and <a href="compose.html">Compose</a>, are the same in all Alpine screens. The other commands change according to which Alpine screen is dislayed.</p>

-<h3>Left pane<br /><br /><hr /></h3>

-<p>The left pane displays:</p>

-<ul>

-  <li><strong>Search.</strong> For a basic search, type a word in the search box and click the search icon. For more search options, click Advanced Search.</li>

-  <li><strong>Inbox and other default folders.</strong> Your inbox contains your mail as it arrives, you can use other folders to organize your mail.</li>

-  <li><strong>Contacts.</strong> Click  to view and manage your contacts.</li>

-  <li><strong>Recent Folders.</strong> A list of the folders that you have recently accessed. You can control how many recent folders are listed (see Settings).</li>

-  <li><strong>View/Manage Folders.</strong> Click to view a list of all of your folders. From this list, you can add, delete, and rename folders.</li>

-  </ul>

-    <h3>Right pane<br /><br /><hr />

-    </h3>

-

-

-<p>Depending on what you are doing, the right pane displays one of five things:</p>

-<ul>

-  <li> <strong><a name="mlists" id="mlists"></a>Message lists.</strong> 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.</li>

-  <li><strong>The Compose window.</strong> Allows you to write and reply to messages.</li>

-  <li><strong>Your  folder list</strong>. 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.</li>

-  <li><strong>Your contacts list.</strong> A list of all of the contacts that you have created. The contacts list functions as your address book.</li>

-  <li><strong>The Settings window.</strong> Allows you to customize the appearance and behavior of Alpine for your account.</li><br /><br />

-</ul>

-

-<h2><a name="compose" id="compose"></a>Parts of the Compose window</h2>

-<p>In the Compose window, you can write, send, and reply to messages. The following figure shows the main parts of the Compose window. </p>

-<p><img src="graphics/compose.gif" alt="Compose screen" /></p>

-<ul>

-  <li> <strong>Header section</strong> (at the top). You use the header section to address the mail and control the text format.  </li>

-  

-  <li><strong>Message section</strong> (below the header). The message section is where you enter and format message text. </li><br /><br />

-  

-</ul>

-<h2><a name="basic" id="basic"></a>Basic Alpine Features</h2>

-<h3>Viewing messages<br /><hr /></h3>

-<p>When you first log in, your Inbox is displayed in the right pane, showing a list of your mail messages. </p>

-<ul>

-  <li>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.</li>

-  <li>You can sort messages in the list by clicking the column headings.</li>

-  <li>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.</li>

-  </ul>

-<p>For more information, see <a href="inbox.html">Your Inbox</a>.</p>

-<h3>Reading mail<br /><hr /></h3>

-

-<p>To read a message, click on its <strong>Subject</strong>. For more information, see <a href="read.html">Reading mail</a>.</p>

-

-<h3>Sending mail<br /><hr /></h3>

-

-To send a message, click <strong>Compose</strong> (or <strong>Reply</strong> or <strong>Forward</strong>) on the menu bar. For more information, see <a href="compose.html">Compose: sending mail</a>.

-

-<h3>Search<br /><hr /></h3>

-

-<p>To search for a message, type a search string in the <strong>Search</strong> box, at the top of the <a href="#main">left pane</a>. Click <strong>Advanced Search</strong> for more search options. For more information, see <a href="search.html">Search</a>.</p>

-

-<h3>Folders<br /><hr /></h3>

-

-<p>Folders help you keep your mail organized. Default folders, such as <strong>Inbox</strong> and <strong>Junk</strong>, are always there. You can also create your own folders by clicking <strong>View/Manage Folders</strong>. For more information, see <a href="folders.html">Folders</a>.</p>

-

-

-<h3>Contacts<br /><hr /></h3>

-

-<p>You can create a contact list,which is a list of addresses that are important or that you frequently use. Click <strong>Contacts</strong> to add items to your contact list. For more information, click <a href="contacts.html">Contacts</a>.</p>

-

-

-<h3><a name="check" id="check"></a>Checking for new mail<br /><hr /></h3>

-

-<p>You can check for new mail from any Alpine window or folder without returning to your Inbox.</p>

-

-<p><strong>To check for new mail  </strong></p>

-<ul>

-  <li>On the menu bar, click <strong>Check Mail</strong>. Alpine checks for new mail. If you have any new mail, a message appears in the middle of the <a href="#main">screen header</a>.</li>

-  </ul>

-  

-<h3>Settings<br /><hr /></h3>

-<p>You can control the appearance and behavior of many parts of the Alpine screen. For more information, see <a href="settings.html">Settings</a>.</p>

-<ul>

- 

-</ul>

-<h3><a name="trash" id="trash"></a>Trash<br /><hr /></h3>

-<p>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.</p>

-<p><strong>To empty the entire contents of the trash</strong></p>

-<ol>

-  <li>In the left pane, next to <strong>Trash</strong>, click <strong>[Empty]</strong>. </li>

-  <li>Click <strong>Empty Trash</strong> to confirm.</li>

-</ol>

-<p>This permanently deletes all of the messages in the trash.</p>

-<p><strong>To permanently delete selected messages from the trash</strong></p>

-<ol>

-  <li>In the  left pane, click <strong>Trash</strong>.</li>

-  <li>Select the box to the left of the messages that you want to delete.</li>

-  <li>On the menu bar, click <strong>Delete Forever</strong>. Be sure that you have selected the right messages; there is no confirmation screen for this action.</li>

-</ol>

-<p><strong>To recover messages from the trash</strong></p>

-<ol>

-  <li>In the  left pane, click Trash.</li>

-  <li>Select the box to the left of the messages that you want to recover.</li>

-  <li>On the menu bar, locate the <strong>Move</strong> or <strong>Copy</strong> button. Skip this step if the one you want is already dislayed. If necessary, click the button and pull down the menu to select <strong>Move</strong> or <strong>Copy</strong>.</li>

-  <li>On the menu bar, click <strong>to Folder</strong> and select the target folder from the list, or select <strong>More Folders</strong> to see a list of all folders. If you select <strong>More Folders</strong>, click the target folder in the list, and then click <strong>Copy</strong> or <strong>Move</strong>.</li>

-</ol>

-</div>

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">
+<link type="text/css" rel="stylesheet" href="../css/help.css">
+<title>Alpine Help Pages</title>
+</head>
+<body>
+<div id="header">
+  <div class="logo"> </div>
+  <div class="nav"><a href="topic-list.html">All Help Topics</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>
+</div>
+<div id="content">
+
+
+<h2>Alpine Quick Start</h2>
+
+
+<p>This page provides a quick overview of basic Alpine features and how to access them.</p>
+<ul>
+  <li><a href="#main">Main parts of the Alpine screen</a></li>
+  <li><a href="#compose">Parts of the Compose window</a></li>
+  <li><a href="#basic">Basic Alpine Features</a></li><br /><br />
+</ul>
+<h2><a name="main" id="main"></a>Main parts of the Alpine screen</h2>
+<p>The following figure shows a portion of the Alpine screen with the main parts identified. </p>
+<p><img src="graphics/parts.gif" alt="Main parts of the screen" width="426" height="186" /></p>
+<h3>Screen header<br /><br /><hr /></h3>
+<p><img src="graphics/screen-header.gif" alt="Screen header" width="445" height="54" /></p>
+<ul>
+  <li>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.</li>
+  <li>The right side provides a bar graph representing the portion of your account's disk space allocation that is currently used.</li>
+  <li>Below the bar graph are links for Settings (for customizing your mail),  Help (for displaying this Help system), and Sign out.</li>
+</ul>
+<h3>Menu bar<br /><br /><hr /></h3>
+<p>The menu bar provides commands needed for each Alpine screen. The two leftmost commands, <a href="#check">Check Mail</a> and <a href="compose.html">Compose</a>, are the same in all Alpine screens. The other commands change according to which Alpine screen is displayed.</p>
+<h3>Left pane<br /><br /><hr /></h3>
+<p>The left pane displays:</p>
+<ul>
+  <li><strong>Search.</strong> For a basic search, type a word in the search box and click the search icon. For more search options, click Advanced Search.</li>
+  <li><strong>Inbox and other default folders.</strong> Your inbox contains your mail as it arrives, you can use other folders to organize your mail.</li>
+  <li><strong>Contacts.</strong> Click  to view and manage your contacts.</li>
+  <li><strong>Recent Folders.</strong> A list of the folders that you have recently accessed. You can control how many recent folders are listed (see Settings).</li>
+  <li><strong>View/Manage Folders.</strong> Click to view a list of all of your folders. From this list, you can add, delete, and rename folders.</li>
+  </ul>
+    <h3>Right pane<br /><br /><hr />
+    </h3>
+
+
+<p>Depending on what you are doing, the right pane displays one of five things:</p>
+<ul>
+  <li> <strong><a name="mlists" id="mlists"></a>Message lists.</strong> 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.</li>
+  <li><strong>The Compose window.</strong> Allows you to write and reply to messages.</li>
+  <li><strong>Your  folder list</strong>. 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.</li>
+  <li><strong>Your contacts list.</strong> A list of all of the contacts that you have created. The contacts list functions as your address book.</li>
+  <li><strong>The Settings window.</strong> Allows you to customize the appearance and behavior of Alpine for your account.</li><br /><br />
+</ul>
+
+<h2><a name="compose" id="compose"></a>Parts of the Compose window</h2>
+<p>In the Compose window, you can write, send, and reply to messages. The following figure shows the main parts of the Compose window. </p>
+<p><img src="graphics/compose.gif" alt="Compose screen" /></p>
+<ul>
+  <li> <strong>Header section</strong> (at the top). You use the header section to address the mail and control the text format.  </li>
+  
+  <li><strong>Message section</strong> (below the header). The message section is where you enter and format message text. </li><br /><br />
+  
+</ul>
+<h2><a name="basic" id="basic"></a>Basic Alpine Features</h2>
+<h3>Viewing messages<br /><hr /></h3>
+<p>When you first log in, your Inbox is displayed in the right pane, showing a list of your mail messages. </p>
+<ul>
+  <li>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.</li>
+  <li>You can sort messages in the list by clicking the column headings.</li>
+  <li>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.</li>
+  </ul>
+<p>For more information, see <a href="inbox.html">Your Inbox</a>.</p>
+<h3>Reading mail<br /><hr /></h3>
+
+<p>To read a message, click on its <strong>Subject</strong>. For more information, see <a href="read.html">Reading mail</a>.</p>
+
+<h3>Sending mail<br /><hr /></h3>
+
+To send a message, click <strong>Compose</strong> (or <strong>Reply</strong> or <strong>Forward</strong>) on the menu bar. For more information, see <a href="compose.html">Compose: sending mail</a>.
+
+<h3>Search<br /><hr /></h3>
+
+<p>To search for a message, type a search string in the <strong>Search</strong> box, at the top of the <a href="#main">left pane</a>. Click <strong>Advanced Search</strong> for more search options. For more information, see <a href="search.html">Search</a>.</p>
+
+<h3>Folders<br /><hr /></h3>
+
+<p>Folders help you keep your mail organized. Default folders, such as <strong>Inbox</strong> and <strong>Junk</strong>, are always there. You can also create your own folders by clicking <strong>View/Manage Folders</strong>. For more information, see <a href="folders.html">Folders</a>.</p>
+
+
+<h3>Contacts<br /><hr /></h3>
+
+<p>You can create a contact list,which is a list of addresses that are important or that you frequently use. Click <strong>Contacts</strong> to add items to your contact list. For more information, click <a href="contacts.html">Contacts</a>.</p>
+
+
+<h3><a name="check" id="check"></a>Checking for new mail<br /><hr /></h3>
+
+<p>You can check for new mail from any Alpine window or folder without returning to your Inbox.</p>
+
+<p><strong>To check for new mail  </strong></p>
+<ul>
+  <li>On the menu bar, click <strong>Check Mail</strong>. Alpine checks for new mail. If you have any new mail, a message appears in the middle of the <a href="#main">screen header</a>.</li>
+  </ul>
+  
+<h3>Settings<br /><hr /></h3>
+<p>You can control the appearance and behavior of many parts of the Alpine screen. For more information, see <a href="settings.html">Settings</a>.</p>
+<ul>
+ 
+</ul>
+<h3><a name="trash" id="trash"></a>Trash<br /><hr /></h3>
+<p>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.</p>
+<p><strong>To empty the entire contents of the trash</strong></p>
+<ol>
+  <li>In the left pane, next to <strong>Trash</strong>, click <strong>[Empty]</strong>. </li>
+  <li>Click <strong>Empty Trash</strong> to confirm.</li>
+</ol>
+<p>This permanently deletes all of the messages in the trash.</p>
+<p><strong>To permanently delete selected messages from the trash</strong></p>
+<ol>
+  <li>In the  left pane, click <strong>Trash</strong>.</li>
+  <li>Select the box to the left of the messages that you want to delete.</li>
+  <li>On the menu bar, click <strong>Delete Forever</strong>. Be sure that you have selected the right messages; there is no confirmation screen for this action.</li>
+</ol>
+<p><strong>To recover messages from the trash</strong></p>
+<ol>
+  <li>In the  left pane, click Trash.</li>
+  <li>Select the box to the left of the messages that you want to recover.</li>
+  <li>On the menu bar, locate the <strong>Move</strong> or <strong>Copy</strong> button. Skip this step if the one you want is already displayed. If necessary, click the button and pull down the menu to select <strong>Move</strong> or <strong>Copy</strong>.</li>
+  <li>On the menu bar, click <strong>to Folder</strong> and select the target folder from the list, or select <strong>More Folders</strong> to see a list of all folders. If you select <strong>More Folders</strong>, click the target folder in the list, and then click <strong>Copy</strong> or <strong>Move</strong>.</li>
+</ol>
+</div>
+</body>
+</html>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">

-<link type="text/css" rel="stylesheet" href="../css/help.css">

-<title>All Help Topics</title>

-</head>

-<body>

-<div id="header">

-  <div class="logo"> </div>

-  <div class="nav"><a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:history.back()">Go Back</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>

-</div>

-<div id="content">

-

-

-  <h2>All Help Topics</h2>

-  <dl>

-    <dt><a href="quick-start.html">Alpine Quick Start</a></dt>

-    <dd>

-      <a href="quick-start.html#main">Main parts of the Alpine screen</a> - 

-  <a href="quick-start.html#compose">Parts of the Compose window</a> - 

- <a href="quick-start.html#basic">Basic Alpine Features</a></li>

-    </dd>

-    <dt><a href="inbox.html">Your Inbox</a></dt>

-    <dd><a href="inbox.html#view">Viewing messages</a> -

-	<a href="inbox.html#sort">Sorting messages</a> -

-	<a href="inbox.html#delete">Deleting messages</a> -

-	<a href="inbox.html#folder">Saving messages to a folder</a> -

-	<a href="inbox.html#icons">Icons</a> -

-	<a href="inbox.html#stars">Marking messages with stars</a> -

-	<a href="inbox.html#spam">Reporting messages as spam</a> -

-	<a href="inbox.html#trash">Emptying trash</a> -

-	<a href="inbox.html#drag">Drag and Drop Shortcuts</a>

-    </dd>

-    <dt><a href="read.html">Reading mail</a></dt>

-    <dd>

-

-	<a href="read.html#view">Viewing a message</a> - 

-	<a href="read.html#attachments">Viewing and downloading attachments</a> - 

-	<a href="read.html#full">Displaying full headers</a> - 

-	<a href="read.html#reply">Replying </a> - 

-	<a href="read.html#forward">Forwarding </a> - 

-	<a href="read.html#contacts">Adding contacts</a> - 

-	<a href="read.html#folder">Saving messages to a folder</a> - 

-	<a href="read.html#print">Printing </a> -

-	<a href="read.html#delete">Deleting a message </a> -

-	<a href="read.html#spam">Reporting a message as spam</a>

-    </dd>

-    <dt><a href="compose.html">Compose: sending mail</a></dt>

-    <dd>

-     

-	<a href="compose.html#writing">Writing messages</a> - 

-	<a href="compose.html#attachments">Including attachments</a> - 

-	<a href="compose.html#sending">Sending, canceling, and saving drafts</a> - 

-	<a href="compose.html#resuming">Resuming drafts</a> -

-	<a href="compose.html#headers">Headers</a> - 

-	<a href="compose.html#autosave">Automatic saves</a>

-     

-    </dd>

-    <dt><a href="search.html">Search</a></dt>

-    <dd>

-      

- 	<a href="search.html#inbox">Basic Index Search</a> - 

-	<a href="search.html#advanced">Advanced Index Search</a> -

-	<a href="search.html#example">Example</a> -

-	<a href="search.html#other">Other Searches (Contacts and Folder List)</a>

-      

-    </dd>

-    <dt><a href="folders.html">Folders: organizing your mail</a></dt>

-    <dd>

-      

-	<a href="folders.html#view">Viewing your list of folders</a> - 

-	<a href="folders.html#viewing">Viewing the messages in a folder</a> - 

-	<a href="folders.html#add">Adding folders</a> - 

-	<a href="folders.html#delete">Deleting folders</a> - 

-	<a href="folders.html#rename">Renaming folders</a> - 

-	<a href="folders.html#route">Routing mail to folders</a>

-    

-    </dd>

-<dt><a href="settings.html">Settings: customizing Alpine</a></dt>

-    <dd>

-	<a href="settings.html#display">Message Display</a> - 

-	<a href="settings.html#folders">Folders</a> - 

-	<a href="settings.html#reply">Reply Options</a> - 

-	<a href="settings.html#forward">Forwarding Options</a> - 

-	<a href="settings.html#fcc">Sent Message Options</a> - 

-	<a href="settings.html#personal">Personal Preferences</a> - 

-	<a href="settings.html#newsweather">News and Weather</a> - 

-	<a href="settings.html#msglist">Message List</a> -

-	<a href="settings.html#msgview">Message View</a> -

-	<a href="settings.html#folders">Folders</a> -

-	<a href="settings.html#compose">Compose</a> -

-	<a href="settings.html#mailservers">Mail Servers</a> -

-	<a href="settings.html#dirservers">Direcory Servers</a>

-    </dd>

-<dt><a href="alpha-index.html">Index</a></dt>

-    <dd>&nbsp;    </dd>

-  </dl>

-</div>

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1">
+<link type="text/css" rel="stylesheet" href="../css/help.css">
+<title>All Help Topics</title>
+</head>
+<body>
+<div id="header">
+  <div class="logo"> </div>
+  <div class="nav"><a href="alpha-index.html">Index</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:history.back()">Go Back</a> &nbsp;&nbsp;| &nbsp;&nbsp;<a href="javascript:self.close();">Close</a></div>
+</div>
+<div id="content">
+
+
+  <h2>All Help Topics</h2>
+  <dl>
+    <dt><a href="quick-start.html">Alpine Quick Start</a></dt>
+    <dd>
+      <a href="quick-start.html#main">Main parts of the Alpine screen</a> - 
+  <a href="quick-start.html#compose">Parts of the Compose window</a> - 
+ <a href="quick-start.html#basic">Basic Alpine Features</a></li>
+    </dd>
+    <dt><a href="inbox.html">Your Inbox</a></dt>
+    <dd><a href="inbox.html#view">Viewing messages</a> -
+	<a href="inbox.html#sort">Sorting messages</a> -
+	<a href="inbox.html#delete">Deleting messages</a> -
+	<a href="inbox.html#folder">Saving messages to a folder</a> -
+	<a href="inbox.html#icons">Icons</a> -
+	<a href="inbox.html#stars">Marking messages with stars</a> -
+	<a href="inbox.html#spam">Reporting messages as spam</a> -
+	<a href="inbox.html#trash">Emptying trash</a> -
+	<a href="inbox.html#drag">Drag and Drop Shortcuts</a>
+    </dd>
+    <dt><a href="read.html">Reading mail</a></dt>
+    <dd>
+
+	<a href="read.html#view">Viewing a message</a> - 
+	<a href="read.html#attachments">Viewing and downloading attachments</a> - 
+	<a href="read.html#full">Displaying full headers</a> - 
+	<a href="read.html#reply">Replying </a> - 
+	<a href="read.html#forward">Forwarding </a> - 
+	<a href="read.html#contacts">Adding contacts</a> - 
+	<a href="read.html#folder">Saving messages to a folder</a> - 
+	<a href="read.html#print">Printing </a> -
+	<a href="read.html#delete">Deleting a message </a> -
+	<a href="read.html#spam">Reporting a message as spam</a>
+    </dd>
+    <dt><a href="compose.html">Compose: sending mail</a></dt>
+    <dd>
+     
+	<a href="compose.html#writing">Writing messages</a> - 
+	<a href="compose.html#attachments">Including attachments</a> - 
+	<a href="compose.html#sending">Sending, canceling, and saving drafts</a> - 
+	<a href="compose.html#resuming">Resuming drafts</a> -
+	<a href="compose.html#headers">Headers</a> - 
+	<a href="compose.html#autosave">Automatic saves</a>
+     
+    </dd>
+    <dt><a href="search.html">Search</a></dt>
+    <dd>
+      
+ 	<a href="search.html#inbox">Basic Index Search</a> - 
+	<a href="search.html#advanced">Advanced Index Search</a> -
+	<a href="search.html#example">Example</a> -
+	<a href="search.html#other">Other Searches (Contacts and Folder List)</a>
+      
+    </dd>
+    <dt><a href="folders.html">Folders: organizing your mail</a></dt>
+    <dd>
+      
+	<a href="folders.html#view">Viewing your list of folders</a> - 
+	<a href="folders.html#viewing">Viewing the messages in a folder</a> - 
+	<a href="folders.html#add">Adding folders</a> - 
+	<a href="folders.html#delete">Deleting folders</a> - 
+	<a href="folders.html#rename">Renaming folders</a> - 
+	<a href="folders.html#route">Routing mail to folders</a>
+    
+    </dd>
+<dt><a href="settings.html">Settings: customizing Alpine</a></dt>
+    <dd>
+	<a href="settings.html#display">Message Display</a> - 
+	<a href="settings.html#folders">Folders</a> - 
+	<a href="settings.html#reply">Reply Options</a> - 
+	<a href="settings.html#forward">Forwarding Options</a> - 
+	<a href="settings.html#fcc">Sent Message Options</a> - 
+	<a href="settings.html#personal">Personal Preferences</a> - 
+	<a href="settings.html#newsweather">News and Weather</a> - 
+	<a href="settings.html#msglist">Message List</a> -
+	<a href="settings.html#msgview">Message View</a> -
+	<a href="settings.html#folders">Folders</a> -
+	<a href="settings.html#compose">Compose</a> -
+	<a href="settings.html#mailservers">Mail Servers</a> -
+	<a href="settings.html#dirservers">Directory Servers</a>
+    </dd>
+<dt><a href="alpha-index.html">Index</a></dt>
+    <dd>&nbsp;    </dd>
+  </dl>
+</div>
+</body>
+</html>
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 " <label for=forward_inline>Forward messsages inline</label>"
+		cgi_put " <label for=forward_inline>Forward messages inline</label>"
 		cgi_br
 		cgi_radio_button forwardAs=attached id="forward_attachment" [set_checked $as_attach]
-		cgi_put " <label for=forward_attachment>Forward messsages as attachments</label>"
+		cgi_put " <label for=forward_attachment>Forward messages as attachments</label>"
 	      }
 	    }
 	    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 <a.kupries@westend.com> needed dynamic control
-		of ouput.  Added user-defineable cgi_puts.
+		of output.  Added user-defineable cgi_puts.
 
 		Josh Lubell <lubell@cme.nist.gov> 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 <gio@egeo.unipg.it> 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[])