Spellcheck. Fixed some wording, and responded to clahey's suggestions--

2000-10-04  Aaron Weber  <aaron@helixcode.com>

	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
	responded to clahey's suggestions-- notably, commented out the
	"add to master list" category feature.

	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
        description.

	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
	entities.

	* C/usage-notes.sgml: Spellchecked, then decided to comment out
	this file/chapter and all references to it, since it's unlikely to
	be implemented any time soon.

	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
	  need more work in the near future.

	* C/usage-sync.sgml: Now it's really short. And spelled correctly.

2000-10-03  Aaron Weber  <aaron@helixcode.com>

	* C/config-prefs.sgml: Mostly spelling. Still needs major
	alteration.

	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
	ran spellcheck. Still needs lots of work, since many menus have
	changed.

	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
	spellchecked.

svn path=/trunk/; revision=5702

22 files changed, 1006 insertions, 782 deletions

diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index f13a56106a..7aa5e494dc 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -63,7 +63,7 @@
   <glossterm>Emoticon</glossterm>
   <glossdef>
    <para>
-     Also called smileys, emoticons are the little sideways faces made
+     Also called "smileys," emoticons are the little sideways faces made
      of colons and parentheses which people use to convey emotion in email.
      Examples: :-) or ;(  .
    </para>
@@ -89,7 +89,8 @@
     executable attachments, but before they can be run, the files must
     be marked as executable with a shell or file manager.  This
     security precaution prevents the automatic or accidental execution
-    of malicious programs.
+    of malicious programs. For more information on executables and file
+    permissions, see the documentation for your file manager or shell.
    </para>
   </glossdef>
  </glossentry>
@@ -131,10 +132,9 @@
   <glossterm>Haiku</glossterm>
   <glossdef>
    <para>
-     A Japanese form of poetry.  Haiku are unrhymed, and
-     three lines long. The first and last lines should have five
-     syllables, and the second line seven syllables.  The subject
-     matter is traditionally related to the seasons.
+     A traditional Japanese form of poetry.  The poems are three lines
+     long, with first and last lines having five syllables, and the
+     second line seven syllables.
    </para>
   </glossdef>
  </glossentry>
@@ -144,9 +144,9 @@
   <glossdef>
    <para>
     Hyper-text Markup Language(<acronym>HTML</acronym>) is the layout
-    language which all webpages are written in.  HTML can be used
-    inside of e-mails to insert images, justfiy text different ways,
-    and even include webpages inside the e-mail itself.
+    language which all web pages are written in.  HTML can be used
+    inside of e-mails to insert images, justify text different ways,
+    and even include web pages inside the e-mail itself.
    </para>
   </glossdef>
  </glossentry>
@@ -191,9 +191,9 @@
    <glossterm>LDAP</glossterm>
    <glossdef>
     <para>
-     LDAP is a protocol which allows a client to search through a
-     large database of addresses, phone numbers, and people, as an
-     alternative to a physical phone book.
+     LDAP, the Lightweight Directory Access Protocol, allows a client
+     to search through a large database of addresses, phone numbers,
+     and people stored on a server.
     </para>
    </glossdef>
   </glossentry>
@@ -251,12 +251,26 @@
   </glossdef>
  </glossentry>
 
+ <glossentry id="protocol">
+  <glossterm>Protocol</glossterm>
+  <glossdef>
+   <para>
+     An agreed-upon method of communication, especially one for
+     sending particular types of information between computer systems.
+     Examples include POP (Post Office Protocol), for email, and HTTP
+     (HypterText Transfer Protocol), for web pages.
+
+   </para>
+  </glossdef>
+ </glossentry>
+
+
  <glossentry id="regular-expression">
   <glossterm>Regular Expression</glossterm>
   <glossdef>
    <para>
       A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wildcard symbols.  For
+      string of text using metacharacters or wild-card symbols.  For
       example, the statement <userinput>fly*so[a|u]p</userinput> means
       "any phrase beginning with 'fly' and ending in 'soup' or
       'soap'".  If you searched for that expression, you'd find both
@@ -271,18 +285,37 @@
   <glossterm>Script</glossterm>
   <glossdef>
    <para>
-    A program which is written in an interpreted language, which can
-    be executed.
+    A program, which is written in an interpreted (rather than
+    compiled) language.  Scripts are more likely to work on multiple
+    platforms, but they require an additional layer of software (the
+    interpreter) which mediates between them and the operating system.
+    Because of this, they typically suffer from relatively sluggish
+    performance, and are limited to smaller tasks.
    </para>
   </glossdef>
  </glossentry>
 
+ <glossentry id="sendmail">
+  <glossterm>Sendmail</glossterm>
+  <glossdef>
+   <para>
+      As its name implies, <application>sendmail</application> is a
+      program which sends mail.  <application>Evolution</application>
+      can use it instead of <glossterm>SMTP</glossterm>; some people
+      prefer it because it offers more flexibility, but is more
+      difficult to set up.
+   </para>
+  </glossdef>
+ </glossentry>
+
+
  <glossentry id="shortcut-bar">
   <glossterm>Shortcut Bar</glossterm>
   <glossdef>
    <para>
-    The <interface>Shortcut Bar</interface> is where the user accesses
-    all the components of <application>Evolution</application> from.
+     A portion of <application>Evolution</application> which offers
+     users fast access to the most frequently used portions of the
+     application.
    </para>
   </glossdef>
  </glossentry>
@@ -291,22 +324,47 @@
    <glossterm>Signature</glossterm>
    <glossdef>
     <para>
-     Signatures allow a user to specify a message to place at the bottom of
-     every email sent.  A signature can be anything from a favorite quote to
-     a link to a webpage.
+     In email terms, a signature is a piece of text placed at the end
+     of every email sent, like a hand-written signature at the bottom
+     of a written letter.  A signature can be anything from a favorite
+     quotation to a link to a web page; courtesy dictates that it be
+     fewer than four lines long.
     </para>
    </glossdef>
   </glossentry> 
 
+  <glossentry id="SMTP">
+   <glossterm>SMTP</glossterm>
+   <glossdef>
+    <para>
+      This is the most common way of transporting mail messages from
+      the client's computer (you) to the server. SMTP stands for
+      Simple Mail Transfer Protocol.
+    </para>
+   </glossdef>
+  </glossentry> 
 
  <glossentry id="spam">
   <glossterm>Spam</glossterm>
   <glossdef>
    <para>
-    Spam: useless, unwanted e-mail.  Spam normally comes in forms of
-    chain-letters and advertisements for unscrupulous websites or
-    services.  Messages that are merely useless are called
-    "opt-in newsletters."
+    Useless, unwanted e-mail.  Spam normally comes in forms of
+    chain-letters and advertisements for unscrupulous web sites or
+    services.  Messages that are merely useless are called "opt-in
+    newsletters."
+   </para>
+  </glossdef>
+ <
+/glossentry>
+
+ <glossentry id="virus">
+  <glossterm>Virus</glossterm>
+  <glossdef>
+   <para>
+    A malicious program which inserts itself into others so that it will be 
+    executed, allowing it to spread to still more programs and other computers.
+    A virus can cause substantial damage by clogging networks or disk drives, 
+    deleting files, or opening security holes.
    </para>
   </glossdef>
  </glossentry>
@@ -315,8 +373,9 @@
   <glossterm>vFolder</glossterm>
   <glossdef>
    <para>
-    vFolders allow an e-mail to be shared among multiple folders, so
-    it appears that theres a copy of the e-mail in each folder.
+    An email organization tool. vFolders allows you to create a folder
+    that contains the results of a complex search. Folder contents are
+    are updated dynamically.
    </para>
   </glossdef>
  </glossentry>
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 7119f13580..7fee2fd340 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -22,12 +22,11 @@
         preferences are separated into several categories:
         <variablelist>
 	<varlistentry>
-          <term><guilabel>Identies</guilabel></term>
+          <term><guilabel>Identities</guilabel></term>
           <listitem>
 	    <para>
                This allows you to create and alter one or more
-               identities for your email: your name, address, and so
-               forth.
+               identities for your email.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -58,7 +57,7 @@
 	    <para>
               If you would like to use
               <application>Evolution</application> to read newsgroups,
-              you can secify your news server preferences here.
+              you can specify your news server preferences here.
            </para>
 	  </listitem>
 	</varlistentry>
@@ -99,7 +98,8 @@
          one address, you will only need to configure one identity. If
          you want, however, you can have multiple identities.  This
          can be useful if you want to keep personal and professional
-         email seperate.
+         email separate, or if you wear several hats at work.
+         
        </para>
        <para>
          To add a new identity, simply click
@@ -175,8 +175,10 @@
 	      <term><guilabel>Mail source type:</guilabel></term>
 	      <listitem>
 		<para>
-                  Select from IMAP, POP or Unix-style
-                  <filename>mbox</filename> files.
+                  Select from IMAP or POP servers, or Unix-style
+                  <systemitem><filename>mbox</filename></systemitem>
+                  or <systemitem><filename>mh</filename></systemitem>
+                  files.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -184,9 +186,9 @@
 	      <term> <guilabel>Server:</guilabel></term>
 	      <listitem>
 		<para>
-                  Enter the name of your mail server in this field.
-                  For example:
-                  <userinput>mail.mycompany.com</userinput>
+                  Enter the name of the mail source server in this
+                  field. If you use an  may or may not be the same as your
+                  <glossterm>SMTP</glossterm> server.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -194,10 +196,13 @@
 	      <term><guilabel>Username:</guilabel></term>
 	      <listitem>
 		<para>
-                  Enter your user name here.  This is often related to
-                  your real name, but not always. Examples include
-                  <guilabel>eltester</guilabel> and
-                  <guilabel>rupert</guilabel>.
+                  Enter the user name for the account you have on the
+                  server-- this should the part of your email address
+                  before the @.  If you use
+                  <systemitem><filename>mbox</filename></systemitem>
+                  or <systemitem><filename>mh</filename></systemitem>
+                  files as your mail source, you do not need to enter
+                  a username.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -229,11 +234,13 @@
           </para>
           <para>
             If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP or
-            <filename>mbox</filename> listings and check and download
-            all POP servers.  In other words, <guibutton>Get
-            Mail</guibutton> gets your mail, no matter how many
-            sources you have, or what types they are.
+            Mail</guibutton> will refresh any IMAP,
+            <systemitem><filename>mh</filename></systemitem>, or
+            <systemitem><filename>mbox</filename></systemitem>
+            listings and check and download mail from all POP servers.
+            In other words, <guibutton>Get Mail</guibutton> gets your
+            mail, no matter how many sources you have, or what types
+            they are.
           </para>
       </sect3>
 
@@ -252,8 +259,8 @@
         </para>
 	<para>
             To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server, which should look like:
-            <userinput>smtp.isp.net</userinput>.
+            name of your SMTP server.  It may have the same name as
+            your mail source server.
          </para>
          <para>
             <application>Evolution</application> can attempt to
@@ -345,9 +352,11 @@
        <para>
           To set your calendar preferences, select
           <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar Configuration</guimenuitem></menuchoice>.  This
-          will open up the <interface>Preferences</interface> window.
-          It contains four tabs: <guilabel>Time display</guilabel>,
+          <guimenuitem>Calendar
+          Configuration</guimenuitem></menuchoice> from the Calendar
+          view.  This will open up the
+          <interface>Preferences</interface> window.  It contains four
+          tabs: <guilabel>Time display</guilabel>,
           <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
           and <guilabel>Alarms</guilabel>.  The <interface>calendar
           preferences window</interface> is illustrated in <xref
@@ -553,7 +562,7 @@
 	    at you for any alarms you have set.  If you leave this box
 	    unchecked, <application>Evolution</application> will only
 	    alert you to events by opening a dialog box. These beeps
-	    are distict from full-fledged audio alarms.
+	    are distinct from full-fledged audio alarms.
            </para>
 	  </listitem>
 	  <listitem>
@@ -573,11 +582,9 @@
       </para>
     </sect2>
 
+   </sect1>
 
-  </sect1>
-
-
-    <sect1 id="config-prefs-contact">
+   <sect1 id="config-prefs-contact">
       <title>Managing the Contact Manager</title>
 	<para>
           To set the behavior of your Contact Manager, click on the
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index 966c62cfc2..392a0bbfc1 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -21,7 +21,8 @@
       </para>
       <para>
          The setup assistant (sometimes called a
-	 <glossterm>Druid</glossterm>) will guide you through the
+	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
+	 that some other programs use) will guide you through the
 	 network configuration process.  It will ask you for some
 	 basic information; your system administrator or ISP should
 	 have the answers you'll need.  The mail setup assistant is
