Accidentally broke docs, now valid.

2000-09-07  Aaron Weber  <aaron@helixcode.com>

	* C/evolution-guide.sgml: Accidentally broke docs, now valid.

svn path=/trunk/; revision=5231

14 files changed, 596 insertions, 376 deletions

diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 997868ca2f..f41bf39185 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -73,7 +73,7 @@
 
       <!-- ==============Figure===================== -->
       <figure id="config-prefs-mail-fig">
-	<title>Preferences Dialog</title>
+	<title>Mail Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Setting mail preferences</screeninfo>
 	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index 8355f90f90..eb36872aa8 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -1,10 +1,12 @@
     <chapter id="config-setupassist">
       <title>Easy Setup with the Setup Assistant</title>
       <para>
-        The setup assistant can gather most of the information
-        necessary for <application>Evolution</application>'s daily
-        operation. If you prefer more detailed or advanced
-        configuration, see <xref linkend="config-prefs">.
+        The first time you try to use email, the mail setup assistant
+        will ask you for some basic information, so
+        <application>Evolution</application> can let you use email. If
+        you prefer more detailed configuration, or if you want to make
+        changes to an existing email setup, see <xref
+        linkend="config-prefs">.
       </para>
 
    <sect1 id="config-setupassist-mail">
@@ -60,8 +62,10 @@
           <term> <guilabel>Organization:</guilabel></term>
 	  <listitem>
 	    <para>
-              <guilabel>Organization:</guilabel> Any organization you
-              represent.  Leave this blank if you wish.
+              Any organization you represent; often, the company where
+              you work.  Leave this blank if you wish.  One person I
+              know always puts "My own bad self" in this box, so
+              people know his opinions are his alone.
             </para>
 	  </listitem>
       </varlistentry>
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 9ec3b0f60e..2fd55de976 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -36,9 +36,9 @@
        right side of the toolbar to switch between views.
     </para>
     <para>
-       To view yesterday's appointments, (last week's, if you're in
-       the weekly view, and last month's for the monthly view), click
-       the <guibutton>Pref</guibutton> button.  For tomorrow, next week,
+       To view yesterday's appointments, &mdash;last week's, if you're in
+       the weekly view, and last month's for the monthly view&mdash; click
+       the <guibutton>Prev</guibutton> button.  For tomorrow, next week,
        or next month, click <guibutton>Next</guibutton>, and of course,
        click <guibutton>Today</guibutton> for today.
     </para>
@@ -71,8 +71,9 @@ lack of time, resources, and interest.
        multiple days, and events that have a date but no specific
        time.  Of course, you can also set event reminders and alarms
        so that you don't forget about everything you've just put into
-       your calendar. Basically, it can handle almost any schedule you
-       throw at it.
+       your calendar. From managing a busy office to managing a busy
+       family (or both!), <application>Evolution</application> can
+       handle the schedule.
     </para>
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
@@ -88,6 +89,16 @@ lack of time, resources, and interest.
 	dialog will pop up with the usual menu bar, tool bar, and
 	window full of choices for you.
       </para>
+      <tip id="new-appointment-shortcut">
+        <title>Shortcut</title>
+        <para>
+           If you don't need to enter more information than the date
+           and time of the appointment, you just click in any blank
+           space in the calendar and start typing. You can enter other
+           information later with the appointment editor.
+        </para>
+      </tip>
+
       <para>
         Your event must have a starting and ending date &mdash; by
         default, today &mdash; but you can choose whether to give it
@@ -130,7 +141,8 @@ lack of time, resources, and interest.
 	    <term><guilabel>Audio</guilabel></term>
 	    <listitem>
 	      <para>
-	        Choose this to have your deliver a sound alarm.
+	        Choose this to have your computer deliver a sound
+	        alarm.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -322,12 +334,12 @@ lack of time, resources, and interest.
     <example>
       <title>Keeping Multiple Calendars</title>
       <para>
-        Keelyn has one calendar for her own schedule.  Next to that
+        Keelyn has one calendar for her own schedule.  On the network,
         she maintains one for the conference room, so people know when
-        they can schedule meetings.  On the local network, she
-        maintains a calendar that reflects when consultants are going
-        to be on site, and another that keeps track of when the Red
-        Sox are playing.
+        they can schedule meetings.  Next to that, she maintains a
+        calendar that reflects when consultants are going to be on
+        site, and another that keeps track of when the Red Sox are
+        playing.
       </para>
     </example>
     <para>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 4f9b9fd058..26c003442d 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -95,9 +95,9 @@
     </para>
     <para>
        The rest of the contact manager is taken up by the display of
-       your cards.  You can view it as a table or as a list of
-       cards&mdash; switch between them in the <guimenu>View</guimenu>
-       menu &mdash; and move through them alphabetically alphanumeric
+       your cards.  You can view that display as a table or as a list
+       of cards&mdash; switch views in the <guimenu>View</guimenu>
+       menu &mdash; and move through them alphabetically with the
        buttons and the scrollbar at the right of the window.
     </para>
   </sect1>
@@ -129,14 +129,14 @@
     	<guilabel>General</guilabel>, for basic contact information,
     	and <guilabel>Details</guilabel>, for a more specific
     	description of the person.  In addition, it contains a full
-    	menu bar, which is still evolving rapidly.  <!-- FIXME -->
+    	menu bar, covered in <xref linkend="menuref">.
       </para>
       
       <figure id="usage-contact-editor-fig">
 	  <title>Evolution Contact Editor</title>
 	  <screenshot>
 	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
 		</graphic>
 	</screenshot>
       </figure>
@@ -152,10 +152,12 @@
         more interesting.
     </para>
     <para>
-      The <guilabel>Categories</guilabel> feature is discussed in
-      <xref linkend="usage-contact-organize">, but the remaining
-      features are described here:
-      <variablelist>
+      For more information about the <guilabel>Categories</guilabel>
+      organization tool, have a look at <xref
+      linkend="usage-contact-organize">.  The rest of the features in
+      the window are here:
+ 
+     <variablelist>
 	<varlistentry>
 	  <term>Full Name</term>
 	  <listitem>
@@ -223,6 +225,7 @@
                  </para>
 		  <tip>
 		    <title>Filing Suggestion</title>
+		   
 		    <para>
                       Don't enter something entirely different from
                       the actual name, since you might forget that
@@ -290,8 +293,8 @@
        mail.  You can have folders and searches the same way you can
        with mail, but the contact manager does not allow vFolders.  It
        does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.
-       Categories are discussed <xref
+       categories, and allow you to create your own categories.  To
+       learn about categories, read <xref
        linkend="usage-contact-organize-group-category">.
     </para>
 
@@ -330,9 +333,10 @@
 	   <guisubmenu>New</guisubmenu>
 	   <guimenuitem>Folder</guimenuitem>
            </menuchoice>
-           and that you can put new folders anywhere you like.  Note
-	   that each card must be in one and only one folder, unless
-	   you want to have duplicate cards.
+           and that you can put new folders anywhere you like.  Each
+	   card must be in a folder, and no card can be in two places
+	   at once.  If you want more flexibility, try <xref
+	   linkend="usage-contact-organize-group-category">
 	 </para>
 	<para>
           To put a card into a folder, just drag it there from the
@@ -364,7 +368,8 @@
         </para>
 	<para>
            Then, you can refer to all the cards in that category by:
