More edits.

2001-07-11  Kevin Breit  <battery841@mediaone.net>

	* C/usage-calendar.sgml: More edits.

	* C/usage-contact.sgml: Sick amounts of changes too!

	* C/usage-mail-org.sgml: Heavy editing...touched almost everything.

	* C/usage-exec-summary.sgml: Minor change.  There was only one change for this chapter, cuz I'm such a 'godly' writer...yeah.

svn path=/trunk/; revision=11018

24 files changed, 598 insertions, 422 deletions

diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index cdbd119790..1772fd57bd 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -41,7 +41,7 @@
 	    <term><guilabel>Composer</guilabel></term>
 	    <listitem>
 	      <para>
-		Customizes the composer window's behavior.
+		Customizes the composer's behavior.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -145,7 +145,7 @@
 	<title>Mail Sources</title>
 	<para>
           The <interface>Mail Sources</interface> tab allows you to
-          edit, add, or delete methods of retrieving mail from
+          add, edit, or delete methods of retrieving mail from
           servers.  Clicking on <guibutton>Add</guibutton> or
           <guibutton>Edit</guibutton> will bring up a dialog box to
           offer you the following options:
@@ -168,7 +168,7 @@
 	      <listitem>
 		<para>
                   Enter the name of the mail source server in this
-                  field. If you use an  may or may not be the same as your
+                  field. Your POP server may or may not be the same as your
                   <glossterm linkend="smtp">SMTP</glossterm> server.
                 </para>
 	      </listitem>
@@ -221,14 +221,15 @@
             listings and check and download mail from all POP servers.
             In other words, <guibutton>Get Mail</guibutton> gets your
             mail, no matter how many sources you have, or what types
-            they are.
+            they are.  You can disable checking mail on accounts in their
+            properties.
           </para>
       </sect3>
 
       <sect3 id="config-prefs-mail-network-transports">
 	<title>Mail Transports</title>
 	<para>
-           The <interface>Mail Transports</interface> tab lets you set
+           The <interface>Mail Transports</interface> tab lets you choose
            how you will send mail.  <application>Evolution</application> currently supports two
            mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
            uses a remote mail server, and
@@ -266,7 +267,7 @@
             Click <guibutton>Add</guibutton> to add a news server; you
             will be prompted for its name.  Enter the name, click
             <guibutton>OK</guibutton>, and you're done.  You can have
-            as many mail servers as you like, of course.  News servers
+            as many news servers as you like, of course.  News servers
             will appear next to your IMAP servers in the
             <interface>folder bar</interface>.
           </para>
@@ -296,12 +297,12 @@
 	  </varlistentry>
 	  <varlistentry>
                 <term> 
-                   <guilabel>Mark Messages as Seen After</guilabel>
+                   <guilabel>Mark Messages as Read After</guilabel>
                 </term>
                 <listitem><para> 
                     When you click on a message,
                     <application>Evolution</application> will wait a
-                    moment before marking it as seen. You can set the
+                    moment before marking it as read. You can set the
                     delay, in milliseconds, here.
                  </para></listitem>
               </varlistentry>
@@ -336,10 +337,8 @@
           <guimenuitem>Calendar
           Configuration</guimenuitem></menuchoice> from the Calendar
           view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>Time display</guilabel>,
-          <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
-          and <guilabel>Alarms</guilabel>.  The <interface>calendar
+          <interface>Preferences</interface> window.  It contains three
+          tabs: <guilabel>Calendar</guilabel>, <guilabel>TaskPad</guilabel>, <guilabel>Reminders</guilabel>.  The <interface>calendar
           preferences window</interface> is illustrated in <xref
           linkend="config-prefs-cal-fig">.
 
@@ -402,12 +401,12 @@
         sample calendar on the right and a list of ten items that can
         be colored in different ways.  If you click on the color
         button to the right of each item, you will bring up a
-        color-selector window where you can choose to alter that
+        color-selector window where you can alter that
         color.  By clicking <guibutton>OK</guibutton> in the color
         selection dialog, you can see the results of the color on the
         sample calendar.
      </para>
-     <para>The display elements whose color you can set are:
+     <para>The display elements colors you can set are:
 
           <itemizedlist>
            <listitem>
@@ -459,7 +458,7 @@
 	  <listitem>
 	    <para> <guilabel>To-Do item that is not yet
              due:</guilabel> Text color for To-Do list items that are
-             not yet due.  (Or maybe background color? find out!)
+             not yet due. 
                </para>
 	  </listitem>
 
@@ -540,10 +539,10 @@
 	  <listitem>
 	    <para><guilabel>Beep on display alarms</guilabel>: select
 	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set.  If you leave this box
+	    at you for any alarms you have set. These beeps
+	    are distinct from full-fledged audio alarms. If you leave this box
 	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. These beeps
-	    are distinct from full-fledged audio alarms.
+	    alert you to events by opening a dialog box. 
            </para>
 	  </listitem>
 	  <listitem>
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index d76deba090..8ed5cd0e38 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -47,9 +47,9 @@
 -->
 
       <para>
-         The setup assistant (sometimes called a
+         The setup assistant, sometimes called a
 	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
-	 that some other programs use) will guide you through the
+	 that some other programs use, will guide you through the
 	 network configuration process.  It will ask you for some
 	 basic information; your system administrator or ISP should
 	 have the answers you'll need.  The mail setup assistant is
@@ -166,7 +166,7 @@
             </para>
 	    <para>
 	      In the <guilabel>Username:</guilabel> input box, type your
-	      username for your email account (the part before the @).
+	      username for your email account (the part before the "@").
 	    </para>
 	  </listitem>
        </varlistentry>
diff --git a/doc/C/config-sync.sgml b/doc/C/config-sync.sgml
index 0445b474c4..64a5f0fb50 100644
--- a/doc/C/config-sync.sgml
+++ b/doc/C/config-sync.sgml
@@ -2,7 +2,7 @@
      <title>Setting up your synchronization system</title> 
      <para>
         Synchronization presents you with two issues you'll need to
-        deal with. 
+        address. 
         <simplelist>
           <member>
             Your computer needs to recognize and access your handheld.
@@ -107,14 +107,14 @@
 
 
       <para> 
-         <warning> 
+         <tip> 
 	  <title>Data Loss Prevention</title> 
 	  <para>
 	    It's always a good idea to make a backup.  To do that,
 	    make a copy of your <systemitem>
 	    <filename>~/evolution</filename> </systemitem> directory.
           </para>
-	</warning>
+	</tip>
        </para>
 
     </chapter>
diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
index b78cfc233a..8201284062 100644
--- a/doc/C/evolution.sgml
+++ b/doc/C/evolution.sgml
@@ -107,8 +107,7 @@ implemented. -->
         Usually, when developers say that, they mean that they didn't
         test it out thoroughly and have left it to other programmers
         to "configure" themselves a working system. In the case of
-        <application>Evolution</application>, "configurable" means
-        what it ought to.  It means that, while you can expect the
+        <application>Evolution</application>, "configurable", it means that, while you can expect the
         program to work perfectly well in its default settings, it's
         also easy to alter its behavior in a wide variety of ways, so
         that it fits your needs exactly.  This part of the book will
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 69fc995d67..81a6a0dc93 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -159,9 +159,27 @@
             click</member> <member><userinput>Anything you type
             in</userinput></member> <member><computeroutput>Text
             output from a computer</computeroutput></member>
-            <member><glossterm linkend="apx-gloss">Words</glossterm>
+	  <member><glossterm linkend="apx-gloss">Words</glossterm>
             that are defined in the <xref linkend="apx-gloss">.</member>
 	  </simplelist>
+	  <tip id="example-tip">
+	      <title>Example Tip</title>
+	      <para>
+		This is what an example looks like.
+	      </para>
+	    </tip>
+	  <example>
+	    <title>Example Example</title>
+	    <para>
+	      This is what an example looks like.
+	    </para>
+	  </example>
+	    <warning id="example-warning">
+	      <title>Example Warning</title>
+	      <para>
+		This is what a warning looks like.
+	      </para>
+	  </warning>
         </para>
       </formalpara>
   </sect1>
@@ -241,8 +259,9 @@
     <para>
       Chances are, <application>Evolution</application> isn't your first email
       program.  You're probably switching from another program and will want
-      email from your other program.  It's for exactly these situations that
-      <application>Evolution</application> includes an import feature.
+      access to your email from your old program.  It's for exactly these 
+      situations that <application>Evolution</application> includes an import 
+      feature.
     </para>
     <para>
       <application>Evolution</application> can import the following types of
@@ -250,22 +269,22 @@
       <itemizedlist>
 	<listitem>
 	  <para>
-	    VCard (.vcf, gcrd)
+	    VCard (.vcf, gcrd) - Contacts
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Outlook Express 4 (.mbx)
+	    Outlook Express 4 (.mbx) - Email
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    MBox(mbox)
+	    MBox(mbox) - Email
 	  </para>
 	</listitem>
       </itemizedlist>
       VCard is a format to store addressbooks and contact information.  Outlook
-      Express and MBox format both handle your email.  If you're coming from
+      handles your email.  If you're coming from
       Windows, you're probably going to be importing Outlook Express files.  If
       you're coming from a Unix program, you're probably using mbox.  Ask your
       system administrator if you aren't sure which you use.
@@ -277,6 +296,15 @@
 	from Eudora, you'll want to select mbox.
       </para>
     </note>
+    <note>
+      <title>Outlook 2000</title>
+      <para>
+	Outlook 2000 uses a format which <application>Evolution</application>
+	cannot directly import.  However, you can import it using Mozilla on
+	Windows.  Please see the FAQ for more information.
+      </para>
+    </note>
+      
     <para>
       To import your files, go to
       <menuchoice>
@@ -285,7 +313,7 @@
       </menuchoice>
     </para>
     <para>
-    A druid will appear, helping you to import your files.  You'll need to
+    An assistant will appear, helping you to import your files.  You'll need to
     specify where the file is that you want to import.  Click
     <guibutton>Next</guibutton> and then <guibutton>Import</guibutton>.
     <application>Evolution</application> will present you with the Folder
@@ -520,7 +548,12 @@
 	    <term></term>
 	    <listitem>
 	      <para>
-		
+		<tip id="new-appt">
+		  <title>New Appointments Fast</title>
+		  <para>
+		    Double-click in a blank space to create a new appointment.
+		  </para>
+		</tip>
 	      </para>
 	    </listitem>
 	    </varlistentry>
@@ -537,21 +570,20 @@
 
         <variablelist>
 	  <varlistentry>
-	    <term>Edit a User</term>
+	    <term>Edit a Contact</term>
 	    <listitem>
 	      <para>
-		You can edit a user two ways:
+		You can edit a contact two ways:
 		<itemizedlist>
 		  <listitem>
 		    <para>