@@ -46,15 +47,14 @@
         <variablelist>
 
           <varlistentry>
-               <term> <guilabel>Name:</guilabel> </term>
-	  <listitem> <para>Your
-            full name: eg. Eva Lucianne Tester </para></listitem>
+               <term> <guilabel>Name:</guilabel> </term> <listitem>
+	  <para>Your full name. </para></listitem>
          </varlistentry>
 
        <varlistentry>
           <term><guilabel>Email address:</guilabel></term>
 	  <listitem><para>
-                 Your email address: eg. eltester@helixcode.com
+                 Your complete email address.
                  </para></listitem>
        </varlistentry>
 
@@ -62,10 +62,9 @@
           <term> <guilabel>Organization:</guilabel></term>
 	  <listitem>
 	    <para>
-              Any organization you represent; often, the company where
-              you work.  Leave this blank if you wish.  One person I
-              know always puts "My own bad self" in this box, so
-              people know his opinions are his alone.
+              Any organization you represent, or the company where you
+              work.  Leave this blank if you wish, or type "My own bad
+              self" so people know your opinions are yours alone.
             </para>
 	  </listitem>
       </varlistentry>
@@ -77,7 +76,7 @@
              A text file appended to any email you send.  A signature
              file typically consists of your name and email address,
              or a quotation you like.  It's good form to keep your
-             "sig" on the short side: four lines is plenty. Remeber,
+             "sig" on the short side: four lines is plenty. Remember,
              this is attached to every email you send.
             </para>
          </listitem>
@@ -87,23 +86,32 @@
            <term> <guilabel>Mail source type:</guilabel></term>
 	  <listitem>
 	    <para>
-              <application>Evolution</application> supports three mail
-              sources: <glossterm>POP</glossterm> servers,
+              <application>Evolution</application> supports several
+              mail sources: <glossterm>POP</glossterm> and
               <glossterm>IMAP</glossterm> servers, and UNIX-style
-              <filename>mbox</filename> files.  POP servers retrieve
-              your mail and store it on your local system so you can
-              refer to it even when not connected to a network;
-              <glossterm>IMAP</glossterm> servers store the mail on
-              the server so you can access it from multiple locations;
-              UNIX-style <filename>mbox</filename> files are used by
-              your computer for internal mail, and may be useful if
-              you want to switch from another email client such as
-              <application>spruce</application> or
-              <application>mutt</application>.  Ask your system
-              administrator which you should use, or keep guessing
-              until one works.  You may use multiple servers if you
-              wish; see <xref linkend="config-prefs-mail-network"> for
-              more information.
+              <systemitem><filename>mbox</filename></systemitem> and
+              <systemitem><filename>mh</filename></systemitem> files.
+              POP servers retrieve your mail and store it on your
+              local system so you can refer to it even when not
+              connected to a network; <glossterm>IMAP</glossterm>
+              servers store the mail on the server so you can access
+              it from multiple locations;
+              <systemitem><filename>mbox</filename>></systemitem>
+              files are used by your computer for internal mail, and
+              may be useful if you want to switch from another email
+              client such as <application>Spruce</application> or
+              <application>Netscape Communicator</application>.  Ask
+              your system administrator which you should use, or keep
+              guessing until one works.  You may use multiple sources
+              if you wish; see <xref
+              linkend="config-prefs-mail-network"> for more
+              information.
+            </para>
+            <para>
+              If you decide not to have
+              <application>Evolution</application> use any servers,
+              the remaining items are not relevant; you only need to
+              point to the location of the files you wish to access.
             </para>
 	  </listitem>
 	  </varlistentry>
@@ -112,9 +120,10 @@
           <term> <guilabel>Server:</guilabel></term>
 	  <listitem>
 	    <para>
-              This should be the name of your mail server: it should
-              look something like:
-              <userinput>mailserver.organization.org</userinput>.
+              This should be the name of the server where you check
+              your mail, if you use one.  It may be the same as the
+              server where you send your outgoing mail, if you use
+              one.
             </para>
 	  </listitem>
 	</varlistentry>
@@ -123,8 +132,9 @@
 	  <term><guilabel>Username:</guilabel></term>
 	<listitem>
              <para>
-              Normally, this is the part of your email address before
-              the @ character, and
+              Enter the username for your mail server account, if you
+              have one. Normally, this is the part of your email
+              address before the @ character, and
               <application>Evolution</application> has selected that
               value as the default.  If you have a different username,
               you can enter it here.
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 9cab3a8bf8..8ec98271cc 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -5,7 +5,6 @@
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-NOTES SYSTEM "usage-notes.sgml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
 <!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
@@ -20,7 +19,11 @@
 ]>
 
 
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and entity names correspond.  APX is for appendix.  -->
+<!-- Almost every chapter is an entity.  Files, Chapter id's, and
+entity names correspond.  APX is for appendix. Note that there is no
+entity for apx-notes.sgml, which is still included in the file
+set. Reinstate the entity if and when the Notes feature is
+implemented. -->
 
 <book id="index">
   <bookinfo>
@@ -92,7 +95,7 @@
     &USAGE-MAIL;
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
-    &USAGE-NOTES;
+<!--   &USAGE-NOTES; -->
     &USAGE-SYNC;
 
   </part>
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index b4ae8d4f83..a3ba7e7b34 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -5,10 +5,11 @@
 <chapter id="menuref">
   <title>Menu Reference</title>
   <para>
-    This section will serve as a reference for every capability that
-    <application>Evolution</application> has.  When menu items are
-    repeated in <application>Evolution</application>, they're repeated
-    here too.
+    This section will serve as a reference for every menu that
+    <application>Evolution</application> has. If you've ever wondered
+    what some obscure menu item does, this is the chapter for
+    you. When menu items are repeated in
+    <application>Evolution</application>, they're repeated here too.
   </para>
   <para>
     From left to right, the menus available to you when you are
@@ -158,7 +159,9 @@
   <sect1 id="menuref-mail">
     <title>Mail Menus</title>
     <para>
-       All the menus for mail. FIXME: this paragraph needs content.
+       <application>Evolution</application> Mail has more specialized
+       menus, and more specialized menu items, than any other part of
+       the application.
     </para>
    
     <sect2 id="menuref-mail-edit">
@@ -169,7 +172,7 @@
     </sect2>
 
     <sect2 id="menuref-mail-view">
-      <title>The View Menu</title>
+      <title>The Mail View Menu</title>
       <para>
         This menu lets you control the way
         <application>Evolution</application> displays your information
@@ -205,7 +208,7 @@
     </sect2>
 
     <sect2 id="menuref-mail-tools">
-      <title>The Tools Menu</title>
+      <title>The Mail Settings Menu</title>
       <para>
       <variablelist>
 	  <varlistentry>
@@ -218,9 +221,10 @@
 	  </varlistentry>
 	  
 	  <varlistentry>
-	    <term><guimenuitem>vFolder Editor</guimenuitem></term>
+	    <term><guimenuitem>Virtual Folder Editor</guimenuitem></term>
 	    <listitem><para>
-              Create, edit, and delete vFolders with this tool. 
+              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
+               with this tool. 
               To learn about using vFolders with mail, see 
               <xref linkend="usage-mail-organize-vfolders">.
            </para></listitem>
@@ -237,66 +241,207 @@
 	  <varlistentry>
 	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
 	    <listitem><para>
-             Although it's really an Action (FIXME), this item will cause 
-             <application>Evolution</application> to forget what your
-             password is.
-           </para></listitem>
+              This item will cause <application>Evolution</application>
+	      to forget what your password is.
+            </para></listitem>
 	  </varlistentry>
 	  
+	</variablelist>
+       </para>
+    </sect2>
+
+    <sect2 id="menuref-mail-folder">
+      <title>The Mail Folder Menu</title>
+      <para>
+          The items in this menu relate to 
+          <application>Evolution</application> mail folders.
+      </para>
+      <para>
+          You can:
+          <variablelist>
+
+	  <varlistentry>
+	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
+	    <listitem><para>
+	      <application>Evolution</application> keeps track of which messages 
+	      you've seen;  to mark everything in a folder as read, choose this item.
+	      You can mark a single message as read by right-clicking it in the message bar.
+	    </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Delete All</guimenuitem></term>
+	    <listitem><para>
+	      This is a favorite item of everyone with too much junk-mail: one click, and it 
+	      deletes every message in the current folder. 
+	    </para></listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term><guimenuitem>Expunge</guimenuitem></term>
+	    <listitem><para>
+                 Empties the trash folder, erasing messages permanently. 
+                 Once you've done this, they're gone for good.
+	       </para></listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term><guimenuitem>Configure Folder</guimenuitem></term>
 	    <listitem><para>
-              Another FIXME item, this allows you to set the file format
-              in which <application>Evolution</application> stores mail.
+              Use this item to set the file format in which
+              <application>Evolution</application> stores mail. You
+              can choose from standard UNIX-style
+              <systemitem><filename>mbox</filename></systemitem>
+              files, or the
+              <systemitem><filename>mh</filename></systemitem> format.
+              Converting large mailboxes may take a long time, and
+              it's a good idea to have a backup copy beforehand.
            </para></listitem>
 	  </varlistentry>
+
 	</variablelist>
        </para>
     </sect2>
 
-    <sect2 id="menuref-mail-actions">
-      <title>The Actions Menu</title>
+  <sect2 id="menuref-mail-message">
+      <title>The Mail Message Menu</title>
       <para>
-          When you select one of the actions from this menu,
-          <application>Evolution</application> will do your bidding,
-          usually to the item you have selected.
+          The items in this menu relate to
+          <application>Evolution</application> mail messages. Most of
+          them require you to have a message selected, and are also
+          available by right-clicking on a message in the message
+          list.
       </para>
       <para>
-          The actions you can perform are:
           <variablelist>
+
+
+	  <varlistentry>
+	    <term><guimenuitem>Open in New Window</guimenuitem></term>
+	    <listitem><para>
+	       Displays the selected message in a new window.
+	   </para></listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term><guimenuitem>Edit Message</guimenuitem></term>
 	    <listitem><para>
-	      Select a message in the drafts folder before you select this 
-	      item.  You can only edit a message you have written. FIXME: POOR
-	      description of BROKEN behavior. 
+	      Open the selected message in the message composer.  You
+              can only edit a message you have written: drafts and messages in 
+              the <guilabel>Sent</guilabel> box. 
 	   </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>View Message</guimenuitem></term>
+	    <term><guimenuitem>Print Message</guimenuitem></term>
 	    <listitem><para>
-	       Displays the selected message in a new window.
+	       Displays the <interface>Print Preview</interface> window, 
+               ready for printing.
 	   </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>Mark all Messages Read</guimenuitem></term>
+	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
 	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  When you don't need to read all those messages, select this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
+	       Opens a message composition window addressed to the
+               author of the  message.  Covered in detail in 
+               <xref linkend="usage-mail-getnsend-send-reply">.
+	      </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
+	    <term><guimenuitem>Reply to All</guimenuitem></term>
 	    <listitem><para>