-           FEATURE NOT IMPLEMENTED... FIXME
+           <!-- FIXME --> Waiting for Evolution to support the
+           operation.
          </para>
 	<para>
            If the master list of categories doesn't suit you, you can
@@ -373,30 +378,22 @@
            choose <guilabel>Add to Master List</guilabel> in the
            window that appears. 
          </para>
-
-         <tip id="usage-contact-categories-multiple">
-            <title>Another way to use Categories</title>
-            <para>
-               You can categorize contacts by typing the category
-               names into the <guilabel>Categories</guilabel>
-               field. You can also create new categories that way:
-               just type in a category name, and it counts as a
-               category.
-            </para>
-          </tip>
       </sect3>
     </sect2>
   </sect1>
   
   <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards (and keeping them to yourself)</title>
+    <title>Sharing your Cards</title>
     <para>
-       Cards can be shared over a network.  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 you
-       also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their
-       workgroup or across the entire company.
+       If you keep your cards on a network using an
+       <glossterm>LDAP</glossterm> server, you can share access to
+       them.  Actually, the server software takes care of that, and
+       also determines who is allowed to see and change them.  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
+       you also share your calendars, people can avoid duplicating
+       work and keep up to date on developments within their workgroup
+       or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -415,15 +412,34 @@
     <para>
        Of course, you don't want to share all of your cards&mdash; why
        overload the network with a list of babysitters, or tell
-       everyone in the office you're talking to new job prospects?
-       <application>Evolution</application> lets you decide which
-       folders you want to make accessible to others.
+       everyone in the office you're talking to new job prospects?  If
+       you keep cards on your own computer, you can decide which items
+       you want to make accessible to others.
     </para>
     <para>
-       To begin sharing a folder of address cards, wait until
-       <application>Evolution</application> supports this
-       feature. <!-- FIXME -->
-    </para>
+       To learn how to set up your connection to an LDAP server, see
+       <xref linkend="config-prefs-contact">.  Once you have a
+       connection, the network contacts folder or folders will appear
+       inside the <guilabel>External Directories</guilabel> folder in
+       the folder bar, and will work exactly like a local folder of
+       cards, with the following exceptions:
+       <itemizedlist>
+          <listitem><para>
+              They are only available when you are connected to the network.  If 
+              you use a laptop or have a modem connection, you may wish to copy or cache
+              the network directory and then synchronize your copy with the networked version
+              periodically.
+          </para></listitem>
+
+	  <listitem><para>
+              Your ability to view, change, add or delete contacts 
+              depends on the settings of the LDAP server.  For example, you may 
+              read all the entries in the public Netcenter directory (available by default in the 
+              <guilabel>External Directories</guilabel> folder), but you may not change or delete 
+              any of them.
+           </para></listitem>
+       </itemizedlist>
+     </para>
   </sect1>
 
   <sect1 id="usage-contact-automate">
@@ -482,11 +498,7 @@
 -->
 
   </sect1>
-  <sect1 id="usage-contact-menubar">
-    <title>Contact Manager Menubar Reference</title>
-     <para>
-     </para>
-  </sect1>
+
 </chapter> 
 
 
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 5dfa03d8c1..510fc145d5 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,6 +1,8 @@
 <!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
+<!-- NOTE: Queue handling, Outbox, and Written Message Editing are not
+implemented with a stable UI yet, and are described wrong -->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -364,8 +366,8 @@
 	  and <guibutton>Redo</guibutton> , but there's a bit more to
 	  sending mail that's less obvious.  In the next few sections,
 	  you'll see how <application>Evolution</application> handles
-	  additional features, including mailing lists, attachments,
-	  and forwarding.
+	  additional features, including large recipient lists,
+	  attachments, and forwarding.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-send-attach">
@@ -424,20 +426,28 @@
 	<sect4 id="usage-mail-getnsend-send-to-mult">
 	  <title>Multiple Recipients</title>
 	  <para>
-	    You can address your email in three different ways.  The
+	    <application>Evolution</application>, like all email
+	    programs (at least, all the ones in current use)
+	    recognizes three types of addressee: primary recipients,
+	    secondary recipients, and hidden ("blind") recipients. The
 	    <guilabel>To:</guilabel> field is for the primary
-	    recipients of the message you are going to send.  However,
-	    it is considered bad form to have more than a few email
-	    addresses in this section.
+	    recipients of the message you are going to send.  
+         </para>
+         <para>
+	    The simplest way to direct a message is to put the email
+            address or addresses in the <guilabel>To:</guilabel>
+            field, to denote primary recipients.  However, it is
+            considered bad form to have more than a few email
+            addresses in this section.  If you are sending mail to
+            more than one or two people, consider the
+            <guilabel>Cc:</guilabel> field.
 	  </para>
 	  <para>
-	    If you're writing to one person, but want to keep a third
-	    party up to date, you can use <guilabel>Cc:</guilabel>.
 	    Hearkening back to the dark ages when people used
 	    typewriters and there were no copy machines, "Cc" stands
 	    for "Carbon Copy."  Use it whenever you want to share a
 	    message you've written to someone else.
-	    <example>
+	    <example id="ex-mail-cc">
 	      <title>Using the Cc: field</title>
 	      <para>
 	         When Susan sends an email to a client, she puts her
@@ -571,25 +581,36 @@ with quoted materials and the relevant replies interspersed-->
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term><guimenuitem>Replace</guimenuitem></term>
-	      <listitem><para> Find something, replace it with
-	      something else.  </para></listitem>
+	       <term><guimenuitem>Replace</guimenuitem></term>
+	       <listitem><para> 
+                 Find a word or phrase, replace it with
+	         something else.  
+               </para></listitem>
 	    </varlistentry>
 
 	  </variablelist>
-            
+        </para>  
+	<para>
+            For all of these items, you have two additional choices.
+            First, you can choose whether to <guilabel>Search
+            Backwards</guilabel>, which will perform the search
+            starting wherever your cursor is, and moving back towards
+            the beginning of the document (normally, it goes the other
+            way).  Then, you can decide whether to have your search be
+            <guilabel>Case Sensitive</guilabel>, meaning should it pay
+            attention to the case of letters when locating a match.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-send-html">
 	<title>Embellish your email with HTML</title>
 	<para>
             You can't normally use text treatments or pictures in
-            emails, which is why you've probably seen people use
-            asterisks for emphasis or use
-            <glossterm>emoticons</glossterm> to convey their
-            feelings.  However, most of the newer email programs can
-            include and display images and text treatments as well as
-            basic alignment and paragraph formatting.
+            emails, which is why you've probably seen people use far
+            too many exclamation points for emphasis or use
+            <glossterm>emoticons</glossterm> to convey their feelings.
+            However, most of the newer email programs can include and
+            display images and text treatments as well as basic
+            alignment and paragraph formatting.
         </para>
 	<note>
 	  <title>HTML Mail is not a Default Setting</title>
@@ -628,9 +649,9 @@ with quoted materials and the relevant replies interspersed-->
                   Choose <guilabel>Normal</guilabel> for a default
                   text style, or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
-                  header.  You can also select
-                  <guilabel>pre</guilabel> for preformatted text
-                  blocks, and three types of <guilabel>List
+                  header from large (1) to tiny (6).  You can also
+                  select <guilabel>pre</guilabel> for preformatted
+                  text blocks, and three types of <guilabel>List
                   Item</guilabel>.
                 </para>
 	      </listitem>