-		      Single click on the person's "rolodex card" and you can
+		      Click once on the person's address card and you can
 		      edit the person's properties all in the same window.
 		    </para>
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Double-click on the contact's card and enter details about
-		      the person.
+		      Double-click on the contact's card and alter their details.
 		    </para>
 		  </listitem>
 		</itemizedlist>
@@ -579,7 +611,7 @@
 	    <term>Email a Contact</term>
 	    <listitem>
 	      <para>
-		Right click on a contact and click on 
+		Right click on a contact and select 
 		<guilabel>Send message to contact</guilabel>.
                </para>
 	    </listitem>
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index cbdcfd5e4e..ed69f5081e 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -111,7 +111,7 @@ lack of time, resources, and interest.
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
       <para>
-	To create a new calendar event, select
+	To create a new appointment, select
         <menuchoice>
 	  <guimenu>File</guimenu>
 	  <guisubmenu>New</guisubmenu> 
@@ -158,7 +158,7 @@ lack of time, resources, and interest.
       <para>
          You can have as many as four different
          <guilabel>Alarms</guilabel>, any time prior to the event
-         you've scheduled.  You can have one alarm of each type:
+         you've scheduled.  You can have one alarm of each of the following types:
          <variablelist>
            <varlistentry>
 	    <term><guilabel>Display</guilabel></term>
@@ -214,7 +214,7 @@ lack of time, resources, and interest.
          determined. <!-- FIXME -->
       </para>
       <para>
-        <application>Evolution</application> allows for categorizing your
+        <application>Evolution</application> lets you categorize your
 	appointments, which can help if you lead a busy life.  The bottom
 	section of the <guilabel>Appointment</guilabel> tab is where your
 	categorization is done.
@@ -225,7 +225,7 @@ lack of time, resources, and interest.
 	<para>
 	 You can add a new category to your category list by clicking on
          <guibutton>Edit Master Category List...</guibutton> and single-clicking
-	 on <guilabel> Click here to add a category </guilabel>.
+	 on <guilabel> Click here to add a category</guilabel>.
 	</para>
       </tip>
 
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 4c6e590eef..5b4de5fd81 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -53,25 +53,24 @@
     </para>
 
     <para>
-      The <guilabel>Contact List</guilabel> lists your contacts which you
-      entered.
+      The <guilabel>Contact List</guilabel> lists your contacts.
     </para>
 
     <para>
-       To open up your address book, click on
+       To open your address book, click on
        <guibutton>Contacts</guibutton> in the shortcut bar, or select
        one of your contacts folders from the folder bar.  <xref
        linkend="usage-contact-fig"> shows the address book in all
        its organizational glory.  By default, the address book
        shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> format.  You can select
+       linkend="minicard">minicard</glossterm> view.  You can select
        other views from the <guimenu>View</guimenu> menu, and adjust
        the width of the columns by clicking and dragging the grey
        column dividers.
     </para>
 
     <para>
-       The toolbar for the address book is quite simple:
+       The toolbar for the address book is quite simple.
        <itemizedlist>
 	<listitem><para>
            <guibutton>New</guibutton> creates a new card.
@@ -91,7 +90,8 @@
         <listitem><para> <guibutton>View All</guibutton> displays all
            the address information in the folder.  Use this button to
            refresh the display for a network folder, or to switch from
-           viewing the results of a search and see the whole contents.
+           viewing the results of a search and see all your contacts.
+	    <!-- Lets xref to search feature -->
            </para></listitem>
 
         <listitem><para> <guibutton>Stop</guibutton> stops loading
@@ -104,7 +104,7 @@
     <para>
        Your contact information fills the rest of the display.  Move
        through the cards alphabetically with the buttons and the
-       scrollbar at the right of the window. Of course, if you have
+       scrollbar to the right of the window. Of course, if you have
        more than a few people listed, you'll want some way of finding
        them more quickly, which is why there's a search feature.
     </para>
@@ -113,6 +113,7 @@
   <sect1 id="usage-contact-cards">
     <title>The Contact Editor</title>
     <para>
+      To delete a contact:
       <orderedlist numeration="arabic">
 	<listitem>
 	  <para>
@@ -121,7 +122,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    Press <guibutton>Delete</guibutton>.
+	    Press the <guibutton>Delete</guibutton> button.
 	  </para>
 	</listitem>
       </orderedlist>
@@ -129,9 +130,8 @@
     <para>
        If you want to add or change cards, you'll use the contact
        editor.  To change a card that already exists, double click on
-       it to open the contact editor window with all the current
-       information already filled in.  If you want to create a new
-       one, clicking the <guibutton>New</guibutton> button in the
+       it to open the contact editor window.  If you want to create a new
+       card, clicking the <guibutton>New</guibutton> button in the
        toolbar will open the same window, with blank entry boxes for
        you to fill in.
     </para>
@@ -212,36 +212,36 @@
 		    </variablelist>
                    </para>
 		</listitem>
-	        <listitem>
-		  <para>
-                    The <guilabel>Full Name</guilabel> field also
-                    interacts with the <guilabel>File As</guilabel>
-                    box to help you organize your contacts.
-                  </para>
-                  <para>
-                    To see how it works, type a name in the
-                    <guilabel>Full Name</guilabel> field:
-                    <userinput>Rupert T. Monkey</userinput>.  You'll
-                    notice that the <guilabel>File As</guilabel> field
-                    also fills up, but in reverse:
-                    <computeroutput>Monkey, Rupert</computeroutput>.
-                    You can pick <computeroutput>Rupert Monkey
-                    </computeroutput> from the drop-down, or type in
-                    your own, such as <userinput> T. Rupert Monkey
-                    </userinput>.
-                 </para>
-		  <tip>
-		    <title>Filing Suggestion</title>
-		   
-		    <para>
-                      Don't enter something entirely different from
-                      the actual name, since you might forget that
-                      you've filed Rupert's information under "F" for
-                      "Fictitious Ximian Employee."
-                    </para>
-		  </tip>
-		</listitem>
 	      </itemizedlist>
+	      </para>
+		<para>
+		  The <guilabel>Full Name</guilabel> field also
+		  interacts with the <guilabel>File As</guilabel>
+		  box to help you organize your contacts.
+		</para>
+		<para>
+		  To see how it works, type a name in the
+		  <guilabel>Full Name</guilabel> field:
+		  <userinput>Rupert T. Monkey</userinput>.  You'll
+		  notice that the <guilabel>File As</guilabel> field
+		  also fills in, but in reverse:
+		  <computeroutput>Monkey, Rupert</computeroutput>.
+		  You can pick <computeroutput>Rupert Monkey
+		  </computeroutput> from the drop-down, or type in
+		  your own, such as <userinput> T. Rupert Monkey
+		  </userinput>.
+		</para>
+		<tip>
+		  <title>Filing Suggestion</title>
+		  
+		  <para>
+		    Don't enter something entirely different from
+		    the actual name, since you might forget that
+		    you've filed Rupert's information under "F" for
+		    "Fictitious Ximian Employee."
+		  </para>
+		</tip>
+
              </para>
            </listitem>
 	</varlistentry>
@@ -284,7 +284,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    The globe - Misc. notes
+	    The globe - Miscellanious notes
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -331,7 +331,7 @@
     </para>
     <para>
       You can refine searches by doing several in
-      succession, or start over by pressing the <guibutton>View
+      succession, or start over by pressing the <guibutton>Show
 	All</guibutton> button.
     </para>
     <para>
@@ -372,7 +372,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    Name the rule in the <guilabel>Rule name</guilabel> field.
+	    Name the rule in the <guilabel>Rule Name</guilabel> field.
 	  </para>
 	</listitem>
 	<listitem>
@@ -383,7 +383,7 @@
 	<listitem>
 	  <para>
 	    If you want to add more critera, click the <guibutton>Add
-	    criterion</guibutton> button.
+	    Criterion</guibutton> button.
 	  </para>
 	</listitem>
 	<listitem>
@@ -405,7 +405,7 @@
     <para>
        Organizing your address book is a lot like organizing your
        mail.  You can have folders and searches the same way you can
-       with mail, but the address book does not allow vFolders.  It
+       with mail, but the address book does not allow Virtual Folders.  It
        does, however, allow each card to fall under several
        categories, and allow you to create your own categories.  To
        learn about categories, read <xref
@@ -428,8 +428,8 @@
       <para>
          <application>Evolution</application> offers two ways for you
          to organize your cards.  The first way is to use folders;
-         this works the same way that mail folders do.  For more
-         flexibility, you can also mark contacts as members of
+         this works the same way mail folders do.  For more
+         flexibility, you can also mark contacts as elements of
          different categories.
       </para>
 
@@ -464,9 +464,8 @@
 	<title>Grouping with Categories</title>
 	<para>
            The other way to group cards is to mark them as belonging
-           to different categories.  The difference between folders
-           and categories is that folders contain cards, but category
-           membership is a property of each card.  That means that you
+           to different categories.  
+           That means that you
            can mark a card as being in several categories or no
            category at all.  For example, I put my friend Matthew's
            card in the "Business" category, because he works with me,
@@ -507,13 +506,13 @@
     <para>
        If you keep your cards on a network using an <glossterm
        linkend="ldap">LDAP</glossterm> server, you can share access to
-       them, browse other address books, or maintain a shared set of
+       them, browse other peoples address books, or maintain a shared set of
        contact information for your company or your department.  This
        is the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
-       share calendars as well as address books, people can avoid
+       you share calendars as well as address books, people can avoid
        duplicating work and keep up to date on developments within
-       their work-group or across the entire company.
+       their workgroup or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -596,7 +595,7 @@
 	card.  To do so, right click on any email address or email
 	message, and select <guimenuitem>Add Address
 	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> also adds cards from a
+	<application> Evolution</application> can also add cards from a
 	hand-held device during HotSync operation.  For more
 	information about that, see <xref linkend="usage-sync">.
       </para>
diff --git a/doc/C/usage-exec-summary.sgml b/doc/C/usage-exec-summary.sgml
index 1abeafe588..996e4b3132 100644
--- a/doc/C/usage-exec-summary.sgml
+++ b/doc/C/usage-exec-summary.sgml
@@ -136,7 +136,7 @@
 	components in My Evolution.
       </para>
       <sect3 id="modifying-components-mail">
-	<title>Modifying Mail</title>
+	<title>Customizing My Evolution Mail Summary</title>
 	<para>
 	  To modify mail:
 	  <orderedlist numeration="arabic">
@@ -164,7 +164,7 @@
 	  The right section shows which folders are displayed.
 	</para>
 	<para>
-	  To add a folder to be displayed, click on a folder in the
+	  To add a folder to the summary, click on a folder in the
 	  <guilabel>All folders</guilabel> section and click the
 	  <guibutton>Add</guibutton> button.
 	</para>
