More of Megan's revisions, and Field Chooser functions in the Sort

2001-01-19  Aaron Weber  <aaron@helixcode.com>

	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
	functions in the Sort section.

	* C/apx-gloss.sgml: added "ToolTip"

2001-01-18  Aaron Weber  <aaron@helixcode.com>

	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.

	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
	comments.

	* C/evolution-guide.sgml: s/Helix Code/Ximian/

svn path=/trunk/; revision=7638

12 files changed, 580 insertions, 484 deletions

diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index 365e64b60d..6124998862 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -372,14 +372,29 @@
   <glossterm>Spam</glossterm>
   <glossdef>
    <para>
-    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
+    Useless, unsolicited e-mail.  Spam normally comes in forms of
+    chain letters and advertisements for unscrupulous or clueless
+    companies.  Messages that are merely useless are called "opt-in
     newsletters."
    </para>
   </glossdef>
  </glossentry>
 
+
+ <glossentry id="tooltip">
+  <glossterm>Tool-Tip</glossterm>
+  <glossdef>
+   <para>
+      A small box of explanatory text which appears when the mouse
+      pointer is held motionless over a button or other interface
+      element.
+   </para>
+  </glossdef>
+ </glossentry>
+
+
+
+
  <glossentry id="virus">
   <glossterm>Virus</glossterm>
   <glossdef>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 5adc131eeb..dc2f5046aa 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -33,7 +33,7 @@ implemented. -->
     </authorgroup>
     <copyright>
       <year>2000</year>
-      <holder> Helix Code, Inc., </holder>
+      <holder> Ximian, Inc., </holder>
       <holder> Kevin Breit </holder>
     </copyright>
     
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 541f2d4d77..be18abd3d3 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -50,7 +50,7 @@
 
       <para>
         <application>Evolution</application> can help you work in a
-        group, by handling email, address and other contact
+        group by handling email, address and other contact
         information, and one or more calendars.  It can do that on one
         or several computers, connected directly or over a network,
         for one person or for large groups.
@@ -63,9 +63,10 @@
 	  <listitem>
 	    <para>
              The application must be <emphasis>both powerful and easy
-             to use</emphasis>. That means a familiar and intuitive
-             interface that users can customize to their liking, and
-             the development of shortcuts for complex tasks.
+             to use</emphasis>. In other words, it needs a familiar
+             and intuitive interface that users can customize to their
+             liking, and users should have access to shortcuts for
+             complex tasks.
             </para>
 	  </listitem>
 	  <listitem>
@@ -125,7 +126,7 @@
         chunks of information, and many of the features it describes
         are unimplemented.  All the content is subject to change,
         especially if you help.  Please send comments on the guide to
-        <email>aaron@helixcode.com</email>. If you would like to work
+        <email>aaron@ximian.com</email>. If you would like to work
         on the guide please contact me or see the GNOME Documentation
         project <ulink
         url="http://developer.gnome.org/projects/gdp">web
@@ -140,14 +141,14 @@
         tour</link>&mdash; it will explain how to use
         <application>Evolution</application>.  If you are new to
         <application>Evolution</application> or to groupware in
-        general, this is the section for you. The second section,
-        covering <link linkend="config">configuration</link>, is
-        targeted at more advanced users, but anyone who wants to
-        change the way <application>Evolution</application> looks or
-        acts can benefit from reading it.  In addition, there is a
-        comprehensive <link linkend="menuref">menu
-        reference</link> which describes nearly every capability that
-        <application>Evolution</application> has to offer.
+        general, this section is for you. The second section, covering
+        <link linkend="config">configuration</link>, is targeted at
+        more advanced users, but anyone who wants to change the way
+        <application>Evolution</application> looks or acts can benefit
+        from reading it.  In addition, there is a comprehensive <link
+        linkend="menuref">menu reference</link> which describes nearly
+        every capability that <application>Evolution</application> has
+        to offer.
       </para>
       <formalpara>
         <title>Typographical conventions</title>
@@ -178,7 +179,7 @@
   <sect1 id="commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
-        You might want to get a copy of this section and tape it to
+        You might want to copy this section and tape it to
         the wall next to your computer: it's a very short summary of
         most of the things you'll want to do with
         <application>Evolution</application>, and pointers to the
@@ -189,8 +190,7 @@
       <title>Opening or Creating Anything</title>
       <para>
          Here are the keyboard shortcuts and menu items you're most
-         likely to use: (Please note that the shortcuts listed are
-         probably wrong at this point).
+         likely to use:
          
           <variablelist>
 
@@ -257,37 +257,40 @@
 	    </listitem>
 	  </varlistentry>
 
+
 	  <varlistentry>
-	    <term>Create a new Task</term>
+	    <term>Enter a new Contact</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
 		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
+		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
+		  <keycap>C</keycap>
                 </keycombo>
                 </para>
 	    </listitem>
 	  </varlistentry>
 
+
 	  <varlistentry>
-	    <term>Enter a new Contact</term>
+	    <term>Create a new Task</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
 		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
+		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
+		  <keycap>T</keycap>
                 </keycombo>
                 </para>
 	    </listitem>
 	  </varlistentry>
+
 	</variablelist>
       </para>
     </sect2> 
@@ -300,12 +303,10 @@
 	    <term>Check Mail</term>
 	    <listitem>
 	      <para>
-                Click <guibutton>Get Mail</guibutton> in the toolbar, or press 
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
+                Click <guibutton>Get Mail</guibutton> in the
+                toolbar. There is no keyboard shortcut for this task,
+                but you can ask <application>Evolution</application>
+                to check for new mail periodically. To do so, FIXME.
                 </para>
 	    </listitem>
 	  </varlistentry>
@@ -318,14 +319,19 @@
                 click <guibutton>Reply</guibutton> in the
                 toolbar, or press
                 <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
                 </keycombo>
                 </para>
 	      <para>
                 To reply to the sender and all the other visible
-                recipients of the message, click:
+                recipients of the message, click <guibutton>Reply to
+                All</guibutton> or select the message and press
+                <keycombo action="simul">
+		  <keycap>Shift</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
+                </keycombo>
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -338,9 +344,8 @@
                 and click <guibutton>Forward</guibutton> in the
                 toolbar, or press
                 <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>J</keycap>
                 </keycombo>
                 </para>
 	    </listitem>
@@ -361,18 +366,20 @@
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Create Filters and vFolders</term>
+	    <term>Create Filters and Virtual Folders</term>
 	    <listitem>
 	      <para>
-                You can create filters and vFolders based on specific
-                message attributes by right-clicking on a message or
-                by selecting <menuchoice> <guimenu>Tools</guimenu>
+                You can create filters and Virtual Folders based on
+                specific message attributes from the message's
+                right-click menu.  Alternately, select a message, and
+                then choose <menuchoice> <guimenu>Settings</guimenu>
                 <guimenuitem>Mail Filters</guimenuitem> </menuchoice>
-                or <menuchoice> <guimenu>Tools</guimenu>
-                <guimenuitem>vFolder Editor</guimenuitem>
+                or <menuchoice> <guimenu>Settings</guimenu>
+                <guimenuitem>Virtual Folder Editor</guimenuitem>
                 </menuchoice>.  Filters are discussed in <xref
-                linkend="usage-mail-organize-filters">, and vFolders
-                in <xref linkend="usage-mail-organize-vfolders">.
+                linkend="usage-mail-organize-filters">, and Virtual
+                Folders in <xref
+                linkend="usage-mail-organize-vfolders">.
             </para>
 	    </listitem>
 	</varlistentry>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 304b60481c..70fdc76d66 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -19,7 +19,7 @@
        <listitem>
 	 <para>
 	  It can send and receive mail in HTML or as plain text, and
-	  supports file attachments.
+	  permits multiple file attachments.
 	 </para>
        </listitem>
        <listitem>
@@ -43,11 +43,11 @@
       linkend="usage-mail-organize-search">searching</link> functions
       were built for speed and efficiency on gargantuan volumes of
       mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
-      advanced organizational feature not found in other mail clients.
-      If you get a lot of mail, or if you keep every message you get
-      in case you need to refer to it later, you'll find that feature
-      especially useful.
+      <link linkend="usage-mail-organize-vFolders">Virtual
+      Folder</link>, an advanced organizational feature not found in
+      other mail clients.  If you get a lot of mail, or if you keep
+      every message you get in case you need to refer to it later,
+      you'll find this feature especially useful.
     </para>
   </abstract>
 
@@ -61,19 +61,20 @@
        <guibutton>Inbox</guibutton> in the shortcut bar. The first
        time you use <application>Evolution</application>, it will
        start with the <interface>Inbox</interface> open and show you a
-       message from Helix Code welcoming you to the application.
+       message from Ximian welcoming you to the application.
       </para>
       <para>