@@ -639,11 +660,16 @@ with quoted materials and the relevant replies interspersed-->
              <term>Text style</term>
 	      <listitem>
 		<para>
+                  Use these buttons to determine the way your letters
+                  look.  If you have text selected, the style will
+                  apply to the selected text.  If you do not have text
+                  selected, the style will apply to whatever you type
+                  next.  The buttons are:
                   <itemizedlist mark="none">      
-		  <listitem><para><guibutton>B</guibutton> is for bold text</para></listitem>   
-                  <listitem><para><guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para><guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para><guibutton>S</guibutton> for a strikethrough.</para></listitem>
+		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>   
+                  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
+		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
+		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
                  </itemizedlist>
                </para>               
 	      </listitem>    
@@ -672,6 +698,23 @@ with quoted materials and the relevant replies interspersed-->
                </para>
 	    </listitem>
 	  </varlistentry>
+
+	    <varlistentry>
+	      <term>Color Selection</term>
+	      <listitem>
+		<para>
+                  At the far right is the color section tool.  You can
+                  choose from several colors by clickin on the arrow,
+                  or create your own custom color by clicking on the
+                  color box itself.  If you have text selected, the
+                  color will apply to the selected text.  If you do
+                  not have text selected, the color will apply to
+                  whatever you type next.
+               </para>
+	    </listitem>
+	  </varlistentry>
+
+
 	  </variablelist>
         </para>
 	<para>
@@ -682,12 +725,12 @@ with quoted materials and the relevant replies interspersed-->
                <term><guimenuitem>Insert Link</guimenuitem>:</term>
 	       <listitem>
 	        <para>
-                 Use this tool to
-                 put hyperlinks in your HTML messages.  When you
-                 select it, <application>Evolution</application> will
-                 prompt you for the <guilabel>Text</guilabel> that
-                 will appear, and the <guilabel>Link</guilabel>, where
-                 you should enter the actual web address (URL).
+                  Use this tool to put hyperlinks in your HTML
+                  messages.  When you select it,
+                  <application>Evolution</application> will prompt you
+                  for the <guilabel>Text</guilabel> that will appear,
+                  and the <guilabel>Link</guilabel>, where you should
+                  enter the actual web address (URL).
               </para>
 	    </listitem>
           </varlistentry>
@@ -958,16 +1001,27 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-filters">
       <title>Staying organized: Mail Filters in Evolution</title>
       <para>
-	Filters sort your email for you as you send or recieve
-	it. Most often, you'll want to have
-	<application>Evolution</application> put mail into different
-	folders, but you can have it do anything you like.  People who
-	subscribe to multiple mailing lists, or who often need to
-	refer to messages they have sent, find filters especially
-	helpful to separate personal from list-related mail, but
-	they're good for anybody who gets more than a few messages a
-	day.  To create a filter, open the <interface>filter
-	assistant</interface> by selecting
+        I once worked in the mail room of a large company, where my
+        job was to bundle, sort, and distribute mail to the various
+        mail boxes and desks throughout the building.  Filters do that
+        same job with email, but they lose much less mail than I did.
+        In addition, you can have multiple filters performing multiple
+        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.  Which is to say, it's quite a bit more
+        flexible than an actual person with a pile of envelopes.
+      </para>
+      <para>
+        Most often, you'll want to have
+        <application>Evolution</application> put mail into different
+        folders, but you can have it do almost anything you like.
+        People who subscribe to multiple mailing lists, or who often
+        need to refer to messages they have sent, find filters
+        especially helpful to separate personal from list-related
+        mail, but they're good for anybody who gets more than a few
+        messages a day.  To create a filter, open the
+        <interface>filter assistant</interface> by selecting
 	<menuchoice>
 	  <guimenu>Tools</guimenu> 
           <guimenuitem>Mail Filters</guimenuitem>
@@ -1009,12 +1063,13 @@ possibly never will be due to security evil. -->
            </para></listitem>
 
            <listitem><para>
-            <guibutton>Up</guibutton> &mdash; Move the selected filter up in the list.
+            <guibutton>Up</guibutton> &mdash; Move the selected filter up in the list, 
+             so it will be performed sooner.
            </para></listitem>
 
            <listitem><para>
             <guibutton>Down</guibutton> &mdash;  Move the selected filter down 
-             in the list.
+             in the list, so it will be performed later.
            </para></listitem>
         </itemizedlist>
 
@@ -1039,16 +1094,16 @@ possibly never will be due to security evil. -->
       </para>
       <para>
         Enter a name for your filter in the <guilabel>Name</guilabel>
-        field, and then begin choosing criteria.  You can use multiple
-        criteria by pressing <guibutton>More</guibutton>, and remove
-        the last one by pressing <guibutton>Fewer</guibutton>.  you can
-        choose from five types of criteria, and you can have as many
-        as you like.  If you have multiple criteria, you should also
-        decide between <guilabel>Match all parts</guilabel>, which
-        will make the filter affect only those messages which meet all
-        the criteria you're about to describe, and <guilabel>Match any
-        part</guilabel>, which will make the filter affect any message
-        that meets even one of the criteria.
+        field, and then begin choosing criteria.  Choose how many
+        criteria you'd like by pressing <guibutton>More</guibutton>
+        and <guibutton>Fewer</guibutton>.  You can choose from five
+        types of criteria, and you can have as many as you like; at
+        least, I've never found a maximum.  If you have multiple
+        criteria, you'll want to decide between <guilabel>Match all
+        parts</guilabel>, which will make the filter affect only those
+        messages which meet all the criteria you're about to describe,
+        and <guilabel>Match any part</guilabel>, which will make the
+        filter affect any message that meets even one of the criteria.
      </para>
      <para>
         For each of your filter criteria, you must first select what
@@ -1085,10 +1140,10 @@ possibly never will be due to security evil. -->
 	  <varlistentry>
 	    <term><guilabel>Expression</guilabel></term>
 	    <listitem><para>
-                Enter a regular expression (see <xref linkend="apx-gloss"> 
-                for more information), and <application>Evolution</application>
-                will match it for you. 
-            </para></listitem>
+               Enter a <glossterm>regular expression</glossterm>, and
+	       <application>Evolution</application> will match it for
+	       you.
+           </para></listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
@@ -1155,10 +1210,10 @@ possibly never will be due to security evil. -->
 
 	  <varlistentry>
 	    <term><guilabel>Stop Processing</guilabel></term>
-	    <listitem><para>
-               Select this if you want to tell all other filters to ignore
-               this message.
-            </para></listitem>
+	    <listitem><para> Select this if you want to tell all other
+	    filters to ignore this message.  If multiple filters copy
+	    the message to a different folders, you'll have multiple
+	    copies of the message.  </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
@@ -1207,8 +1262,10 @@ possibly never will be due to security evil. -->
 	<title>Two Notable Filter Features</title>
 	<para>
 	  <itemizedlist>
-	    <listitem><para>Any incoming email that does not meet
-	    filter action criteria remains in the Inbox. </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>
 	    </listitem>
 
 	    <listitem><para>If you move a folder, your filters
@@ -1234,51 +1291,28 @@ possibly never will be due to security evil. -->
       <para>
 	A vFolder is really a hybrid of all the other organizational
 	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  Once you've set it up, you'll be