diff --git a/doc/C/usage-mail-org.sgml b/doc/C/usage-mail-org.sgml
index 2fcc24551a..61f46114c4 100644
--- a/doc/C/usage-mail-org.sgml
+++ b/doc/C/usage-mail-org.sgml
@@ -19,7 +19,7 @@
          <guilabel>Date</guilabel> fields. You can change their order
          and remove them by dragging and dropping them.  
 
-      To add columns to sort by:
+      To add columns:
       <orderedlist numeration="arabic">
 	<listitem>
 	  <para>
@@ -61,8 +61,10 @@
 	  <varlistentry>
 	    <term><guimenuitem>Group By this Field</guimenuitem></term>
 	    <listitem><para>
-		Groups messages instead of sorting them. (FIXME: Explain further) 
-	      </para></listitem>
+	      Groups messages instead of sorting them. This makes each contact
+	      with identical properties in the specified field to be placed in
+	      its own group and physically separated from others. 
+	    </para></listitem>
 	  </varlistentry>
 	  
 	  <varlistentry>
@@ -75,12 +77,13 @@
 	  
 	  <varlistentry>
 	    <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>
+		Chooser</guimenuitem></term> <listitem><para> 
+	      When you choose this item, a list
+	      of column headers will appear; 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>
     </sect1>
@@ -226,7 +229,7 @@
         actions that may effect the same message in several ways.  For
         example, your filters could put copies of one message into
         multiple folders, or keep a copy and send one to another
-        person as well, and it can do that in under a second. Which is
+        person as well, and it can do that quickly. Which is
         to say, it's faster and more flexible than an actual person
         with a pile of envelopes.
       </para>
@@ -330,8 +333,8 @@
 		
 		<listitem>
 		  <para>
-		    Attachments - Create a filter whether or not you have an
-		    attachment in the email.
+		    Attachments - Create a filter based on whether or not you 
+		    have an attachment in the email.
 		  </para>
 		</listitem>
 		
@@ -459,12 +462,12 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton>.
+	      Press <guibutton>OK</guibutton> in the filter editor window.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton>.
+	      Press <guibutton>OK</guibutton> in the filter manager window.
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -494,13 +497,15 @@
       </para>
       <para>
 	<note>
-	  <title>Notable Filter Features</title>
+	  <title>Changing Folder Names and Filters</title>
 	  <para>
 	    <itemizedlist>
-	      <listitem><para>
+	      <listitem>
+		<para>
 		  Incoming email that your filters don't move goes into the Inbox; 
-		  outgoing mail that they don't move ends up in the Sent folder.
-	    </para>
+		  outgoing mail that they don't move ends up in the Sent
+		  folder.  So be sure to change the filters that go with it.
+		</para>
 	      </listitem>
 	    </itemizedlist>
 	  </para>
@@ -554,7 +559,7 @@
     <example id="usage-mail-organize-vFolders-ex">
       <title>Using Folders, Searches, and Virtual Folders</title>
       <para>
-	To organize their mailbox, Jim sets up a virtual volder for emails from
+	To organize his mailbox, Jim sets up a virtual volder for emails from
 	his friend and co-worker Anna.  He has another one for messages that
 	have ximian.com in the address and <application>Evolution</application> in the subject line, so he
 	can keep a record of what people from work send him about
@@ -589,9 +594,9 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Name your filter in the <guilabel>Rule name</guilabel> field.
-	      For each filter criterion, you must first select 
-	      which of the following parts of the message you want the filter to 
+	      Name your virtual folder in the <guilabel>Rule name</guilabel> field.
+	      For each criterion, you must first select 
+	      which of the following parts of the message you want the search to 
 	      examine:
 	      <itemizedlist>
 		<listitem><para>
@@ -608,7 +613,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Specific Header - The filter can look at any header you
+		    Specific Header - The virtual folder can look at any header you
 		    want, even obscure or custom ones. Enter the header name
 		    in the first text box, and put your search text in the
 		    second one.
@@ -622,15 +627,15 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define filters in <application>Evolution</application>.
+		    define virtual folders in <application>Evolution</application>.
 		  </para>
 		</listitem>
 		
-		<listitem><para> Date sent - Filter messages according to the date on
+		<listitem><para> Date sent - Search messages according to the date on
 		    which they were sent: First, choose the conditions you
 		    want a message to meet &mdash; <guilabel>before</guilabel>
 		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The filter will compare the
+		    Then, choose the time. The virtual folder will compare the
 		    message's time-stamp to the system clock when the filter
 		    is run, or to a specific time and date you choose from a
 		    calendar.  You can even have it look for messages within a
@@ -646,8 +651,9 @@
 		
 		<listitem><para>
 		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have filters set the
-		    priority of messages you recieve, and then have other filters 
+		    important) to 3 (most important). You can have virtual folders set the
+		    priority of messages you recieve, and then have other
+		    virtual folders 
 		    applied only to those messages which have a certain priority.
 		  </para></listitem>
 		
@@ -659,21 +665,21 @@
 		
 		<listitem>
 		  <para>
-		    Status - Filters according to the status of a message, such as
+		    Status - Searches according to the status of a message, such as
 		    'New'.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Attachments - Create a filter whether or not you have an
+		    Attachments - Create a virtual folder based on  whether or not you have an
 		    attachment in the email.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Mailing List - Filter based on the mailing list it came from.
+		    Mailing List - Search based on the mailing list it came from.
 		  </para>
 		</listitem>
 		
@@ -687,7 +693,7 @@
 		
 		<listitem>
 		  <para>
-		    Source Account - Filter messages according the server you got them from.
+		    Source Account - Search messages according the server you got them from.
 		    You can enter a URL or choose one from the drop-down
 		    list.  This ability is only relevant if you use more
 		    than one mail source.
@@ -699,7 +705,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the criterion for the condition.
+	      Select criteria to search by.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -708,7 +714,7 @@
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    specific folders only
+		    Specific folders only
 		    <note>
 		      <para>
 			If you select specific folders only, you need to specify the
@@ -719,17 +725,17 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    all local folders
+		    All local folders
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    with all active remote folders
+		    With all active remote folders
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    with all local and active folders
+		    With all local and active folders
 		  </para>
 		</listitem>
 	      </itemizedlist>
@@ -738,16 +744,16 @@
 	  </listitem>
 	  <listitem>
 	<para>
-	      If you want multiple criterion for this filter, press <guibutton>Add
+	      If you want multiple criteria for this filter, press <guibutton>Add
 		criterion</guibutton> and repeat the previous step.
 	    </para>
-      </listitem>
+	  </listitem>
     </orderedlist>
 
       <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a vFolder Rule</title>
+	<title>Selecting a Virtual Folder Rule</title>
 	<screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
+	  <screeninfo>Creating a Virtual Folder Rule</screeninfo>
 	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
 	  </graphic>
 	</screenshot>
@@ -755,10 +761,10 @@
       </para>
     </sect2>
     <sect2 id="usage-mail-vfolder-unmatched">
-      <title>The Unmatched vFolder</title>
+      <title>The Unmatched Virtual Folder</title>
       <para>
-	Obveously, not all messages will fit into all your vFolders.  That is
-	what the UNMATCHED vFolder is for.  The UNMATCHED vFolder is a vFolder
+	Obveously, not all messages will fit into all your Virtual Folders.  That is
+	what the UNMATCHED Virtual Folder is for.  The UNMATCHED Virtual Folder is a folder
 	for any mail that doesn't get matched by other rules.
       </para>
     </sect2>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 08c3a1648d..12ceb903db 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -4,7 +4,7 @@
     <title> A Guide to the Evolution Mailer</title>
     <para>
        <application>Evolution</application> email is like other email
-       programs in all the ways you would hope:
+       programs in all the ways that matter:
      <itemizedlist>
        <listitem>
          <para>
@@ -15,7 +15,7 @@
        <listitem>
          <para>
           It can send and receive mail in HTML or as plain text, and
-          permits multiple file attachments.
+          makes it easy to send and recieve multiple file attachments.
          </para>
        </listitem>
        <listitem>
@@ -28,7 +28,12 @@
            even NNTP messages (newsgroups), which aren't technically
            email.
          </para>
-       </listitem>
+	</listitem>
+	<listitem>
+	  <para>
+	    Lets you enhance your security with encryption.
+	  </para>
+	</listitem>
      </itemizedlist>
     </para>
     <para>
@@ -130,9 +135,8 @@
     <sect2 id="usage-mail-listorder">
       <title>Sorting the message list</title>
       <para>
-	One of the ways <application>Evolution</application> lets
-	you choose the way you work is the way it lets you sort your
-	message lists.  To sort by sender, subject, or date, click
+	<application>Evolution</application> helps you work by letting you sort
+	your email.  To sort by sender, subject, or date, click
 	on the bars with those labels at the top of the message
 	list. The direction of the arrow next to the label indicates
 	the direction of the sort, and if you click again, you'll
@@ -179,8 +183,8 @@
 	    <note>
 	      <title>Deleted but still here?</title>
 	      <para>
-		When you do this, your message is marked to be deleted.  It is
-		not until you expunge the message that the message is gone.
+		When you do this, your message is marked to be deleted.  Your
+		email is not gone until you have expunged it.
 	      </para>
 	    </note>
 	  </listitem>
@@ -201,9 +205,9 @@
 	</orderedlist>
       </para>
       <note>
-	<title>Trash is Actually a vFolder?</title>
+	<title>Trash is Actually a Virtual Folder?</title>
 	<para>
-	  Your trash bin is actually a vFolder that searches for all mails that
+	  Your trash bin is actually a Virtual Folder that searches for all mails that
 	  are queued to be deleted.
 	</para>
       </note>
@@ -249,21 +253,21 @@
       information it needs to check your email.
     </para>
     <para>
-      The druid will give you several dialog boxes where you setup:
+      The assistant will give you several dialog boxes where you configure:
       <itemizedlist>
 	<listitem>
 	  <para>
-	    Setup your personal information
+	    your personal information
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Setup your outgoing email server information
+	    your outgoing email server information
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Identity Name
+	    your mail account identity name
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -279,7 +283,7 @@
       <title>Can't Check Mail?</title>
       <para>
 	If you get an error message instead of mail, you probably need to check
-	your network settings.  If you.  To learn how to do that,
+	your network settings.  To learn how to do that,
 	 have a look at <xref linkend="config-prefs-mail-network">, or
 	 ask your system administrator.
        </para>
@@ -382,9 +386,14 @@
       -->
         <para>
            <application>Evolution</application> can also display
-           HTML-formatted mail, complete with graphics.  HTML
-           formatting will display automatically, although you can
-           turn it off if you prefer.
+           HTML-formatted mail, complete with graphics.  Graphics don't load
+           automatically by default, becuase they can be large and take a long
+           time to download.  They can also be used by spammers to help track
+           who reads their email.  So having them not load automatically helps
+           protect your privacy.
+	<!-- I say the privacy thing because I saw an internal email which
+           stated that gallop polls show people are concerned about online
+           security and that we'd be best marketing Evolution as more secure -->
       </para>
     </sect2>
   </sect1>