-	The <application>Evolution</application>
-	<guilabel>Inbox</guilabel>, should look like the one in <xref
-	linkend="usage-mail-intro-fig">, which has a message from
-	Helix Code. The message summary appears at the top, in the
-	<interface>message list</interface>.  The message itself is
-	displayed below that, in the <interface>view pane</interface>.
-	If you find the <interface>view pane</interface> too small,
-	you can resize the pane, enlarge the whole window, or double-click
-	on the message in the <interface>message list</interface> to
-	have it open in a new window.  Just like with folders, you can
+	Your <application>Evolution</application>
+	<guilabel>Inbox</guilabel> will look something like the one in
+	<xref linkend="usage-mail-intro-fig">. Just below the toolbar
+	is the <interface>message list</interface>, showing message
+	header information like <guilabel>Subject</guilabel> and
+	<guilabel>Date</guilabel>.  The message itself appears below
+	that, in the <interface>view pane</interface>.  If you find
+	the <interface>view pane</interface> too small, you can resize
+	the pane, enlarge the whole window, or double-click on the
+	message in the <interface>message list</interface> to have it
+	open in a new window.  Just like with folders, you can
 	right-click on messages in the message list and get a menu of
 	possible actions.
      </para>
@@ -111,21 +112,26 @@
           you choose the way you work is the way it lets you sort your
           message lists.  To sort by sender, subject, or date, click
           on the bars with those labels at the top of the message
-          list.  If you click twice, you'll sort them in reverse
-          order. You can also right-click on the message header bars
-          to get a set of sorting options, and add or remove columns
-          from the message list.  You can find detailed instructions
-          on how to customize your message display columns in <xref
-          linkend="usage-mail-organize-columns">.
+          list. The direction of the arrow next to the label indicates
+          the direction of the sort, and if you click again, you'll
+          sort them in reverse order. For example, click once on
+          <guilabel>Date</guilabel> to sort messages by date from
+          oldest to newest.  Click again, and
+          <application>Evolution</application> sorts the list from
+          newest to oldest. You can also right-click on the message
+          header bars to get a set of sorting options, and add or
+          remove columns from the message list.  You can find detailed
+          instructions on how to customize your message display
+          columns in <xref linkend="usage-mail-organize-columns">.
         </para>
 	<para>
           You can also choose a threaded message view. Select
           <menuchoice> <guimenu>View</guimenu>
           <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  If the option selected,
-          <application>Evolution</application> will group the replies
-          to a message with the original, so you can follow the thread
-          of a conversation from one message to the next.
+          the threaded view on or off.  When you select this option,
+          <application>Evolution</application> groups the replies to a
+          message with the original, so you can follow the thread of a
+          conversation from one message to the next.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-delete">
@@ -135,16 +141,19 @@
           it. To mark a message for deletion, select it in the the
           <interface>message list</interface> by clicking on it once.
           Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar.  The message now has a line through it,
-          because you've marked it for deletion.
+          the tool bar. Or, right-click on a message and choose
+          <guimenuitem>Delete</guimenuitem> from the right-click
+          menu. The message will appear with a line through it, to
+          show that you've marked it for deletion.
         </para>
         <para>
-          If you really want to get rid of it, choose
+          If you change your mind and decide you want to keep it,
+          select <menuchoice> <guimenu>Message</guimenu>
+          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you
+          really want to get rid of it, choose
           <guimenuitem>Expunge</guimenuitem> from the
           <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently. If you change your mind and decide you want to
-          keep it, select <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Undelete</guimenuitem></menuchoice>.
+          permanently.
         </para>
       </sect3>
     </sect2>
@@ -163,9 +172,9 @@
      <para>
         Then, you need to enter your email
         password. <application>Evolution</application> will remember
-        the password until you quit the application or until you
-        select <menuchoice> <guimenu>Settings</guimenu>
-        <guimenuitem>Forget Passwords</guimenuitem> </menuchoice>.
+        your password until until you select <menuchoice>
+        <guimenu>Settings</guimenu> <guimenuitem>Forget
+        Passwords</guimenuitem> </menuchoice>.
       </para>
       <para>
         Once it's validated the password,
@@ -188,9 +197,9 @@
       <sect3 id="usage-mail-getnsend-get-news">
          <title>Using Evolution for News </title>
        <para>