-                   Emtpies the trash folder, erasing messages permanently. 
-                   Once you've done this, don't come crying to me if you
-                   want a message back.
-	       </para></listitem>
+	        Opens a message composition window addressed to the
+                author of the  message and all known recipients.
+                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
+	      </para></listitem>
 	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Forward</guimenuitem></term>
+	    <listitem><para>
+	       Appends the body of the selected message to a new message.
+               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Delete Message</guimenuitem></term>
+	    <listitem><para>
+	       Marks a message for deletion.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Move Message</guimenuitem></term>
+	    <listitem><para>
+	       Choose a folder in which to place this message.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Copy Message</guimenuitem></term>
+	    <listitem><para>
+	       Copy the selected  message to another folder.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
+	    <listitem><para>
+	       This item, and the three that follow it, will create vFolders 
+               which you may customize further or save as-is. This one will
+               create a vFolder which will display all messages that contain the 
+               subject line of the selected message.                
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
+	    <listitem><para>
+	       Creates a vFolder to hold all messages from the sender of
+               the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
+	    <listitem><para>
+	       Creates a VFolder to hold all messages addressed to the 
+               recipient of the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
+	    <listitem><para>
+	       This item, and the three that follow it, will create Filters 
+               for which you must select actions.  You may keep the criteria as 
+               they are, or alter them as you wish. This one will
+               create a filter which will affect all messages that contain the 
+               subject line of the selected message.                
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
+	    <listitem><para>
+	       Creates a filter which affects all messages from the sender of
+               the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
+	    <listitem><para>
+	       Creates a filter which will affect all messages addressed to the 
+               recipient of the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
 	</variablelist>
        </para>
     </sect2>
@@ -343,8 +488,7 @@
 	      <term><guimenu>Save in Folder</guimenu></term>
 	      <listitem><para>
 		 Save a message as a draft, rather than 
-		 as a seperate text file. (FIXME: should be removed, and 
-		 functionality subsumed under "Save As").
+		 as a separate text file.
 	      </para></listitem>
 	    </varlistentry>
 
@@ -357,12 +501,19 @@
 	    </varlistentry>
 	  
 	    <varlistentry>
-	      <term><guimenu>Send</guimenu></term>
+	      <term><guimenu>Send Now</guimenu></term>
 	      <listitem><para>
 		  Sends the message immediately.
 	      </para></listitem>
 	    </varlistentry>
 
+	    <varlistentry>
+	      <term><guimenu>Send Later</guimenu></term>
+	      <listitem><para>
+		  Queue 
+	      </para></listitem>
+	    </varlistentry>
+
 	  <varlistentry>
 	    <term><guimenu>Close</guimenu></term>
 	    <listitem><para>
@@ -430,18 +581,16 @@
                As with <guimenuitem>Find Regex</guimenuitem>, 
                <guimenuitem>Find Again</guimenuitem>, and
                <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards, and.
-
+                will offer you the option to search forwards or backwards.
 	    </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><guimenuitem>Find Regex</guimenuitem></term>
 	    <listitem><para>
-               If you are familiar with regular expressions, often called 
-               "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic. If you're not familiar with 
-               them, there are numerous resources for you on the web.
+               If you are familiar with <glossterm>regular expressions</glossterm>,
+                often called "regexes," you can search for something more complicated, 
+               using wildcards and boolean logic.
 	    </para></listitem>
 	  </varlistentry>
 
@@ -503,7 +652,7 @@
 	    <term><guimenuitem>Show Attachments</guimenuitem></term>
 	    <listitem><para> 
               Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a seperate pane
+              <application>Evolution</application> will create a separate pane
               of the composition window to show what attachments you are appending
               to the message. 
 	    </para></listitem>
@@ -559,142 +708,8 @@
       </para>
     </sect2>
   </sect1>
-  <sect1 id="menuref-mail-context">
-    <title>Contextual Menus in Evolution Mail</title>
-    <para>
-      The following menus appear when you right-click on something:
-    </para>
-
-    <sect2 id="menuref-mail-context-message">
-      <title>Right-click menu for messages in the message list</title>
-      <para>
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Open a new window to read this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit this Message</guimenuitem></term>
-	    <listitem><para>
-              Available only for messages you have
-	      written and saved to the <guilabel>Drafts</guilabel>
-              or <guilabel>Outbox</guilabel> folders, this opens the
-              message in a message composition window, so you can alter it.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-	       Opens the Print Preview window in preparation
-               for printing the message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
 
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a Filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="menuref-cal">
+    <sect1 id="menuref-cal">
     <title>The Calendar Menus</title>
     <para>
       The Main window of the calendar has the same menus as the main
@@ -784,31 +799,26 @@
       </para>
     </sect2>
 
-    <sect2 id="menuref-cal-tools">
-      <title>The Calendar Tools Menu</title>
+    <sect2 id="menuref-cal-settings">
+      <title>The Calendar Settings Menu</title>
       <para>
          This menu is empty.
       </para>
     </sect2>
 
-    <sect2 id="menuref-cal-actions">
-      <title>The Calendar Actions Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
   </sect1>
 
   <sect1 id="menuref-cal-editor">
     <title>The Appointment Editor Menus</title>
     <para>
-    FIXME: Insert Content Here.
+    The appointment editor has its own menus, to help you use its
+    wide-ranging abilities.
     </para>
     
     <sect2 id="menuref-cal-editor-file">
-      <title>The Appintment Editor's File Menu</title>
+      <title>The Appointment Editor's File Menu</title>
       <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> 
+         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
          that is identical to that in the 
          <link linkend="menuref-universal-file">main window's file menu</link>.
          Its other contents are:
@@ -914,7 +924,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-edit">
-      <title>The Appintment Editor's Edit Menu</title>
+      <title>The Appointment Editor's Edit Menu</title>
       <para>
          FIXME: this menu is copied and pasted entirely from somewhere
          else.
@@ -922,7 +932,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-view">
-      <title>The Appintment Editor's View Menu</title>
+      <title>The Appointment Editor's View Menu</title>
       <para>
          This menu allows you to look at different appointments, and
          set the way you look at them, without having to move back to
@@ -982,7 +992,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-insert">
-      <title>The Appintment Editor's Insert Menu</title>
+      <title>The Appointment Editor's Insert Menu</title>
       <para>
         This menu contains: (FIXME: Insert Content Here)
         <variablelist>
@@ -1013,7 +1023,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-format">
-      <title>The Appintment Editor's Format Menu</title>
+      <title>The Appointment Editor's Format Menu</title>
       <para>
          This menu contains two items, neither of which
          have any functionality yet:
@@ -1037,7 +1047,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-tools">
-      <title>The Appintment Editor's Tools Menu</title>
+      <title>The Appointment Editor's Tools Menu</title>
       <para>
          
          This menu contains four items, none of which
@@ -1061,7 +1071,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-actions">
-      <title>The Appintment Editor's Actions Menu</title>
+      <title>The Appointment Editor's Actions Menu</title>
       <para>
         This menu contains:
 
@@ -1101,7 +1111,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-help">
-      <title>The Appintment Editor's File Menu</title>
+      <title>The Appointment Editor's File Menu</title>
       <para>
          This menu is empty.
       </para>
@@ -1124,7 +1134,7 @@
 
 
     <sect2 id="menuref-contact-view">
-      <title>Contact Manager Edit Menu</title>
+      <title>Contact Manager View Menu</title>
       <para>
         This menu contains the following items:
 
@@ -1146,7 +1156,7 @@
 	  </varlistentry>
 		  
 	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem></term>
+	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
 	  <listitem><para>
              View your contacts as a table.  
              When in table-view mode, this menu item reads 
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 5cceac51ea..5e74a2ce0e 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -90,7 +90,7 @@
 	  <listitem>
 	    <para>
                Data must be safe: <application>Evolution</application>
-               must not not lose mail, corrupt mailbox files or other
+               must not lose mail, corrupt mailbox files or other
                data, execute arbitrary scripts, or delete files from
                your hard disk.
             </para>
@@ -270,7 +270,6 @@
 	    </listitem>
 	  </varlistentry>
 
-
 	  <varlistentry>
 	    <term>Enter a new Contact</term>
 	    <listitem>
@@ -286,8 +285,6 @@
                 </para>
 	    </listitem>
 	  </varlistentry>
-
-
 	</variablelist>
       </para>
     </sect2> 
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 2fd55de976..9e1ec88ef2 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -71,9 +71,9 @@ lack of time, resources, and interest.
        multiple days, and events that have a date but no specific
        time.  Of course, you can also set event reminders and alarms
        so that you don't forget about everything you've just put into
-       your calendar. From managing a busy office to managing a busy
-       family (or both!), <application>Evolution</application> can
-       handle the schedule.
+       your calendar. From office or family to office
+       <emphasis>and</emphasis> family,
+       <application>Evolution</application> can handle the schedule.
     </para>
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
@@ -103,24 +103,23 @@ lack of time, resources, and interest.
         Your event must have a starting and ending date &mdash; by
         default, today &mdash; but you can choose whether to give it
         starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>.  For the purposes of the calendar, an
-        <guilabel>All day event</guilabel> begins at ten in the
-        morning, runs until eleven at night, and is displayed at the
-        top of a day's event list rather than inside it.  That makes
-        it easy to have events that overlap and fit inside each other.
-        For example, a conference might be an all day event, and the
-        meetings at the conference would be timed events.  Events with
-        starting and ending times can also overlap, however, and when
-        they do they're displayed as multiple columns in the day view
-        of the calendar.
+        day event</guilabel>. An <guilabel>All day event</guilabel>
+        appears at the top of a day's event list rather than inside
+        it.  That makes it easy to have events that overlap and fit
+        inside each other.  For example, a conference might be an all
+        day event, and the meetings at the conference would be timed
+        events.  Of course, events with specific starting and ending
+        times can also overlap.  When they do they're displayed as
+        multiple columns in the day view of the calendar.
       </para>
       <note>
        <title>Doing Two Things At Once</title>
          <para>
-           If you create two calendar events that overlap,
-           <application>Evolution</application> will display them as
-           multiple columns in the calendar window.  If you manage to
-           do both things at once, I'd like to meet you.
+           If you create calendar events that overlap,
+           <application>Evolution</application> will display them side
+           by side in your calendar.  However,
+           <application>Evolution</application> cannot help you do
+           multiple things at once.
          </para>
       </note>
       <para>
@@ -177,7 +176,7 @@ lack of time, resources, and interest.
          and a public event can be viewed by anyone on the calendar
          sharing network.  <guilabel>Private</guilabel> denotes one
          level of security, and <guilabel>Confidential</guilabel> a
-         higer level.  <!-- FIXME --> Exact determinations and implementations of
+         higher level.  <!-- FIXME --> Exact determinations and implementations of
          this feature have yet to be determined. <!-- FIXME -->
       </para>
       <para>
@@ -235,7 +234,7 @@ lack of time, resources, and interest.
 	it, and then choose <guimenuitem>Event
 	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
 	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to deselect the
+	window, click the "tentative" button to De-select the
 	event.
       </para>
     </sect2>
@@ -334,8 +333,9 @@ lack of time, resources, and interest.
     <example>
       <title>Keeping Multiple Calendars</title>
       <para>
-        Keelyn has one calendar for her own schedule.  On the network,
-        she maintains one for the conference room, so people know when
+        Keelyn. the office manager for a small company, has one
+        calendar for her own schedule.  On the local network, she
+        maintains one for the conference room, so people know when
         they can schedule meetings.  Next to that, she maintains a
         calendar that reflects when consultants are going to be on
         site, and another that keeps track of when the Red Sox are