@@ -435,9 +444,8 @@
            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.
-           Many times, one might want to use "Send Later" becuase it gives
-           you a chance to change your mind about a message before it
-           is sent.  This way, you may not say something you may regret.
+           You might want to use "Send Later" becuase it gives
+           you a chance to change your mind about a message before you send it.
         </para>
         <para>
            To learn more about how you can specify message queue and
@@ -563,7 +571,7 @@
                  category into the <guilabel>To:</guilabel> or
                  <guilabel>Cc:</guilabel> fields, he'll make the
                  company's <emphasis>entire</emphasis> client list
-                 public. However, but putting his "Clients" addressbook
+                 public. But putting his "Clients" addressbook
                  into the Bcc: section, that will cause them to be hidden
                  from the competition.  It seems insignificant, but it can
                  make a huge difference in some situations.
@@ -592,7 +600,7 @@
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
             <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            a potentially a very long one &mdash; of the email addresses
+            potentially a very long one &mdash; of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
@@ -610,14 +618,14 @@
         <title>Replying to Messages</title>
         <para>
            To reply to a message, press the
-           <guibutton>Reply</guibutton> button while it is selected,
-           or choose <guimenuitem>Reply to Sender</guimenuitem> from
+           <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
            <interface>message composer</interface>.  The
-           <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
+           <guilabel>To:</guilabel> and <guilabel>Subject:</guilabel>
            fields will already be filled, although you can alter them
            if you wish.  In addition, the full text of the old message