-	able to open it and read the messages in it as though it were
-	a normal mail folder.  It's not a folder, though, because when
-	you open a vFolder, <application>Evolution</application>
-	performs a search for you.  It's not a regular search, though,
-	because you can build a vFolder with a very complicated set of
-	criteria with multiple inclusions and exclusions, as though
-	you were setting up a filter.
+	set it up like a filter.  In other words, while a conventional
+	folder actually contains messages, a vFolder is a view of
+	messages that may be in several different folders.  The
+	messages it contains are determined on the fly using a set of
+	criteria you choose in advance.
       </para>
 
-<!-- potentially useful, but doesn't fit at the moment:
-     <para>
-       An important difference between a folder and a virtual folder
-	is that a conventional folder actually contains messages, but
-	a vFolder is a view of messages that may be in several
-	different folders.  This means that while a message may fall
-	into several vFolders, it can be in only one conventional
-	folder.  Also, it means that you cannot remove a message from
-	a vFolder unless you delete it, and you cannot add a message
-	to a vFolder unless you change the vFolder's search criteria.
-      </para>
--->
-
       <para>
 	As messages that meet the vFolder criteria arrive or are
 	deleted, <application>Evolution</application> will
 	automatically place them in and and remove them from the
 	vFolder contents list.  When you delete a message, it gets
 	erased from the folder in which it actually exists, as well as
-	any vFolders which include it.
-      </para>
-      <para>
-	That's pretty complicated, but it can be useful. For example,
-	if I have a folder for all the email from one person, and
-	another folder for all the email on a given topic, I
-	<emphasis>feel</emphasis> organized.  But when the person
-	sends me mail about the topic, my whole email filing universe
-	becomes chaotic, and I need vFolders to save the day for me.
+	any vFolders which display it.
       </para>
+
       <para>
-	That sounds silly, but imagine a business trying to keep track
-	of mail from hundreds of vendors and clients, or a university
-	with overlapping and changing groups of faculty, staff,
-	administrators and students.  The more mail you need to organize, the less
-	you can afford the sort of confusion that stems from an
+	Imagine a business trying to keep track of mail from hundreds
+	of vendors and clients, or a university with overlapping and
+	changing groups of faculty, staff, administrators and
+	students.  The more mail you need to organize, the less you
+	can afford the sort of confusion that stems from an
 	organizational system that's not flexible enough.  vFolders
 	make for better organization because they can accept
 	overlapping groups in a way that regular folders and filing
@@ -1288,24 +1322,22 @@ possibly never will be due to security evil. -->
       <example id="usage-mail-organize-vFolders-ex">
 	<title>Using Folders, Searches, and vFolders</title>
 	<para>
-	   To organize my mail box, I can set up a vFolder for emails
-	   from my friend Vince.  Then, whenever I want to see the
-	   messages Vince has sent me, I open the vFolder, and every
-	   message he's sent me shows up, no matter where I've
-	   actually filed it.  If I want, I can also create a vFolder
-	   containing any message from my list of co-workers which
-	   also has the name of the project in it.  That way, when
-	   Vince sends me mail about the project, I can see that
-	   message both in the "Vince" vFolder and in the "Project"
-	   vFolder.  That's because when I open up the "Vince" folder,
-	   I'm really performing a search for all the mail from Vince,
-	   and when I open the "Project" folder I'm really performing
-	   a search for all the mail about the project.
+	   To organize my mail box, I set up a vFolder for emails from
+	   my friend and co-worker Anna.  I have another one for
+	   messages from anybody at work that have "Evolution" in the
+	   subject line, so I can keep a record of what people from
+	   work send me about <application>Evolution</application>.
+	   If Anna sends a message about a picnic on Saturday, it only
+	   shows up in the "Anna" folder. When Anna sends me mail
+	   about the user interface for
+	   <application>Evolution</application>, I can see that
+	   message both in the "Anna" vFolder and in the "Internal
+	   Evolution Discussion" vFolder.
+	</para>
+      </example>
 
 	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
 
-	</para>
-      </example>
       <para>
 	 To create a vFolder, select <guimenuitem>VFolder
 	 Editor</guimenuitem> from the <guimenu>Tools</guimenu>
@@ -1334,9 +1366,12 @@ possibly never will be due to security evil. -->
          The second part, however, is slightly different.  In the
          section of the window labelled <guilabel>vFolder Sources
          </guilabel> is a list of folders in which
-         <application>Evolution</application> will search for the contents
-         of your vFolder.  Click <guibutton>Add</guibutton> to add a folder,
-         or <guibutton>Remove</guibutton> to remove one.         
+         <application>Evolution</application> will search for the
+         contents of your vFolder.  Click <guibutton>Add</guibutton>
+         to add a folder, or <guibutton>Remove</guibutton> to remove
+         one.  That way, you can have your vFolder search in
+         newsgroups, or just in one of your mailboxes, or just in a
+         select few folders you've already screened with filters.
        </para>
        <para>
         The vFolder creation window is shown in <xref
diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml
index a4161da810..378b9c3866 100644
--- a/doc/C/usage-notes.sgml
+++ b/doc/C/usage-notes.sgml
@@ -3,11 +3,14 @@
   <abstract>
     <title> An Overview of the Evolution Notes</title>
     <para>
-      In the dark ages before email was invented, there were notes.
-      Even now, notes are an almost necessary part of our lives.  It
-      only makes sense that <application> Evolution</application> has
-      a Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
+      In the dark ages before email was invented, there were little
+      scraps of people which people used for short-term information
+      storage.  These scraps of paper were called notes.  Now, notes
+      are an almost necessary part of our lives, albeit in electronic
+      form.  It only makes sense, then, that
+      <application>Evolution</application> has a Notes feature.
+      <application>Evolution</application> can help you take notes in
+      the following ways:
      <itemizedlist>
        <listitem>
          <para>
@@ -17,13 +20,13 @@
        </listitem>
        <listitem>
          <para>
-           You can color code each note to help cateogrize each note into
-           a topic.
+           You can color code notes to organize them, or just to
+           make them look good.
          </para>
        </listitem>
        <listitem>
          <para>
-           Something
+           Turn a note into an email or a text file.
          </para>
        </listitem>
        <listitem>
@@ -39,3 +42,6 @@
    </para>
   </abstract>
 </chapter>