@@ -351,7 +351,7 @@ lack of time, resources, and interest.
 
        You can place the calendar in any calendar folder and access it
        from the folder view.  Alarms, configuration, and display for
-       each calendar are seperate from each other.
+       each calendar are separate from each other.
     </para>
     
   </sect1>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 26c003442d..e983a2367d 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -47,7 +47,7 @@
        shows all your cards in alphabetical order, in a
        <glossterm>minicard</glossterm> format.  You can select other
        views from the <guimenu>View</guimenu> menu, and adjust the
-       width of the colums by clicking and dragging the grey column
+       width of the columns by clicking and dragging the grey column
        dividers.
     </para>
 
@@ -78,6 +78,15 @@
         <listitem><para>
            <guibutton>Delete</guibutton> deletes a selected card.
         </para></listitem>
+
+        <listitem><para>
+           <guibutton>Show All</guibutton> Shows all cards.
+        </para></listitem>
+
+        <listitem><para>
+           <guibutton>Stop</guibutton> Stop loading card data from the network.
+        </para></listitem>
+
       </itemizedlist>
     </para>
     <para>
@@ -88,10 +97,9 @@
        the cards to find one that matches.
     </para>
     <para>
-       If there are no matches, the card display will be blank.  To
-       display <emphasis>all</emphasis> of your contacts, you can
-       leave the <guilabel>Quick Search</guilabel> field blank, and
-       press enter.
+       If there are no matches, the card display will be blank. When
+       you'd like to see all the cards again, press <guilabel>Show
+       All</guilabel>.
     </para>
     <para>
        The rest of the contact manager is taken up by the display of
@@ -107,7 +115,7 @@
     <para>
        To delete a card, click on it once to select it, then press the
        <guibutton>Delete Card</guibutton> button.  If you have
-       multiple cards selected, you'll delete mutliple cards.
+       multiple cards selected, you'll delete multiple cards.
     </para>
     <para>
        Adding or changing cards is slightly more complicated.  Any
@@ -217,7 +225,7 @@
                     <userinput>Eva Lucianne Tester</userinput>.
                     You'll notice that the <guilabel>File
                     As</guilabel> field also fills up, but in reverse:
-                    <computeroutput>Tester, Lucianne</computeroutput>.
+                    <computeroutput>Tester, Eva</computeroutput>.
                     You can pick <computeroutput>Eva
                     Tester</computeroutput> from the drop-down, or
                     type in your own, such as <userinput>Lucianne
@@ -230,7 +238,7 @@
                       Don't enter something entirely different from
                       the actual name, since you might forget that
                       you've filed Eva's information under "F" for
-                      "Fictitious Helix Code Employees"
+                      "Fictitious Helix Code Employee."
                     </para>
 		  </tip>
 		</listitem>
@@ -300,13 +308,12 @@
 
 <!--
     <para>
-      Another useful UNIMPLEMENTED
-      <application>Evolution</application> feature is its ability to
-      recognize when people live or work together.  If several people
-      in your contact manager share an address, and you change the
-      address for one of them, <application>Evolution</application>
-      will ask you if you wish to change the address for all of them,
-      or just for one.
+      Another useful <application>Evolution</application> feature is
+      its ability to recognize when people live or work together.  If
+      several people in your contact manager share an address, and you
+      change the address for one of them,
+      <application>Evolution</application> will ask you if you wish to
+      change the address for all of them, or just for one.
     </para>
 -->
 
@@ -333,10 +340,11 @@
 	   <guisubmenu>New</guisubmenu>
 	   <guimenuitem>Folder</guimenuitem>
            </menuchoice>
-           and that you can put new folders anywhere you like.  Each
-	   card must be in a folder, and no card can be in two places
-	   at once.  If you want more flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">
+           and that you can put new folders anywhere you like. Just
+	   like with mail, cards must be in a card folder, and no card
+	   can be in two places at once.  If you want more
+	   flexibility, try <xref
+	   linkend="usage-contact-organize-group-category">.
 	 </para>
 	<para>
           To put a card into a folder, just drag it there from the
@@ -371,13 +379,18 @@
            <!-- FIXME --> Waiting for Evolution to support the
            operation.
          </para>
+
+       <!-- FIXME: Feature Not Implemented
 	<para>
+
            If the master list of categories doesn't suit you, you can
            add your own.  Just enter the new category's name in the
            text box, then click <guibutton>Categories</guibutton> and
            choose <guilabel>Add to Master List</guilabel> in the
            window that appears. 
          </para>
+       -->
+
       </sect3>
     </sect2>
   </sect1>
@@ -392,7 +405,7 @@
        the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
        you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their workgroup
+       work and keep up to date on developments within their work-group
        or across the entire company.
     </para>
 
@@ -424,19 +437,29 @@
        the folder bar, and will work exactly like a local folder of
        cards, with the following exceptions:
        <itemizedlist>
+
           <listitem><para>
               They are only available when you are connected to the network.  If 
               you use a laptop or have a modem connection, you may wish to copy or cache
               the network directory and then synchronize your copy with the networked version
               periodically.
           </para></listitem>
-
+          <listitem><para>
+              To prevent excess network traffic,
+              <application>Evolution</application> will not normally
+              load the contents of LDAP folders immediately upon
+              opening.  You must click <guilabel>Display
+              All</guilabel> before LDAP folder cards will be loaded
+              from the network. You can change this behavior in the
+              <interface>Contact Preferences</interface> window.
+          </para></listitem>
 	  <listitem><para>
-              Your ability to view, change, add or delete contacts 
-              depends on the settings of the LDAP server.  For example, you may 
-              read all the entries in the public Netcenter directory (available by default in the 
-              <guilabel>External Directories</guilabel> folder), but you may not change or delete 
-              any of them.
+              Your ability to view, change, add or delete
+              contacts depends on the settings of the LDAP server.
+              For example, you may read all the entries in the public
+              Netcenter directory (available by default in the
+              <guilabel>External Directories</guilabel> folder), but
+              you may not change or delete any of them.
            </para></listitem>
        </itemizedlist>
      </para>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 3dcc38db86..394c634c27 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -166,12 +166,12 @@
       </variablelist>
     </para>
     <para>
-      If you don't like the shortcut bar, you can use keyboard
-      shortcuts, or <glossterm>hot keys</glossterm>.  They're shown
-      next to their equivalent menu items in the menu bar. You can
-      also set your own hot keys for functions that don't have any;
-      this is covered in <xref linkend="config">.  If you're using the
-      keyboard shortcuts you may also want to hide the
+      If you don't like the shortcut bar, you can use the menu bar, or
+      keyboard shortcuts, also called <glossterm>hot keys</glossterm>.
+      They're shown next to their equivalent menu items in the menu
+      bar. You can also set your own hot keys for functions that don't
+      have any; this is covered in <xref linkend="config">.  If you're
+      using the keyboard shortcuts you may also want to hide the
       <interface>shortcut bar</interface> by selecting <menuchoice>
       <guimenu>View</guimenu> <guimenuitem>Show Shortcut
       Bar</guimenuitem> </menuchoice>.
@@ -350,32 +350,27 @@
           </para></listitem>
         </varlistentry>
 
+       <varlistentry>
+          <term> <guimenu>View</guimenu> Menu </term>
+          <listitem><para>
+            This menu lets you decide how <application>Evolution</application> 
+            should look. Some of the features control the appearance of 
+            <application>Evolution</application> as a whole, and others 
+            the way a particular kind of information appears.
+          </para></listitem>
+        </varlistentry>
+
         <varlistentry>
-          <term> <guimenu>Tools</guimenu> Menu </term>
-          <listitem><para> All of your assistants and configuration
-          tools go here.  For the <interface>Inbox</interface>, that
-          means things like <guimenuitem>Mail
-          Configuration</guimenuitem> and the <guimenuitem>vFolder
-          Editor</guimenuitem>.  For the
+          <term> <guimenu>Settings</guimenu> Menu </term>
+          <listitem><para> Tools for configuring, changing, and
+          setting up go here.  For mail, that means things like
+          <guimenuitem>Mail Configuration</guimenuitem> and the
+          <guimenuitem>vFolder Editor</guimenuitem>.  For the
           <interface>Calendar</interface> and the <interface>Contact
           Manager</interface>, it's color, network, and layout
           configuration. </para></listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term> <guimenu>Actions</guimenu> Menu </term>
-          <listitem><para>
-            This menu contains a list of actions you can perform on
-            the information you've stored with
-            <application>Evolution</application>.  The contents vary
-            depending on the view, but for the
-            <interface>Inbox</interface>, it contains items like
-            <guimenuitem>Mark All Messages Read</guimenuitem> and
-            <guimenuitem>Expunge</guimenuitem>, to erase all the 
-            messages you've marked for deletion.    
-          </para></listitem>
-        </varlistentry>
-
        <varlistentry>
           <term> <guimenu>Help</guimenu> Menu</term>
           <listitem><para>
@@ -387,6 +382,14 @@
       </variablelist>
    </para>
    <para>
+     Other menus, like <guilabel>Folder</guilabel>,
+     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,
+     appear only occasionally.  <guilabel>Message</guilabel> and
+     <guilabel>Folder</guilabel>, for example, have commands that only
+     relate to email, so they're only available when you're looking at
+     email.
+   </para>
+   <para>
       Once you've familiarized yourself with the <interface>main
       window</interface> you can start doing things with it.  We'll
       start with your email inbox, since you've got a letter waiting
diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml
index 378b9c3866..1ff2283128 100644
--- a/doc/C/usage-notes.sgml
+++ b/doc/C/usage-notes.sgml
@@ -8,19 +8,19 @@
       storage.  These scraps of paper were called notes.  Now, notes
       are an almost necessary part of our lives, albeit in electronic
       form.  It only makes sense, then, that
-      <application>Evolution</application> has a Notes feature.
-      <application>Evolution</application> can help you take notes in
-      the following ways:
+      <application>Evolution</application> will eventually have a
+      Notes feature.  <application>Evolution</application> can help
+      you take notes in the following ways:
      <itemizedlist>
        <listitem>
          <para>
-           You can take down phone numbers, take school notes, take phone
+           Take down phone numbers, take school notes, take phone
 	   messages, or even write poetry.
          </para>
        </listitem>
        <listitem>
          <para>
-           You can color code notes to organize them, or just to
+           Color code notes to organize them, or just to
            make them look good.
          </para>
        </listitem>
@@ -31,14 +31,16 @@
        </listitem>
        <listitem>
          <para>
-           Something
+           Write <glossterm>Haiku</glossterm>
          </para>
        </listitem>
      </itemizedlist>
    </para>
    <para>
-     You can start writing notes by clicking <guibutton>Notes</guibutton> in the
-     shortcut bar.
+     You can start writing notes by clicking
+     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
+     it's not there yet. But when it is, it'll take you to the
+     notepad.
    </para>
   </abstract>
 </chapter>
diff --git a/doc/C/usage-sync.sgml b/doc/C/usage-sync.sgml
index 07325e1848..a6b53e9526 100644
--- a/doc/C/usage-sync.sgml
+++ b/doc/C/usage-sync.sgml
@@ -2,21 +2,19 @@
     <chapter id="usage-sync">
       <title>Synchronizing with a Hand-held Device</title>
       <para>
-        Once you've set up a synchronization system, it pretty much
-        takes care of itself.  Not only that, it's entirely possible
-        that your system administrator has set it up for you.  All
-        that this chapter covers is how to use that system once it's
-        installed and configured.  If you need to set it up, consult
-        <xref linkend="config-sync">.
+        This chapter covers is how to synchronize data 
+        installed and configured.  If you need information on how to
+        set up a synchronization system, consult <xref
+        linkend="config-sync">.
       </para>