-           is inserted into the new message, either in italics (for
+           is inserted into the new message, either grey (for
            HTML display) or with the &gt; character before each line
            (in plain text mode), to indicate that it's part of the
            previous message.  People often intersperse their message
@@ -671,8 +679,11 @@ with quoted materials and the relevant replies interspersed-->
               collaboration on the Internet works.  They allow people to send one
               message to one server.  The server then knows who is subscribed to the
               mailing list, and sends a copy of your email to all the people on the
-              list.  As a matter of fact, mailing lists are one of the main ways in
-              which <application>Evolution</application> was developed.
+              list.  
+              For example, evolution-hackers@ximian.com allows the
+              <application>Evolution</application> programmers to converse
+              publically about their latest developments so that everyone can
+              stay up to date.
             </para>
             <para>
               There are two different types of mailing lists.  The first is a
@@ -979,8 +990,8 @@ with quoted materials and the relevant replies interspersed-->
         <title>Forwarding Mail</title>
         <para>
           The post office forwards your mail for you when you change
-          addresses, and you can forward mail when you get a letter by
-          mistake.  The email <guilabel>Forward</guilabel> button
+          addresses, and you can forward a letter if it comes to you by mistake.
+          The email <guilabel>Forward</guilabel> button
           works in much the same way.  It's particularly useful if you
           have received a message and you think someone else would
           like to see it.  You can forward a message as an attachment
@@ -1120,13 +1131,16 @@ with quoted materials and the relevant replies interspersed-->
 	<example>
 	  <title>Encryption Example</title>
 	  <para>
-	    Kevin orders an <application>Evolution</application> t-shirt from
-	    Ximian, Inc. over the Internet.  He puts in his credit card number
-	    which is 1234-567-8901.  For security, his computer encrypts the
-	    credit card number so it can be safely transmitted over the Internet.
-	    The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	    resemblance to the initial number.  When the information gets to
-	    Ximian, Inc. it'll be decrypted into the initial number.
+	    Kevin sends his friend Rachel and email and chooses to encrypt it.
+	    The email has the following contents:
+	      Hi Rachel.
+	      Go banana!
+	      Kevin
+	    He tells <application>Evolution</application> to encrypt the
+	    message.  The computer encrypts the message which now looks like
+	    @#$23ui7yr87#@!48970fsd.  When the information gets to Rachel,
+	    she'll decrypt the message and it'll show up in plain text for her
+	    to read.
 	  </para>
 	</example>
 	Encryption can be used in email in two ways: to verify that the sender is
@@ -1149,14 +1163,14 @@ with quoted materials and the relevant replies interspersed-->
 	</para>
       </tip>
       <para>
-	You can start by typing in: <command>gpg --gen-key</command>.  At the
-	first question, select 1.  The next question asks you about key length.
+	You can start by typing in: <command>gpg --gen-key</command> at the
+	console.  When you are asked about the algorythm to use, select 1.  The next question asks you about key length.
 	The longer the key, more stronger it is.  However, the longer the key, the
 	longer it takes to generate.  This is your choice.  However, 1024 bits
 	(default) should be adequate.  The next question asks you if you want your
 	key to expire.  Expiring keys make your key invalid after a certain amount
-	of time, so old keys don't float around active.  This is the same concept
-	as a coupon at a supermarket.  Next, you'll type in your Real name, your
+	of time, so old keys don't float around when they aren't used anymore.  This is the same concept
+	as a coupon at a supermarket.  Next, you'll type in your real name, your
 	email address, and a comment.  You should not forge this information, as
 	it is used later to verify who you are.  Assuming that all your
 	information is correct, press "O" to continue.  GPG now asks you for a
@@ -1165,7 +1179,7 @@ with quoted materials and the relevant replies interspersed-->
 	sensitive, which means that it does know the difference between capital
 	letters and lower-case.  Now your key is generated.  It is recommend you
 	surf the Internet, read your email, or write a letter in a word
-	processor.  This help creates randomness in the key.
+	processor while your key is generated.
       </para>
       <para>
 	Once this is completed, you'll be dropped back to the command line.
@@ -1188,8 +1202,42 @@ with quoted materials and the relevant replies interspersed-->
 	You will be prompted to type in your password <!-- verify that you need to
 	enter your password here --> and your key will be uploaded for your
 	friends to download.
+	<note id="why-keyserver">
+	  <title>Why Use a Keyserver?</title>
+	  <para>
+	    Keyservers store your public keys for you so that your friends can
+	    decrypt your messages.  If you choose not to use a keyserver, you
+	    can manually send your friends your public key.  It is much easier
+	    though to upload to a keyserver and then let your friends download
+	    your public key on their own wish. <!-- Bad wording -->
+	  </para>
+	</note>
+	<note id="pub-priv">
+	  <title>Public Key?  Private Key?  Whats the difference?</title>
+	  <para>
+	    GPG uses two types of keys: public and private.  The private should
+	    be given out to no one, ever.  Your private key allows your mail to
+	    be signed and encrypted and decrypted by anyone who has it.  The
+	    public key is what you give your friends so that they can decrypt
+	    your mails.
+	  </para>
+	</note>
       </para>
     </sect2>
+    <sect2 id="encrypt-getting-key">
+      <title>Retrieving a Friends Key</title>
+      <para>
+	To encrypt a message to your friends, you'll need to use their public
+	key in combination with your private key.
+	<application>Evolution</application> does that transparently, but you
+	still need to get their key off a keyserver.  To do that, type:
+	<command>
+	  gpg --recv-keys --keyserver wwwkeys.pgp.net keyid
+	</command>.  You will need to type in your password, and then their ID
+	will automatically be added to your keyring.
+      </para>
+    </sect2>
+
     <sect2 id="encrypt-evo-integ">
       <title>Setting up Evolution's Encryption</title>
       <para>
@@ -1201,7 +1249,7 @@ with quoted materials and the relevant replies interspersed-->
 	Once there, select the account you'd like to associate the key to and click
 	the <guibutton>Edit</guibutton> button.  In the
 	<guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-	  Goog Privacy</guilabel>.  Enter your key ID and click
+	  Good Privacy</guilabel>.  Enter your key ID and click
 	<guibutton>OK</guibutton>.  Your key is now integrated into your identity
 	in <application>Evolution</application>.
       </para>
@@ -1209,7 +1257,7 @@ with quoted materials and the relevant replies interspersed-->
     <sect2 id="encrypt-sending">
       <title>Sending Encrypted Messages</title>
       <para>
-	You can either sign or encrypt a message.  When you sign a message, verify
+	You can either sign or encrypt a message.  When you sign a message, you verify
 	that you were the one who sent it, and that no one is forging your
 	identity.  Encrypting a message makes it impossible for someone with
 	prying eyes to view it while it's in transmission.
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index b4943af412..2bb1815efb 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -36,16 +36,6 @@
 	the message list view, where  a summary of your email is displayed.
 	If you're running the program for the first time,
 	you'll have one message: a welcome from Ximian.
-	<!-- ==============Figure=================================== -->
-    <figure id="usage-mainwindow-fig">
-    <title>Evolution Main Window and Inbox</title>
-    <screenshot>
-      <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-    </screenshot>
-    </figure>
-<!-- ==============End of Figure=================================== -->
     </para>
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
@@ -215,7 +205,7 @@
 	    the messages you have marked for deletion but not yet
 	    <glossterm linkend="expunge">expunged</glossterm>. Note that 
 	    once you have expunged a message, it
-	    is gone for good.
+	    is permanently deleted.
 	   </para>
 	 </listitem>
       </itemizedlist>
@@ -226,8 +216,9 @@
        <para>
          You don't need the folder bar or the shortcut bar to move
          around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another, and the folder
-         menu on the right side of the window just below the toolbar
+         switch from one part of the window to another. When you hide the folder
+         bar, 
+         there is a menu on the left side of the window just below the toolbar
          to move about the folder tree, even with the folder and
          shortcut bars hidden.
        </para>
@@ -312,10 +303,10 @@
     <sect3 id="subfolders">
     <title>Subfolders</title>
       <para>
-        <application>Evolution</application> can also manage subfolders.
-	Subfolders are folders inside of folders.  This works well if
+        <application>Evolution</application> can also manage subfolders,
+	subfolders are folders inside of folders.  This works well if
 	you want to try to separate your home folders from your work
-	folders. 
+	folders, or if you like to keep very organized.
       </para>
 
     
@@ -348,7 +339,7 @@
     </para>
 
     <para>
-      You can also rearrange folders and messages with by dragging and
+      You can also rearrange folders and messages by dragging and
       dropping them.
     </para>
 
@@ -368,13 +359,13 @@
 -->
 
 	<para>
-	  Any time new information arrives in a folder, that folder label
-	  is displayed in bold text, along with the amount of new messages in
+	  Any time new information arrives in a mail folder, that folder label
+	  is displayed in bold text, along with the number of new messages in
 	  that folder inside of paranthesis.
 	</para>
       </sect3>
-      </sect2>
-
+    </sect2>
+    
     <sect2 id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
     <para>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 83f3ec1927..25035c6d24 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,17 @@
+2001-07-11  Kevin Breit  <battery841@mediaone.net>
+
+	* C/usage-calendar.sgml: More edits.
+
+	* C/usage-contact.sgml: Sick amounts of changes too!
+
+	* C/usage-mail-org.sgml: Heavy editing...touched almost everything.
+
+	* C/usage-exec-summary.sgml: Minor change.  There was only one change for this chapter, cuz I'm such a 'godly' writer...yeah.
+
+	* C/usage-mainwindow.sgml: A bit of editing.
+
+	* C/preface.sgml: Screwed with the examples and did some cleanup.
+
 2001-07-10  Aaron Weber  <aaron@ximian.com>
 
 	* C/usage-mail-org.sgml: validation.
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index cdbd119790..1772fd57bd 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -41,7 +41,7 @@
 	    <term><guilabel>Composer</guilabel></term>
 	    <listitem>
 	      <para>
-		Customizes the composer window's behavior.
+		Customizes the composer's behavior.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -145,7 +145,7 @@
 	<title>Mail Sources</title>
 	<para>
           The <interface>Mail Sources</interface> tab allows you to
-          edit, add, or delete methods of retrieving mail from
+          add, edit, or delete methods of retrieving mail from
           servers.  Clicking on <guibutton>Add</guibutton> or
           <guibutton>Edit</guibutton> will bring up a dialog box to
           offer you the following options:
@@ -168,7 +168,7 @@
 	      <listitem>
 		<para>
                   Enter the name of the mail source server in this
-                  field. If you use an  may or may not be the same as your
+                  field. Your POP server may or may not be the same as your
                   <glossterm linkend="smtp">SMTP</glossterm> server.
                 </para>
 	      </listitem>
@@ -221,14 +221,15 @@
             listings and check and download mail from all POP servers.
             In other words, <guibutton>Get Mail</guibutton> gets your
             mail, no matter how many sources you have, or what types
-            they are.
+            they are.  You can disable checking mail on accounts in their
+            properties.
           </para>
       </sect3>
 
       <sect3 id="config-prefs-mail-network-transports">
 	<title>Mail Transports</title>
 	<para>
-           The <interface>Mail Transports</interface> tab lets you set
+           The <interface>Mail Transports</interface> tab lets you choose
            how you will send mail.  <application>Evolution</application> currently supports two
            mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
            uses a remote mail server, and
@@ -266,7 +267,7 @@
             Click <guibutton>Add</guibutton> to add a news server; you
             will be prompted for its name.  Enter the name, click
             <guibutton>OK</guibutton>, and you're done.  You can have
-            as many mail servers as you like, of course.  News servers
+            as many news servers as you like, of course.  News servers
             will appear next to your IMAP servers in the
             <interface>folder bar</interface>.
           </para>
@@ -296,12 +297,12 @@
 	  </varlistentry>
 	  <varlistentry>
                 <term> 
-                   <guilabel>Mark Messages as Seen After</guilabel>
+                   <guilabel>Mark Messages as Read After</guilabel>
                 </term>
                 <listitem><para> 
                     When you click on a message,
                     <application>Evolution</application> will wait a
-                    moment before marking it as seen. You can set the
+                    moment before marking it as read. You can set the
                     delay, in milliseconds, here.
                  </para></listitem>
               </varlistentry>
@@ -336,10 +337,8 @@
           <guimenuitem>Calendar
           Configuration</guimenuitem></menuchoice> from the Calendar
           view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>Time display</guilabel>,
-          <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
-          and <guilabel>Alarms</guilabel>.  The <interface>calendar
+          <interface>Preferences</interface> window.  It contains three
+          tabs: <guilabel>Calendar</guilabel>, <guilabel>TaskPad</guilabel>, <guilabel>Reminders</guilabel>.  The <interface>calendar
           preferences window</interface> is illustrated in <xref
           linkend="config-prefs-cal-fig">.
 
@@ -402,12 +401,12 @@
         sample calendar on the right and a list of ten items that can
         be colored in different ways.  If you click on the color
         button to the right of each item, you will bring up a
-        color-selector window where you can choose to alter that
+        color-selector window where you can alter that
         color.  By clicking <guibutton>OK</guibutton> in the color
         selection dialog, you can see the results of the color on the
         sample calendar.
      </para>
-     <para>The display elements whose color you can set are:
+     <para>The display elements colors you can set are:
 
           <itemizedlist>
            <listitem>
@@ -459,7 +458,7 @@
 	  <listitem>
 	    <para> <guilabel>To-Do item that is not yet
              due:</guilabel> Text color for To-Do list items that are
-             not yet due.  (Or maybe background color? find out!)
+             not yet due. 
                </para>
 	  </listitem>
 
@@ -540,10 +539,10 @@
 	  <listitem>
 	    <para><guilabel>Beep on display alarms</guilabel>: select
 	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set.  If you leave this box
+	    at you for any alarms you have set. These beeps
+	    are distinct from full-fledged audio alarms. If you leave this box
 	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. These beeps
-	    are distinct from full-fledged audio alarms.
+	    alert you to events by opening a dialog box. 
            </para>
 	  </listitem>
 	  <listitem>
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index d76deba090..8ed5cd0e38 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -47,9 +47,9 @@
 -->
 
       <para>
-         The setup assistant (sometimes called a
+         The setup assistant, sometimes called a
 	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
-	 that some other programs use) will guide you through the
+	 that some other programs use, will guide you through the
 	 network configuration process.  It will ask you for some
 	 basic information; your system administrator or ISP should
 	 have the answers you'll need.  The mail setup assistant is
@@ -166,7 +166,7 @@
             </para>
 	    <para>
 	      In the <guilabel>Username:</guilabel> input box, type your
-	      username for your email account (the part before the @).
+	      username for your email account (the part before the "@").
 	    </para>
 	  </listitem>
        </varlistentry>
diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
index 0445b474c4..64a5f0fb50 100644
--- a/help/C/config-sync.sgml
+++ b/help/C/config-sync.sgml
@@ -2,7 +2,7 @@
      <title>Setting up your synchronization system</title> 
      <para>
         Synchronization presents you with two issues you'll need to
-        deal with. 
+        address. 
         <simplelist>
           <member>
             Your computer needs to recognize and access your handheld.
@@ -107,14 +107,14 @@
 
 
       <para> 
-         <warning> 
+         <tip> 
 	  <title>Data Loss Prevention</title> 
 	  <para>
 	    It's always a good idea to make a backup.  To do that,
 	    make a copy of your <systemitem>
 	    <filename>~/evolution</filename> </systemitem> directory.
           </para>
-	</warning>
+	</tip>
        </para>
 
     </chapter>
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index b78cfc233a..8201284062 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -107,8 +107,7 @@ implemented. -->
         Usually, when developers say that, they mean that they didn't
         test it out thoroughly and have left it to other programmers
         to "configure" themselves a working system. In the case of
-        <application>Evolution</application>, "configurable" means
-        what it ought to.  It means that, while you can expect the
+        <application>Evolution</application>, "configurable", it means that, while you can expect the
         program to work perfectly well in its default settings, it's
         also easy to alter its behavior in a wide variety of ways, so
         that it fits your needs exactly.  This part of the book will
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 69fc995d67..81a6a0dc93 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -159,9 +159,27 @@
             click</member> <member><userinput>Anything you type
             in</userinput></member> <member><computeroutput>Text
             output from a computer</computeroutput></member>
-            <member><glossterm linkend="apx-gloss">Words</glossterm>
+	  <member><glossterm linkend="apx-gloss">Words</glossterm>
             that are defined in the <xref linkend="apx-gloss">.</member>
 	  </simplelist>
+	  <tip id="example-tip">
+	      <title>Example Tip</title>
+	      <para>
+		This is what an example looks like.
+	      </para>
+	    </tip>
+	  <example>
+	    <title>Example Example</title>
+	    <para>
+	      This is what an example looks like.
+	    </para>
+	  </example>
+	    <warning id="example-warning">
+	      <title>Example Warning</title>
+	      <para>
+		This is what a warning looks like.
+	      </para>
+	  </warning>
         </para>
       </formalpara>
   </sect1>
@@ -241,8 +259,9 @@
     <para>
       Chances are, <application>Evolution</application> isn't your first email
       program.  You're probably switching from another program and will want
-      email from your other program.  It's for exactly these situations that
-      <application>Evolution</application> includes an import feature.
+      access to your email from your old program.  It's for exactly these 
+      situations that <application>Evolution</application> includes an import 
+      feature.
     </para>
     <para>
       <application>Evolution</application> can import the following types of
@@ -250,22 +269,22 @@
       <itemizedlist>
 	<listitem>
 	  <para>
-	    VCard (.vcf, gcrd)
+	    VCard (.vcf, gcrd) - Contacts
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Outlook Express 4 (.mbx)
+	    Outlook Express 4 (.mbx) - Email
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    MBox(mbox)
+	    MBox(mbox) - Email
 	  </para>
 	</listitem>
       </itemizedlist>
       VCard is a format to store addressbooks and contact information.  Outlook
-      Express and MBox format both handle your email.  If you're coming from
+      handles your email.  If you're coming from
       Windows, you're probably going to be importing Outlook Express files.  If
       you're coming from a Unix program, you're probably using mbox.  Ask your
       system administrator if you aren't sure which you use.
@@ -277,6 +296,15 @@
 	from Eudora, you'll want to select mbox.
       </para>
     </note>
+    <note>
+      <title>Outlook 2000</title>
+      <para>
+	Outlook 2000 uses a format which <application>Evolution</application>
+	cannot directly import.  However, you can import it using Mozilla on
+	Windows.  Please see the FAQ for more information.
+      </para>
+    </note>
+      
     <para>
       To import your files, go to
       <menuchoice>
@@ -285,7 +313,7 @@
       </menuchoice>
     </para>
     <para>
-    A druid will appear, helping you to import your files.  You'll need to
+    An assistant will appear, helping you to import your files.  You'll need to
     specify where the file is that you want to import.  Click
     <guibutton>Next</guibutton> and then <guibutton>Import</guibutton>.
     <application>Evolution</application> will present you with the Folder
@@ -520,7 +548,12 @@
 	    <term></term>
 	    <listitem>
 	      <para>
-		
+		<tip id="new-appt">
+		  <title>New Appointments Fast</title>
+		  <para>
+		    Double-click in a blank space to create a new appointment.
+		  </para>
+		</tip>
 	      </para>
 	    </listitem>
 	    </varlistentry>
@@ -537,21 +570,20 @@
 
         <variablelist>
 	  <varlistentry>
-	    <term>Edit a User</term>
+	    <term>Edit a Contact</term>
 	    <listitem>
 	      <para>
-		You can edit a user two ways:
+		You can edit a contact two ways:
 		<itemizedlist>
 		  <listitem>
 		    <para>
-		      Single click on the person's "rolodex card" and you can
+		      Click once on the person's address card and you can
 		      edit the person's properties all in the same window.
 		    </para>
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Double-click on the contact's card and enter details about
-		      the person.
+		      Double-click on the contact's card and alter their details.
 		    </para>
 		  </listitem>
 		</itemizedlist>
@@ -579,7 +611,7 @@
 	    <term>Email a Contact</term>
 	    <listitem>
 	      <para>
-		Right click on a contact and click on 
+		Right click on a contact and select 
 		<guilabel>Send message to contact</guilabel>.
                </para>
 	    </listitem>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index cbdcfd5e4e..ed69f5081e 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -111,7 +111,7 @@ lack of time, resources, and interest.
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
       <para>
-	To create a new calendar event, select
+	To create a new appointment, select
         <menuchoice>
 	  <guimenu>File</guimenu>
 	  <guisubmenu>New</guisubmenu> 
@@ -158,7 +158,7 @@ lack of time, resources, and interest.
       <para>
          You can have as many as four different
          <guilabel>Alarms</guilabel>, any time prior to the event
-         you've scheduled.  You can have one alarm of each type:
+         you've scheduled.  You can have one alarm of each of the following types:
          <variablelist>
            <varlistentry>
 	    <term><guilabel>Display</guilabel></term>
@@ -214,7 +214,7 @@ lack of time, resources, and interest.
          determined. <!-- FIXME -->
       </para>
       <para>
-        <application>Evolution</application> allows for categorizing your
+        <application>Evolution</application> lets you categorize your
 	appointments, which can help if you lead a busy life.  The bottom
 	section of the <guilabel>Appointment</guilabel> tab is where your
 	categorization is done.
@@ -225,7 +225,7 @@ lack of time, resources, and interest.
 	<para>
 	 You can add a new category to your category list by clicking on
          <guibutton>Edit Master Category List...</guibutton> and single-clicking
-	 on <guilabel> Click here to add a category </guilabel>.
+	 on <guilabel> Click here to add a category</guilabel>.
 	</para>
       </tip>
 
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 4c6e590eef..5b4de5fd81 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -53,25 +53,24 @@
     </para>
 
     <para>
-      The <guilabel>Contact List</guilabel> lists your contacts which you
-      entered.
+      The <guilabel>Contact List</guilabel> lists your contacts.
     </para>
 
     <para>
-       To open up your address book, click on
+       To open your address book, click on
        <guibutton>Contacts</guibutton> in the shortcut bar, or select
        one of your contacts folders from the folder bar.  <xref
        linkend="usage-contact-fig"> shows the address book in all
        its organizational glory.  By default, the address book
        shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> format.  You can select
+       linkend="minicard">minicard</glossterm> view.  You can select
        other views from the <guimenu>View</guimenu> menu, and adjust
        the width of the columns by clicking and dragging the grey
        column dividers.
     </para>
 
     <para>
-       The toolbar for the address book is quite simple:
+       The toolbar for the address book is quite simple.
        <itemizedlist>
 	<listitem><para>
            <guibutton>New</guibutton> creates a new card.
@@ -91,7 +90,8 @@
         <listitem><para> <guibutton>View All</guibutton> displays all
            the address information in the folder.  Use this button to
            refresh the display for a network folder, or to switch from
-           viewing the results of a search and see the whole contents.
+           viewing the results of a search and see all your contacts.
+	    <!-- Lets xref to search feature -->
            </para></listitem>
 
         <listitem><para> <guibutton>Stop</guibutton> stops loading
@@ -104,7 +104,7 @@
     <para>
        Your contact information fills the rest of the display.  Move
        through the cards alphabetically with the buttons and the
-       scrollbar at the right of the window. Of course, if you have
+       scrollbar to the right of the window. Of course, if you have
        more than a few people listed, you'll want some way of finding
        them more quickly, which is why there's a search feature.
     </para>
@@ -113,6 +113,7 @@
   <sect1 id="usage-contact-cards">
     <title>The Contact Editor</title>
     <para>
+      To delete a contact:
       <orderedlist numeration="arabic">
 	<listitem>
 	  <para>
@@ -121,7 +122,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    Press <guibutton>Delete</guibutton>.
+	    Press the <guibutton>Delete</guibutton> button.
 	  </para>
 	</listitem>
       </orderedlist>
@@ -129,9 +130,8 @@
     <para>
        If you want to add or change cards, you'll use the contact
        editor.  To change a card that already exists, double click on
-       it to open the contact editor window with all the current
-       information already filled in.  If you want to create a new
-       one, clicking the <guibutton>New</guibutton> button in the
+       it to open the contact editor window.  If you want to create a new
+       card, clicking the <guibutton>New</guibutton> button in the
        toolbar will open the same window, with blank entry boxes for
        you to fill in.
     </para>
@@ -212,36 +212,36 @@
 		    </variablelist>
                    </para>
 		</listitem>
-	        <listitem>
-		  <para>
-                    The <guilabel>Full Name</guilabel> field also
-                    interacts with the <guilabel>File As</guilabel>
-                    box to help you organize your contacts.
-                  </para>
-                  <para>
-                    To see how it works, type a name in the
-                    <guilabel>Full Name</guilabel> field:
-                    <userinput>Rupert T. Monkey</userinput>.  You'll
-                    notice that the <guilabel>File As</guilabel> field
-                    also fills up, but in reverse:
-                    <computeroutput>Monkey, Rupert</computeroutput>.
-                    You can pick <computeroutput>Rupert Monkey
-                    </computeroutput> from the drop-down, or type in
-                    your own, such as <userinput> T. Rupert Monkey
-                    </userinput>.
-                 </para>
-		  <tip>
-		    <title>Filing Suggestion</title>
-		   
-		    <para>
-                      Don't enter something entirely different from
-                      the actual name, since you might forget that
-                      you've filed Rupert's information under "F" for
-                      "Fictitious Ximian Employee."
-                    </para>
-		  </tip>
-		</listitem>
 	      </itemizedlist>
+	      </para>
+		<para>
+		  The <guilabel>Full Name</guilabel> field also
+		  interacts with the <guilabel>File As</guilabel>
+		  box to help you organize your contacts.
+		</para>
+		<para>
+		  To see how it works, type a name in the
+		  <guilabel>Full Name</guilabel> field:
+		  <userinput>Rupert T. Monkey</userinput>.  You'll
+		  notice that the <guilabel>File As</guilabel> field
+		  also fills in, but in reverse:
+		  <computeroutput>Monkey, Rupert</computeroutput>.
+		  You can pick <computeroutput>Rupert Monkey
+		  </computeroutput> from the drop-down, or type in
+		  your own, such as <userinput> T. Rupert Monkey
+		  </userinput>.
+		</para>
+		<tip>
+		  <title>Filing Suggestion</title>
+		  
+		  <para>
+		    Don't enter something entirely different from
+		    the actual name, since you might forget that
+		    you've filed Rupert's information under "F" for
+		    "Fictitious Ximian Employee."
+		  </para>
+		</tip>
+
              </para>
            </listitem>
 	</varlistentry>
@@ -284,7 +284,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    The globe - Misc. notes
+	    The globe - Miscellanious notes
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -331,7 +331,7 @@
     </para>
     <para>
       You can refine searches by doing several in
-      succession, or start over by pressing the <guibutton>View
+      succession, or start over by pressing the <guibutton>Show
 	All</guibutton> button.
     </para>
     <para>
@@ -372,7 +372,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    Name the rule in the <guilabel>Rule name</guilabel> field.
+	    Name the rule in the <guilabel>Rule Name</guilabel> field.
 	  </para>
 	</listitem>
 	<listitem>
@@ -383,7 +383,7 @@
 	<listitem>
 	  <para>
 	    If you want to add more critera, click the <guibutton>Add
-	    criterion</guibutton> button.
+	    Criterion</guibutton> button.
 	  </para>
 	</listitem>
 	<listitem>
@@ -405,7 +405,7 @@
     <para>
        Organizing your address book is a lot like organizing your
        mail.  You can have folders and searches the same way you can
-       with mail, but the address book does not allow vFolders.  It
+       with mail, but the address book does not allow Virtual Folders.  It
        does, however, allow each card to fall under several
        categories, and allow you to create your own categories.  To
        learn about categories, read <xref
@@ -428,8 +428,8 @@
       <para>
          <application>Evolution</application> offers two ways for you
          to organize your cards.  The first way is to use folders;
-         this works the same way that mail folders do.  For more
-         flexibility, you can also mark contacts as members of
+         this works the same way mail folders do.  For more
+         flexibility, you can also mark contacts as elements of
          different categories.
       </para>
 
@@ -464,9 +464,8 @@
 	<title>Grouping with Categories</title>
 	<para>
            The other way to group cards is to mark them as belonging
-           to different categories.  The difference between folders
-           and categories is that folders contain cards, but category
-           membership is a property of each card.  That means that you
+           to different categories.  
+           That means that you
            can mark a card as being in several categories or no
            category at all.  For example, I put my friend Matthew's
            card in the "Business" category, because he works with me,
@@ -507,13 +506,13 @@
     <para>
        If you keep your cards on a network using an <glossterm
        linkend="ldap">LDAP</glossterm> server, you can share access to
-       them, browse other address books, or maintain a shared set of
+       them, browse other peoples address books, or maintain a shared set of
        contact information for your company or your department.  This
        is the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
-       share calendars as well as address books, people can avoid
+       you share calendars as well as address books, people can avoid
        duplicating work and keep up to date on developments within
-       their work-group or across the entire company.
+       their workgroup or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -596,7 +595,7 @@
 	card.  To do so, right click on any email address or email
 	message, and select <guimenuitem>Add Address
 	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> also adds cards from a
+	<application> Evolution</application> can also add cards from a
 	hand-held device during HotSync operation.  For more
 	information about that, see <xref linkend="usage-sync">.
       </para>
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index 1abeafe588..996e4b3132 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -136,7 +136,7 @@
 	components in My Evolution.
       </para>
       <sect3 id="modifying-components-mail">
-	<title>Modifying Mail</title>
+	<title>Customizing My Evolution Mail Summary</title>
 	<para>
 	  To modify mail:
 	  <orderedlist numeration="arabic">
@@ -164,7 +164,7 @@
 	  The right section shows which folders are displayed.
 	</para>
 	<para>
-	  To add a folder to be displayed, click on a folder in the
+	  To add a folder to the summary, click on a folder in the
 	  <guilabel>All folders</guilabel> section and click the
 	  <guibutton>Add</guibutton> button.
 	</para>
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 2fcc24551a..61f46114c4 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -19,7 +19,7 @@
          <guilabel>Date</guilabel> fields. You can change their order
          and remove them by dragging and dropping them.  
 
-      To add columns to sort by:
+      To add columns:
       <orderedlist numeration="arabic">
 	<listitem>
 	  <para>
@@ -61,8 +61,10 @@
 	  <varlistentry>
 	    <term><guimenuitem>Group By this Field</guimenuitem></term>
 	    <listitem><para>
-		Groups messages instead of sorting them. (FIXME: Explain further) 
-	      </para></listitem>
+	      Groups messages instead of sorting them. This makes each contact
+	      with identical properties in the specified field to be placed in
+	      its own group and physically separated from others. 
+	    </para></listitem>
 	  </varlistentry>
 	  
 	  <varlistentry>
@@ -75,12 +77,13 @@
 	  
 	  <varlistentry>
 	    <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>
+		Chooser</guimenuitem></term> <listitem><para> 
+	      When you choose this item, a list
+	      of column headers will appear; 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>
     </sect1>
@@ -226,7 +229,7 @@
         actions that may effect the same message in several ways.  For
         example, your filters could put copies of one message into
         multiple folders, or keep a copy and send one to another
-        person as well, and it can do that in under a second. Which is
+        person as well, and it can do that quickly. Which is
         to say, it's faster and more flexible than an actual person
         with a pile of envelopes.
       </para>
@@ -330,8 +333,8 @@
 		
 		<listitem>
 		  <para>
-		    Attachments - Create a filter whether or not you have an
-		    attachment in the email.
+		    Attachments - Create a filter based on whether or not you 
+		    have an attachment in the email.
 		  </para>
 		</listitem>
 		
@@ -459,12 +462,12 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton>.
+	      Press <guibutton>OK</guibutton> in the filter editor window.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton>.
+	      Press <guibutton>OK</guibutton> in the filter manager window.
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -494,13 +497,15 @@
       </para>
       <para>
 	<note>
-	  <title>Notable Filter Features</title>
+	  <title>Changing Folder Names and Filters</title>
 	  <para>
 	    <itemizedlist>
-	      <listitem><para>
+	      <listitem>
+		<para>
 		  Incoming email that your filters don't move goes into the Inbox; 
-		  outgoing mail that they don't move ends up in the Sent folder.
-	    </para>
+		  outgoing mail that they don't move ends up in the Sent
+		  folder.  So be sure to change the filters that go with it.
+		</para>
 	      </listitem>
 	    </itemizedlist>
 	  </para>
@@ -554,7 +559,7 @@
     <example id="usage-mail-organize-vFolders-ex">
       <title>Using Folders, Searches, and Virtual Folders</title>
       <para>
-	To organize their mailbox, Jim sets up a virtual volder for emails from
+	To organize his mailbox, Jim sets up a virtual volder for emails from
 	his friend and co-worker Anna.  He has another one for messages that
 	have ximian.com in the address and <application>Evolution</application> in the subject line, so he
 	can keep a record of what people from work send him about
@@ -589,9 +594,9 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Name your filter in the <guilabel>Rule name</guilabel> field.
-	      For each filter criterion, you must first select 
-	      which of the following parts of the message you want the filter to 
+	      Name your virtual folder in the <guilabel>Rule name</guilabel> field.
+	      For each criterion, you must first select 
+	      which of the following parts of the message you want the search to 
 	      examine:
 	      <itemizedlist>
 		<listitem><para>
@@ -608,7 +613,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Specific Header - The filter can look at any header you
+		    Specific Header - The virtual folder can look at any header you
 		    want, even obscure or custom ones. Enter the header name
 		    in the first text box, and put your search text in the
 		    second one.
@@ -622,15 +627,15 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define filters in <application>Evolution</application>.
+		    define virtual folders in <application>Evolution</application>.
 		  </para>
 		</listitem>
 		
-		<listitem><para> Date sent - Filter messages according to the date on
+		<listitem><para> Date sent - Search messages according to the date on
 		    which they were sent: First, choose the conditions you
 		    want a message to meet &mdash; <guilabel>before</guilabel>
 		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The filter will compare the
+		    Then, choose the time. The virtual folder will compare the
 		    message's time-stamp to the system clock when the filter
 		    is run, or to a specific time and date you choose from a
 		    calendar.  You can even have it look for messages within a
@@ -646,8 +651,9 @@
 		
 		<listitem><para>
 		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have filters set the
-		    priority of messages you recieve, and then have other filters 
+		    important) to 3 (most important). You can have virtual folders set the
+		    priority of messages you recieve, and then have other
+		    virtual folders 
 		    applied only to those messages which have a certain priority.
 		  </para></listitem>
 		