+
+
+
diff --git a/doc/ChangeLog b/doc/ChangeLog
index de7d5b808e..15f46d074b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,46 @@
+2000-09-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
+
+2000-09-06  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Editing, proofing.
+
+2000-09-05  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Grammar, links, screenshots.
+
+	* fig/* Re-took most screenshots.
+
+	* C/usage-mail.sgml: Filters, proofing.
+
+2000-09-01  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
+	distinction (there's a theme to these four log entries here).
+
+	* C/usage-mail.sgml: Added coverage of news.
+
+	* C/config-setupassist.sgml: Revised mail sources content for
+	IMAP/POP stuff.
+
+	* C/apx-gloss.sgml: Added IMAP and POP.
+
 2000-08-31  Aaron Weber  <aaron@helixcode.com>
 
+	* C/apx-gloss.sgml: Added regular expressions to glossary.
+	Explanation should be removed from other portions of the book now.
+
+	* C/usage-mainwindow.sgml: Revisions, minor.
+
+	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
+	status as a part.
+
+	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
+	part, not an appendix.
+
+	* C/apx-menuref.sgml: Added contextual menus for mail.
+
 	* C/preface.sgml: Added "quickref and pointers" sections. Props to
 	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
 	  idea.
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 997868ca2f..f41bf39185 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -73,7 +73,7 @@
 
       <!-- ==============Figure===================== -->
       <figure id="config-prefs-mail-fig">
-	<title>Preferences Dialog</title>
+	<title>Mail Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Setting mail preferences</screeninfo>
 	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index 8355f90f90..eb36872aa8 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -1,10 +1,12 @@
     <chapter id="config-setupassist">
       <title>Easy Setup with the Setup Assistant</title>
       <para>
-        The setup assistant can gather most of the information
-        necessary for <application>Evolution</application>'s daily
-        operation. If you prefer more detailed or advanced
-        configuration, see <xref linkend="config-prefs">.
+        The first time you try to use email, the mail setup assistant
+        will ask you for some basic information, so
+        <application>Evolution</application> can let you use email. If
+        you prefer more detailed configuration, or if you want to make
+        changes to an existing email setup, see <xref
+        linkend="config-prefs">.
       </para>
 
    <sect1 id="config-setupassist-mail">
@@ -60,8 +62,10 @@
           <term> <guilabel>Organization:</guilabel></term>
 	  <listitem>
 	    <para>
-              <guilabel>Organization:</guilabel> Any organization you
-              represent.  Leave this blank if you wish.
+              Any organization you represent; often, the company where
+              you work.  Leave this blank if you wish.  One person I
+              know always puts "My own bad self" in this box, so
+              people know his opinions are his alone.
             </para>
 	  </listitem>
       </varlistentry>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 9ec3b0f60e..2fd55de976 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -36,9 +36,9 @@
        right side of the toolbar to switch between views.
     </para>
     <para>
-       To view yesterday's appointments, (last week's, if you're in
-       the weekly view, and last month's for the monthly view), click
-       the <guibutton>Pref</guibutton> button.  For tomorrow, next week,
+       To view yesterday's appointments, &mdash;last week's, if you're in
+       the weekly view, and last month's for the monthly view&mdash; click
+       the <guibutton>Prev</guibutton> button.  For tomorrow, next week,
        or next month, click <guibutton>Next</guibutton>, and of course,
        click <guibutton>Today</guibutton> for today.
     </para>
@@ -71,8 +71,9 @@ lack of time, resources, and interest.
        multiple days, and events that have a date but no specific
        time.  Of course, you can also set event reminders and alarms
        so that you don't forget about everything you've just put into
-       your calendar. Basically, it can handle almost any schedule you
-       throw at it.
+       your calendar. From managing a busy office to managing a busy
+       family (or both!), <application>Evolution</application> can
+       handle the schedule.
     </para>
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
@@ -88,6 +89,16 @@ lack of time, resources, and interest.
 	dialog will pop up with the usual menu bar, tool bar, and
 	window full of choices for you.
       </para>
+      <tip id="new-appointment-shortcut">
+        <title>Shortcut</title>
+        <para>
+           If you don't need to enter more information than the date
+           and time of the appointment, you just click in any blank
+           space in the calendar and start typing. You can enter other
+           information later with the appointment editor.
+        </para>
+      </tip>
+
       <para>
         Your event must have a starting and ending date &mdash; by
         default, today &mdash; but you can choose whether to give it
@@ -130,7 +141,8 @@ lack of time, resources, and interest.
 	    <term><guilabel>Audio</guilabel></term>
 	    <listitem>
 	      <para>
-	        Choose this to have your deliver a sound alarm.
+	        Choose this to have your computer deliver a sound
+	        alarm.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -322,12 +334,12 @@ lack of time, resources, and interest.
     <example>
       <title>Keeping Multiple Calendars</title>
       <para>
-        Keelyn has one calendar for her own schedule.  Next to that
+        Keelyn has one calendar for her own schedule.  On the network,
         she maintains one for the conference room, so people know when
-        they can schedule meetings.  On the local network, she
-        maintains a calendar that reflects when consultants are going
-        to be on site, and another that keeps track of when the Red
-        Sox are playing.
+        they can schedule meetings.  Next to that, she maintains a
+        calendar that reflects when consultants are going to be on
+        site, and another that keeps track of when the Red Sox are
+        playing.
       </para>
     </example>
     <para>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 4f9b9fd058..26c003442d 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -95,9 +95,9 @@
     </para>
     <para>
        The rest of the contact manager is taken up by the display of
-       your cards.  You can view it as a table or as a list of
-       cards&mdash; switch between them in the <guimenu>View</guimenu>
-       menu &mdash; and move through them alphabetically alphanumeric
+       your cards.  You can view that display as a table or as a list
+       of cards&mdash; switch views in the <guimenu>View</guimenu>
+       menu &mdash; and move through them alphabetically with the
        buttons and the scrollbar at the right of the window.
     </para>
   </sect1>
@@ -129,14 +129,14 @@
     	<guilabel>General</guilabel>, for basic contact information,
     	and <guilabel>Details</guilabel>, for a more specific
     	description of the person.  In addition, it contains a full
-    	menu bar, which is still evolving rapidly.  <!-- FIXME -->
+    	menu bar, covered in <xref linkend="menuref">.
       </para>
       
       <figure id="usage-contact-editor-fig">
 	  <title>Evolution Contact Editor</title>
 	  <screenshot>
 	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
 		</graphic>
 	</screenshot>
       </figure>
@@ -152,10 +152,12 @@
         more interesting.
     </para>
     <para>
-      The <guilabel>Categories</guilabel> feature is discussed in
-      <xref linkend="usage-contact-organize">, but the remaining
-      features are described here:
-      <variablelist>
+      For more information about the <guilabel>Categories</guilabel>
+      organization tool, have a look at <xref
+      linkend="usage-contact-organize">.  The rest of the features in
+      the window are here:
+ 
+     <variablelist>
 	<varlistentry>
 	  <term>Full Name</term>
 	  <listitem>
@@ -223,6 +225,7 @@
                  </para>
 		  <tip>
 		    <title>Filing Suggestion</title>
+		   
 		    <para>
                       Don't enter something entirely different from
                       the actual name, since you might forget that
@@ -290,8 +293,8 @@
        mail.  You can have folders and searches the same way you can
        with mail, but the contact manager does not allow vFolders.  It
        does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.
-       Categories are discussed <xref
+       categories, and allow you to create your own categories.  To
+       learn about categories, read <xref
        linkend="usage-contact-organize-group-category">.
     </para>
 
@@ -330,9 +333,10 @@
 	   <guisubmenu>New</guisubmenu>
 	   <guimenuitem>Folder</guimenuitem>
            </menuchoice>
-           and that you can put new folders anywhere you like.  Note
-	   that each card must be in one and only one folder, unless
-	   you want to have duplicate cards.
+           and that you can put new folders anywhere you like.  Each
+	   card must be in a folder, and no card can be in two places
+	   at once.  If you want more flexibility, try <xref
+	   linkend="usage-contact-organize-group-category">
 	 </para>
 	<para>
           To put a card into a folder, just drag it there from the
@@ -364,7 +368,8 @@
         </para>
 	<para>
            Then, you can refer to all the cards in that category by:
-           FEATURE NOT IMPLEMENTED... FIXME
+           <!-- FIXME --> Waiting for Evolution to support the
+           operation.
          </para>
 	<para>
            If the master list of categories doesn't suit you, you can
@@ -373,30 +378,22 @@
            choose <guilabel>Add to Master List</guilabel> in the
            window that appears. 
          </para>
-
-         <tip id="usage-contact-categories-multiple">
-            <title>Another way to use Categories</title>
-            <para>
-               You can categorize contacts by typing the category
-               names into the <guilabel>Categories</guilabel>
-               field. You can also create new categories that way:
-               just type in a category name, and it counts as a
-               category.
-            </para>
-          </tip>
       </sect3>
     </sect2>
   </sect1>
   
   <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards (and keeping them to yourself)</title>
+    <title>Sharing your Cards</title>
     <para>
-       Cards can be shared over a network.  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 you
-       also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their
-       workgroup or across the entire company.
+       If you keep your cards on a network using an
+       <glossterm>LDAP</glossterm> server, you can share access to
+       them.  Actually, the server software takes care of that, and
+       also determines who is allowed to see and change them.  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
+       you also share your calendars, people can avoid duplicating
+       work and keep up to date on developments within their workgroup
+       or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -415,15 +412,34 @@
     <para>
        Of course, you don't want to share all of your cards&mdash; why
        overload the network with a list of babysitters, or tell
-       everyone in the office you're talking to new job prospects?
-       <application>Evolution</application> lets you decide which
-       folders you want to make accessible to others.
+       everyone in the office you're talking to new job prospects?  If
+       you keep cards on your own computer, you can decide which items
+       you want to make accessible to others.
     </para>
     <para>
-       To begin sharing a folder of address cards, wait until
-       <application>Evolution</application> supports this
-       feature. <!-- FIXME -->
-    </para>
+       To learn how to set up your connection to an LDAP server, see
+       <xref linkend="config-prefs-contact">.  Once you have a
+       connection, the network contacts folder or folders will appear
+       inside the <guilabel>External Directories</guilabel> folder in
+       the folder bar, and will work exactly like a local folder of
+       cards, with the following exceptions:
+       <itemizedlist>
+          <listitem><para>
+              They are only available when you are connected to the network.  If 
+              you use a laptop or have a modem connection, you may wish to copy or cache
+              the network directory and then synchronize your copy with the networked version
+              periodically.
+          </para></listitem>
+
+	  <listitem><para>
+              Your ability to view, change, add or delete contacts 
+              depends on the settings of the LDAP server.  For example, you may 
+              read all the entries in the public Netcenter directory (available by default in the 
+              <guilabel>External Directories</guilabel> folder), but you may not change or delete 
+              any of them.
+           </para></listitem>
+       </itemizedlist>
+     </para>
   </sect1>
 
   <sect1 id="usage-contact-automate">
@@ -482,11 +498,7 @@
 -->
 
   </sect1>
-  <sect1 id="usage-contact-menubar">
-    <title>Contact Manager Menubar Reference</title>
-     <para>
-     </para>
-  </sect1>
+
 </chapter> 
 
 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 5dfa03d8c1..510fc145d5 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,6 +1,8 @@
 <!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
+<!-- NOTE: Queue handling, Outbox, and Written Message Editing are not
+implemented with a stable UI yet, and are described wrong -->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -364,8 +366,8 @@
 	  and <guibutton>Redo</guibutton> , but there's a bit more to
 	  sending mail that's less obvious.  In the next few sections,
 	  you'll see how <application>Evolution</application> handles
-	  additional features, including mailing lists, attachments,
-	  and forwarding.
+	  additional features, including large recipient lists,
+	  attachments, and forwarding.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-send-attach">
@@ -424,20 +426,28 @@
 	<sect4 id="usage-mail-getnsend-send-to-mult">
 	  <title>Multiple Recipients</title>
 	  <para>
-	    You can address your email in three different ways.  The
+	    <application>Evolution</application>, like all email
+	    programs (at least, all the ones in current use)
+	    recognizes three types of addressee: primary recipients,
+	    secondary recipients, and hidden ("blind") recipients. The
 	    <guilabel>To:</guilabel> field is for the primary
-	    recipients of the message you are going to send.  However,
-	    it is considered bad form to have more than a few email
-	    addresses in this section.
+	    recipients of the message you are going to send.  
+         </para>
+         <para>
+	    The simplest way to direct a message is to put the email
+            address or addresses in the <guilabel>To:</guilabel>
+            field, to denote primary recipients.  However, it is
+            considered bad form to have more than a few email
+            addresses in this section.  If you are sending mail to
+            more than one or two people, consider the
+            <guilabel>Cc:</guilabel> field.
 	  </para>
 	  <para>
-	    If you're writing to one person, but want to keep a third
-	    party up to date, you can use <guilabel>Cc:</guilabel>.
 	    Hearkening back to the dark ages when people used
 	    typewriters and there were no copy machines, "Cc" stands
 	    for "Carbon Copy."  Use it whenever you want to share a
 	    message you've written to someone else.
-	    <example>
+	    <example id="ex-mail-cc">
 	      <title>Using the Cc: field</title>
 	      <para>
 	         When Susan sends an email to a client, she puts her
@@ -571,25 +581,36 @@ with quoted materials and the relevant replies interspersed-->
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term><guimenuitem>Replace</guimenuitem></term>
-	      <listitem><para> Find something, replace it with
-	      something else.  </para></listitem>
+	       <term><guimenuitem>Replace</guimenuitem></term>
+	       <listitem><para> 
+                 Find a word or phrase, replace it with
+	         something else.  
+               </para></listitem>
 	    </varlistentry>
 
 	  </variablelist>
-            
+        </para>  
+	<para>
+            For all of these items, you have two additional choices.
+            First, you can choose whether to <guilabel>Search
+            Backwards</guilabel>, which will perform the search
+            starting wherever your cursor is, and moving back towards
+            the beginning of the document (normally, it goes the other
+            way).  Then, you can decide whether to have your search be
+            <guilabel>Case Sensitive</guilabel>, meaning should it pay
+            attention to the case of letters when locating a match.
         </para>
       </sect3>
       <sect3 id="usage-mail-getnsend-send-html">
 	<title>Embellish your email with HTML</title>
 	<para>
             You can't normally use text treatments or pictures in
-            emails, which is why you've probably seen people use
-            asterisks for emphasis or use
-            <glossterm>emoticons</glossterm> to convey their
-            feelings.  However, most of the newer email programs can
-            include and display images and text treatments as well as
-            basic alignment and paragraph formatting.
+            emails, which is why you've probably seen people use far
+            too many exclamation points for emphasis or use
+            <glossterm>emoticons</glossterm> to convey their feelings.
+            However, most of the newer email programs can include and
+            display images and text treatments as well as basic
+            alignment and paragraph formatting.
         </para>
 	<note>
 	  <title>HTML Mail is not a Default Setting</title>
@@ -628,9 +649,9 @@ with quoted materials and the relevant replies interspersed-->
                   Choose <guilabel>Normal</guilabel> for a default
                   text style, or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
-                  header.  You can also select
-                  <guilabel>pre</guilabel> for preformatted text
-                  blocks, and three types of <guilabel>List
+                  header from large (1) to tiny (6).  You can also
+                  select <guilabel>pre</guilabel> for preformatted
+                  text blocks, and three types of <guilabel>List
                   Item</guilabel>.
                 </para>
 	      </listitem>
@@ -639,11 +660,16 @@ with quoted materials and the relevant replies interspersed-->
              <term>Text style</term>
 	      <listitem>
 		<para>
+                  Use these buttons to determine the way your letters
+                  look.  If you have text selected, the style will
+                  apply to the selected text.  If you do not have text
+                  selected, the style will apply to whatever you type
+                  next.  The buttons are:
                   <itemizedlist mark="none">      
-		  <listitem><para><guibutton>B</guibutton> is for bold text</para></listitem>   
-                  <listitem><para><guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para><guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para><guibutton>S</guibutton> for a strikethrough.</para></listitem>
+		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>   
+                  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
+		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
+		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
                  </itemizedlist>
                </para>               
 	      </listitem>    
@@ -672,6 +698,23 @@ with quoted materials and the relevant replies interspersed-->
                </para>
 	    </listitem>
 	  </varlistentry>
+
+	    <varlistentry>
+	      <term>Color Selection</term>
+	      <listitem>
+		<para>
+                  At the far right is the color section tool.  You can
+                  choose from several colors by clickin on the arrow,
+                  or create your own custom color by clicking on the
+                  color box itself.  If you have text selected, the
+                  color will apply to the selected text.  If you do
+                  not have text selected, the color will apply to
+                  whatever you type next.
+               </para>
+	    </listitem>
+	  </varlistentry>
+
+
 	  </variablelist>
         </para>
 	<para>
@@ -682,12 +725,12 @@ with quoted materials and the relevant replies interspersed-->
                <term><guimenuitem>Insert Link</guimenuitem>:</term>
 	       <listitem>
 	        <para>
-                 Use this tool to
-                 put hyperlinks in your HTML messages.  When you
-                 select it, <application>Evolution</application> will
-                 prompt you for the <guilabel>Text</guilabel> that
-                 will appear, and the <guilabel>Link</guilabel>, where
-                 you should enter the actual web address (URL).
+                  Use this tool to put hyperlinks in your HTML
+                  messages.  When you select it,
+                  <application>Evolution</application> will prompt you
+                  for the <guilabel>Text</guilabel> that will appear,
+                  and the <guilabel>Link</guilabel>, where you should
+                  enter the actual web address (URL).
               </para>
 	    </listitem>
           </varlistentry>
@@ -958,16 +1001,27 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-filters">
       <title>Staying organized: Mail Filters in Evolution</title>
       <para>
-	Filters sort your email for you as you send or recieve
-	it. Most often, you'll want to have
-	<application>Evolution</application> put mail into different
-	folders, but you can have it do anything you like.  People who
-	subscribe to multiple mailing lists, or who often need to
-	refer to messages they have sent, find filters especially
-	helpful to separate personal from list-related mail, but
-	they're good for anybody who gets more than a few messages a
-	day.  To create a filter, open the <interface>filter
-	assistant</interface> by selecting
+        I once worked in the mail room of a large company, where my
+        job was to bundle, sort, and distribute mail to the various
+        mail boxes and desks throughout the building.  Filters do that
+        same job with email, but they lose much less mail than I did.
+        In addition, you can have multiple filters performing multiple
+        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.  Which is to say, it's quite a bit more
+        flexible than an actual person with a pile of envelopes.
+      </para>
+      <para>
+        Most often, you'll want to have
+        <application>Evolution</application> put mail into different
+        folders, but you can have it do almost anything you like.
+        People who subscribe to multiple mailing lists, or who often
+        need to refer to messages they have sent, find filters
+        especially helpful to separate personal from list-related
+        mail, but they're good for anybody who gets more than a few
+        messages a day.  To create a filter, open the
+        <interface>filter assistant</interface> by selecting
 	<menuchoice>
 	  <guimenu>Tools</guimenu> 
           <guimenuitem>Mail Filters</guimenuitem>
@@ -1009,12 +1063,13 @@ possibly never will be due to security evil. -->
            </para></listitem>
 
            <listitem><para>
-            <guibutton>Up</guibutton> &mdash; Move the selected filter up in the list.
+            <guibutton>Up</guibutton> &mdash; Move the selected filter up in the list, 
+             so it will be performed sooner.
            </para></listitem>
 
            <listitem><para>
             <guibutton>Down</guibutton> &mdash;  Move the selected filter down 
-             in the list.
+             in the list, so it will be performed later.
            </para></listitem>
         </itemizedlist>
 
@@ -1039,16 +1094,16 @@ possibly never will be due to security evil. -->
       </para>
       <para>
         Enter a name for your filter in the <guilabel>Name</guilabel>
-        field, and then begin choosing criteria.  You can use multiple
-        criteria by pressing <guibutton>More</guibutton>, and remove
-        the last one by pressing <guibutton>Fewer</guibutton>.  you can
-        choose from five types of criteria, and you can have as many
-        as you like.  If you have multiple criteria, you should also
-        decide between <guilabel>Match all parts</guilabel>, which
-        will make the filter affect only those messages which meet all
-        the criteria you're about to describe, and <guilabel>Match any
-        part</guilabel>, which will make the filter affect any message
-        that meets even one of the criteria.
+        field, and then begin choosing criteria.  Choose how many
+        criteria you'd like by pressing <guibutton>More</guibutton>
+        and <guibutton>Fewer</guibutton>.  You can choose from five
+        types of criteria, and you can have as many as you like; at
+        least, I've never found a maximum.  If you have multiple
+        criteria, you'll want to decide between <guilabel>Match all
+        parts</guilabel>, which will make the filter affect only those
+        messages which meet all the criteria you're about to describe,
+        and <guilabel>Match any part</guilabel>, which will make the
+        filter affect any message that meets even one of the criteria.
      </para>
      <para>
         For each of your filter criteria, you must first select what
@@ -1085,10 +1140,10 @@ possibly never will be due to security evil. -->
 	  <varlistentry>
 	    <term><guilabel>Expression</guilabel></term>
 	    <listitem><para>
-                Enter a regular expression (see <xref linkend="apx-gloss"> 
-                for more information), and <application>Evolution</application>
-                will match it for you. 
-            </para></listitem>
+               Enter a <glossterm>regular expression</glossterm>, and
+	       <application>Evolution</application> will match it for
+	       you.
+           </para></listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
@@ -1155,10 +1210,10 @@ possibly never will be due to security evil. -->
 
 	  <varlistentry>
 	    <term><guilabel>Stop Processing</guilabel></term>
-	    <listitem><para>
-               Select this if you want to tell all other filters to ignore
-               this message.
-            </para></listitem>
+	    <listitem><para> Select this if you want to tell all other
+	    filters to ignore this message.  If multiple filters copy
+	    the message to a different folders, you'll have multiple
+	    copies of the message.  </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
@@ -1207,8 +1262,10 @@ possibly never will be due to security evil. -->
 	<title>Two Notable Filter Features</title>
 	<para>
 	  <itemizedlist>
-	    <listitem><para>Any incoming email that does not meet
-	    filter action criteria remains in the Inbox. </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>
 	    </listitem>
 
 	    <listitem><para>If you move a folder, your filters
@@ -1234,51 +1291,28 @@ possibly never will be due to security evil. -->
       <para>
 	A vFolder is really a hybrid of all the other organizational
 	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  Once you've set it up, you'll be
-	able to open it and read the messages in it as though it were
-	a normal mail folder.  It's not a folder, though, because when
-	you open a vFolder, <application>Evolution</application>
-	performs a search for you.  It's not a regular search, though,
-	because you can build a vFolder with a very complicated set of
-	criteria with multiple inclusions and exclusions, as though
-	you were setting up a filter.
+	set it up like a filter.  In other words, while a conventional
+	folder actually contains messages, a vFolder is a view of
+	messages that may be in several different folders.  The
+	messages it contains are determined on the fly using a set of
+	criteria you choose in advance.
       </para>
 
-<!-- potentially useful, but doesn't fit at the moment:
-     <para>
-       An important difference between a folder and a virtual folder
-	is that a conventional folder actually contains messages, but
-	a vFolder is a view of messages that may be in several
-	different folders.  This means that while a message may fall
-	into several vFolders, it can be in only one conventional
-	folder.  Also, it means that you cannot remove a message from
-	a vFolder unless you delete it, and you cannot add a message
-	to a vFolder unless you change the vFolder's search criteria.
-      </para>
--->
-
       <para>
 	As messages that meet the vFolder criteria arrive or are
 	deleted, <application>Evolution</application> will
 	automatically place them in and and remove them from the
 	vFolder contents list.  When you delete a message, it gets
 	erased from the folder in which it actually exists, as well as
-	any vFolders which include it.
-      </para>
-      <para>
-	That's pretty complicated, but it can be useful. For example,
-	if I have a folder for all the email from one person, and
-	another folder for all the email on a given topic, I
-	<emphasis>feel</emphasis> organized.  But when the person
-	sends me mail about the topic, my whole email filing universe
-	becomes chaotic, and I need vFolders to save the day for me.
+	any vFolders which display it.
       </para>
+
       <para>
-	That sounds silly, but imagine a business trying to keep track
-	of mail from hundreds of vendors and clients, or a university
-	with overlapping and changing groups of faculty, staff,
-	administrators and students.  The more mail you need to organize, the less
-	you can afford the sort of confusion that stems from an
+	Imagine a business trying to keep track of mail from hundreds
+	of vendors and clients, or a university with overlapping and
+	changing groups of faculty, staff, administrators and
+	students.  The more mail you need to organize, the less you
+	can afford the sort of confusion that stems from an
 	organizational system that's not flexible enough.  vFolders
 	make for better organization because they can accept
 	overlapping groups in a way that regular folders and filing
@@ -1288,24 +1322,22 @@ possibly never will be due to security evil. -->
       <example id="usage-mail-organize-vFolders-ex">
 	<title>Using Folders, Searches, and vFolders</title>
 	<para>
-	   To organize my mail box, I can set up a vFolder for emails
-	   from my friend Vince.  Then, whenever I want to see the
-	   messages Vince has sent me, I open the vFolder, and every
-	   message he's sent me shows up, no matter where I've
-	   actually filed it.  If I want, I can also create a vFolder
-	   containing any message from my list of co-workers which
-	   also has the name of the project in it.  That way, when
-	   Vince sends me mail about the project, I can see that
-	   message both in the "Vince" vFolder and in the "Project"
-	   vFolder.  That's because when I open up the "Vince" folder,
-	   I'm really performing a search for all the mail from Vince,
-	   and when I open the "Project" folder I'm really performing
-	   a search for all the mail about the project.
+	   To organize my mail box, I set up a vFolder for emails from
+	   my friend and co-worker Anna.  I have another one for
+	   messages from anybody at work that have "Evolution" in the
+	   subject line, so I can keep a record of what people from
+	   work send me about <application>Evolution</application>.
+	   If Anna sends a message about a picnic on Saturday, it only
+	   shows up in the "Anna" folder. When Anna sends me mail
+	   about the user interface for
+	   <application>Evolution</application>, I can see that
+	   message both in the "Anna" vFolder and in the "Internal
+	   Evolution Discussion" vFolder.
+	</para>
+      </example>
 
 	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
 
-	</para>
-      </example>
       <para>
 	 To create a vFolder, select <guimenuitem>VFolder
 	 Editor</guimenuitem> from the <guimenu>Tools</guimenu>
@@ -1334,9 +1366,12 @@ possibly never will be due to security evil. -->
          The second part, however, is slightly different.  In the
          section of the window labelled <guilabel>vFolder Sources
          </guilabel> is a list of folders in which
-         <application>Evolution</application> will search for the contents
-         of your vFolder.  Click <guibutton>Add</guibutton> to add a folder,
-         or <guibutton>Remove</guibutton> to remove one.         
+         <application>Evolution</application> will search for the
+         contents of your vFolder.  Click <guibutton>Add</guibutton>
+         to add a folder, or <guibutton>Remove</guibutton> to remove
+         one.  That way, you can have your vFolder search in
+         newsgroups, or just in one of your mailboxes, or just in a
+         select few folders you've already screened with filters.
        </para>
        <para>
         The vFolder creation window is shown in <xref
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
index a4161da810..378b9c3866 100644
--- a/help/C/usage-notes.sgml
+++ b/help/C/usage-notes.sgml
@@ -3,11 +3,14 @@
   <abstract>
     <title> An Overview of the Evolution Notes</title>
     <para>
-      In the dark ages before email was invented, there were notes.
-      Even now, notes are an almost necessary part of our lives.  It
-      only makes sense that <application> Evolution</application> has
-      a Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
+      In the dark ages before email was invented, there were little
+      scraps of people which people used for short-term information
+      storage.  These scraps of paper were called notes.  Now, notes
+      are an almost necessary part of our lives, albeit in electronic
+      form.  It only makes sense, then, that
+      <application>Evolution</application> has a Notes feature.
+      <application>Evolution</application> can help you take notes in
+      the following ways:
      <itemizedlist>
        <listitem>
          <para>
@@ -17,13 +20,13 @@
        </listitem>
        <listitem>
          <para>
-           You can color code each note to help cateogrize each note into
-           a topic.
+           You can color code notes to organize them, or just to
+           make them look good.
          </para>
        </listitem>
        <listitem>
          <para>
-           Something
+           Turn a note into an email or a text file.
          </para>
        </listitem>
        <listitem>
@@ -39,3 +42,6 @@
    </para>
   </abstract>
 </chapter>
+
+
+
diff --git a/help/ChangeLog b/help/ChangeLog
index de7d5b808e..15f46d074b 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,5 +1,46 @@
+2000-09-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
+
+2000-09-06  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Editing, proofing.
+
+2000-09-05  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Grammar, links, screenshots.
+
+	* fig/* Re-took most screenshots.
+
+	* C/usage-mail.sgml: Filters, proofing.
+
+2000-09-01  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
+	distinction (there's a theme to these four log entries here).
+
+	* C/usage-mail.sgml: Added coverage of news.
+
+	* C/config-setupassist.sgml: Revised mail sources content for
+	IMAP/POP stuff.
+
+	* C/apx-gloss.sgml: Added IMAP and POP.
+
 2000-08-31  Aaron Weber  <aaron@helixcode.com>
 
+	* C/apx-gloss.sgml: Added regular expressions to glossary.
+	Explanation should be removed from other portions of the book now.
+
+	* C/usage-mainwindow.sgml: Revisions, minor.
+
+	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
+	status as a part.
+
+	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
+	part, not an appendix.
+
+	* C/apx-menuref.sgml: Added contextual menus for mail.
+
 	* C/preface.sgml: Added "quickref and pointers" sections. Props to
 	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
 	  idea.