-
-      <para>
-        If you've already got Gnome-pilot set up to use
-        <application>Evolution</application>, put
-        your hand-held device on the cradle and press the HotSync
-        button.
-      </para>
-      <para>
+      <sect1 id="hotsync">
+        <title>Using HotSync</title>
+        <para>
+          Put your hand-held device on its cradle and press the
+          HotSync button.
+        </para>
+        <para>
          No, really.  That's all there is to it.
-      </para>
+        </para>
+       </sect1>
     </chapter>
\ No newline at end of file
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index f13a56106a..7aa5e494dc 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -63,7 +63,7 @@
   <glossterm>Emoticon</glossterm>
   <glossdef>
    <para>
-     Also called smileys, emoticons are the little sideways faces made
+     Also called "smileys," emoticons are the little sideways faces made
      of colons and parentheses which people use to convey emotion in email.
      Examples: :-) or ;(  .
    </para>
@@ -89,7 +89,8 @@
     executable attachments, but before they can be run, the files must
     be marked as executable with a shell or file manager.  This
     security precaution prevents the automatic or accidental execution
-    of malicious programs.
+    of malicious programs. For more information on executables and file
+    permissions, see the documentation for your file manager or shell.
    </para>
   </glossdef>
  </glossentry>
@@ -131,10 +132,9 @@
   <glossterm>Haiku</glossterm>
   <glossdef>
    <para>
-     A Japanese form of poetry.  Haiku are unrhymed, and
-     three lines long. The first and last lines should have five
-     syllables, and the second line seven syllables.  The subject
-     matter is traditionally related to the seasons.
+     A traditional Japanese form of poetry.  The poems are three lines
+     long, with first and last lines having five syllables, and the
+     second line seven syllables.
    </para>
   </glossdef>
  </glossentry>
@@ -144,9 +144,9 @@
   <glossdef>
    <para>
     Hyper-text Markup Language(<acronym>HTML</acronym>) is the layout
-    language which all webpages are written in.  HTML can be used
-    inside of e-mails to insert images, justfiy text different ways,
-    and even include webpages inside the e-mail itself.
+    language which all web pages are written in.  HTML can be used
+    inside of e-mails to insert images, justify text different ways,
+    and even include web pages inside the e-mail itself.
    </para>
   </glossdef>
  </glossentry>
@@ -191,9 +191,9 @@
    <glossterm>LDAP</glossterm>
    <glossdef>
     <para>
-     LDAP is a protocol which allows a client to search through a
-     large database of addresses, phone numbers, and people, as an
-     alternative to a physical phone book.
+     LDAP, the Lightweight Directory Access Protocol, allows a client
+     to search through a large database of addresses, phone numbers,
+     and people stored on a server.
     </para>
    </glossdef>
   </glossentry>
@@ -251,12 +251,26 @@
   </glossdef>
  </glossentry>
 
+ <glossentry id="protocol">
+  <glossterm>Protocol</glossterm>
+  <glossdef>
+   <para>
+     An agreed-upon method of communication, especially one for
+     sending particular types of information between computer systems.
+     Examples include POP (Post Office Protocol), for email, and HTTP
+     (HypterText Transfer Protocol), for web pages.
+
+   </para>
+  </glossdef>
+ </glossentry>
+
+
  <glossentry id="regular-expression">
   <glossterm>Regular Expression</glossterm>
   <glossdef>
    <para>
       A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wildcard symbols.  For
+      string of text using metacharacters or wild-card symbols.  For
       example, the statement <userinput>fly*so[a|u]p</userinput> means
       "any phrase beginning with 'fly' and ending in 'soup' or
       'soap'".  If you searched for that expression, you'd find both
@@ -271,18 +285,37 @@
   <glossterm>Script</glossterm>
   <glossdef>
    <para>
-    A program which is written in an interpreted language, which can
-    be executed.
+    A program, which is written in an interpreted (rather than
+    compiled) language.  Scripts are more likely to work on multiple
+    platforms, but they require an additional layer of software (the
+    interpreter) which mediates between them and the operating system.
+    Because of this, they typically suffer from relatively sluggish
+    performance, and are limited to smaller tasks.
    </para>
   </glossdef>
  </glossentry>
 
+ <glossentry id="sendmail">
+  <glossterm>Sendmail</glossterm>
+  <glossdef>
+   <para>
+      As its name implies, <application>sendmail</application> is a
+      program which sends mail.  <application>Evolution</application>
+      can use it instead of <glossterm>SMTP</glossterm>; some people
+      prefer it because it offers more flexibility, but is more
+      difficult to set up.
+   </para>
+  </glossdef>
+ </glossentry>
+
+
  <glossentry id="shortcut-bar">
   <glossterm>Shortcut Bar</glossterm>
   <glossdef>
    <para>
-    The <interface>Shortcut Bar</interface> is where the user accesses
-    all the components of <application>Evolution</application> from.
+     A portion of <application>Evolution</application> which offers
+     users fast access to the most frequently used portions of the
+     application.
    </para>
   </glossdef>
  </glossentry>
@@ -291,22 +324,47 @@
    <glossterm>Signature</glossterm>
    <glossdef>
     <para>
-     Signatures allow a user to specify a message to place at the bottom of
-     every email sent.  A signature can be anything from a favorite quote to
-     a link to a webpage.
+     In email terms, a signature is a piece of text placed at the end
+     of every email sent, like a hand-written signature at the bottom
+     of a written letter.  A signature can be anything from a favorite
+     quotation to a link to a web page; courtesy dictates that it be
+     fewer than four lines long.
     </para>
    </glossdef>
   </glossentry> 
 
+  <glossentry id="SMTP">
+   <glossterm>SMTP</glossterm>
+   <glossdef>
+    <para>
+      This is the most common way of transporting mail messages from
+      the client's computer (you) to the server. SMTP stands for
+      Simple Mail Transfer Protocol.
+    </para>
+   </glossdef>
+  </glossentry> 
 
  <glossentry id="spam">
   <glossterm>Spam</glossterm>
   <glossdef>
    <para>
-    Spam: useless, unwanted e-mail.  Spam normally comes in forms of
-    chain-letters and advertisements for unscrupulous websites or
-    services.  Messages that are merely useless are called
-    "opt-in newsletters."
+    Useless, unwanted e-mail.  Spam normally comes in forms of
+    chain-letters and advertisements for unscrupulous web sites or
+    services.  Messages that are merely useless are called "opt-in
+    newsletters."
+   </para>
+  </glossdef>
+ <
+/glossentry>
+
+ <glossentry id="virus">
+  <glossterm>Virus</glossterm>
+  <glossdef>
+   <para>
+    A malicious program which inserts itself into others so that it will be 
+    executed, allowing it to spread to still more programs and other computers.
+    A virus can cause substantial damage by clogging networks or disk drives, 
+    deleting files, or opening security holes.
    </para>
   </glossdef>
  </glossentry>
@@ -315,8 +373,9 @@
   <glossterm>vFolder</glossterm>
   <glossdef>
    <para>
-    vFolders allow an e-mail to be shared among multiple folders, so
-    it appears that theres a copy of the e-mail in each folder.
+    An email organization tool. vFolders allows you to create a folder
+    that contains the results of a complex search. Folder contents are
+    are updated dynamically.
    </para>
   </glossdef>
  </glossentry>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 7119f13580..7fee2fd340 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -22,12 +22,11 @@
         preferences are separated into several categories:
         <variablelist>
 	<varlistentry>
-          <term><guilabel>Identies</guilabel></term>
+          <term><guilabel>Identities</guilabel></term>
           <listitem>
 	    <para>
                This allows you to create and alter one or more
-               identities for your email: your name, address, and so
-               forth.
+               identities for your email.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -58,7 +57,7 @@
 	    <para>
               If you would like to use
               <application>Evolution</application> to read newsgroups,
-              you can secify your news server preferences here.
+              you can specify your news server preferences here.
            </para>
 	  </listitem>
 	</varlistentry>
@@ -99,7 +98,8 @@
          one address, you will only need to configure one identity. If
          you want, however, you can have multiple identities.  This
          can be useful if you want to keep personal and professional
-         email seperate.
+         email separate, or if you wear several hats at work.
+         
        </para>
        <para>
          To add a new identity, simply click
@@ -175,8 +175,10 @@
 	      <term><guilabel>Mail source type:</guilabel></term>
 	      <listitem>
 		<para>
-                  Select from IMAP, POP or Unix-style
-                  <filename>mbox</filename> files.
+                  Select from IMAP or POP servers, or Unix-style
+                  <systemitem><filename>mbox</filename></systemitem>
+                  or <systemitem><filename>mh</filename></systemitem>
+                  files.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -184,9 +186,9 @@
 	      <term> <guilabel>Server:</guilabel></term>
 	      <listitem>
 		<para>
-                  Enter the name of your mail server in this field.
-                  For example:
-                  <userinput>mail.mycompany.com</userinput>
+                  Enter the name of the mail source server in this
+                  field. If you use an  may or may not be the same as your
+                  <glossterm>SMTP</glossterm> server.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -194,10 +196,13 @@
 	      <term><guilabel>Username:</guilabel></term>
 	      <listitem>
 		<para>
-                  Enter your user name here.  This is often related to
-                  your real name, but not always. Examples include
-                  <guilabel>eltester</guilabel> and
-                  <guilabel>rupert</guilabel>.
+                  Enter the user name for the account you have on the
+                  server-- this should the part of your email address
+                  before the @.  If you use
+                  <systemitem><filename>mbox</filename></systemitem>
+                  or <systemitem><filename>mh</filename></systemitem>
+                  files as your mail source, you do not need to enter
+                  a username.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -229,11 +234,13 @@
           </para>
           <para>
             If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP or
-            <filename>mbox</filename> listings and check and download
-            all POP servers.  In other words, <guibutton>Get
-            Mail</guibutton> gets your mail, no matter how many
-            sources you have, or what types they are.
+            Mail</guibutton> will refresh any IMAP,
+            <systemitem><filename>mh</filename></systemitem>, or
+            <systemitem><filename>mbox</filename></systemitem>
+            listings and check and download mail from all POP servers.
+            In other words, <guibutton>Get Mail</guibutton> gets your
+            mail, no matter how many sources you have, or what types
+            they are.
           </para>
       </sect3>
 
@@ -252,8 +259,8 @@
         </para>
 	<para>
             To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server, which should look like:
-            <userinput>smtp.isp.net</userinput>.
+            name of your SMTP server.  It may have the same name as
+            your mail source server.
          </para>
          <para>
             <application>Evolution</application> can attempt to
@@ -345,9 +352,11 @@
        <para>
           To set your calendar preferences, select
           <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar Configuration</guimenuitem></menuchoice>.  This
-          will open up the <interface>Preferences</interface> window.
-          It contains four tabs: <guilabel>Time display</guilabel>,
+          <guimenuitem>Calendar
+          Configuration</guimenuitem></menuchoice> from the Calendar
+          view.  This will open up the
+          <interface>Preferences</interface> window.  It contains four
+          tabs: <guilabel>Time display</guilabel>,
           <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
           and <guilabel>Alarms</guilabel>.  The <interface>calendar
           preferences window</interface> is illustrated in <xref
@@ -553,7 +562,7 @@
 	    at you for any alarms you have set.  If you leave this box
 	    unchecked, <application>Evolution</application> will only
 	    alert you to events by opening a dialog box. These beeps
-	    are distict from full-fledged audio alarms.
+	    are distinct from full-fledged audio alarms.
            </para>
 	  </listitem>
 	  <listitem>
@@ -573,11 +582,9 @@
       </para>
     </sect2>
 
+   </sect1>
 
-  </sect1>
-
-
-    <sect1 id="config-prefs-contact">
+   <sect1 id="config-prefs-contact">
       <title>Managing the Contact Manager</title>
 	<para>
           To set the behavior of your Contact Manager, click on the
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index 966c62cfc2..392a0bbfc1 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -21,7 +21,8 @@
       </para>
       <para>
          The setup assistant (sometimes called a
-	 <glossterm>Druid</glossterm>) will guide you through the
+	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
+	 that some other programs use) will guide you through the
 	 network configuration process.  It will ask you for some
 	 basic information; your system administrator or ISP should
 	 have the answers you'll need.  The mail setup assistant is