@@ -659,21 +665,21 @@
 		
 		<listitem>
 		  <para>
-		    Status - Filters according to the status of a message, such as
+		    Status - Searches according to the status of a message, such as
 		    'New'.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Attachments - Create a filter whether or not you have an
+		    Attachments - Create a virtual folder based on  whether or not you have an
 		    attachment in the email.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Mailing List - Filter based on the mailing list it came from.
+		    Mailing List - Search based on the mailing list it came from.
 		  </para>
 		</listitem>
 		
@@ -687,7 +693,7 @@
 		
 		<listitem>
 		  <para>
-		    Source Account - Filter messages according the server you got them from.
+		    Source Account - Search messages according the server you got them from.
 		    You can enter a URL or choose one from the drop-down
 		    list.  This ability is only relevant if you use more
 		    than one mail source.
@@ -699,7 +705,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the criterion for the condition.
+	      Select criteria to search by.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -708,7 +714,7 @@
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    specific folders only
+		    Specific folders only
 		    <note>
 		      <para>
 			If you select specific folders only, you need to specify the
@@ -719,17 +725,17 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    all local folders
+		    All local folders
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    with all active remote folders
+		    With all active remote folders
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    with all local and active folders
+		    With all local and active folders
 		  </para>
 		</listitem>
 	      </itemizedlist>