-         Newsgroups are so similar to email there's no reason not to
-         read them side by side.  If you want to do that, add a news
-         source to your configuration (see <xref
+         Newsgroups are so similar to email that there's no reason not
+         to read them side by side.  If you want to do that, add a
+         news source to your configuration (see <xref
          linkend="config-prefs-network-news">). The news server will
          appear as a remote server, and will look quite similar to an
          IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
@@ -208,20 +217,14 @@
 	  at the bottom of the message to which it's attached.  Text,
 	  HTML, and most images will be displayed within the message
 	  itself.  For other files,
-	  <application>Evolution</application> will provide a link and
-	  icon at the end of the message.  Click on that, and
-	  <application>Evolution</application> will ask you where you
-	  want to put the file.  Once you've chosen a location and
-	  saved the file, you can open, move, copy, or execute it just
-	  like any other, using <application>Nautilus</application> or
-	  your favorite shell or file manager.
+	  <application>Evolution</application> will show an icon at
+	  the end of the message.  Right-click on the icon to get a
+	  list of options which will vary depending on the type of
+	  attachment. You will have the option to display most files
+	  as part of the message, export them to a different
+	  application (images to Eye of GNOME, spreadsheets to
+	  Gnumeric, and so forth), or save them to disk.
         </para>
-        <para>
-          As usual, there's a shortcut here: right-click on the link,
-	  and choose an application for the file: you can send an
-	  image straight to the <application>GIMP</application>, or a
-	  spredsheet straight to <application>Gnumeric</application>.
-	</para>
 
 	<para>
 	   <application>Evolution</application> can also display
@@ -238,7 +241,7 @@
 	 You can start writing a new email message by selecting
 	 <menuchoice> <guimenu>File</guimenu>
 	 <guisubmenu>New</guisubmenu> <guimenuitem>
-	 Mail</guimenuitem></menuchoice>, or by pressing the
+	 Mail Message</guimenuitem></menuchoice>, or by pressing the
 	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
 	 When you do so, the <interface>New Message</interface> window
 	 will open, as shown in <xref
@@ -262,8 +265,7 @@
 	 Enter an address in the <guilabel>To:</guilabel> field, a
 	 subject in the <guilabel>Subject:</guilabel> and a message in
 	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.  That's easy, although it can
-	 get a little more complicated if you want.
+	 <guibutton>Send</guibutton>.
        </para>
 
       <sect3 id="usage-mail-getnsend-send-delay">
@@ -272,14 +274,14 @@
 	   Evolution will send mail immediately unless you tell it to
 	   do otherwise by selecting <menuchoice>
 	   <guimenu>File</guimenu> <guimenuitem>Send
-	   Later</guimenuitem></menuchoice>.  That will add messages
-	   to the <guilabel>Outbox</guilabel> queue.  Then, when you
-	   press <guibutton>Send</guibutton> in another message, or
-	   <guibutton>Get Mail</guibutton> in the main mail window,
-	   all your unsent messages will go out at once.  I like to
-	   use "Send Later" because it gives me a chance to change my
-	   mind about a message before it goes out.  That way, I don't
-	   send anything I'll regret the next day.
+	   Later</guimenuitem></menuchoice>.  This will add your
+	   messages to the <guilabel>Outbox</guilabel> queue.  Then,
+	   when you press <guibutton>Send</guibutton> in another
+	   message, or <guibutton>Get Mail</guibutton> in the main
+	   mail window, all your unsent messages will go out at once.
+	   I like to use "Send Later" because it gives me a chance to
+	   change my mind about a message before it goes out.  That
+	   way, I don't send anything I'll regret the next day.
 	</para>
 	<para>
 	   To learn more about how you can specify message queue and
@@ -322,7 +324,7 @@
 	    labelled <guibutton>Attach</guibutton>.  If you click the
 	    <guibutton>Attach</guibutton> button,
 	    <application>Evolution</application> will open a file
-	    selection dialog box, to ask you which file you want to
+	    selection dialog box to ask you which file you want to
 	    send.  Select the file and click <guilabel>OK</guilabel>.
         </para>
 	<para>
@@ -341,18 +343,16 @@
         <sect4 id="usage-mail-getnsend-send-to-types">
          <title>Types of Recipients</title>
         <para>
-	    <application>Evolution</application>, like all email
-	    programs (at least, all the ones in current use)
-	    recognizes three types of addressee: primary recipients,
-	    secondary recipients, and hidden ("blind") recipients.
+	    <application>Evolution</application>, like most email
+	    programs recognizes three types of addressee: primary
+	    recipients, secondary recipients, and hidden ("blind")
+	    recipients.
          </para>
          <para>
 	    The simplest way to direct a message is to put the email
             address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  However, it's
-            considered bad form to have more than a few email
-            addresses in this section.  If you are sending mail to
-            more than one or two people, consider the
+            field, which denotes primary recipients.  To send mail to
+            more than one or two people, you can use the the
             <guilabel>Cc:</guilabel> field.
 	  </para>
 	  <para>
@@ -377,11 +377,13 @@
 	    to send mail to several people without sharing the
 	    recipient list, you should use
 	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
-	    Copy", and means that people you put in the
-	    <guilabel>Bcc:</guilabel> field get the message, but
-	    nobody else sees their email address.  They will still see
-	    the list of addresses from the <guilabel>To:</guilabel>
-	    and <guilabel>Cc:</guilabel> fields, though.
+	    Copy", and it sends messages discreetly.  In other words,
+	    the people in the <guilabel>Bcc:</guilabel> field get the
+	    message, but nobody sees that they got it.  Note that the
+	    contents of the <guilabel>To:</guilabel> and
+	    <guilabel>Cc:</guilabel> fields are visible to all
+	    recipients, even to people on the
+	    <guilabel>Bcc:</guilabel> list.
 
 	    <example id="ex-mail-bcc">
 	      <title>Using the Bcc: field</title>
@@ -395,7 +397,8 @@
 	         category into the <guilabel>To:</guilabel> or
 	         <guilabel>Cc:</guilabel> fields, he'll make the
 	         company's <emphasis>entire</emphasis> client list
-	         public.  Don't assume it won't happen to you!
+	         public. It seems like a small difference, but it can
+	         make a huge difference in some situations.
 	     </para>
 	    </example>
 	  </para>
@@ -440,7 +443,7 @@
 	   To reply to a message, press the
 	   <guibutton>Reply</guibutton> button while it is selected,
 	   or choose <guimenuitem>Reply to Sender</guimenuitem> from
-	   the message's right-click menu.  That will open
+	   the message's right-click menu.  That will open the
 	   <interface>message composer</interface>.  The
 	   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
 	   fields will already be filled, although you can alter them
@@ -452,7 +455,7 @@
 	   with the quoted material as shown in <xref
 	   linkend="usage-mail-getnsend-reply-fig">.
 
-<!-- note that this figure should have a reply mail ready to send,
+<!-- note that this figure should have a reply message ready to send,
 with quoted materials and the relevant replies interspersed-->
  <!-- ==============Figure=================================== -->
        <figure id="usage-mail-getnsend-reply-fig">
@@ -472,18 +475,21 @@ with quoted materials and the relevant replies interspersed-->
 	   <guibutton>Reply</guibutton>.  If there are large numbers
 	   of people in the <guilabel>Cc:</guilabel> or
 	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time.  But be careful, and always make sure you
-	   know who is getting a message: one address could be a
-	   mailing list with thousands of subscribers.
+	   amounts of time.  Be careful: always make sure you know who
+	   is getting a message: one address could be a mailing list
+	   with thousands of subscribers.
 	  <example>
 	    <title>Using the Reply to All feature</title>
 	    <para>
-	      Susan sends an email to a client, and sends copies to
-	      Tim and to an internal company mailing list of
-	      co-workers.  If Tim wants to make a comment to all of
-	      them, he uses <guibutton>Reply to All</guibutton>, but
-	      if he just wants to tell Susan that he agrees with her,
-              he uses <guibutton>Reply</guibutton>.
+	      Susan sends an email to a client and sends copies to Tim
+	      and to an internal company mailing list of co-workers.
+	      If Tim wants to make a comment for all of them to read,
+	      he uses <guibutton>Reply to All</guibutton>, but if he
+	      just wants to tell Susan that he agrees with her, he
+	      uses <guibutton>Reply</guibutton>.  Note that his reply
+	      will not reach anyone that Susan put on her
+	      <guilabel>Bcc</guilabel> list, since nobody else knows
+	      that they got that message.
 	    </para>
 	  </example>
 	</para>
@@ -512,9 +518,9 @@ with quoted materials and the relevant replies interspersed-->
 	      <term><guimenuitem>Find Regex</guimenuitem></term>
 	      <listitem>
 		<para>
-                  Perform a search for a <glossterm
-                  linkend="regular-expression">regular
-                  expression</glossterm>, or "regex."
+                  Find a regex, also called a
+                  <glossterm linkend="regular-expression">regular
+                  expression</glossterm>, in your composer window.
                </para>
              </listitem>
 	    </varlistentry>
@@ -537,28 +543,27 @@ with quoted materials and the relevant replies interspersed-->
 	  </variablelist>
         </para>  
 	<para>
-            For all of these items, you have two additional choices.
-            First, you can choose whether to <guilabel>Search
-            Backwards</guilabel>, which will perform the search
-            starting wherever your cursor is, and moving back towards
-            the beginning of the document (normally, it goes the other
-            way).  Then, you can decide whether to have your search be
-            <guilabel>Case Sensitive</guilabel>, meaning should it pay
-            attention to the case of letters when locating a match.
+            For all of these menu items, you can choose whether or not
+            to <guilabel>Search Backwards</guilabel> in the document
+            from the point where your cursor is.  For all but the
+            regular expression search (which doesn't need it), you are
+            offered a check box to determine whether the search is to
+            be <guilabel>Case Sensitive</guilabel> when it determines
+            a match.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-send-html">
 	<title>Embellish your email with HTML</title>
 	<para>
-            You can't normally set text styles or insert pictures in
+            Normally, you can't set text styles or insert pictures in
             emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis or use <glossterm
-            linkend="emoticon">emoticons</glossterm> to convey their
-            feelings.  However, most of the newer email programs can
-            include and display images and text styles as well as
-            basic alignment and paragraph formatting. They do this
-            with <glossterm linkend="html">HTML</glossterm>, just like
-            web sites do.
+            too many exclamation points for emphasis, or use
+            <glossterm linkend="emoticon">emoticons</glossterm> to
+            convey their feelings.  However, most newer email programs
+            can display images and text styles as well as basic
+            alignment and paragraph formatting. They do this with
+            <glossterm linkend="html">HTML</glossterm>, just like web
+            pages do.
         </para>
 	<note>
 	  <title>HTML Mail is not a Default Setting</title>
@@ -579,28 +584,30 @@ with quoted materials and the relevant replies interspersed-->
           </para>
 	</note>
 	<para>
-           HTML formatting tools are located just above the
-	   composition frame, and in the <guimenu>Insert</guimenu> and
-	   <guimenu>Format</guimenu> menus.  Your message text will
-	   appear formatted in the composer window, and the message
-	   will be sent as HTML.
+           HTML formatting tools are located in the toolbar just above
+	   the space where you'll actually compose the message, and
+	   they also appear in the <guimenu>Insert</guimenu> and
+	   <guimenu>Format</guimenu> menus.  
 	  </para>
 	  <para>
-            The icons in the toolbar are explained in tool-tips, which
-            appear when you hold your mouse over the buttons.  The
-            buttons fall into four categories:
+            The icons in the toolbar are explained in <glossterm
+            linkend="tooltip">tool-tips</glossterm>, which appear when
+            you hold your mouse over the buttons.  The buttons fall
+            into four categories:
             <variablelist>
              <varlistentry>
              <term>Headers and lists</term>
 	      <listitem>
 		<para>
-                  Choose <guilabel>Normal</guilabel> for a default
-                  text style, or <guilabel>Header 1</guilabel> through
+                  At the left edge of the toolbar, you can choose
+                  <guilabel>Normal</guilabel> for a default text style
+                  or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6).  You can also
-                  select <guilabel>pre</guilabel> for preformatted
-                  text blocks, and three types of <guilabel>List
-                  Item</guilabel>.
+                  header from large (1) to tiny (6). Other styles
+                  include <guilabel>pre</guilabel>, to use the HTML
+                  tag for preformatted blocks of text, and three types
+                  of <guilabel>List Item</guilabel> for the highly
+                  organized.
                 </para>
 	      </listitem>
            </varlistentry>
@@ -626,12 +633,12 @@ with quoted materials and the relevant replies interspersed-->
 	      <term>Alignment</term>
 	      <listitem>
 		<para>
-                   Located next to the text style buttons,
-                   these three paragraph icons should be familiar to
-                   users of most word processing software.  The
-                   leftmost button will make your text left-justified,
-                   the center button, centered, and the right hand
-                   button, right-justified.
+                   Located next to the text style buttons, these three
+                   paragraph icons should be familiar to users of most
+                   word processing software.  The leftmost button will
+                   make your text aligned to the left, the center
+                   button, centered, and the right hand button,
+                   aligned on the right side.
                 </para>
 	      </listitem>
 	      </varlistentry>
@@ -651,13 +658,13 @@ with quoted materials and the relevant replies interspersed-->
 	      <term>Color Selection</term>
 	      <listitem>
 		<para>
-                  At the far right is the color section tool.  You can
-                  choose from several colors by clicking on the arrow,
-                  or create your own custom color by clicking on the
-                  color box itself.  If you have text selected, the
-                  color will apply to the selected text.  If you do
-                  not have text selected, the color will apply to
-                  whatever you type next.
+                  At the far right is the color section tool.  The
+                  colored box displays the current text color; to
+                  choose a new one, click the arrow button just to the
+                  right. If you have text selected, the color will
+                  apply to the selected text.  If you do not have text
+                  selected, the color will apply to whatever you type
+                  next.
                </para>
 	    </listitem>
 	  </varlistentry>
@@ -689,10 +696,9 @@ with quoted materials and the relevant replies interspersed-->
             <term> <guimenuitem>Insert Image</guimenuitem>:</term>
 	    <listitem>
 	      <para>
-               <guimenuitem>Insert Image</guimenuitem>: Select this
-               item to embed an image into your email, as was done in
-               the welcome message.  Images will appear at the
-               location of the cursor. This is different from
+               Select this item to embed an image into your email, as
+               was done in the welcome message.  Images will appear at
+               the location of the cursor. This is different from
                attaching them to a message, but not very different.
               </para>
 	    </listitem>
@@ -777,7 +783,7 @@ possibly never will be due to security evil. -->
 	</para>
       </sect3>
       <sect3 id="usage-mail-getnsend-ettiquette">
-	<title>Seven Tips for Email Usage</title>
+	<title>Seven Tips for Email Courtesy</title>
 	<para>
 	  I started with ten, but four were "Don't send
 	  <glossterm linkend="spam">spam</glossterm>."
@@ -789,15 +795,15 @@ possibly never will be due to security evil. -->
 		 watch out for hoaxes and urban legends, and make sure
 		 the message doesn't have multiple layers of
 		 greater-than signs, (&gt;) indicating multiple layers
-		 of careless inline forwarding.
+		 of careless in-line forwarding.
 	      </para>
 	    </listitem>
 
 	    <listitem>
 	      <para>
-		Always begin and close with a salutation. Say
-		"please" and "thank you", just like you do in real
-		life. You can keep your pleasantries short, but be pleasant!
+		Always begin and close with a salutation. Say "please"
+		and "thank you," just like you do in real life. You
+		can keep your pleasantries short, but be pleasant!
 	      </para>
 	    </listitem>
 
@@ -856,12 +862,16 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-columns">
       <title>Sorting Mail with Column Headers</title>
       <para>
-         By default, the columns in a mail message list are an
-         envelope icon indicating whether a message has been read
-         (closed for unread, open for read), an exclamation point
-         indicating priority, and the <guilabel>From</guilabel>,
+         By default, the columns in a mail message list are: an
+         envelope icon indicating whether you have read or replied to
+         a message (closed for unread, open for read, and open with an
+         arrow on it to indicate you've sent a reply), an exclamation
+         point indicating priority, and the <guilabel>From</guilabel>,
          <guilabel>Subject</guilabel>, and <guilabel>Date</guilabel>
-         fields.  However, you can change that if you want.
+         fields. You can change their order and remove them by
+         dragging and dropping them.  You can add new ones with the
+         <guimenuitem>Field Chooser</guimenuitem> item in the right
+         click menu for the column headings.
       </para>
       <para>
          Right-click on one of the column headers to get a list of
@@ -869,29 +879,37 @@ possibly never will be due to security evil. -->
              <variablelist>
 
                <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
-                  <listitem><para>
-                  </para></listitem>
+                  <term><guimenuitem>Sort Ascending</guimenuitem>,
+                  <guimenuitem>Sort Descending</guimenuitem>, and
+                  <guimenuitem>Unsort</guimenuitem></term>
+                  <listitem><para>Which should be pretty obvious. You
+                  can also set these sorts by just clicking on the
+                  column headers.</para></listitem>
                </varlistentry>
 
               <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
+                  <term><guimenuitem>Group By this Field</guimenuitem></term>
                   <listitem><para>
+                     Groups messages instead of sorting them. (FIXME: Explain further) 
                   </para></listitem>
                </varlistentry>
 
               <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
-                  <listitem><para>
-                  </para></listitem>
+                  <term><guimenuitem>Remove this
+                  Column</guimenuitem></term> <listitem><para> Remove
+                  this column from the display. You can also remove
+                  columns by dragging the header off the list and
+                  letting it drop.  </para></listitem>
                </varlistentry>
 
               <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
-                  <listitem><para>
-                  </para></listitem>
+                  <term><guimenuitem>Field
+                  Chooser</guimenuitem></term> <listitem><para> A list
+                  of column headers; just drag and drop them into
+                  place between two existing headers. A red arrow will
+                  appear to show you where you're about to put the
+                  column.  </para></listitem>
                </varlistentry>
-
             </variablelist>
       </para>
     </sect2>
@@ -1189,13 +1207,14 @@ possibly never will be due to security evil. -->
 
 	  <varlistentry>
 	    <term><guilabel>Regex Match</guilabel></term>
-	    <listitem><para>
-              If you know your way around a <glossterm
-	      linkend="regular-expression">regular
-	      expression</glossterm>, or regex, put your knowledge to
-	      use here. You can match your expression in the message
-	      headers or in its body.
-            </para></listitem>
+	    <listitem>
+              <para>
+                If you know your way around a <glossterm
+  	        linkend="regular-expression">regex </glossterm>, or
+  	        regular expression, put your knowledge to use
+  	        here.
+               </para>
+            </listitem>
           </varlistentry>
 
 	  <varlistentry>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 94c65acfd8..54607c8c01 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -28,7 +28,7 @@
      part of the <interface>main window</interface> is taken up by the
      actual <interface>Inbox</interface>, where messages are listed
      and displayed.  If you're running the program for the first time,
-     you'll have just one message: a welcome from Helix Code.
+     you'll have just one message: a welcome from Ximian.
 
 
 <!-- ==============Figure=================================== -->
@@ -81,8 +81,8 @@
        Directories</guilabel>, it will slide up and you'll see buttons
        for the <guilabel>Bigfoot</guilabel> and
        <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator might have added. You
-       can add more groups by right-clicking on the background of the
+       others you or your system administrator may have added. You can
+       add more groups by right-clicking on the background of the
        shortcut bar and selecting <guimenuitem>Menu
        Group</guimenuitem>.  Internet directories behave a lot like
        the local contact manager, which is covered in <xref
@@ -171,7 +171,7 @@
     </para>
     <para>
       If you don't like the shortcut bar, you can use the folder bar
-      or the menu bar to navigate. Press 
+      or the menu bar to navigate the main window. Press 
             <keycombo action="simul">
                  <keycap>Ctrl</keycap> 
                  <keycap>O</keycap> 
@@ -208,18 +208,17 @@
       appointments, address cards, and email in a tree that's a lot
       like a <glossterm linkend="filetree">file
       tree</glossterm>&mdash; it starts small at the top, and branches
-      downwards. On most computers, there will be three folders at the
-      base.  First, and probably most important, is the
-      <guilabel>Local</guilabel> folder, which holds all the
-      <application>Evolution</application> data that's stored on your
-      computer.  After that come <guilabel>vFolders</guilabel>, or
-      virtual folders, discussed in <xref
-      linkend="usage-mail-organize-vfolders">, followed by any
-      <glossterm linkend="imap">IMAP</glossterm> mail folders you
-      might have available to you over your network.  Lastly, there
-      are <guilabel>External Directories</guilabel>, <glossterm
+      downwards. On most computers, there will be three or four
+      folders at the base.  First is the <guilabel>Local</guilabel>
+      folder, which holds all the <application>Evolution</application>
+      data that's stored on your computer.  After that come
+      <guilabel>Virtual Folders</guilabel>, or virtual folders, discussed in
+      <xref linkend="usage-mail-organize-vfolders">, followed by any
+      <glossterm linkend="imap">IMAP</glossterm> mail folders you may
+      have available to you over your network.  Lastly, there are
+      <guilabel>External Directories</guilabel>, <glossterm
       linkend="ldap">LDAP</glossterm> contact directories stored on a
-      network. 
+      network.
     </para>
     <para>
        
@@ -266,7 +265,6 @@
 	   </para>
 	 </listitem>
 
-
       </itemizedlist>
 
     </para>
@@ -294,13 +292,8 @@
        <note>
 	  <title>Folders Have Limits</title>
 	  <para>
-              No matter where they exist, calendars must go in
-	      calendar folders, mail in mail folders, and contacts in
-	      contact folders.  Network folders follow the same type
-	      restriction, because the network servers are only set up
-	      to handle one kind of information. Within your local
-	      system, though you can folders inside each other,
-	      regardless of type.
+              Calendars must go in calendar folders, mail in mail
+	      folders, and contacts in contact folders.
            </para>
 	</note>
 
@@ -310,8 +303,7 @@
       exception.  If you right-click on a folder, you'll have a
       menu with the following options:
       <itemizedlist>
-	<listitem><para><guimenuitem>View</guimenuitem>, to view a message.</para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
+	<listitem><para><guimenuitem>FIXME</guimenuitem>, for another purpose. </para></listitem>
 	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
       </itemizedlist>.
     </para>
@@ -371,8 +363,7 @@
        <varlistentry>
           <term> <guimenu>Edit</guimenu> Menu </term>
           <listitem><para>
-              Although it doesn't contain anything at first,
-              the <guimenu>Edit</guimenu> menu fills up with 
+              The <guimenu>Edit</guimenu> menu holds
               useful tools that help you edit text and move it around.
           </para></listitem>
         </varlistentry>
@@ -392,7 +383,7 @@
           <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
+          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
           <interface>Calendar</interface> and the <interface>Contact
           Manager</interface>, it's color, network, and layout
           configuration. </para></listitem>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 02c0ed3501..51d8d6eb7c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,19 @@
+2001-01-19  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
+	functions in the Sort section.
+
+	* C/apx-gloss.sgml: added "ToolTip"
+
+2001-01-18  Aaron Weber  <aaron@helixcode.com>
+
+	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.
+
+	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
+	comments.
+
+	* C/evolution-guide.sgml: s/Helix Code/Ximian/
+
 2000-12-13  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 365e64b60d..6124998862 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -372,14 +372,29 @@
   <glossterm>Spam</glossterm>
   <glossdef>
    <para>
-    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
+    Useless, unsolicited e-mail.  Spam normally comes in forms of
+    chain letters and advertisements for unscrupulous or clueless
+    companies.  Messages that are merely useless are called "opt-in
     newsletters."
    </para>
   </glossdef>
  </glossentry>
 
+
+ <glossentry id="tooltip">
+  <glossterm>Tool-Tip</glossterm>
+  <glossdef>
+   <para>
+      A small box of explanatory text which appears when the mouse
+      pointer is held motionless over a button or other interface
+      element.
+   </para>
+  </glossdef>
+ </glossentry>
+
+
+
+
  <glossentry id="virus">
   <glossterm>Virus</glossterm>
   <glossdef>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 5adc131eeb..dc2f5046aa 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -33,7 +33,7 @@ implemented. -->
     </authorgroup>
     <copyright>
       <year>2000</year>
-      <holder> Helix Code, Inc., </holder>
+      <holder> Ximian, Inc., </holder>
       <holder> Kevin Breit </holder>
     </copyright>
     
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 541f2d4d77..be18abd3d3 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -50,7 +50,7 @@
 
       <para>
         <application>Evolution</application> can help you work in a
-        group, by handling email, address and other contact
+        group by handling email, address and other contact
         information, and one or more calendars.  It can do that on one
         or several computers, connected directly or over a network,
         for one person or for large groups.
@@ -63,9 +63,10 @@
 	  <listitem>
 	    <para>
              The application must be <emphasis>both powerful and easy
-             to use</emphasis>. That means a familiar and intuitive
-             interface that users can customize to their liking, and
-             the development of shortcuts for complex tasks.
+             to use</emphasis>. In other words, it needs a familiar
+             and intuitive interface that users can customize to their
+             liking, and users should have access to shortcuts for
+             complex tasks.
             </para>
 	  </listitem>
 	  <listitem>
@@ -125,7 +126,7 @@
         chunks of information, and many of the features it describes
         are unimplemented.  All the content is subject to change,
         especially if you help.  Please send comments on the guide to
-        <email>aaron@helixcode.com</email>. If you would like to work
+        <email>aaron@ximian.com</email>. If you would like to work
         on the guide please contact me or see the GNOME Documentation
         project <ulink
         url="http://developer.gnome.org/projects/gdp">web
@@ -140,14 +141,14 @@
         tour</link>&mdash; it will explain how to use
         <application>Evolution</application>.  If you are new to
         <application>Evolution</application> or to groupware in
-        general, this is the section for you. The second section,
-        covering <link linkend="config">configuration</link>, is
-        targeted at more advanced users, but anyone who wants to
-        change the way <application>Evolution</application> looks or
-        acts can benefit from reading it.  In addition, there is a
-        comprehensive <link linkend="menuref">menu
-        reference</link> which describes nearly every capability that
-        <application>Evolution</application> has to offer.
+        general, this section is for you. The second section, covering
+        <link linkend="config">configuration</link>, is targeted at
+        more advanced users, but anyone who wants to change the way
+        <application>Evolution</application> looks or acts can benefit
+        from reading it.  In addition, there is a comprehensive <link
+        linkend="menuref">menu reference</link> which describes nearly
+        every capability that <application>Evolution</application> has
+        to offer.
       </para>
       <formalpara>
         <title>Typographical conventions</title>
@@ -178,7 +179,7 @@
   <sect1 id="commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
-        You might want to get a copy of this section and tape it to
+        You might want to copy this section and tape it to
         the wall next to your computer: it's a very short summary of
         most of the things you'll want to do with
         <application>Evolution</application>, and pointers to the
@@ -189,8 +190,7 @@
       <title>Opening or Creating Anything</title>
       <para>
          Here are the keyboard shortcuts and menu items you're most
-         likely to use: (Please note that the shortcuts listed are
-         probably wrong at this point).
+         likely to use:
          
           <variablelist>
 
@@ -257,37 +257,40 @@
 	    </listitem>
 	  </varlistentry>
 
+
 	  <varlistentry>
-	    <term>Create a new Task</term>
+	    <term>Enter a new Contact</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
 		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
+		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
+		  <keycap>C</keycap>
                 </keycombo>
                 </para>
 	    </listitem>
 	  </varlistentry>
 
+
 	  <varlistentry>
-	    <term>Enter a new Contact</term>
+	    <term>Create a new Task</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
 		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
+		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
+		  <keycap>T</keycap>
                 </keycombo>
                 </para>
 	    </listitem>
 	  </varlistentry>
+
 	</variablelist>
       </para>
     </sect2> 
@@ -300,12 +303,10 @@
 	    <term>Check Mail</term>
 	    <listitem>
 	      <para>
-                Click <guibutton>Get Mail</guibutton> in the toolbar, or press 
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
+                Click <guibutton>Get Mail</guibutton> in the
+                toolbar. There is no keyboard shortcut for this task,
+                but you can ask <application>Evolution</application>
+                to check for new mail periodically. To do so, FIXME.
                 </para>
 	    </listitem>
 	  </varlistentry>
@@ -318,14 +319,19 @@
                 click <guibutton>Reply</guibutton> in the
                 toolbar, or press
                 <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
                 </keycombo>
                 </para>
 	      <para>
                 To reply to the sender and all the other visible
-                recipients of the message, click:
+                recipients of the message, click <guibutton>Reply to
+                All</guibutton> or select the message and press
+                <keycombo action="simul">
+		  <keycap>Shift</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
+                </keycombo>
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -338,9 +344,8 @@
                 and click <guibutton>Forward</guibutton> in the
                 toolbar, or press
                 <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>J</keycap>
                 </keycombo>
                 </para>
 	    </listitem>
@@ -361,18 +366,20 @@
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Create Filters and vFolders</term>
+	    <term>Create Filters and Virtual Folders</term>
 	    <listitem>
 	      <para>
-                You can create filters and vFolders based on specific
-                message attributes by right-clicking on a message or
-                by selecting <menuchoice> <guimenu>Tools</guimenu>
+                You can create filters and Virtual Folders based on
+                specific message attributes from the message's
+                right-click menu.  Alternately, select a message, and
+                then choose <menuchoice> <guimenu>Settings</guimenu>
                 <guimenuitem>Mail Filters</guimenuitem> </menuchoice>
-                or <menuchoice> <guimenu>Tools</guimenu>
-                <guimenuitem>vFolder Editor</guimenuitem>
+                or <menuchoice> <guimenu>Settings</guimenu>
+                <guimenuitem>Virtual Folder Editor</guimenuitem>
                 </menuchoice>.  Filters are discussed in <xref
-                linkend="usage-mail-organize-filters">, and vFolders
-                in <xref linkend="usage-mail-organize-vfolders">.
+                linkend="usage-mail-organize-filters">, and Virtual
+                Folders in <xref
+                linkend="usage-mail-organize-vfolders">.
             </para>
 	    </listitem>
 	</varlistentry>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 304b60481c..70fdc76d66 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -19,7 +19,7 @@
        <listitem>
 	 <para>
 	  It can send and receive mail in HTML or as plain text, and
-	  supports file attachments.
+	  permits multiple file attachments.
 	 </para>
        </listitem>
        <listitem>
@@ -43,11 +43,11 @@
       linkend="usage-mail-organize-search">searching</link> functions
       were built for speed and efficiency on gargantuan volumes of
       mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
-      advanced organizational feature not found in other mail clients.
-      If you get a lot of mail, or if you keep every message you get
-      in case you need to refer to it later, you'll find that feature
-      especially useful.
+      <link linkend="usage-mail-organize-vFolders">Virtual
+      Folder</link>, an advanced organizational feature not found in
+      other mail clients.  If you get a lot of mail, or if you keep
+      every message you get in case you need to refer to it later,
+      you'll find this feature especially useful.
     </para>
   </abstract>
 
@@ -61,19 +61,20 @@
        <guibutton>Inbox</guibutton> in the shortcut bar. The first
        time you use <application>Evolution</application>, it will
        start with the <interface>Inbox</interface> open and show you a
-       message from Helix Code welcoming you to the application.
+       message from Ximian welcoming you to the application.
       </para>
       <para>
-	The <application>Evolution</application>
-	<guilabel>Inbox</guilabel>, should look like the one in <xref
-	linkend="usage-mail-intro-fig">, which has a message from
-	Helix Code. The message summary appears at the top, in the
-	<interface>message list</interface>.  The message itself is
-	displayed below that, in the <interface>view pane</interface>.
-	If you find the <interface>view pane</interface> too small,
-	you can resize the pane, enlarge the whole window, or double-click
-	on the message in the <interface>message list</interface> to
-	have it open in a new window.  Just like with folders, you can
+	Your <application>Evolution</application>
+	<guilabel>Inbox</guilabel> will look something like the one in
+	<xref linkend="usage-mail-intro-fig">. Just below the toolbar
+	is the <interface>message list</interface>, showing message
+	header information like <guilabel>Subject</guilabel> and
+	<guilabel>Date</guilabel>.  The message itself appears below
+	that, in the <interface>view pane</interface>.  If you find
+	the <interface>view pane</interface> too small, you can resize
+	the pane, enlarge the whole window, or double-click on the
+	message in the <interface>message list</interface> to have it
+	open in a new window.  Just like with folders, you can
 	right-click on messages in the message list and get a menu of
 	possible actions.
      </para>
@@ -111,21 +112,26 @@
           you choose the way you work is the way it lets you sort your
           message lists.  To sort by sender, subject, or date, click
           on the bars with those labels at the top of the message
-          list.  If you click twice, you'll sort them in reverse
-          order. You can also right-click on the message header bars
-          to get a set of sorting options, and add or remove columns
-          from the message list.  You can find detailed instructions
-          on how to customize your message display columns in <xref
-          linkend="usage-mail-organize-columns">.
+          list. The direction of the arrow next to the label indicates
+          the direction of the sort, and if you click again, you'll
+          sort them in reverse order. For example, click once on
+          <guilabel>Date</guilabel> to sort messages by date from
+          oldest to newest.  Click again, and
+          <application>Evolution</application> sorts the list from
+          newest to oldest. You can also right-click on the message
+          header bars to get a set of sorting options, and add or
+          remove columns from the message list.  You can find detailed
+          instructions on how to customize your message display
+          columns in <xref linkend="usage-mail-organize-columns">.
         </para>
 	<para>
           You can also choose a threaded message view. Select
           <menuchoice> <guimenu>View</guimenu>
           <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  If the option selected,
-          <application>Evolution</application> will group the replies
-          to a message with the original, so you can follow the thread
-          of a conversation from one message to the next.
+          the threaded view on or off.  When you select this option,
+          <application>Evolution</application> groups the replies to a
+          message with the original, so you can follow the thread of a
+          conversation from one message to the next.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-delete">
@@ -135,16 +141,19 @@
           it. To mark a message for deletion, select it in the the
           <interface>message list</interface> by clicking on it once.
           Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar.  The message now has a line through it,
-          because you've marked it for deletion.
+          the tool bar. Or, right-click on a message and choose
+          <guimenuitem>Delete</guimenuitem> from the right-click
+          menu. The message will appear with a line through it, to
+          show that you've marked it for deletion.
         </para>
         <para>
-          If you really want to get rid of it, choose
+          If you change your mind and decide you want to keep it,
+          select <menuchoice> <guimenu>Message</guimenu>
+          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you
+          really want to get rid of it, choose
           <guimenuitem>Expunge</guimenuitem> from the
           <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently. If you change your mind and decide you want to
-          keep it, select <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Undelete</guimenuitem></menuchoice>.
+          permanently.
         </para>
       </sect3>
     </sect2>
@@ -163,9 +172,9 @@
      <para>
         Then, you need to enter your email
         password. <application>Evolution</application> will remember
-        the password until you quit the application or until you
-        select <menuchoice> <guimenu>Settings</guimenu>
-        <guimenuitem>Forget Passwords</guimenuitem> </menuchoice>.
+        your password until until you select <menuchoice>
+        <guimenu>Settings</guimenu> <guimenuitem>Forget
+        Passwords</guimenuitem> </menuchoice>.
       </para>
       <para>
         Once it's validated the password,
@@ -188,9 +197,9 @@
       <sect3 id="usage-mail-getnsend-get-news">
          <title>Using Evolution for News </title>
        <para>
-         Newsgroups are so similar to email there's no reason not to
-         read them side by side.  If you want to do that, add a news
-         source to your configuration (see <xref
+         Newsgroups are so similar to email that there's no reason not
+         to read them side by side.  If you want to do that, add a
+         news source to your configuration (see <xref
          linkend="config-prefs-network-news">). The news server will
          appear as a remote server, and will look quite similar to an
          IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
@@ -208,20 +217,14 @@
 	  at the bottom of the message to which it's attached.  Text,
 	  HTML, and most images will be displayed within the message
 	  itself.  For other files,
-	  <application>Evolution</application> will provide a link and
-	  icon at the end of the message.  Click on that, and
-	  <application>Evolution</application> will ask you where you
-	  want to put the file.  Once you've chosen a location and
-	  saved the file, you can open, move, copy, or execute it just
-	  like any other, using <application>Nautilus</application> or
-	  your favorite shell or file manager.
+	  <application>Evolution</application> will show an icon at
+	  the end of the message.  Right-click on the icon to get a
+	  list of options which will vary depending on the type of
+	  attachment. You will have the option to display most files
+	  as part of the message, export them to a different
+	  application (images to Eye of GNOME, spreadsheets to
+	  Gnumeric, and so forth), or save them to disk.
         </para>
-        <para>
-          As usual, there's a shortcut here: right-click on the link,
-	  and choose an application for the file: you can send an
-	  image straight to the <application>GIMP</application>, or a
-	  spredsheet straight to <application>Gnumeric</application>.
-	</para>
 
 	<para>
 	   <application>Evolution</application> can also display
@@ -238,7 +241,7 @@
 	 You can start writing a new email message by selecting
 	 <menuchoice> <guimenu>File</guimenu>
 	 <guisubmenu>New</guisubmenu> <guimenuitem>
-	 Mail</guimenuitem></menuchoice>, or by pressing the
+	 Mail Message</guimenuitem></menuchoice>, or by pressing the
 	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
 	 When you do so, the <interface>New Message</interface> window
 	 will open, as shown in <xref
@@ -262,8 +265,7 @@
 	 Enter an address in the <guilabel>To:</guilabel> field, a
 	 subject in the <guilabel>Subject:</guilabel> and a message in
 	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.  That's easy, although it can
-	 get a little more complicated if you want.
+	 <guibutton>Send</guibutton>.
        </para>
 
       <sect3 id="usage-mail-getnsend-send-delay">
@@ -272,14 +274,14 @@
 	   Evolution will send mail immediately unless you tell it to
 	   do otherwise by selecting <menuchoice>
 	   <guimenu>File</guimenu> <guimenuitem>Send
-	   Later</guimenuitem></menuchoice>.  That will add messages
-	   to the <guilabel>Outbox</guilabel> queue.  Then, when you
-	   press <guibutton>Send</guibutton> in another message, or
-	   <guibutton>Get Mail</guibutton> in the main mail window,
-	   all your unsent messages will go out at once.  I like to
-	   use "Send Later" because it gives me a chance to change my
-	   mind about a message before it goes out.  That way, I don't
-	   send anything I'll regret the next day.
+	   Later</guimenuitem></menuchoice>.  This will add your
+	   messages to the <guilabel>Outbox</guilabel> queue.  Then,
+	   when you press <guibutton>Send</guibutton> in another
+	   message, or <guibutton>Get Mail</guibutton> in the main
+	   mail window, all your unsent messages will go out at once.
+	   I like to use "Send Later" because it gives me a chance to
+	   change my mind about a message before it goes out.  That
+	   way, I don't send anything I'll regret the next day.
 	</para>
 	<para>
 	   To learn more about how you can specify message queue and
@@ -322,7 +324,7 @@
 	    labelled <guibutton>Attach</guibutton>.  If you click the
 	    <guibutton>Attach</guibutton> button,
 	    <application>Evolution</application> will open a file
-	    selection dialog box, to ask you which file you want to
+	    selection dialog box to ask you which file you want to
 	    send.  Select the file and click <guilabel>OK</guilabel>.
         </para>
 	<para>
@@ -341,18 +343,16 @@
         <sect4 id="usage-mail-getnsend-send-to-types">
          <title>Types of Recipients</title>
         <para>
-	    <application>Evolution</application>, like all email
-	    programs (at least, all the ones in current use)
-	    recognizes three types of addressee: primary recipients,
-	    secondary recipients, and hidden ("blind") recipients.
+	    <application>Evolution</application>, like most email
+	    programs recognizes three types of addressee: primary
+	    recipients, secondary recipients, and hidden ("blind")
+	    recipients.
          </para>
          <para>
 	    The simplest way to direct a message is to put the email
             address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  However, it's
-            considered bad form to have more than a few email
-            addresses in this section.  If you are sending mail to
-            more than one or two people, consider the
+            field, which denotes primary recipients.  To send mail to
+            more than one or two people, you can use the the
             <guilabel>Cc:</guilabel> field.
 	  </para>
 	  <para>
@@ -377,11 +377,13 @@
 	    to send mail to several people without sharing the
 	    recipient list, you should use
 	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
-	    Copy", and means that people you put in the
-	    <guilabel>Bcc:</guilabel> field get the message, but
-	    nobody else sees their email address.  They will still see
-	    the list of addresses from the <guilabel>To:</guilabel>
-	    and <guilabel>Cc:</guilabel> fields, though.
+	    Copy", and it sends messages discreetly.  In other words,
+	    the people in the <guilabel>Bcc:</guilabel> field get the
+	    message, but nobody sees that they got it.  Note that the
+	    contents of the <guilabel>To:</guilabel> and
+	    <guilabel>Cc:</guilabel> fields are visible to all
+	    recipients, even to people on the
+	    <guilabel>Bcc:</guilabel> list.
 
 	    <example id="ex-mail-bcc">
 	      <title>Using the Bcc: field</title>
@@ -395,7 +397,8 @@
 	         category into the <guilabel>To:</guilabel> or
 	         <guilabel>Cc:</guilabel> fields, he'll make the
 	         company's <emphasis>entire</emphasis> client list
-	         public.  Don't assume it won't happen to you!
+	         public. It seems like a small difference, but it can
+	         make a huge difference in some situations.
 	     </para>
 	    </example>
 	  </para>
@@ -440,7 +443,7 @@
 	   To reply to a message, press the
 	   <guibutton>Reply</guibutton> button while it is selected,
 	   or choose <guimenuitem>Reply to Sender</guimenuitem> from
-	   the message's right-click menu.  That will open
+	   the message's right-click menu.  That will open the
 	   <interface>message composer</interface>.  The
 	   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
 	   fields will already be filled, although you can alter them
@@ -452,7 +455,7 @@
 	   with the quoted material as shown in <xref
 	   linkend="usage-mail-getnsend-reply-fig">.
 
-<!-- note that this figure should have a reply mail ready to send,
+<!-- note that this figure should have a reply message ready to send,
 with quoted materials and the relevant replies interspersed-->
  <!-- ==============Figure=================================== -->
        <figure id="usage-mail-getnsend-reply-fig">
@@ -472,18 +475,21 @@ with quoted materials and the relevant replies interspersed-->
 	   <guibutton>Reply</guibutton>.  If there are large numbers
 	   of people in the <guilabel>Cc:</guilabel> or
 	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time.  But be careful, and always make sure you
-	   know who is getting a message: one address could be a
-	   mailing list with thousands of subscribers.
+	   amounts of time.  Be careful: always make sure you know who
+	   is getting a message: one address could be a mailing list
+	   with thousands of subscribers.
 	  <example>
 	    <title>Using the Reply to All feature</title>
 	    <para>
-	      Susan sends an email to a client, and sends copies to
-	      Tim and to an internal company mailing list of
-	      co-workers.  If Tim wants to make a comment to all of
-	      them, he uses <guibutton>Reply to All</guibutton>, but
-	      if he just wants to tell Susan that he agrees with her,
-              he uses <guibutton>Reply</guibutton>.
+	      Susan sends an email to a client and sends copies to Tim
+	      and to an internal company mailing list of co-workers.
+	      If Tim wants to make a comment for all of them to read,
+	      he uses <guibutton>Reply to All</guibutton>, but if he
+	      just wants to tell Susan that he agrees with her, he
+	      uses <guibutton>Reply</guibutton>.  Note that his reply
+	      will not reach anyone that Susan put on her
+	      <guilabel>Bcc</guilabel> list, since nobody else knows
+	      that they got that message.
 	    </para>
 	  </example>
 	</para>
@@ -512,9 +518,9 @@ with quoted materials and the relevant replies interspersed-->
 	      <term><guimenuitem>Find Regex</guimenuitem></term>
 	      <listitem>
 		<para>
-                  Perform a search for a <glossterm
-                  linkend="regular-expression">regular
-                  expression</glossterm>, or "regex."
+                  Find a regex, also called a
+                  <glossterm linkend="regular-expression">regular
+                  expression</glossterm>, in your composer window.
                </para>
              </listitem>
 	    </varlistentry>
@@ -537,28 +543,27 @@ with quoted materials and the relevant replies interspersed-->
 	  </variablelist>
         </para>  
 	<para>
-            For all of these items, you have two additional choices.
-            First, you can choose whether to <guilabel>Search
-            Backwards</guilabel>, which will perform the search
-            starting wherever your cursor is, and moving back towards
-            the beginning of the document (normally, it goes the other
-            way).  Then, you can decide whether to have your search be
-            <guilabel>Case Sensitive</guilabel>, meaning should it pay
-            attention to the case of letters when locating a match.
+            For all of these menu items, you can choose whether or not
+            to <guilabel>Search Backwards</guilabel> in the document
+            from the point where your cursor is.  For all but the
+            regular expression search (which doesn't need it), you are
+            offered a check box to determine whether the search is to
+            be <guilabel>Case Sensitive</guilabel> when it determines
+            a match.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-send-html">
 	<title>Embellish your email with HTML</title>
 	<para>
-            You can't normally set text styles or insert pictures in
+            Normally, you can't set text styles or insert pictures in
             emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis or use <glossterm
-            linkend="emoticon">emoticons</glossterm> to convey their
-            feelings.  However, most of the newer email programs can
-            include and display images and text styles as well as
-            basic alignment and paragraph formatting. They do this
-            with <glossterm linkend="html">HTML</glossterm>, just like
-            web sites do.
+            too many exclamation points for emphasis, or use
+            <glossterm linkend="emoticon">emoticons</glossterm> to
+            convey their feelings.  However, most newer email programs
+            can display images and text styles as well as basic
+            alignment and paragraph formatting. They do this with
+            <glossterm linkend="html">HTML</glossterm>, just like web
+            pages do.
         </para>
 	<note>
 	  <title>HTML Mail is not a Default Setting</title>
@@ -579,28 +584,30 @@ with quoted materials and the relevant replies interspersed-->
           </para>
 	</note>
 	<para>
-           HTML formatting tools are located just above the
-	   composition frame, and in the <guimenu>Insert</guimenu> and
-	   <guimenu>Format</guimenu> menus.  Your message text will
-	   appear formatted in the composer window, and the message
-	   will be sent as HTML.
+           HTML formatting tools are located in the toolbar just above
+	   the space where you'll actually compose the message, and
+	   they also appear in the <guimenu>Insert</guimenu> and
+	   <guimenu>Format</guimenu> menus.  
 	  </para>
 	  <para>
-            The icons in the toolbar are explained in tool-tips, which
-            appear when you hold your mouse over the buttons.  The
-            buttons fall into four categories:
+            The icons in the toolbar are explained in <glossterm
+            linkend="tooltip">tool-tips</glossterm>, which appear when
+            you hold your mouse over the buttons.  The buttons fall
+            into four categories:
             <variablelist>
              <varlistentry>
              <term>Headers and lists</term>
 	      <listitem>
 		<para>
-                  Choose <guilabel>Normal</guilabel> for a default
-                  text style, or <guilabel>Header 1</guilabel> through
+                  At the left edge of the toolbar, you can choose
+                  <guilabel>Normal</guilabel> for a default text style
+                  or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6).  You can also
-                  select <guilabel>pre</guilabel> for preformatted
-                  text blocks, and three types of <guilabel>List
-                  Item</guilabel>.
+                  header from large (1) to tiny (6). Other styles
+                  include <guilabel>pre</guilabel>, to use the HTML
+                  tag for preformatted blocks of text, and three types
+                  of <guilabel>List Item</guilabel> for the highly
+                  organized.
                 </para>
 	      </listitem>
            </varlistentry>
@@ -626,12 +633,12 @@ with quoted materials and the relevant replies interspersed-->
 	      <term>Alignment</term>
 	      <listitem>
 		<para>
-                   Located next to the text style buttons,
-                   these three paragraph icons should be familiar to
-                   users of most word processing software.  The
-                   leftmost button will make your text left-justified,
-                   the center button, centered, and the right hand
-                   button, right-justified.
+                   Located next to the text style buttons, these three
+                   paragraph icons should be familiar to users of most
+                   word processing software.  The leftmost button will
+                   make your text aligned to the left, the center
+                   button, centered, and the right hand button,
+                   aligned on the right side.
                 </para>
 	      </listitem>
 	      </varlistentry>
@@ -651,13 +658,13 @@ with quoted materials and the relevant replies interspersed-->
 	      <term>Color Selection</term>
 	      <listitem>
 		<para>
-                  At the far right is the color section tool.  You can
-                  choose from several colors by clicking on the arrow,
-                  or create your own custom color by clicking on the
-                  color box itself.  If you have text selected, the
-                  color will apply to the selected text.  If you do
-                  not have text selected, the color will apply to
-                  whatever you type next.
+                  At the far right is the color section tool.  The
+                  colored box displays the current text color; to
+                  choose a new one, click the arrow button just to the
+                  right. If you have text selected, the color will
+                  apply to the selected text.  If you do not have text
+                  selected, the color will apply to whatever you type
+                  next.
                </para>
 	    </listitem>
 	  </varlistentry>
@@ -689,10 +696,9 @@ with quoted materials and the relevant replies interspersed-->
             <term> <guimenuitem>Insert Image</guimenuitem>:</term>
 	    <listitem>
 	      <para>
-               <guimenuitem>Insert Image</guimenuitem>: Select this
-               item to embed an image into your email, as was done in
-               the welcome message.  Images will appear at the
-               location of the cursor. This is different from
+               Select this item to embed an image into your email, as
+               was done in the welcome message.  Images will appear at
+               the location of the cursor. This is different from
                attaching them to a message, but not very different.
               </para>
 	    </listitem>
@@ -777,7 +783,7 @@ possibly never will be due to security evil. -->
 	</para>
       </sect3>
       <sect3 id="usage-mail-getnsend-ettiquette">
-	<title>Seven Tips for Email Usage</title>
+	<title>Seven Tips for Email Courtesy</title>
 	<para>
 	  I started with ten, but four were "Don't send
 	  <glossterm linkend="spam">spam</glossterm>."
@@ -789,15 +795,15 @@ possibly never will be due to security evil. -->
 		 watch out for hoaxes and urban legends, and make sure
 		 the message doesn't have multiple layers of
 		 greater-than signs, (&gt;) indicating multiple layers
-		 of careless inline forwarding.
+		 of careless in-line forwarding.
 	      </para>
 	    </listitem>
 
 	    <listitem>
 	      <para>
-		Always begin and close with a salutation. Say
-		"please" and "thank you", just like you do in real
-		life. You can keep your pleasantries short, but be pleasant!
+		Always begin and close with a salutation. Say "please"
+		and "thank you," just like you do in real life. You
+		can keep your pleasantries short, but be pleasant!
 	      </para>
 	    </listitem>
 
@@ -856,12 +862,16 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-columns">
       <title>Sorting Mail with Column Headers</title>
       <para>
-         By default, the columns in a mail message list are an
-         envelope icon indicating whether a message has been read
-         (closed for unread, open for read), an exclamation point
-         indicating priority, and the <guilabel>From</guilabel>,
+         By default, the columns in a mail message list are: an
+         envelope icon indicating whether you have read or replied to
+         a message (closed for unread, open for read, and open with an
+         arrow on it to indicate you've sent a reply), an exclamation
+         point indicating priority, and the <guilabel>From</guilabel>,
          <guilabel>Subject</guilabel>, and <guilabel>Date</guilabel>
-         fields.  However, you can change that if you want.
+         fields. You can change their order and remove them by
+         dragging and dropping them.  You can add new ones with the
+         <guimenuitem>Field Chooser</guimenuitem> item in the right
+         click menu for the column headings.
       </para>
       <para>
          Right-click on one of the column headers to get a list of
@@ -869,29 +879,37 @@ possibly never will be due to security evil. -->
              <variablelist>
 
                <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
-                  <listitem><para>
-                  </para></listitem>
+                  <term><guimenuitem>Sort Ascending</guimenuitem>,
+                  <guimenuitem>Sort Descending</guimenuitem>, and
+                  <guimenuitem>Unsort</guimenuitem></term>
+                  <listitem><para>Which should be pretty obvious. You
+                  can also set these sorts by just clicking on the
+                  column headers.</para></listitem>
                </varlistentry>
 
               <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
+                  <term><guimenuitem>Group By this Field</guimenuitem></term>
                   <listitem><para>
+                     Groups messages instead of sorting them. (FIXME: Explain further) 
                   </para></listitem>
                </varlistentry>
 
               <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
-                  <listitem><para>
-                  </para></listitem>
+                  <term><guimenuitem>Remove this
+                  Column</guimenuitem></term> <listitem><para> Remove
+                  this column from the display. You can also remove
+                  columns by dragging the header off the list and
+                  letting it drop.  </para></listitem>
                </varlistentry>
 
               <varlistentry>
-                  <term><guimenuitem> </guimenuitem></term>
-                  <listitem><para>
-                  </para></listitem>
+                  <term><guimenuitem>Field
+                  Chooser</guimenuitem></term> <listitem><para> A list
+                  of column headers; just drag and drop them into
+                  place between two existing headers. A red arrow will
+                  appear to show you where you're about to put the
+                  column.  </para></listitem>
                </varlistentry>
-
             </variablelist>
       </para>
     </sect2>
@@ -1189,13 +1207,14 @@ possibly never will be due to security evil. -->
 
 	  <varlistentry>
 	    <term><guilabel>Regex Match</guilabel></term>
-	    <listitem><para>
-              If you know your way around a <glossterm
-	      linkend="regular-expression">regular
-	      expression</glossterm>, or regex, put your knowledge to
-	      use here. You can match your expression in the message
-	      headers or in its body.
-            </para></listitem>
+	    <listitem>
+              <para>
+                If you know your way around a <glossterm
+  	        linkend="regular-expression">regex </glossterm>, or
+  	        regular expression, put your knowledge to use
+  	        here.
+               </para>
+            </listitem>
           </varlistentry>
 
 	  <varlistentry>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 94c65acfd8..54607c8c01 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -28,7 +28,7 @@
      part of the <interface>main window</interface> is taken up by the
      actual <interface>Inbox</interface>, where messages are listed
      and displayed.  If you're running the program for the first time,
-     you'll have just one message: a welcome from Helix Code.
+     you'll have just one message: a welcome from Ximian.
 
 
 <!-- ==============Figure=================================== -->
@@ -81,8 +81,8 @@
        Directories</guilabel>, it will slide up and you'll see buttons
        for the <guilabel>Bigfoot</guilabel> and
        <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator might have added. You
-       can add more groups by right-clicking on the background of the
+       others you or your system administrator may have added. You can
+       add more groups by right-clicking on the background of the
        shortcut bar and selecting <guimenuitem>Menu
        Group</guimenuitem>.  Internet directories behave a lot like
        the local contact manager, which is covered in <xref
@@ -171,7 +171,7 @@
     </para>
     <para>
       If you don't like the shortcut bar, you can use the folder bar
-      or the menu bar to navigate. Press 
+      or the menu bar to navigate the main window. Press 
             <keycombo action="simul">
                  <keycap>Ctrl</keycap> 
                  <keycap>O</keycap> 
@@ -208,18 +208,17 @@
       appointments, address cards, and email in a tree that's a lot
       like a <glossterm linkend="filetree">file
       tree</glossterm>&mdash; it starts small at the top, and branches
-      downwards. On most computers, there will be three folders at the
-      base.  First, and probably most important, is the
-      <guilabel>Local</guilabel> folder, which holds all the
-      <application>Evolution</application> data that's stored on your
-      computer.  After that come <guilabel>vFolders</guilabel>, or
-      virtual folders, discussed in <xref
-      linkend="usage-mail-organize-vfolders">, followed by any
-      <glossterm linkend="imap">IMAP</glossterm> mail folders you
-      might have available to you over your network.  Lastly, there
-      are <guilabel>External Directories</guilabel>, <glossterm
+      downwards. On most computers, there will be three or four
+      folders at the base.  First is the <guilabel>Local</guilabel>
+      folder, which holds all the <application>Evolution</application>
+      data that's stored on your computer.  After that come
+      <guilabel>Virtual Folders</guilabel>, or virtual folders, discussed in
+      <xref linkend="usage-mail-organize-vfolders">, followed by any
+      <glossterm linkend="imap">IMAP</glossterm> mail folders you may
+      have available to you over your network.  Lastly, there are
+      <guilabel>External Directories</guilabel>, <glossterm
       linkend="ldap">LDAP</glossterm> contact directories stored on a
-      network. 
+      network.
     </para>
     <para>
        
@@ -266,7 +265,6 @@
 	   </para>
 	 </listitem>
 
-
       </itemizedlist>
 
     </para>
@@ -294,13 +292,8 @@
        <note>
 	  <title>Folders Have Limits</title>
 	  <para>
-              No matter where they exist, calendars must go in
-	      calendar folders, mail in mail folders, and contacts in
-	      contact folders.  Network folders follow the same type
-	      restriction, because the network servers are only set up
-	      to handle one kind of information. Within your local
-	      system, though you can folders inside each other,
-	      regardless of type.
+              Calendars must go in calendar folders, mail in mail
+	      folders, and contacts in contact folders.
            </para>
 	</note>
 
@@ -310,8 +303,7 @@
       exception.  If you right-click on a folder, you'll have a
       menu with the following options:
       <itemizedlist>
-	<listitem><para><guimenuitem>View</guimenuitem>, to view a message.</para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
+	<listitem><para><guimenuitem>FIXME</guimenuitem>, for another purpose. </para></listitem>
 	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
       </itemizedlist>.
     </para>
@@ -371,8 +363,7 @@
        <varlistentry>
           <term> <guimenu>Edit</guimenu> Menu </term>
           <listitem><para>
-              Although it doesn't contain anything at first,
-              the <guimenu>Edit</guimenu> menu fills up with 
+              The <guimenu>Edit</guimenu> menu holds
               useful tools that help you edit text and move it around.
           </para></listitem>
         </varlistentry>
@@ -392,7 +383,7 @@
           <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
+          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
           <interface>Calendar</interface> and the <interface>Contact
           Manager</interface>, it's color, network, and layout
           configuration. </para></listitem>
diff --git a/help/ChangeLog b/help/ChangeLog
index 02c0ed3501..51d8d6eb7c 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,19 @@
+2001-01-19  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
+	functions in the Sort section.
+
+	* C/apx-gloss.sgml: added "ToolTip"
+
+2001-01-18  Aaron Weber  <aaron@helixcode.com>
+
+	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.
+
+	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
+	comments.
+
+	* C/evolution-guide.sgml: s/Helix Code/Ximian/
+
 2000-12-13  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to