@@ -46,15 +47,14 @@
         <variablelist>
 
           <varlistentry>
-               <term> <guilabel>Name:</guilabel> </term>
-	  <listitem> <para>Your
-            full name: eg. Eva Lucianne Tester </para></listitem>
+               <term> <guilabel>Name:</guilabel> </term> <listitem>
+	  <para>Your full name. </para></listitem>
          </varlistentry>
 
        <varlistentry>
           <term><guilabel>Email address:</guilabel></term>
 	  <listitem><para>
-                 Your email address: eg. eltester@helixcode.com
+                 Your complete email address.
                  </para></listitem>
        </varlistentry>
 
@@ -62,10 +62,9 @@
           <term> <guilabel>Organization:</guilabel></term>
 	  <listitem>
 	    <para>
-              Any organization you represent; often, the company where
-              you work.  Leave this blank if you wish.  One person I
-              know always puts "My own bad self" in this box, so
-              people know his opinions are his alone.
+              Any organization you represent, or the company where you
+              work.  Leave this blank if you wish, or type "My own bad
+              self" so people know your opinions are yours alone.
             </para>
 	  </listitem>
       </varlistentry>
@@ -77,7 +76,7 @@
              A text file appended to any email you send.  A signature
              file typically consists of your name and email address,
              or a quotation you like.  It's good form to keep your
-             "sig" on the short side: four lines is plenty. Remeber,
+             "sig" on the short side: four lines is plenty. Remember,
              this is attached to every email you send.
             </para>
          </listitem>
@@ -87,23 +86,32 @@
            <term> <guilabel>Mail source type:</guilabel></term>
 	  <listitem>
 	    <para>
-              <application>Evolution</application> supports three mail
-              sources: <glossterm>POP</glossterm> servers,
+              <application>Evolution</application> supports several
+              mail sources: <glossterm>POP</glossterm> and
               <glossterm>IMAP</glossterm> servers, and UNIX-style
-              <filename>mbox</filename> files.  POP servers retrieve
-              your mail and store it on your local system so you can
-              refer to it even when not connected to a network;
-              <glossterm>IMAP</glossterm> servers store the mail on
-              the server so you can access it from multiple locations;
-              UNIX-style <filename>mbox</filename> files are used by
-              your computer for internal mail, and may be useful if
-              you want to switch from another email client such as
-              <application>spruce</application> or
-              <application>mutt</application>.  Ask your system
-              administrator which you should use, or keep guessing
-              until one works.  You may use multiple servers if you
-              wish; see <xref linkend="config-prefs-mail-network"> for
-              more information.
+              <systemitem><filename>mbox</filename></systemitem> and
+              <systemitem><filename>mh</filename></systemitem> files.
+              POP servers retrieve your mail and store it on your
+              local system so you can refer to it even when not
+              connected to a network; <glossterm>IMAP</glossterm>
+              servers store the mail on the server so you can access
+              it from multiple locations;
+              <systemitem><filename>mbox</filename>></systemitem>
+              files are used by your computer for internal mail, and
+              may be useful if you want to switch from another email
+              client such as <application>Spruce</application> or
+              <application>Netscape Communicator</application>.  Ask
+              your system administrator which you should use, or keep
+              guessing until one works.  You may use multiple sources
+              if you wish; see <xref
+              linkend="config-prefs-mail-network"> for more
+              information.
+            </para>
+            <para>
+              If you decide not to have
+              <application>Evolution</application> use any servers,
+              the remaining items are not relevant; you only need to
+              point to the location of the files you wish to access.
             </para>
 	  </listitem>
 	  </varlistentry>
@@ -112,9 +120,10 @@
           <term> <guilabel>Server:</guilabel></term>
 	  <listitem>
 	    <para>
-              This should be the name of your mail server: it should
-              look something like:
-              <userinput>mailserver.organization.org</userinput>.
+              This should be the name of the server where you check
+              your mail, if you use one.  It may be the same as the
+              server where you send your outgoing mail, if you use
+              one.
             </para>
 	  </listitem>
 	</varlistentry>
@@ -123,8 +132,9 @@
 	  <term><guilabel>Username:</guilabel></term>
 	<listitem>
              <para>
-              Normally, this is the part of your email address before
-              the @ character, and
+              Enter the username for your mail server account, if you
+              have one. Normally, this is the part of your email
+              address before the @ character, and
               <application>Evolution</application> has selected that
               value as the default.  If you have a different username,
               you can enter it here.
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 9cab3a8bf8..8ec98271cc 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -5,7 +5,6 @@
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-NOTES SYSTEM "usage-notes.sgml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
 <!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
@@ -20,7 +19,11 @@
 ]>
 
 
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and entity names correspond.  APX is for appendix.  -->
+<!-- Almost every chapter is an entity.  Files, Chapter id's, and
+entity names correspond.  APX is for appendix. Note that there is no
+entity for apx-notes.sgml, which is still included in the file
+set. Reinstate the entity if and when the Notes feature is
+implemented. -->
 
 <book id="index">
   <bookinfo>
@@ -92,7 +95,7 @@
     &USAGE-MAIL;
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
-    &USAGE-NOTES;
+<!--   &USAGE-NOTES; -->
     &USAGE-SYNC;
 
   </part>
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index b4ae8d4f83..a3ba7e7b34 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -5,10 +5,11 @@
 <chapter id="menuref">
   <title>Menu Reference</title>
   <para>
-    This section will serve as a reference for every capability that
-    <application>Evolution</application> has.  When menu items are
-    repeated in <application>Evolution</application>, they're repeated
-    here too.
+    This section will serve as a reference for every menu that
+    <application>Evolution</application> has. If you've ever wondered
+    what some obscure menu item does, this is the chapter for
+    you. When menu items are repeated in
+    <application>Evolution</application>, they're repeated here too.
   </para>
   <para>
     From left to right, the menus available to you when you are
@@ -158,7 +159,9 @@
   <sect1 id="menuref-mail">
     <title>Mail Menus</title>
     <para>
-       All the menus for mail. FIXME: this paragraph needs content.
+       <application>Evolution</application> Mail has more specialized
+       menus, and more specialized menu items, than any other part of
+       the application.
     </para>
    
     <sect2 id="menuref-mail-edit">
@@ -169,7 +172,7 @@
     </sect2>
 
     <sect2 id="menuref-mail-view">
-      <title>The View Menu</title>
+      <title>The Mail View Menu</title>
       <para>
         This menu lets you control the way
         <application>Evolution</application> displays your information
@@ -205,7 +208,7 @@
     </sect2>
 
     <sect2 id="menuref-mail-tools">
-      <title>The Tools Menu</title>
+      <title>The Mail Settings Menu</title>
       <para>
       <variablelist>
 	  <varlistentry>
@@ -218,9 +221,10 @@
 	  </varlistentry>
 	  
 	  <varlistentry>
-	    <term><guimenuitem>vFolder Editor</guimenuitem></term>
+	    <term><guimenuitem>Virtual Folder Editor</guimenuitem></term>
 	    <listitem><para>
-              Create, edit, and delete vFolders with this tool. 
+              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
+               with this tool. 
               To learn about using vFolders with mail, see 
               <xref linkend="usage-mail-organize-vfolders">.
            </para></listitem>
@@ -237,66 +241,207 @@
 	  <varlistentry>
 	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
 	    <listitem><para>
-             Although it's really an Action (FIXME), this item will cause 
-             <application>Evolution</application> to forget what your
-             password is.
-           </para></listitem>
+              This item will cause <application>Evolution</application>
+	      to forget what your password is.
+            </para></listitem>
 	  </varlistentry>
 	  
+	</variablelist>
+       </para>
+    </sect2>
+
+    <sect2 id="menuref-mail-folder">
+      <title>The Mail Folder Menu</title>
+      <para>
+          The items in this menu relate to 
+          <application>Evolution</application> mail folders.
+      </para>
+      <para>
+          You can:
+          <variablelist>
+
+	  <varlistentry>
+	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
+	    <listitem><para>
+	      <application>Evolution</application> keeps track of which messages 
+	      you've seen;  to mark everything in a folder as read, choose this item.
+	      You can mark a single message as read by right-clicking it in the message bar.
+	    </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Delete All</guimenuitem></term>
+	    <listitem><para>
+	      This is a favorite item of everyone with too much junk-mail: one click, and it 
+	      deletes every message in the current folder. 
+	    </para></listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term><guimenuitem>Expunge</guimenuitem></term>
+	    <listitem><para>
+                 Empties the trash folder, erasing messages permanently. 
+                 Once you've done this, they're gone for good.
+	       </para></listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term><guimenuitem>Configure Folder</guimenuitem></term>
 	    <listitem><para>
-              Another FIXME item, this allows you to set the file format
-              in which <application>Evolution</application> stores mail.
+              Use this item to set the file format in which
+              <application>Evolution</application> stores mail. You
+              can choose from standard UNIX-style
+              <systemitem><filename>mbox</filename></systemitem>
+              files, or the
+              <systemitem><filename>mh</filename></systemitem> format.
+              Converting large mailboxes may take a long time, and
+              it's a good idea to have a backup copy beforehand.
            </para></listitem>
 	  </varlistentry>
+
 	</variablelist>
        </para>
     </sect2>
 
-    <sect2 id="menuref-mail-actions">
-      <title>The Actions Menu</title>
+  <sect2 id="menuref-mail-message">
+      <title>The Mail Message Menu</title>
       <para>
-          When you select one of the actions from this menu,
-          <application>Evolution</application> will do your bidding,
-          usually to the item you have selected.
+          The items in this menu relate to
+          <application>Evolution</application> mail messages. Most of
+          them require you to have a message selected, and are also
+          available by right-clicking on a message in the message
+          list.
       </para>
       <para>
-          The actions you can perform are:
           <variablelist>
+
+
+	  <varlistentry>
+	    <term><guimenuitem>Open in New Window</guimenuitem></term>
+	    <listitem><para>
+	       Displays the selected message in a new window.
+	   </para></listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term><guimenuitem>Edit Message</guimenuitem></term>
 	    <listitem><para>
-	      Select a message in the drafts folder before you select this 
-	      item.  You can only edit a message you have written. FIXME: POOR
-	      description of BROKEN behavior. 
+	      Open the selected message in the message composer.  You
+              can only edit a message you have written: drafts and messages in 
+              the <guilabel>Sent</guilabel> box. 
 	   </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>View Message</guimenuitem></term>
+	    <term><guimenuitem>Print Message</guimenuitem></term>
 	    <listitem><para>
-	       Displays the selected message in a new window.
+	       Displays the <interface>Print Preview</interface> window, 
+               ready for printing.
 	   </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>Mark all Messages Read</guimenuitem></term>
+	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
 	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  When you don't need to read all those messages, select this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
+	       Opens a message composition window addressed to the
+               author of the  message.  Covered in detail in 
+               <xref linkend="usage-mail-getnsend-send-reply">.
+	      </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
+	    <term><guimenuitem>Reply to All</guimenuitem></term>
 	    <listitem><para>
-                   Emtpies the trash folder, erasing messages permanently. 
-                   Once you've done this, don't come crying to me if you
-                   want a message back.
-	       </para></listitem>
+	        Opens a message composition window addressed to the
+                author of the  message and all known recipients.
+                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
+	      </para></listitem>
 	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Forward</guimenuitem></term>