@@ -738,16 +744,16 @@
 	  </listitem>
 	  <listitem>
 	<para>
-	      If you want multiple criterion for this filter, press <guibutton>Add
+	      If you want multiple criteria for this filter, press <guibutton>Add
 		criterion</guibutton> and repeat the previous step.
 	    </para>
-      </listitem>
+	  </listitem>
     </orderedlist>
 
       <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a vFolder Rule</title>
+	<title>Selecting a Virtual Folder Rule</title>
 	<screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
+	  <screeninfo>Creating a Virtual Folder Rule</screeninfo>
 	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
 	  </graphic>
 	</screenshot>
@@ -755,10 +761,10 @@
       </para>
     </sect2>
     <sect2 id="usage-mail-vfolder-unmatched">
-      <title>The Unmatched vFolder</title>
+      <title>The Unmatched Virtual Folder</title>
       <para>
-	Obveously, not all messages will fit into all your vFolders.  That is
-	what the UNMATCHED vFolder is for.  The UNMATCHED vFolder is a vFolder
+	Obveously, not all messages will fit into all your Virtual Folders.  That is
+	what the UNMATCHED Virtual Folder is for.  The UNMATCHED Virtual Folder is a folder
 	for any mail that doesn't get matched by other rules.
       </para>
     </sect2>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 08c3a1648d..12ceb903db 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -4,7 +4,7 @@
     <title> A Guide to the Evolution Mailer</title>
     <para>
        <application>Evolution</application> email is like other email
-       programs in all the ways you would hope:
+       programs in all the ways that matter:
      <itemizedlist>
        <listitem>
          <para>
@@ -15,7 +15,7 @@
        <listitem>
          <para>
           It can send and receive mail in HTML or as plain text, and
-          permits multiple file attachments.
+          makes it easy to send and recieve multiple file attachments.
          </para>
        </listitem>
        <listitem>
@@ -28,7 +28,12 @@
            even NNTP messages (newsgroups), which aren't technically
            email.
          </para>
-       </listitem>
+	</listitem>
+	<listitem>
+	  <para>
+	    Lets you enhance your security with encryption.
+	  </para>
+	</listitem>
      </itemizedlist>
     </para>
     <para>
@@ -130,9 +135,8 @@
     <sect2 id="usage-mail-listorder">
       <title>Sorting the message list</title>
       <para>
-	One of the ways <application>Evolution</application> lets
-	you choose the way you work is the way it lets you sort your
-	message lists.  To sort by sender, subject, or date, click
+	<application>Evolution</application> helps you work by letting you sort
+	your email.  To sort by sender, subject, or date, click
 	on the bars with those labels at the top of the message
 	list. The direction of the arrow next to the label indicates
 	the direction of the sort, and if you click again, you'll
@@ -179,8 +183,8 @@
 	    <note>
 	      <title>Deleted but still here?</title>
 	      <para>
-		When you do this, your message is marked to be deleted.  It is
-		not until you expunge the message that the message is gone.
+		When you do this, your message is marked to be deleted.  Your
+		email is not gone until you have expunged it.
 	      </para>
 	    </note>
 	  </listitem>
@@ -201,9 +205,9 @@
 	</orderedlist>
       </para>
       <note>
-	<title>Trash is Actually a vFolder?</title>
+	<title>Trash is Actually a Virtual Folder?</title>
 	<para>
-	  Your trash bin is actually a vFolder that searches for all mails that
+	  Your trash bin is actually a Virtual Folder that searches for all mails that
 	  are queued to be deleted.
 	</para>
       </note>
@@ -249,21 +253,21 @@
       information it needs to check your email.
     </para>
     <para>
-      The druid will give you several dialog boxes where you setup:
+      The assistant will give you several dialog boxes where you configure:
       <itemizedlist>
 	<listitem>
 	  <para>
-	    Setup your personal information
+	    your personal information
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Setup your outgoing email server information
+	    your outgoing email server information
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Identity Name
+	    your mail account identity name
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -279,7 +283,7 @@
       <title>Can't Check Mail?</title>
       <para>
 	If you get an error message instead of mail, you probably need to check
-	your network settings.  If you.  To learn how to do that,
+	your network settings.  To learn how to do that,
 	 have a look at <xref linkend="config-prefs-mail-network">, or
 	 ask your system administrator.
        </para>
@@ -382,9 +386,14 @@
       -->
         <para>
            <application>Evolution</application> can also display
-           HTML-formatted mail, complete with graphics.  HTML
-           formatting will display automatically, although you can
-           turn it off if you prefer.
+           HTML-formatted mail, complete with graphics.  Graphics don't load
+           automatically by default, becuase they can be large and take a long
+           time to download.  They can also be used by spammers to help track
+           who reads their email.  So having them not load automatically helps
+           protect your privacy.
+	<!-- I say the privacy thing because I saw an internal email which
+           stated that gallop polls show people are concerned about online
+           security and that we'd be best marketing Evolution as more secure -->
       </para>
     </sect2>
   </sect1>
@@ -435,9 +444,8 @@
            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.
-           Many times, one might want to use "Send Later" becuase it gives
-           you a chance to change your mind about a message before it
-           is sent.  This way, you may not say something you may regret.
+           You might want to use "Send Later" becuase it gives
+           you a chance to change your mind about a message before you send it.
         </para>
         <para>
            To learn more about how you can specify message queue and
@@ -563,7 +571,7 @@
                  category into the <guilabel>To:</guilabel> or
                  <guilabel>Cc:</guilabel> fields, he'll make the
                  company's <emphasis>entire</emphasis> client list
-                 public. However, but putting his "Clients" addressbook
+                 public. But putting his "Clients" addressbook
                  into the Bcc: section, that will cause them to be hidden
                  from the competition.  It seems insignificant, but it can
                  make a huge difference in some situations.
@@ -592,7 +600,7 @@
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
             <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            a potentially a very long one &mdash; of the email addresses
+            potentially a very long one &mdash; of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
@@ -610,14 +618,14 @@
         <title>Replying to Messages</title>
         <para>
            To reply to a message, press the
-           <guibutton>Reply</guibutton> button while it is selected,
-           or choose <guimenuitem>Reply to Sender</guimenuitem> from
+           <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
            <interface>message composer</interface>.  The
-           <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
+           <guilabel>To:</guilabel> and <guilabel>Subject:</guilabel>
            fields will already be filled, although you can alter them
            if you wish.  In addition, the full text of the old message
-           is inserted into the new message, either in italics (for
+           is inserted into the new message, either grey (for
            HTML display) or with the &gt; character before each line
            (in plain text mode), to indicate that it's part of the
            previous message.  People often intersperse their message
@@ -671,8 +679,11 @@ with quoted materials and the relevant replies interspersed-->
               collaboration on the Internet works.  They allow people to send one
               message to one server.  The server then knows who is subscribed to the
               mailing list, and sends a copy of your email to all the people on the
-              list.  As a matter of fact, mailing lists are one of the main ways in
-              which <application>Evolution</application> was developed.
+              list.  
+              For example, evolution-hackers@ximian.com allows the
+              <application>Evolution</application> programmers to converse
+              publically about their latest developments so that everyone can
+              stay up to date.
             </para>
             <para>
               There are two different types of mailing lists.  The first is a
@@ -979,8 +990,8 @@ with quoted materials and the relevant replies interspersed-->
         <title>Forwarding Mail</title>
         <para>
           The post office forwards your mail for you when you change
-          addresses, and you can forward mail when you get a letter by
-          mistake.  The email <guilabel>Forward</guilabel> button
+          addresses, and you can forward a letter if it comes to you by mistake.
+          The email <guilabel>Forward</guilabel> button
           works in much the same way.  It's particularly useful if you
           have received a message and you think someone else would
           like to see it.  You can forward a message as an attachment
@@ -1120,13 +1131,16 @@ with quoted materials and the relevant replies interspersed-->
 	<example>
 	  <title>Encryption Example</title>
 	  <para>
-	    Kevin orders an <application>Evolution</application> t-shirt from
-	    Ximian, Inc. over the Internet.  He puts in his credit card number
-	    which is 1234-567-8901.  For security, his computer encrypts the
-	    credit card number so it can be safely transmitted over the Internet.
-	    The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	    resemblance to the initial number.  When the information gets to
-	    Ximian, Inc. it'll be decrypted into the initial number.
+	    Kevin sends his friend Rachel and email and chooses to encrypt it.
+	    The email has the following contents:
+	      Hi Rachel.
+	      Go banana!
+	      Kevin
+	    He tells <application>Evolution</application> to encrypt the
+	    message.  The computer encrypts the message which now looks like
+	    @#$23ui7yr87#@!48970fsd.  When the information gets to Rachel,
+	    she'll decrypt the message and it'll show up in plain text for her
+	    to read.
 	  </para>
 	</example>
 	Encryption can be used in email in two ways: to verify that the sender is
@@ -1149,14 +1163,14 @@ with quoted materials and the relevant replies interspersed-->
 	</para>
       </tip>
       <para>
-	You can start by typing in: <command>gpg --gen-key</command>.  At the
-	first question, select 1.  The next question asks you about key length.
+	You can start by typing in: <command>gpg --gen-key</command> at the
+	console.  When you are asked about the algorythm to use, select 1.  The next question asks you about key length.
 	The longer the key, more stronger it is.  However, the longer the key, the
 	longer it takes to generate.  This is your choice.  However, 1024 bits
 	(default) should be adequate.  The next question asks you if you want your
 	key to expire.  Expiring keys make your key invalid after a certain amount
-	of time, so old keys don't float around active.  This is the same concept
-	as a coupon at a supermarket.  Next, you'll type in your Real name, your
+	of time, so old keys don't float around when they aren't used anymore.  This is the same concept
+	as a coupon at a supermarket.  Next, you'll type in your real name, your
 	email address, and a comment.  You should not forge this information, as
 	it is used later to verify who you are.  Assuming that all your
 	information is correct, press "O" to continue.  GPG now asks you for a
@@ -1165,7 +1179,7 @@ with quoted materials and the relevant replies interspersed-->
 	sensitive, which means that it does know the difference between capital
 	letters and lower-case.  Now your key is generated.  It is recommend you
 	surf the Internet, read your email, or write a letter in a word
-	processor.  This help creates randomness in the key.
+	processor while your key is generated.
       </para>
       <para>
 	Once this is completed, you'll be dropped back to the command line.
@@ -1188,8 +1202,42 @@ with quoted materials and the relevant replies interspersed-->
 	You will be prompted to type in your password <!-- verify that you need to
 	enter your password here --> and your key will be uploaded for your
 	friends to download.
+	<note id="why-keyserver">
+	  <title>Why Use a Keyserver?</title>
+	  <para>
+	    Keyservers store your public keys for you so that your friends can
+	    decrypt your messages.  If you choose not to use a keyserver, you
+	    can manually send your friends your public key.  It is much easier
+	    though to upload to a keyserver and then let your friends download
+	    your public key on their own wish. <!-- Bad wording -->
+	  </para>
+	</note>
+	<note id="pub-priv">
+	  <title>Public Key?  Private Key?  Whats the difference?</title>
+	  <para>
+	    GPG uses two types of keys: public and private.  The private should
+	    be given out to no one, ever.  Your private key allows your mail to
+	    be signed and encrypted and decrypted by anyone who has it.  The
+	    public key is what you give your friends so that they can decrypt
+	    your mails.
+	  </para>
+	</note>
       </para>
     </sect2>
+    <sect2 id="encrypt-getting-key">
+      <title>Retrieving a Friends Key</title>
+      <para>
+	To encrypt a message to your friends, you'll need to use their public
+	key in combination with your private key.
+	<application>Evolution</application> does that transparently, but you
+	still need to get their key off a keyserver.  To do that, type:
+	<command>
+	  gpg --recv-keys --keyserver wwwkeys.pgp.net keyid
+	</command>.  You will need to type in your password, and then their ID
+	will automatically be added to your keyring.
+      </para>
+    </sect2>
+
     <sect2 id="encrypt-evo-integ">
       <title>Setting up Evolution's Encryption</title>
       <para>
@@ -1201,7 +1249,7 @@ with quoted materials and the relevant replies interspersed-->
 	Once there, select the account you'd like to associate the key to and click
 	the <guibutton>Edit</guibutton> button.  In the
 	<guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-	  Goog Privacy</guilabel>.  Enter your key ID and click
+	  Good Privacy</guilabel>.  Enter your key ID and click
 	<guibutton>OK</guibutton>.  Your key is now integrated into your identity
 	in <application>Evolution</application>.
       </para>
@@ -1209,7 +1257,7 @@ with quoted materials and the relevant replies interspersed-->
     <sect2 id="encrypt-sending">
       <title>Sending Encrypted Messages</title>
       <para>
-	You can either sign or encrypt a message.  When you sign a message, verify
+	You can either sign or encrypt a message.  When you sign a message, you verify
 	that you were the one who sent it, and that no one is forging your
 	identity.  Encrypting a message makes it impossible for someone with
 	prying eyes to view it while it's in transmission.
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index b4943af412..2bb1815efb 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -36,16 +36,6 @@
 	the message list view, where  a summary of your email is displayed.
 	If you're running the program for the first time,
 	you'll have one message: a welcome from Ximian.
-	<!-- ==============Figure=================================== -->
-    <figure id="usage-mainwindow-fig">
-    <title>Evolution Main Window and Inbox</title>
-    <screenshot>
-      <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-    </screenshot>
-    </figure>
-<!-- ==============End of Figure=================================== -->
     </para>
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
@@ -215,7 +205,7 @@
 	    the messages you have marked for deletion but not yet
 	    <glossterm linkend="expunge">expunged</glossterm>. Note that 
 	    once you have expunged a message, it
-	    is gone for good.
+	    is permanently deleted.
 	   </para>
 	 </listitem>
       </itemizedlist>
@@ -226,8 +216,9 @@
        <para>
          You don't need the folder bar or the shortcut bar to move
          around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another, and the folder
-         menu on the right side of the window just below the toolbar
+         switch from one part of the window to another. When you hide the folder
+         bar, 
+         there is a menu on the left side of the window just below the toolbar
          to move about the folder tree, even with the folder and
          shortcut bars hidden.
        </para>
@@ -312,10 +303,10 @@
     <sect3 id="subfolders">
     <title>Subfolders</title>
       <para>
-        <application>Evolution</application> can also manage subfolders.
-	Subfolders are folders inside of folders.  This works well if
+        <application>Evolution</application> can also manage subfolders,
+	subfolders are folders inside of folders.  This works well if
 	you want to try to separate your home folders from your work
-	folders. 
+	folders, or if you like to keep very organized.
       </para>
 
     
@@ -348,7 +339,7 @@
     </para>
 
     <para>
-      You can also rearrange folders and messages with by dragging and
+      You can also rearrange folders and messages by dragging and
       dropping them.
     </para>
 
@@ -368,13 +359,13 @@
 -->
 
 	<para>
-	  Any time new information arrives in a folder, that folder label
-	  is displayed in bold text, along with the amount of new messages in
+	  Any time new information arrives in a mail folder, that folder label
+	  is displayed in bold text, along with the number of new messages in
 	  that folder inside of paranthesis.
 	</para>
       </sect3>
-      </sect2>
-
+    </sect2>
+    
     <sect2 id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
     <para>
diff --git a/help/ChangeLog b/help/ChangeLog
index 83f3ec1927..25035c6d24 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,17 @@
+2001-07-11  Kevin Breit  <battery841@mediaone.net>
+
+	* C/usage-calendar.sgml: More edits.
+
+	* C/usage-contact.sgml: Sick amounts of changes too!
+
+	* C/usage-mail-org.sgml: Heavy editing...touched almost everything.
+
+	* C/usage-exec-summary.sgml: Minor change.  There was only one change for this chapter, cuz I'm such a 'godly' writer...yeah.
+
+	* C/usage-mainwindow.sgml: A bit of editing.
+
+	* C/preface.sgml: Screwed with the examples and did some cleanup.
+
 2001-07-10  Aaron Weber  <aaron@ximian.com>
 
 	* C/usage-mail-org.sgml: validation.