+	    <listitem><para>
+	       Appends the body of the selected message to a new message.
+               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Delete Message</guimenuitem></term>
+	    <listitem><para>
+	       Marks a message for deletion.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Move Message</guimenuitem></term>
+	    <listitem><para>
+	       Choose a folder in which to place this message.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Copy Message</guimenuitem></term>
+	    <listitem><para>
+	       Copy the selected  message to another folder.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
+	    <listitem><para>
+	       This item, and the three that follow it, will create vFolders 
+               which you may customize further or save as-is. This one will
+               create a vFolder which will display all messages that contain the 
+               subject line of the selected message.                
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
+	    <listitem><para>
+	       Creates a vFolder to hold all messages from the sender of
+               the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
+	    <listitem><para>
+	       Creates a VFolder to hold all messages addressed to the 
+               recipient of the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
+	    <listitem><para>
+	       This item, and the three that follow it, will create Filters 
+               for which you must select actions.  You may keep the criteria as 
+               they are, or alter them as you wish. This one will
+               create a filter which will affect all messages that contain the 
+               subject line of the selected message.                
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
+	    <listitem><para>
+	       Creates a filter which affects all messages from the sender of
+               the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
+	    <listitem><para>
+	       Creates a filter which will affect all messages addressed to the 
+               recipient of the selected message.
+	      </para></listitem>
+	  </varlistentry>
+
 	</variablelist>
        </para>
     </sect2>
@@ -343,8 +488,7 @@
 	      <term><guimenu>Save in Folder</guimenu></term>
 	      <listitem><para>
 		 Save a message as a draft, rather than 
-		 as a seperate text file. (FIXME: should be removed, and 
-		 functionality subsumed under "Save As").
+		 as a separate text file.
 	      </para></listitem>
 	    </varlistentry>
 
@@ -357,12 +501,19 @@
 	    </varlistentry>
 	  
 	    <varlistentry>
-	      <term><guimenu>Send</guimenu></term>
+	      <term><guimenu>Send Now</guimenu></term>
 	      <listitem><para>
 		  Sends the message immediately.
 	      </para></listitem>
 	    </varlistentry>
 
+	    <varlistentry>
+	      <term><guimenu>Send Later</guimenu></term>
+	      <listitem><para>
+		  Queue 
+	      </para></listitem>
+	    </varlistentry>
+
 	  <varlistentry>
 	    <term><guimenu>Close</guimenu></term>
 	    <listitem><para>
@@ -430,18 +581,16 @@
                As with <guimenuitem>Find Regex</guimenuitem>, 
                <guimenuitem>Find Again</guimenuitem>, and
                <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards, and.
-
+                will offer you the option to search forwards or backwards.
 	    </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><guimenuitem>Find Regex</guimenuitem></term>
 	    <listitem><para>
-               If you are familiar with regular expressions, often called 
-               "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic. If you're not familiar with 
-               them, there are numerous resources for you on the web.
+               If you are familiar with <glossterm>regular expressions</glossterm>,
+                often called "regexes," you can search for something more complicated, 
+               using wildcards and boolean logic.
 	    </para></listitem>
 	  </varlistentry>
 
@@ -503,7 +652,7 @@
 	    <term><guimenuitem>Show Attachments</guimenuitem></term>
 	    <listitem><para> 
               Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a seperate pane
+              <application>Evolution</application> will create a separate pane
               of the composition window to show what attachments you are appending
               to the message. 
 	    </para></listitem>
@@ -559,142 +708,8 @@
       </para>
     </sect2>
   </sect1>
-  <sect1 id="menuref-mail-context">
-    <title>Contextual Menus in Evolution Mail</title>
-    <para>
-      The following menus appear when you right-click on something:
-    </para>
-
-    <sect2 id="menuref-mail-context-message">
-      <title>Right-click menu for messages in the message list</title>
-      <para>
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Open a new window to read this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit this Message</guimenuitem></term>
-	    <listitem><para>
-              Available only for messages you have
-	      written and saved to the <guilabel>Drafts</guilabel>
-              or <guilabel>Outbox</guilabel> folders, this opens the
-              message in a message composition window, so you can alter it.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-	       Opens the Print Preview window in preparation
-               for printing the message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
 
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a Filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="menuref-cal">
+    <sect1 id="menuref-cal">
     <title>The Calendar Menus</title>
     <para>
       The Main window of the calendar has the same menus as the main
@@ -784,31 +799,26 @@
       </para>
     </sect2>
 
-    <sect2 id="menuref-cal-tools">
-      <title>The Calendar Tools Menu</title>
+    <sect2 id="menuref-cal-settings">
+      <title>The Calendar Settings Menu</title>
       <para>
          This menu is empty.
       </para>
     </sect2>
 
-    <sect2 id="menuref-cal-actions">
-      <title>The Calendar Actions Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
   </sect1>
 
   <sect1 id="menuref-cal-editor">
     <title>The Appointment Editor Menus</title>
     <para>
-    FIXME: Insert Content Here.
+    The appointment editor has its own menus, to help you use its
+    wide-ranging abilities.
     </para>
     
     <sect2 id="menuref-cal-editor-file">
-      <title>The Appintment Editor's File Menu</title>
+      <title>The Appointment Editor's File Menu</title>
       <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> 
+         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
          that is identical to that in the 
          <link linkend="menuref-universal-file">main window's file menu</link>.
          Its other contents are:
@@ -914,7 +924,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-edit">
-      <title>The Appintment Editor's Edit Menu</title>
+      <title>The Appointment Editor's Edit Menu</title>
       <para>
          FIXME: this menu is copied and pasted entirely from somewhere
          else.
@@ -922,7 +932,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-view">
-      <title>The Appintment Editor's View Menu</title>
+      <title>The Appointment Editor's View Menu</title>
       <para>
          This menu allows you to look at different appointments, and
          set the way you look at them, without having to move back to
@@ -982,7 +992,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-insert">
-      <title>The Appintment Editor's Insert Menu</title>
+      <title>The Appointment Editor's Insert Menu</title>
       <para>
         This menu contains: (FIXME: Insert Content Here)
         <variablelist>
@@ -1013,7 +1023,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-format">
-      <title>The Appintment Editor's Format Menu</title>
+      <title>The Appointment Editor's Format Menu</title>
       <para>
          This menu contains two items, neither of which
          have any functionality yet:
@@ -1037,7 +1047,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-tools">
-      <title>The Appintment Editor's Tools Menu</title>
+      <title>The Appointment Editor's Tools Menu</title>
       <para>
          
          This menu contains four items, none of which
@@ -1061,7 +1071,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-actions">
-      <title>The Appintment Editor's Actions Menu</title>
+      <title>The Appointment Editor's Actions Menu</title>
       <para>
         This menu contains:
 
@@ -1101,7 +1111,7 @@
     </sect2>
 
     <sect2 id="menuref-cal-editor-help">
-      <title>The Appintment Editor's File Menu</title>
+      <title>The Appointment Editor's File Menu</title>
       <para>
          This menu is empty.
       </para>
@@ -1124,7 +1134,7 @@
 
 
     <sect2 id="menuref-contact-view">
-      <title>Contact Manager Edit Menu</title>
+      <title>Contact Manager View Menu</title>
       <para>
         This menu contains the following items:
 
@@ -1146,7 +1156,7 @@
 	  </varlistentry>
 		  
 	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem></term>
+	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
 	  <listitem><para>
              View your contacts as a table.  
              When in table-view mode, this menu item reads 
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 5cceac51ea..5e74a2ce0e 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -90,7 +90,7 @@
 	  <listitem>
 	    <para>
                Data must be safe: <application>Evolution</application>
-               must not not lose mail, corrupt mailbox files or other
+               must not lose mail, corrupt mailbox files or other
                data, execute arbitrary scripts, or delete files from
                your hard disk.
             </para>
@@ -270,7 +270,6 @@
 	    </listitem>
 	  </varlistentry>
 
-
 	  <varlistentry>
 	    <term>Enter a new Contact</term>
 	    <listitem>
@@ -286,8 +285,6 @@
                 </para>
 	    </listitem>
 	  </varlistentry>
-
-
 	</variablelist>
       </para>
     </sect2> 
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 2fd55de976..9e1ec88ef2 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -71,9 +71,9 @@ lack of time, resources, and interest.
        multiple days, and events that have a date but no specific
        time.  Of course, you can also set event reminders and alarms
        so that you don't forget about everything you've just put into
-       your calendar. From managing a busy office to managing a busy
-       family (or both!), <application>Evolution</application> can
-       handle the schedule.
+       your calendar. From office or family to office
+       <emphasis>and</emphasis> family,
+       <application>Evolution</application> can handle the schedule.
     </para>
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
@@ -103,24 +103,23 @@ lack of time, resources, and interest.
         Your event must have a starting and ending date &mdash; by
         default, today &mdash; but you can choose whether to give it
         starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>.  For the purposes of the calendar, an
-        <guilabel>All day event</guilabel> begins at ten in the
-        morning, runs until eleven at night, and is displayed at the
-        top of a day's event list rather than inside it.  That makes
-        it easy to have events that overlap and fit inside each other.
-        For example, a conference might be an all day event, and the
-        meetings at the conference would be timed events.  Events with
-        starting and ending times can also overlap, however, and when
-        they do they're displayed as multiple columns in the day view
-        of the calendar.
+        day event</guilabel>. An <guilabel>All day event</guilabel>
+        appears at the top of a day's event list rather than inside
+        it.  That makes it easy to have events that overlap and fit
+        inside each other.  For example, a conference might be an all
+        day event, and the meetings at the conference would be timed
+        events.  Of course, events with specific starting and ending
+        times can also overlap.  When they do they're displayed as
+        multiple columns in the day view of the calendar.
       </para>
       <note>
        <title>Doing Two Things At Once</title>
          <para>
-           If you create two calendar events that overlap,
-           <application>Evolution</application> will display them as
-           multiple columns in the calendar window.  If you manage to
-           do both things at once, I'd like to meet you.
+           If you create calendar events that overlap,
+           <application>Evolution</application> will display them side
+           by side in your calendar.  However,
+           <application>Evolution</application> cannot help you do
+           multiple things at once.
          </para>
       </note>
       <para>
@@ -177,7 +176,7 @@ lack of time, resources, and interest.
          and a public event can be viewed by anyone on the calendar
          sharing network.  <guilabel>Private</guilabel> denotes one
          level of security, and <guilabel>Confidential</guilabel> a
-         higer level.  <!-- FIXME --> Exact determinations and implementations of
+         higher level.  <!-- FIXME --> Exact determinations and implementations of
          this feature have yet to be determined. <!-- FIXME -->
       </para>
       <para>
@@ -235,7 +234,7 @@ lack of time, resources, and interest.
 	it, and then choose <guimenuitem>Event
 	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
 	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to deselect the
+	window, click the "tentative" button to De-select the
 	event.
       </para>
     </sect2>
@@ -334,8 +333,9 @@ lack of time, resources, and interest.
     <example>
       <title>Keeping Multiple Calendars</title>
       <para>
-        Keelyn has one calendar for her own schedule.  On the network,
-        she maintains one for the conference room, so people know when
+        Keelyn. the office manager for a small company, has one
+        calendar for her own schedule.  On the local network, she
+        maintains one for the conference room, so people know when
         they can schedule meetings.  Next to that, she maintains a
         calendar that reflects when consultants are going to be on
         site, and another that keeps track of when the Red Sox are
@@ -351,7 +351,7 @@ lack of time, resources, and interest.
 
        You can place the calendar in any calendar folder and access it
        from the folder view.  Alarms, configuration, and display for
-       each calendar are seperate from each other.
+       each calendar are separate from each other.
     </para>
     
   </sect1>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 26c003442d..e983a2367d 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -47,7 +47,7 @@
        shows all your cards in alphabetical order, in a
        <glossterm>minicard</glossterm> format.  You can select other
        views from the <guimenu>View</guimenu> menu, and adjust the
-       width of the colums by clicking and dragging the grey column
+       width of the columns by clicking and dragging the grey column
        dividers.
     </para>
 
@@ -78,6 +78,15 @@
         <listitem><para>
            <guibutton>Delete</guibutton> deletes a selected card.
         </para></listitem>
+
+        <listitem><para>
+           <guibutton>Show All</guibutton> Shows all cards.
+        </para></listitem>
+
+        <listitem><para>
+           <guibutton>Stop</guibutton> Stop loading card data from the network.
+        </para></listitem>
+
       </itemizedlist>
     </para>
     <para>
@@ -88,10 +97,9 @@
        the cards to find one that matches.
     </para>
     <para>
-       If there are no matches, the card display will be blank.  To
-       display <emphasis>all</emphasis> of your contacts, you can
-       leave the <guilabel>Quick Search</guilabel> field blank, and
-       press enter.
+       If there are no matches, the card display will be blank. When
+       you'd like to see all the cards again, press <guilabel>Show
+       All</guilabel>.
     </para>
     <para>
        The rest of the contact manager is taken up by the display of
@@ -107,7 +115,7 @@
     <para>
        To delete a card, click on it once to select it, then press the
        <guibutton>Delete Card</guibutton> button.  If you have
-       multiple cards selected, you'll delete mutliple cards.
+       multiple cards selected, you'll delete multiple cards.
     </para>
     <para>
        Adding or changing cards is slightly more complicated.  Any
@@ -217,7 +225,7 @@
                     <userinput>Eva Lucianne Tester</userinput>.
                     You'll notice that the <guilabel>File
                     As</guilabel> field also fills up, but in reverse:
-                    <computeroutput>Tester, Lucianne</computeroutput>.
+                    <computeroutput>Tester, Eva</computeroutput>.
                     You can pick <computeroutput>Eva
                     Tester</computeroutput> from the drop-down, or
                     type in your own, such as <userinput>Lucianne
@@ -230,7 +238,7 @@
                       Don't enter something entirely different from
                       the actual name, since you might forget that
                       you've filed Eva's information under "F" for
-                      "Fictitious Helix Code Employees"
+                      "Fictitious Helix Code Employee."
                     </para>
 		  </tip>
 		</listitem>
@@ -300,13 +308,12 @@
 
 <!--
     <para>
-      Another useful UNIMPLEMENTED
-      <application>Evolution</application> feature is its ability to
-      recognize when people live or work together.  If several people
-      in your contact manager share an address, and you change the
-      address for one of them, <application>Evolution</application>
-      will ask you if you wish to change the address for all of them,
-      or just for one.
+      Another useful <application>Evolution</application> feature is
+      its ability to recognize when people live or work together.  If
+      several people in your contact manager share an address, and you
+      change the address for one of them,
+      <application>Evolution</application> will ask you if you wish to
+      change the address for all of them, or just for one.
     </para>
 -->
 
@@ -333,10 +340,11 @@
 	   <guisubmenu>New</guisubmenu>
 	   <guimenuitem>Folder</guimenuitem>
            </menuchoice>
-           and that you can put new folders anywhere you like.  Each
-	   card must be in a folder, and no card can be in two places
-	   at once.  If you want more flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">
+           and that you can put new folders anywhere you like. Just
+	   like with mail, cards must be in a card folder, and no card
+	   can be in two places at once.  If you want more
+	   flexibility, try <xref
+	   linkend="usage-contact-organize-group-category">.
 	 </para>
 	<para>
           To put a card into a folder, just drag it there from the
@@ -371,13 +379,18 @@
            <!-- FIXME --> Waiting for Evolution to support the
            operation.
          </para>
+
+       <!-- FIXME: Feature Not Implemented
 	<para>
+
            If the master list of categories doesn't suit you, you can
            add your own.  Just enter the new category's name in the
            text box, then click <guibutton>Categories</guibutton> and
            choose <guilabel>Add to Master List</guilabel> in the
            window that appears. 
          </para>
+       -->
+
       </sect3>
     </sect2>
   </sect1>
@@ -392,7 +405,7 @@
        the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
        you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their workgroup
+       work and keep up to date on developments within their work-group
        or across the entire company.
     </para>
 
@@ -424,19 +437,29 @@
        the folder bar, and will work exactly like a local folder of
        cards, with the following exceptions:
        <itemizedlist>
+
           <listitem><para>
               They are only available when you are connected to the network.  If 
               you use a laptop or have a modem connection, you may wish to copy or cache
               the network directory and then synchronize your copy with the networked version
               periodically.
           </para></listitem>
-
+          <listitem><para>
+              To prevent excess network traffic,
+              <application>Evolution</application> will not normally
+              load the contents of LDAP folders immediately upon
+              opening.  You must click <guilabel>Display
+              All</guilabel> before LDAP folder cards will be loaded
+              from the network. You can change this behavior in the
+              <interface>Contact Preferences</interface> window.
+          </para></listitem>
 	  <listitem><para>
-              Your ability to view, change, add or delete contacts 
-              depends on the settings of the LDAP server.  For example, you may 
-              read all the entries in the public Netcenter directory (available by default in the 
-              <guilabel>External Directories</guilabel> folder), but you may not change or delete 
-              any of them.
+              Your ability to view, change, add or delete
+              contacts depends on the settings of the LDAP server.
+              For example, you may read all the entries in the public
+              Netcenter directory (available by default in the
+              <guilabel>External Directories</guilabel> folder), but
+              you may not change or delete any of them.
            </para></listitem>
        </itemizedlist>
      </para>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 3dcc38db86..394c634c27 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -166,12 +166,12 @@
       </variablelist>
     </para>
     <para>
-      If you don't like the shortcut bar, you can use keyboard
-      shortcuts, or <glossterm>hot keys</glossterm>.  They're shown
-      next to their equivalent menu items in the menu bar. You can
-      also set your own hot keys for functions that don't have any;
-      this is covered in <xref linkend="config">.  If you're using the
-      keyboard shortcuts you may also want to hide the
+      If you don't like the shortcut bar, you can use the menu bar, or
+      keyboard shortcuts, also called <glossterm>hot keys</glossterm>.
+      They're shown next to their equivalent menu items in the menu
+      bar. You can also set your own hot keys for functions that don't
+      have any; this is covered in <xref linkend="config">.  If you're
+      using the keyboard shortcuts you may also want to hide the
       <interface>shortcut bar</interface> by selecting <menuchoice>
       <guimenu>View</guimenu> <guimenuitem>Show Shortcut
       Bar</guimenuitem> </menuchoice>.
@@ -350,32 +350,27 @@
           </para></listitem>
         </varlistentry>
 
+       <varlistentry>
+          <term> <guimenu>View</guimenu> Menu </term>
+          <listitem><para>
+            This menu lets you decide how <application>Evolution</application> 
+            should look. Some of the features control the appearance of 
+            <application>Evolution</application> as a whole, and others 
+            the way a particular kind of information appears.
+          </para></listitem>
+        </varlistentry>
+
         <varlistentry>
-          <term> <guimenu>Tools</guimenu> Menu </term>
-          <listitem><para> All of your assistants and configuration
-          tools go here.  For the <interface>Inbox</interface>, that
-          means things like <guimenuitem>Mail
-          Configuration</guimenuitem> and the <guimenuitem>vFolder
-          Editor</guimenuitem>.  For the
+          <term> <guimenu>Settings</guimenu> Menu </term>
+          <listitem><para> Tools for configuring, changing, and
+          setting up go here.  For mail, that means things like
+          <guimenuitem>Mail Configuration</guimenuitem> and the
+          <guimenuitem>vFolder Editor</guimenuitem>.  For the
           <interface>Calendar</interface> and the <interface>Contact
           Manager</interface>, it's color, network, and layout
           configuration. </para></listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term> <guimenu>Actions</guimenu> Menu </term>
-          <listitem><para>
-            This menu contains a list of actions you can perform on
-            the information you've stored with
-            <application>Evolution</application>.  The contents vary
-            depending on the view, but for the
-            <interface>Inbox</interface>, it contains items like
-            <guimenuitem>Mark All Messages Read</guimenuitem> and
-            <guimenuitem>Expunge</guimenuitem>, to erase all the 
-            messages you've marked for deletion.    
-          </para></listitem>
-        </varlistentry>
-
        <varlistentry>
           <term> <guimenu>Help</guimenu> Menu</term>
           <listitem><para>
@@ -387,6 +382,14 @@
       </variablelist>
    </para>
    <para>
+     Other menus, like <guilabel>Folder</guilabel>,
+     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,
+     appear only occasionally.  <guilabel>Message</guilabel> and
+     <guilabel>Folder</guilabel>, for example, have commands that only
+     relate to email, so they're only available when you're looking at
+     email.
+   </para>
+   <para>
       Once you've familiarized yourself with the <interface>main
       window</interface> you can start doing things with it.  We'll
       start with your email inbox, since you've got a letter waiting
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
index 378b9c3866..1ff2283128 100644
--- a/help/C/usage-notes.sgml
+++ b/help/C/usage-notes.sgml
@@ -8,19 +8,19 @@
       storage.  These scraps of paper were called notes.  Now, notes
       are an almost necessary part of our lives, albeit in electronic
       form.  It only makes sense, then, that
-      <application>Evolution</application> has a Notes feature.
-      <application>Evolution</application> can help you take notes in
-      the following ways:
+      <application>Evolution</application> will eventually have a
+      Notes feature.  <application>Evolution</application> can help
+      you take notes in the following ways:
      <itemizedlist>
        <listitem>
          <para>
-           You can take down phone numbers, take school notes, take phone
+           Take down phone numbers, take school notes, take phone
 	   messages, or even write poetry.
          </para>
        </listitem>
        <listitem>
          <para>
-           You can color code notes to organize them, or just to
+           Color code notes to organize them, or just to
            make them look good.
          </para>
        </listitem>
@@ -31,14 +31,16 @@
        </listitem>
        <listitem>
          <para>
-           Something
+           Write <glossterm>Haiku</glossterm>
          </para>
        </listitem>
      </itemizedlist>
    </para>
    <para>
-     You can start writing notes by clicking <guibutton>Notes</guibutton> in the
-     shortcut bar.
+     You can start writing notes by clicking
+     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
+     it's not there yet. But when it is, it'll take you to the
+     notepad.
    </para>
   </abstract>
 </chapter>
diff --git a/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
index 07325e1848..a6b53e9526 100644
--- a/help/C/usage-sync.sgml
+++ b/help/C/usage-sync.sgml
@@ -2,21 +2,19 @@
     <chapter id="usage-sync">
       <title>Synchronizing with a Hand-held Device</title>
       <para>
-        Once you've set up a synchronization system, it pretty much
-        takes care of itself.  Not only that, it's entirely possible
-        that your system administrator has set it up for you.  All
-        that this chapter covers is how to use that system once it's
-        installed and configured.  If you need to set it up, consult
-        <xref linkend="config-sync">.
+        This chapter covers is how to synchronize data 
+        installed and configured.  If you need information on how to
+        set up a synchronization system, consult <xref
+        linkend="config-sync">.
       </para>
-
-      <para>
-        If you've already got Gnome-pilot set up to use
-        <application>Evolution</application>, put
-        your hand-held device on the cradle and press the HotSync
-        button.
-      </para>
-      <para>
+      <sect1 id="hotsync">
+        <title>Using HotSync</title>
+        <para>
+          Put your hand-held device on its cradle and press the
+          HotSync button.
+        </para>
+        <para>
          No, really.  That's all there is to it.
-      </para>
+        </para>
+       </sect1>
     </chapter>
\ No newline at end of file