new file new file New directory, for figure graphics.

	* C/fig/mainwindow-pic.png: new file
	* C/fig/mail-druid-pic.png: new file
	* C/fig: New directory, for figure graphics.

	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.

	* C/usage-setup.sgml: More accurate description of druid, and
	moved to mail section-- see usage-mail.sgml entry.  This is a new
	location for this entity, and it may move more later.


	* C/usage-mainwindow.sgml: altered description of starting
	evolution. added screenshot for main-window picture.

	* C/usage-mail.sgml: added screenshots, added coverage of setup
	druid and put it into get-and-send section, which is probably not
	where it should stay.  Also started filter druid coverage and
	clarified examples, esp. in Bcc: section.

	* C/usage-contact.sgml: Clarified examples.

	* C/preface.sgml: rewording of "what is" and "about book" sections.

	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
	phrasing in part intros, changed order of Setup-assistant section.

	* C/config-prefs.sgml: changed wording, removed ref. to re-running
	setup assistant.

svn path=/trunk/; revision=3222

24 files changed, 1320 insertions, 320 deletions

diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
new file mode 100644
index 0000000000..80f9b3f14b
--- /dev/null
+++ b/doc/C/apx-gloss.sgml
@@ -0,0 +1,242 @@
+
+
+<glossary id="glossary">
+
+ <title>Glossary</title>
+
+ <glossentry id="attachment">
+  <glossterm>Attachment</glossterm>
+  <glossdef>
+   <para>
+    Any file sent with an e-mail for the reciever to download.
+   </para>
+  </glossdef>
+ </glossentry>
+
+<glossentry id="automatic-indexing">
+  <glossterm>Automatic Indexing</glossterm>
+  <glossdef>
+   <para>
+     Pre-sorting procedure that allows
+     <application>Evolution</application> to refer to data quickly.
+     It enables faster searches and decreases memory usage for
+     data displays.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="bcc">
+  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
+  <glossdef>
+   <para>
+    A way of addressing a message.  Bcc is used to send a group of
+    people an e-mail, while hiding their names and addresses from each
+    other.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="cc">
+  <glossterm>Cc (Carbon Copy)</glossterm>
+  <glossdef>
+   <para>
+    Carbon-copies are used to send a 3rd party a copy of the e-mail,
+    so they an keep up to date on a conversation, without being in the
+    To: list.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="druid">
+  <glossterm>Druid</glossterm>
+  <glossdef>
+   <para>
+    A small program or script used to help configure or set up some
+    larger program.  The <application>mail setup druid</application>
+    helps you ready your email system for use.  Druids are the Linux
+    equivalent of "Assistants" and "Wizards." 
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="evolution">
+  <glossterm>Evolution</glossterm>
+  <glossdef>
+   <para>
+    <application>Evolution</application> is the <acronym> GNOME
+    </acronym> groupware application.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="execute">
+  <glossterm>Execute</glossterm>
+  <glossdef>
+   <para>
+    To run a program.  Any file that can be run is called an
+    executable.  In order to be execute program, a user must have
+    the proper permissions.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="filter">
+  <glossterm>Filter</glossterm>
+  <glossdef>
+   <para>
+    Within <application>Evolution</application>, a filter is a method
+    of sorting mail automatically.  
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="forward">
+  <glossterm>Forward</glossterm>
+  <glossdef>
+   <para>
+    By forwarding an e-mail, the user can send a third party a message
+    which was sent to the user originally.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="groupware">
+ <glossterm>Groupware</glossterm>
+  <glossdef>
+   <para>
+    Groupware is a term describing an application who has many
+    productivity features built into one program.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="haiku">
+  <glossterm>Haiku</glossterm>
+  <glossdef>
+   <para>
+     A Japanese form of poetry.  Haiku are unrhymed, and
+     three lines long. The first and last lines should have five
+     syllables, and the second line seven syllables.  The subject
+     matter is traditionally related to the seasons.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="html">
+  <glossterm>HTML</glossterm>
+  <glossdef>
+   <para>
+    Hyper-text Markup Language(<acronym>HTML</acronym>) is the layout
+    language which all webpages are written in.  HTML can be used
+    inside of e-mails to insert images, justfiy text different ways,
+    and even include webpages inside the e-mail itself.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="hot-key">
+  <glossterm>Hot Key</glossterm>
+  <glossdef>
+   <para>
+    Hot-keys are keyboard combinations used to do actions on a
+    computer instead of using the mouse to do the same action.
+    Hot-keys can speed up computer usage.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="ical">
+  <glossterm>iCal</glossterm>
+  <glossdef>
+   <para>
+    <application>iCal</application> is the program which
+    <application>Evolution</application> uses to manage the calendar
+    section.
+   </para>
+  </glossdef>
+ </glossentry> 
+
+ <glossentry id="live-doc">
+  <glossterm>Live Document</glossterm>
+  <glossdef>
+   <para>
+      A document embedded in or attached an email message that
+      contains scripting or other active contents.  For example, a
+      <application>Gnumeric</application> spreadsheet page could be
+      included in a message, and the recipient could alter some of the
+      data from within <application>Evolution</application> without
+      having to start another program.
+   </para>
+  </glossdef>
+ </glossentry> 
+
+ <glossentry id="mail-client">
+  <glossterm>Mail Client</glossterm>
+  <glossdef>
+   <para>
+    A mail client is the application which a user reads and sends
+    their e-mail with.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="nautilus">
+  <glossterm>Nautilus</glossterm>
+  <glossdef>
+   <para>
+    <application>Nautilus</application> is the next generation file
+    manager for <acronym>GNOME</acronym> being written by Eazel.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="nickname">
+  <glossterm>Nickname</glossterm>
+  <glossdef>
+   <para>
+    An alias for an e-mail address.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="script">
+  <glossterm>Script</glossterm>
+  <glossdef>
+   <para>
+    A program which is written in an interpreted language, which can
+    be executed.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="shortcut-bar">
+  <glossterm>Shortcut Bar</glossterm>
+  <glossdef>
+   <para>
+    The <interface>Shortcut Bar</interface> is where the user accesses
+    all the components of <application>Evolution</application> from.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="spam">
+  <glossterm>Spam</glossterm>
+  <glossdef>
+   <para>
+    Spam: useless e-mail.  Spam normally comes in forms of
+    chain-letters and advertisements for websites or services.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="vfolder">
+  <glossterm>vFolder</glossterm>
+  <glossdef>
+   <para>
+    vFolders allow an e-mail to be shared among multiple folders, so
+    it appears that theres a copy of the e-mail in each folder.
+   </para>
+  </glossdef>
+ </glossentry>
+
+</glossary>
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 67ca0e7577..8ca4dbbc7d 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -2,10 +2,11 @@
     <chapter id="config-prefs">
       <title>Advanced Configuration with the Preferences Window</title>
       <para>
-        If you prefer not to use the setup assistant, select
+        To change your configuration settings, select
         <guimenuitem>Preferences</guimenuitem> from the
-        <guimenu>Settings</guimenu> menu, and work your way through
-        the page tabs it offers you.  They are:
+        <guimenu>Settings</guimenu> menu.  This will open the
+        preferences window, illustrated in <xref linkend="config-prefs-fig">.
+        Preferences are seperated into several categories:
         <itemizedlist>
           <listitem>
 	    <para>
@@ -17,37 +18,31 @@
 
 	  <listitem>
 	    <para>
-              <guilabel>Network</guilabel>, which allows you to
-              specify your network settings.  There are no default
-              values for this information.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
               <guilabel>Mail</guilabel>, which allows you to specify
-              attachment and HTML handling, forwarding behavior,
-              filters, and other <application>Evolution</application>
-              behaviors specific to email.  The default behaviors are
-              those approved by Jamie Zawinski.
+              your email server and protocols, as well as attachment
+              and HTML handling, forwarding behavior, filters, and
+              other <application>Evolution</application> behaviors
+              specific to email.  The default behaviors are those
+              approved by Jamie Zawinski.
             </para>
 	  </listitem>
  
 	  <listitem>
 	    <para>
                <guilabel>Contacts</guilabel>, which allows you to
-               specify behavior that is specific to your contact
-               manager.
+               control addressbook sharing as well as other funcctions
+               specific to your contact manager.
             </para>
 	  </listitem>
 
 	  <listitem>
 	    <para>
               <guilabel>Calendar</guilabel>, which allows you to set
-              the way that your calendar will behave and appear.  The
-              default view is by week and the default calendar is
-              Western.  Date format is determined by the system clock
-              and localization, and cannot be set here.
+              up calendar networking, as well as the way that your
+              calendar will behave and appear.  The default view is by
+              week and the default calendar is Western.  Time and
+              date are determined by the system clock and
+              localization, and cannot be set here.
             </para>
 	  </listitem>
  
@@ -60,9 +55,7 @@
 	  </listitem>
 	</itemizedlist>
       
-        The <interface>Preferences Dialog</interface> is shown in
-        <xref linkend="config-prefs-fig">.
-      </para>
+    </para>
 
       <!-- ==============Figure===================== -->
       <figure id="config-prefs-fig">
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index 03b85ea12c..f33cc81de2 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -14,3 +14,6 @@
          screenshot or two.
       </para>
     </chapter>
+
+
+
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 3e6b374fca..9df4a2a170 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -13,9 +13,11 @@
 <!ENTITY DEVEL-ACTION SYSTEM "devel-action.sgml">
 <!ENTITY DEVEL-SCRIPT SYSTEM "devel-script.sgml">
 <!ENTITY DEVEL-COMPONENT SYSTEM "devel-component.sgml">
+<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
 <!ENTITY APX-FDL SYSTEM "apx-fdl.sgml">
+
 ]>
 
 
@@ -65,7 +67,6 @@ standardize on second person, not 1st pers. plural.
       </para>
     </partintro>
 
-    &USAGE-SETUP;
     &USAGE-MAINWINDOW;
     &USAGE-MAIL;
     &USAGE-CONTACT;
@@ -101,8 +102,8 @@ standardize on second person, not 1st pers. plural.
         There are three levels of developing for
         <application>Evolution</application>.  You can write actions.
         You can write scripts.  And you can write full-fledged
-        Evolution components.  INSERT CONTENT: paragraph should describe the
-        differences.
+        Evolution components.  This paragraph will eventually
+        desfcribe what that means.
       </para>
     </partintro>
     
@@ -110,9 +111,20 @@ standardize on second person, not 1st pers. plural.
     &DEVEL-SCRIPT;
     &DEVEL-COMPONENT;
   </part>
-
+  &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
   &APX-FDL;
 
 </book>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/C/fig/mail-druid-pic.png b/doc/C/fig/mail-druid-pic.png
new file mode 100644
index 0000000000..f29f3e77be
--- /dev/null
+++ b/doc/C/fig/mail-druid-pic.png
diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png
new file mode 100644
index 0000000000..b7c6067449
--- /dev/null
+++ b/doc/C/fig/mainwindow-pic.png
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 05129eb550..9ccb257e5e 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -82,7 +82,7 @@
         by email, or to send email to a contact or appointment.
         <application>Evolution</application> makes displays faster and
         more efficient, so searches are faster and memory usage is
-        much lower.  People who get lots of mail will appreciate
+        lower.  People who get lots of mail will appreciate
         advanced features like <link
         linkend="usage-mail-organize-vFolders">vFolders</link>, which
         let you save searches as though they were ordinary mail
@@ -93,16 +93,20 @@
 
     <section id="aboutbook">
       <title>About This Book</title>
-
     <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
       <para>
-        This is a DRAFT of the <application>Evolution</application>
-        User's Guide.  Please send comments on it to
-        <email>aaron@helixcode.com</email>.  Items that are known to
-        need action are indicated as such, often with notation like
-        (INSERT CONTENT HERE).  If you have content to add, please
-        contact me.  This paragraph will be removed in later versions
-        of the manual.
+        This version of the <application>Evolution</application>
+        User's Guide is a <emphasis>draft</emphasis>.  It is missing
+        huge chunks of information, and many of the features it
+        describes are unimplemented.  All the content is subject to
+        change, especially if you help.  Please send comments on the
+        guide to <email>aaron@helixcode.com</email>.  Items that are
+        known to need action are indicated as such, often with
+        notation like (INSERT CONTENT HERE).  If you would like to
+        work on the guide please contact me or see the GNOME
+        Documentation project <ulink
+        url="http://www.gnome.org/gdp">web site</ulink>.  This
+        paragraph will be removed in later versions of the manual.
       </para>
     <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
 
@@ -138,12 +142,18 @@
           It's listed below:
           <simplelist>
 	    <member><application>Applications</application></member>
-	    <member><command>Commands</command></member>
-	    <member><guilabel>Labels</guilabel>for menu items and buttons</member>
+	    <member><command>Commands</command> typed at the command line</member>
+	    <member><guilabel>Labels</guilabel> for menu items and buttons</member>
+	    <member>Other text treatments</member>
 	    <member>Other text treatments</member>
-	    <member>more info here</member>
 	  </simplelist>
         </para>
       </formalpara>
     </section>
-  </preface>
\ No newline at end of file
+  </preface>
+
+
+
+
+
+
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index f88a3d5791..6cc9cd605f 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -45,7 +45,7 @@
         </para>
 	<para>
           Describe the interface.  Include the fact that the
-          whole book consists of a set of cards, organized into
+          whole address book consists of a set of cards, organized into
           folders.
         </para>
       </sect1>
@@ -194,7 +194,7 @@
       </sect1>
 
       <sect1 id="usage-contact-sharing">
-	<title>Sharing your cards (Or Keeping them to Yourself)</title>
+	<title>Sharing your Cards (and keeping them to yourself)</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
@@ -213,7 +213,11 @@
                 contacts there, so I know whom to call.  Since we also
                 share the calendars, I know that Deanna has already
                 scheduled a meeting with them next Thursday, and I can
-                just ask her to bring up my concerns at the meeting.
+                either go to the meeting myself or ask Deanna to
+                discuss my concerns for me.  Either way, I avoid
+                having to schedule yet another meeting with Company X,
+                which is good since everybody hates their products and
+                they're doomed to fail anyway.
              </para>
 	  </example>
 
@@ -225,9 +229,9 @@
            decide which folders you want to make accessible to others.
         </para>
 	<para>
-           To begin sharing a folder of address cards, select <!--
+           To begin sharing a folder of address cards, select (something) <!--
            DESCRIBE PROCESS HERE -->.  The
-           <interface>Sharing</interface> will pop up.  It contains:
+           <interface>Sharing</interface> window will pop up.  It contains:
            <!--DESCRIBE INTERFACE HERE-->
         </para>
       </sect1>
@@ -241,6 +245,7 @@
           mailing lists, you'll find that the contact manager is more
           than a mere address book.
         </para>
+
 	<sect2 id="contact-automation-basic">
 	  <title>Send me a card: Adding New Cards Quickly</title>
 	  <para>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index c81c384cfb..88e92756fe 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,6 +1,6 @@
 
     <chapter id="usage-mail"> 
-      <title>Evolution Mail: Witty Phrase to Come Later</title>
+      <title>Evolution Mail</title>
       <abstract>
 	<title> An Overview of the Evolution Mailer</title>
 	<para>
@@ -8,7 +8,24 @@
           <application>Evolution</application> mail is here to help
           you keep track of it.  <application>Evolution</application>
           email is like other email programs in all the ways you would
-          hope: (INSERT GOOD SIMILARITIES).
+          hope:
+         <itemizedlist>
+           <listitem>
+             <para>
+               Item: Description
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               Item: Description
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               Item: Description
+             </para>
+           </listitem>
+         </itemizedlist>.
         </para>
         <para>
           However, <application>Evolution</application> has some
@@ -28,7 +45,9 @@
         
 	<para>
            You can start reading email by clicking
-           <guibutton>Inbox</guibutton> in the shortcut bar.
+           <guibutton>Inbox</guibutton> in the shortcut bar.  By
+           default, the <interface>Inbox</interface> is open when you
+           start <application>Evolution</application>.
         </para>
       </abstract>
    
@@ -42,7 +61,7 @@
             <guilabel>Inbox</guilabel>, you will see a window like the
             one in <xref linkend="usage-mail-intro-fig">, with a
             message from Helix Code in the<interface> message
-            list</interface>.  A preview of the message is displayed
+            list</interface>.  The message is displayed
             below that, in the <interface>view pane</interface>.  If
             you find the<interface> view pane</interface> too small,
             you can double-click on the message in the
@@ -69,14 +88,16 @@
 	      <title>Evolution Mail</title>
 	      <screenshot>
 		<screeninfo>Evolution Mail</screeninfo>
-		<graphic fileref="mail-intro-pic" format="png" srccredit="Aaron Weber">
+		<graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	    </screenshot>
 	  </figure>
    <!-- ==============End of Figure=================================== -->
           </para>
 	</sect2>
-	
+
+        &USAGE-SETUP;
+ 	
 	<sect2 id="usage-mail-getnsend-get">
 	  <title>Getting Mail</title>
 	  <para>
@@ -88,12 +109,12 @@
             <interface>Inbox</interface> and also in the
             <interface>Today View</interface>.
           </para>
+
 	  <para>
-             If you get an error message, you probably need to
-            change your network preferences.  To do that, you can run
-            the setup assistant again, have a look at <xref
-            linkend="config-prefs-network">, or ask your system
-            administrator.
+            If you get an error message, you probably need to change
+            your network preferences.  To learn how to do that, have a
+            look at <xref linkend="config-prefs-network">, or ask your
+            system administrator.
           </para>
 
 	  <sect3 id="usage-mail-getnsend-get-attach">
@@ -101,22 +122,24 @@
 	    <para>
               If you receive a file attached to an email,
               <application>Evolution</application> will ask where you
-              want to put it.  Once you've downloaded it, you can
-              open, move, copy, or execute those files just like any
-              others, using <application>Nautilus</application> or
-              your favorite shell or file manager.
+              want to put it.  Once you've downloaded a file, you can
+              open, move, copy, or execute it just like any other,
+              using <application>Nautilus</application> or your
+              favorite shell or file manager.
             </para>
+
 	    <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.
             </para>
+
 	    <para>
                It can also display <glossterm>live
                documents</glossterm>, which have scripted or
                executable contents&mdash; for example, a working
-               spreadsheet page or a chess game.
+               spreadsheet page or a chess game.  
             </para>
 	    <tip id="badidea-attachment">
 	      <title>Bad Idea</title>
@@ -181,8 +204,9 @@
            </para>
 
 	  <para>
-            There is more to sending mail, though.  In the
-            next few sections, we'll go over additional features,
+            There is quite a bit more to sending mail, though.  In the
+            next few sections, you'll see how
+            <application>Evolution</application> handles additional features,
             including mailing lists, attachments, and forwarding.
           </para>
 
@@ -237,15 +261,27 @@
               to send mail to several people without sharing the
               recipient list, you should use
               <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
-              Carbon Copy", and means that addresses in the
-              <guilabel>BCc:</guilabel> field will receive copies of
-              the message, but they will not receive the list of the
-              other recipients' addresses, nor will other recipients
-              know that they have recieved the message.  When I send a
-              generic message to all my friends and I want them to
-              think I've written a personalized email to every one of
-              them, I put them all in the <guilabel>BCc:</guilabel>
-              list.
+              Carbon Copy", and means that people listed in the
+              <guilabel>BCc:</guilabel> are excluded from the
+              recipient list, although they will receive the message
+              and the list of addresses from the
+              <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
+              fields.  
+
+              <example id="ex-mail-bcc">
+                 <title>Using the BCc: field</title>
+                 <para>
+                   Let's say Tim sends an email to a client, and wants
+                   his supervisor to know what he wrote.  He doesn't,
+                   however, want the client to start writing his
+                   supervisor about the project&mdash; it's Tim's job
+                   to deal with the client.  So Tim puts his
+                   supervisor's email address in the
+                   <guilabel>BCc:</guilabel> field.  That way, the
+                   client has one contact, and the boss stays in the
+                   loop.
+               </para>
+             </example>
             </para>
 	  </sect3>
 
@@ -289,21 +325,24 @@
               <guimenu>MENU</guimenu> menu.  This will allow you to
               choose one or several of the other message recipients in
               addition to the person who originally sent you the
-              message.  
+              message. If there are large numbers of people in the
+              <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
+              fields, this can save substantial amounts of time.  In
+              addition, Reply-To makes it very easy to keep off-topic
+              conversation away from mailing lists and newsgroups.
               <example>
 		<title>Using the Reply-To feature</title>
 		<para>
-                  Returning to the previous example, the client can
-                  decide whether to reply just to Susan, just to Tim,
-                  or to both of them by selecting a menu item, rather
-                  than by cutting and pasting the email addresses.  If
-                  there are large numbers of people in the Cc: fields,
-                  this can save substantial amounts of time.
+                  Returning again to the email Susan sent to Tim and
+                  their client, you'll note that the Reply-To feature
+                  allows the client to decide whether to reply just to
+                  Susan, or to both Tim and Susan by selecting
+                  a menu item, rather than by cutting and pasting the
+                  email addresses. 
                 </para>
 	      </example>
             </para>
 	  </sect3>
-
 	  
 	  <sect3 id="usage-mail-getnsend-send-fancy">
 	    <title>Embellishing that email</title>
@@ -315,7 +354,6 @@
                 spreadhseets or chess games.  This section will tell
                 you how.
             </para>
-
 	    
 	    <sect4 id="usage-mail-getnsend-send-html">
 	      <title>Colors, pictures, and fonts with HTML Mail</title> 
@@ -340,7 +378,7 @@
                   role="html">&lt;BR&gt;Bold Text&lt;/BR&gt</markup>,
                   the the composer will assume you meant exactly that,
                   and not "make this text bold," as a HTML composition
-                  tool would.  For the technically inclined, that
+                  tool would.  For the very technically inclined, that
                   means that when the text <markup
                   role="html">&lt;BR&gt</markup> is sent as HTML, it
                   will be converted to the string
@@ -349,16 +387,18 @@
 	      </note>
 	      <para>
                 Some people do not have HTML-capable mail clients, or
-                prefer not to receive HTML-enhanced mail because it
-                is slower to download and display.  Some people refer
-                to HTML mail as "the root of all evil" and get very
-                angry if you send them HTML mail, which is why the
-                default in <application>Evolution</application> is
-                plain text.  If you have an address book entry for
-                someone who does not wish to receive HTML-enhanced
-                mail, you can note that preference in their address
-                card.  The mailer will automatically strip the HTML
-                tags from any messages you send to that address.
+                prefer not to receive HTML-enhanced mail because it is
+                slower to download and display.
+                <emphasis>Some</emphasis> people refer to HTML mail as
+                "the root of all evil" and get very angry if you send
+                them HTML mail, which is why the default in
+                <application>Evolution</application> is plain text.
+                If you choose to send HTML mail, but have an address
+                book entry for someone who does not wish to receive
+                HTML-enhanced mail, you can note that preference in
+                their address card.  The mailer will automatically
+                strip the HTML tags from any messages you send to that
+                address.
               </para>
 	    </sect4>
       
@@ -369,15 +409,15 @@
                 you can do so by <!--describe process here-->.  If
                 your recipients can read HTML mail, you can put an
                 image inside the mail by dragging the file into the
-                composer window, or by selecting (INSERT DESCRIPTION
-                HERE) (IS THIS CORRECT?).  Still, unless you know what
-                email client the recipient is using, it's best to send
-                a message or attachment in the simplest manner
-                possible.
+                composer window, or by selecting <guimenuitem>Menu
+                Item</guimenuitem> from the <guimenu>Menu</guimenu>
+                menu.  Still, unless you know what email client the
+                recipient is using, it's best to send a message or
+                attachment in the simplest manner possible.
               </para>
 	    </sect4>
 	    <sect4 id="usage-mail-getnsend-send-live">
-	      <title></title>
+	      <title>Live Documents</title>
 	      <para>
                 Later versions of <application>Evolution</application>
                 will allow you to enliven your email with almost any
@@ -529,7 +569,53 @@
             of what those terms mean)
           </para>
           <para>
-            (INSERT the way one creates a search and so forth)
+            To create a search, enter the word or phrase you're
+            looking for in the form field below the toolbar, and
+            choose a search type:
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <guilabel>Body or subject contains:</guilabel> This
+                  will search message subjects and the messages
+                  themselves for the word or phrase you've entered in
+                  the search field.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Body contains:</guilabel> This will search
+                   only in message text, not the subject lines.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Subject contains:</guilabel> This will
+                  show you messages where the search text is in the
+                  subject line.  It will not search in the message body.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Body does not contain:</guilabel> This
+                  finds every email message that does not have the
+                  search text in the message body.  It will still show
+                  messages that have the search text in the subject
+                  line, if it is not also in the body.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Subject does not contain:</guilabel>This
+                  finds every mail whose subject does not
+                  contain the search text.
+               </para>
+             </listitem>
+            </itemizedlist>
+
           </para>
 	</sect2>
     
@@ -611,26 +697,59 @@
 	<sect2 id="usage-mail-organize-filters">
 	  <title>Staying organized: Mail Filters in Evolution</title>
 	  <para>
-            Filters sort your email for you as it arrives in your
-            Inbox, so you don't have to sort them all yourself.
-            People who subscribe to multiple mailing lists find
-            filters especially helpful to sort personal from
-            list-related mail.  To create a filter, go to your
-            <interface>Inbox</interface>.  Then select BLAH BLAH BLAH.
-            This will open the <interface>filters</interface> window.
+            Filters sort your email for you.  People who subscribe to
+            multiple mailing lists, or who often need to refer to
+            messages they have sent, find filters especially helpful
+            to seperate personal from list-related mail, but they're
+            good for anybody who gets more than a few messages a day.
+            To create a filter, go to your
+            <interface>Inbox</interface>.  Then select
+            <guimenuitem>Filter Druid</guimenuitem> from the
+            <guimenu>Tools</guimenu> menu. This will start the a
+            <glossterm> druid</glossterm>, which will allow you to
+            create filters.
           </para>
 
-          <para> 
-            The <interface>filters</interface> window contains the
-            following items: <!--DESCRIBE INTERFACE--> 
+          <para> The <interface>filter druid</interface> window
+            contains a window listing rules, and an option to create a
+            new rule.  To start filtering your mail, click
+            <guibutton>Add</guibutton> to add a filtering rule.
+            You'll decide when it should take place: 
+              <itemizedlist>
+		<listitem>
+                   <para>
+                     <guilabel>When mail arrives:</guilabel> new mail
+		     arrives in the Inbox, and you can filter it from
+		     here.
+                   </para>
+                 </listitem>
+                 <listitem>
+                   <para>
+                     <guilabel> When mail is sent:</guilabel> When you
+                     send mail, you can perform additional actions on
+                     it&mdash; perhaps you keep your Outbox sorted into
+                     subfolders.
+                 </para>
+              </listitem>
+            </itemizedlist>
           </para>
-	  
+
+	  <para>
+           Then, the filter druid will ask you which emails it should
+           act upon.  You can set criteria to include words or phrases
+           in the subject, To:, Cc: or body of the message.  Once
+           you've decided which messages to filter, the druid will ask
+           you the sort of action you wish to take.  More details and
+           screenshots should follow here.
+          </para>
+
+
 	  <note>
 	    <title>Two Notable Filter Features</title>
 	    <para>
               <itemizedlist>
-		<listitem><para>Any email that does not meet filter
-                action criteria remains in the Inbox. </para>
+		<listitem><para>Any incoming email that does not meet
+                filter action criteria remains in the Inbox. </para>
                 </listitem>
 		
 		<listitem><para>If you move a folder, your filters
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 8470189977..3dc91e5a97 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -3,18 +3,23 @@
 
     <title>The Main Window: Evolution Basics</title>
       <para>
-	After <application>Evolution</application> starts up, you will
-	see the <interface>main window</interface>, which looks a lot
-	like in <xref linkend="usage-mainwindow-fig">. On the left of
-	the <interface>main window</interface> are the
-	<interface>shortcut bar</interface> and the
-	<interface>tree-view</interface>.  Just underneath the title
-	bar is a series of menus in the <interface>menu
-	bar</interface>, and below that, the <interface>tool
-	bar</interface> with buttons for different functions. The
-	largest part of the <interface>main window</interface> is
-	taken up by a welcome message.  <!-- para does not end here
-	but after fig! -->
+	
+        Start <application>Evolution</application> by selecting
+	<guimenuitem>Evolution</guimenuitem> from the
+	<guisubmenu>Applications</guisubmenu> of the <guimenu>Main
+	Panel Menu</guimenu>, or by typing
+	<command>evolution</command> at the command-line.After
+	<application>Evolution</application> starts up, you will see
+	the <interface>main window</interface>, which looks a lot like
+	in <xref linkend="usage-mainwindow-fig">. On the left of the
+	<interface>main window</interface> are the <interface>shortcut
+	bar</interface> and the <interface>tree-view</interface>.
+	Just underneath the title bar is a series of menus in the
+	<interface>menu bar</interface>, and below that, the
+	<interface>tool bar</interface> with buttons for different
+	functions. The largest part of the <interface>main
+	window</interface> is taken up by a welcome message.  <!--
+	para does not end here but after fig! -->
 
 <!-- ==============Figure=================================== -->
 
@@ -25,10 +30,10 @@ forth.  Can these things be labelled with little arrows & stuff?
  -->
 
 	<figure id="usage-mainwindow-fig">
-	<title>Evolution Main Window</title>
+	<title>Evolution Main Window and Inbox</title>
 	<screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="mainwindow-pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
 	</figure>
@@ -189,14 +194,14 @@ forth.  Can these things be labelled with little arrows & stuff?
         </para>
 
 	<para>
-          (CHANGE that title! THIS SECTION BELONGS SOMEWHERE ELSE!)
           You can drag the folders inside the tree view to change
           their order or put one folder inside another.  To delete a
           folder, you can drag it into the trash folder.  The same
           goes for individual messages, appointments, and address
           cards, whether they're in the <interface>tree
           view</interface> or not: drag them where you want them, and
-          they will go there. (IS THIS TRUE?)
+          they will go there.
+<!--  ****This paragraph could use some work****  -->
         </para>
 	<para>
           You can also use the <guimenu>right-click menu</guimenu> to
@@ -211,4 +216,4 @@ forth.  Can these things be labelled with little arrows & stuff?
           already.
         </para>
       </sect1>
-    </chapter>
\ No newline at end of file
+    </chapter>
diff --git a/doc/C/usage-setup.sgml b/doc/C/usage-setup.sgml
index 1290b000bb..3e793fdbcd 100644
--- a/doc/C/usage-setup.sgml
+++ b/doc/C/usage-setup.sgml
@@ -1,46 +1,126 @@
-   <chapter id="usage-setup">
-      <title>A Quick Start</title>
+   <sect2 id="usage-setup">
+      <title>Mail Setup</title>
       <para>
-        Start <application>Evolution</application> by selecting
-	<guimenuitem>Evolution</guimenuitem> from the
-	<guisubmenu>Applications</guisubmenu> of the <guimenu>Main
-	Panel Menu</guimenu>, or by typing
-	<command>evolution</command> at the command-line.  If this is
-	the first time you have run
-	<application>Evolution</application>, you'll be asked if you
-	want help setting up your email preferences.  If you don't
-	plan to use email, or if you'd rather configure your email
-	preferences later, select <guibutton>No</guibutton>, and it
-	will go away.  You can configure your email preferences later
-	by selecting SOMETHING from SOME MENU.
+        The first time you try to send or receive mail with
+	<application>Evolution</application>, the <interface>mail
+	setup druid</interface> will pop up to help you
+	set up your email preferences.  If you don't plan to use
+	email, or if you'd rather configure your email preferences
+	later, click <guibutton>Cancel</guibutton>.
       </para>
       <para>
-         If you answer yes, it will guide you through the network
-	 configuration process.  It will ask you for the following
-	 information: (FLESH OUT THIS LIST!)
+         The setup <glossterm>druid</glossterm>
+	 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 druid is pictured in <xref
+	 linkend="usage-setup-fig">.
+
+<!-- ==============Figure=================================== -->
+
+	<figure id="usage-setup-fig">
+	<title>Mail Setup Druid</title>
+	<screenshot>
+	  <screeninfo>Evolution Main Window</screeninfo>
+	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	</screenshot>
+	</figure>
+<!-- ==============End of Figure=================================== -->
+
+
+
+  The druid will ask you for the following information:
         <itemizedlist>
-	  <listitem> <para>
-            Name&mdash; Your full name: eg. William Blake
-          </para></listitem>
-
-	  <listitem><para>
-                UserName&mdash; Your user or account name: eg. wblake
-          </para></listitem>
-	  <listitem><para>  
-             Type of Server&mdash; POP vs. SMTP vs....
-          </para></listitem>
+	  <listitem> <para> <guilabel>Name&mdash; </guilabel> Your
+            full name: eg. Eva Lucianne Tester </para></listitem>
+
+	  <listitem><para> <guilabel>Email address&mdash</guilabel>;
+                 Your email address: eg. eltester@helixcode.com
+                 </para></listitem>
+
+	  <listitem>
+	    <para>
+               <guilabel> Organization&mdash;</guilabel> Any
+              organization you represent.  Leave this blank if you
+              wish.
+            </para>
+	  </listitem>
+
+	  <listitem><para> <guilabel>Signature File&mdash;</guilabel> A text
+             file appended to any email you send, typically your name
+             and email address, or a quotation you like.  It should be
+             under three lines of text.</para></listitem>
 	  
 	  <listitem>
 	    <para>
-              TERM&mdash; DESCRIPTION
+              <guilabel>Mail source type&mdash;</guilabel>
+              <application>Evolution</application> supports two mail
+              sources: POP servers, the most common email server type,
+              and UNIX-style MBOX files.  Ask your system
+              administrator which one you use.
             </para>
 	  </listitem>
 	  
 	  <listitem>
 	    <para>
-              TERM&mdash; DESCRIPTION
+                <guilabel>Server&mdash;</guilabel> This should be the
+              name of your mail server, eg.
+              mailserver.organization.org
+            </para>
+	  </listitem>
+	
+	  <listitem>
+	    <para>
+              <guilabel> Username&mdash; </guilabel>Usually, this is
+              the part of your email address before the @ character,
+              and <application>Evolution</application> has selected
+              that value as the default.  If you have a different
+              username, you can enter it here.
+            </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>
+              <guilabel>Authentication&mdash;</guilabel> Select the
+              type of authentication you will use.  You can click
+              <guibutton>Detect supported types</guibutton> to find
+              out which authentication protocols your network allows.
+            </para>
+	  </listitem>
+
+
+	  <listitem>
+	    <para>
+             <guilabel>Mail Transport&mdash;</guilabel> This is the
+              mail sending protocol you will want to use.  Sendmail is
+              the default.
             </para>
 	  </listitem>
 	</itemizedlist>
       </para>
-    </chapter>
\ No newline at end of file
+      <para>
+        To learn how to configure <application>Evolution</application>
+        in greater detail, or to change preferences once you have set
+        them, see <xref linkend="config-prefs">.
+      </para>
+    </sect2>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f20a7856f7..3f83d88d05 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,34 @@
+2000-05-26  Aaron Weber  <aaron@helixcode.com>
+
+	* C/fig/mainwindow-pic.png: new file
+	* C/fig/mail-druid-pic.png: new file
+	* C/fig: New directory, for figure graphics.
+
+	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
+	
+	* C/usage-setup.sgml: More accurate description of druid, and
+	moved to mail section-- see usage-mail.sgml entry.  This is a new
+	location for this entity, and it may move more later.
+	
+
+	* C/usage-mainwindow.sgml: altered description of starting
+	evolution. added screenshot for main-window picture. 
+
+	* C/usage-mail.sgml: added screenshots, added coverage of setup
+	druid and put it into get-and-send section, which is probably not
+	where it should stay.  Also started filter druid coverage and
+	clarified examples, esp. in Bcc: section.
+
+	* C/usage-contact.sgml: Clarified examples.
+
+	* C/preface.sgml: rewording of "what is" and "about book" sections.
+
+	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
+	phrasing in part intros, changed order of Setup-assistant section.
+
+	* C/config-prefs.sgml: changed wording, removed ref. to re-running
+	setup assistant.
+
 2000-05-18  Aaron Weber  <aaron@helixcode.com>
 
 	* C/evo_book_0.1.sgml: removed.	
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
new file mode 100644
index 0000000000..80f9b3f14b
--- /dev/null
+++ b/help/C/apx-gloss.sgml
@@ -0,0 +1,242 @@
+
+
+<glossary id="glossary">
+
+ <title>Glossary</title>
+
+ <glossentry id="attachment">
+  <glossterm>Attachment</glossterm>
+  <glossdef>
+   <para>
+    Any file sent with an e-mail for the reciever to download.
+   </para>
+  </glossdef>
+ </glossentry>
+
+<glossentry id="automatic-indexing">
+  <glossterm>Automatic Indexing</glossterm>
+  <glossdef>
+   <para>
+     Pre-sorting procedure that allows
+     <application>Evolution</application> to refer to data quickly.
+     It enables faster searches and decreases memory usage for
+     data displays.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="bcc">
+  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
+  <glossdef>
+   <para>
+    A way of addressing a message.  Bcc is used to send a group of
+    people an e-mail, while hiding their names and addresses from each
+    other.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="cc">
+  <glossterm>Cc (Carbon Copy)</glossterm>
+  <glossdef>
+   <para>
+    Carbon-copies are used to send a 3rd party a copy of the e-mail,
+    so they an keep up to date on a conversation, without being in the
+    To: list.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="druid">
+  <glossterm>Druid</glossterm>
+  <glossdef>
+   <para>
+    A small program or script used to help configure or set up some
+    larger program.  The <application>mail setup druid</application>
+    helps you ready your email system for use.  Druids are the Linux
+    equivalent of "Assistants" and "Wizards." 
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="evolution">
+  <glossterm>Evolution</glossterm>
+  <glossdef>
+   <para>
+    <application>Evolution</application> is the <acronym> GNOME
+    </acronym> groupware application.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="execute">
+  <glossterm>Execute</glossterm>
+  <glossdef>
+   <para>
+    To run a program.  Any file that can be run is called an
+    executable.  In order to be execute program, a user must have
+    the proper permissions.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="filter">
+  <glossterm>Filter</glossterm>
+  <glossdef>
+   <para>
+    Within <application>Evolution</application>, a filter is a method
+    of sorting mail automatically.  
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="forward">
+  <glossterm>Forward</glossterm>
+  <glossdef>
+   <para>
+    By forwarding an e-mail, the user can send a third party a message
+    which was sent to the user originally.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="groupware">
+ <glossterm>Groupware</glossterm>
+  <glossdef>
+   <para>
+    Groupware is a term describing an application who has many
+    productivity features built into one program.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="haiku">
+  <glossterm>Haiku</glossterm>
+  <glossdef>
+   <para>
+     A Japanese form of poetry.  Haiku are unrhymed, and
+     three lines long. The first and last lines should have five
+     syllables, and the second line seven syllables.  The subject
+     matter is traditionally related to the seasons.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="html">
+  <glossterm>HTML</glossterm>
+  <glossdef>
+   <para>
+    Hyper-text Markup Language(<acronym>HTML</acronym>) is the layout
+    language which all webpages are written in.  HTML can be used
+    inside of e-mails to insert images, justfiy text different ways,
+    and even include webpages inside the e-mail itself.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="hot-key">
+  <glossterm>Hot Key</glossterm>
+  <glossdef>
+   <para>
+    Hot-keys are keyboard combinations used to do actions on a
+    computer instead of using the mouse to do the same action.
+    Hot-keys can speed up computer usage.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="ical">
+  <glossterm>iCal</glossterm>
+  <glossdef>
+   <para>
+    <application>iCal</application> is the program which
+    <application>Evolution</application> uses to manage the calendar
+    section.
+   </para>
+  </glossdef>
+ </glossentry> 
+
+ <glossentry id="live-doc">
+  <glossterm>Live Document</glossterm>
+  <glossdef>
+   <para>
+      A document embedded in or attached an email message that
+      contains scripting or other active contents.  For example, a
+      <application>Gnumeric</application> spreadsheet page could be
+      included in a message, and the recipient could alter some of the
+      data from within <application>Evolution</application> without
+      having to start another program.
+   </para>
+  </glossdef>
+ </glossentry> 
+
+ <glossentry id="mail-client">
+  <glossterm>Mail Client</glossterm>
+  <glossdef>
+   <para>
+    A mail client is the application which a user reads and sends
+    their e-mail with.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="nautilus">
+  <glossterm>Nautilus</glossterm>
+  <glossdef>
+   <para>
+    <application>Nautilus</application> is the next generation file
+    manager for <acronym>GNOME</acronym> being written by Eazel.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="nickname">
+  <glossterm>Nickname</glossterm>
+  <glossdef>
+   <para>
+    An alias for an e-mail address.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="script">
+  <glossterm>Script</glossterm>
+  <glossdef>
+   <para>
+    A program which is written in an interpreted language, which can
+    be executed.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="shortcut-bar">
+  <glossterm>Shortcut Bar</glossterm>
+  <glossdef>
+   <para>
+    The <interface>Shortcut Bar</interface> is where the user accesses
+    all the components of <application>Evolution</application> from.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="spam">
+  <glossterm>Spam</glossterm>
+  <glossdef>
+   <para>
+    Spam: useless e-mail.  Spam normally comes in forms of
+    chain-letters and advertisements for websites or services.
+   </para>
+  </glossdef>
+ </glossentry>
+
+ <glossentry id="vfolder">
+  <glossterm>vFolder</glossterm>
+  <glossdef>
+   <para>
+    vFolders allow an e-mail to be shared among multiple folders, so
+    it appears that theres a copy of the e-mail in each folder.
+   </para>
+  </glossdef>
+ </glossentry>
+
+</glossary>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 67ca0e7577..8ca4dbbc7d 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -2,10 +2,11 @@
     <chapter id="config-prefs">
       <title>Advanced Configuration with the Preferences Window</title>
       <para>
-        If you prefer not to use the setup assistant, select
+        To change your configuration settings, select
         <guimenuitem>Preferences</guimenuitem> from the
-        <guimenu>Settings</guimenu> menu, and work your way through
-        the page tabs it offers you.  They are:
+        <guimenu>Settings</guimenu> menu.  This will open the
+        preferences window, illustrated in <xref linkend="config-prefs-fig">.
+        Preferences are seperated into several categories:
         <itemizedlist>
           <listitem>
 	    <para>
@@ -17,37 +18,31 @@
 
 	  <listitem>
 	    <para>
-              <guilabel>Network</guilabel>, which allows you to
-              specify your network settings.  There are no default
-              values for this information.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
               <guilabel>Mail</guilabel>, which allows you to specify
-              attachment and HTML handling, forwarding behavior,
-              filters, and other <application>Evolution</application>
-              behaviors specific to email.  The default behaviors are
-              those approved by Jamie Zawinski.
+              your email server and protocols, as well as attachment
+              and HTML handling, forwarding behavior, filters, and
+              other <application>Evolution</application> behaviors
+              specific to email.  The default behaviors are those
+              approved by Jamie Zawinski.
             </para>
 	  </listitem>
  
 	  <listitem>
 	    <para>
                <guilabel>Contacts</guilabel>, which allows you to
-               specify behavior that is specific to your contact
-               manager.
+               control addressbook sharing as well as other funcctions
+               specific to your contact manager.
             </para>
 	  </listitem>
 
 	  <listitem>
 	    <para>
               <guilabel>Calendar</guilabel>, which allows you to set
-              the way that your calendar will behave and appear.  The
-              default view is by week and the default calendar is
-              Western.  Date format is determined by the system clock
-              and localization, and cannot be set here.
+              up calendar networking, as well as the way that your
+              calendar will behave and appear.  The default view is by
+              week and the default calendar is Western.  Time and
+              date are determined by the system clock and
+              localization, and cannot be set here.
             </para>
 	  </listitem>
  
@@ -60,9 +55,7 @@
 	  </listitem>
 	</itemizedlist>
       
-        The <interface>Preferences Dialog</interface> is shown in
-        <xref linkend="config-prefs-fig">.
-      </para>
+    </para>
 
       <!-- ==============Figure===================== -->
       <figure id="config-prefs-fig">
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index 03b85ea12c..f33cc81de2 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -14,3 +14,6 @@
          screenshot or two.
       </para>
     </chapter>
+
+
+
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 3e6b374fca..9df4a2a170 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -13,9 +13,11 @@
 <!ENTITY DEVEL-ACTION SYSTEM "devel-action.sgml">
 <!ENTITY DEVEL-SCRIPT SYSTEM "devel-script.sgml">
 <!ENTITY DEVEL-COMPONENT SYSTEM "devel-component.sgml">
+<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
 <!ENTITY APX-FDL SYSTEM "apx-fdl.sgml">
+
 ]>
 
 
@@ -65,7 +67,6 @@ standardize on second person, not 1st pers. plural.
       </para>
     </partintro>
 
-    &USAGE-SETUP;
     &USAGE-MAINWINDOW;
     &USAGE-MAIL;
     &USAGE-CONTACT;
@@ -101,8 +102,8 @@ standardize on second person, not 1st pers. plural.
         There are three levels of developing for
         <application>Evolution</application>.  You can write actions.
         You can write scripts.  And you can write full-fledged
-        Evolution components.  INSERT CONTENT: paragraph should describe the
-        differences.
+        Evolution components.  This paragraph will eventually
+        desfcribe what that means.
       </para>
     </partintro>
     
@@ -110,9 +111,20 @@ standardize on second person, not 1st pers. plural.
     &DEVEL-SCRIPT;
     &DEVEL-COMPONENT;
   </part>
-
+  &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
   &APX-FDL;
 
 </book>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/help/C/fig/mail-druid-pic.png b/help/C/fig/mail-druid-pic.png
new file mode 100644
index 0000000000..f29f3e77be
--- /dev/null
+++ b/help/C/fig/mail-druid-pic.png
diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png
new file mode 100644
index 0000000000..b7c6067449
--- /dev/null
+++ b/help/C/fig/mainwindow-pic.png
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 05129eb550..9ccb257e5e 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -82,7 +82,7 @@
         by email, or to send email to a contact or appointment.
         <application>Evolution</application> makes displays faster and
         more efficient, so searches are faster and memory usage is
-        much lower.  People who get lots of mail will appreciate
+        lower.  People who get lots of mail will appreciate
         advanced features like <link
         linkend="usage-mail-organize-vFolders">vFolders</link>, which
         let you save searches as though they were ordinary mail
@@ -93,16 +93,20 @@
 
     <section id="aboutbook">
       <title>About This Book</title>
-
     <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
       <para>
-        This is a DRAFT of the <application>Evolution</application>
-        User's Guide.  Please send comments on it to
-        <email>aaron@helixcode.com</email>.  Items that are known to
-        need action are indicated as such, often with notation like
-        (INSERT CONTENT HERE).  If you have content to add, please
-        contact me.  This paragraph will be removed in later versions
-        of the manual.
+        This version of the <application>Evolution</application>
+        User's Guide is a <emphasis>draft</emphasis>.  It is missing
+        huge chunks of information, and many of the features it
+        describes are unimplemented.  All the content is subject to
+        change, especially if you help.  Please send comments on the
+        guide to <email>aaron@helixcode.com</email>.  Items that are
+        known to need action are indicated as such, often with
+        notation like (INSERT CONTENT HERE).  If you would like to
+        work on the guide please contact me or see the GNOME
+        Documentation project <ulink
+        url="http://www.gnome.org/gdp">web site</ulink>.  This
+        paragraph will be removed in later versions of the manual.
       </para>
     <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
 
@@ -138,12 +142,18 @@
           It's listed below:
           <simplelist>
 	    <member><application>Applications</application></member>
-	    <member><command>Commands</command></member>
-	    <member><guilabel>Labels</guilabel>for menu items and buttons</member>
+	    <member><command>Commands</command> typed at the command line</member>
+	    <member><guilabel>Labels</guilabel> for menu items and buttons</member>
+	    <member>Other text treatments</member>
 	    <member>Other text treatments</member>
-	    <member>more info here</member>
 	  </simplelist>
         </para>
       </formalpara>
     </section>
-  </preface>
\ No newline at end of file
+  </preface>
+
+
+
+
+
+
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index f88a3d5791..6cc9cd605f 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -45,7 +45,7 @@
         </para>
 	<para>
           Describe the interface.  Include the fact that the
-          whole book consists of a set of cards, organized into
+          whole address book consists of a set of cards, organized into
           folders.
         </para>
       </sect1>
@@ -194,7 +194,7 @@
       </sect1>
 
       <sect1 id="usage-contact-sharing">
-	<title>Sharing your cards (Or Keeping them to Yourself)</title>
+	<title>Sharing your Cards (and keeping them to yourself)</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
@@ -213,7 +213,11 @@
                 contacts there, so I know whom to call.  Since we also
                 share the calendars, I know that Deanna has already
                 scheduled a meeting with them next Thursday, and I can
-                just ask her to bring up my concerns at the meeting.
+                either go to the meeting myself or ask Deanna to
+                discuss my concerns for me.  Either way, I avoid
+                having to schedule yet another meeting with Company X,
+                which is good since everybody hates their products and
+                they're doomed to fail anyway.
              </para>
 	  </example>
 
@@ -225,9 +229,9 @@
            decide which folders you want to make accessible to others.
         </para>
 	<para>
-           To begin sharing a folder of address cards, select <!--
+           To begin sharing a folder of address cards, select (something) <!--
            DESCRIBE PROCESS HERE -->.  The
-           <interface>Sharing</interface> will pop up.  It contains:
+           <interface>Sharing</interface> window will pop up.  It contains:
            <!--DESCRIBE INTERFACE HERE-->
         </para>
       </sect1>
@@ -241,6 +245,7 @@
           mailing lists, you'll find that the contact manager is more
           than a mere address book.
         </para>
+
 	<sect2 id="contact-automation-basic">
 	  <title>Send me a card: Adding New Cards Quickly</title>
 	  <para>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index c81c384cfb..88e92756fe 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,6 +1,6 @@
 
     <chapter id="usage-mail"> 
-      <title>Evolution Mail: Witty Phrase to Come Later</title>
+      <title>Evolution Mail</title>
       <abstract>
 	<title> An Overview of the Evolution Mailer</title>
 	<para>
@@ -8,7 +8,24 @@
           <application>Evolution</application> mail is here to help
           you keep track of it.  <application>Evolution</application>
           email is like other email programs in all the ways you would
-          hope: (INSERT GOOD SIMILARITIES).
+          hope:
+         <itemizedlist>
+           <listitem>
+             <para>
+               Item: Description
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               Item: Description
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               Item: Description
+             </para>
+           </listitem>
+         </itemizedlist>.
         </para>
         <para>
           However, <application>Evolution</application> has some
@@ -28,7 +45,9 @@
         
 	<para>
            You can start reading email by clicking
-           <guibutton>Inbox</guibutton> in the shortcut bar.
+           <guibutton>Inbox</guibutton> in the shortcut bar.  By
+           default, the <interface>Inbox</interface> is open when you
+           start <application>Evolution</application>.
         </para>
       </abstract>
    
@@ -42,7 +61,7 @@
             <guilabel>Inbox</guilabel>, you will see a window like the
             one in <xref linkend="usage-mail-intro-fig">, with a
             message from Helix Code in the<interface> message
-            list</interface>.  A preview of the message is displayed
+            list</interface>.  The message is displayed
             below that, in the <interface>view pane</interface>.  If
             you find the<interface> view pane</interface> too small,
             you can double-click on the message in the
@@ -69,14 +88,16 @@
 	      <title>Evolution Mail</title>
 	      <screenshot>
 		<screeninfo>Evolution Mail</screeninfo>
-		<graphic fileref="mail-intro-pic" format="png" srccredit="Aaron Weber">
+		<graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	    </screenshot>
 	  </figure>
    <!-- ==============End of Figure=================================== -->
           </para>
 	</sect2>
-	
+
+        &USAGE-SETUP;
+ 	
 	<sect2 id="usage-mail-getnsend-get">
 	  <title>Getting Mail</title>
 	  <para>
@@ -88,12 +109,12 @@
             <interface>Inbox</interface> and also in the
             <interface>Today View</interface>.
           </para>
+
 	  <para>
-             If you get an error message, you probably need to
-            change your network preferences.  To do that, you can run
-            the setup assistant again, have a look at <xref
-            linkend="config-prefs-network">, or ask your system
-            administrator.
+            If you get an error message, you probably need to change
+            your network preferences.  To learn how to do that, have a
+            look at <xref linkend="config-prefs-network">, or ask your
+            system administrator.
           </para>
 
 	  <sect3 id="usage-mail-getnsend-get-attach">
@@ -101,22 +122,24 @@
 	    <para>
               If you receive a file attached to an email,
               <application>Evolution</application> will ask where you
-              want to put it.  Once you've downloaded it, you can
-              open, move, copy, or execute those files just like any
-              others, using <application>Nautilus</application> or
-              your favorite shell or file manager.
+              want to put it.  Once you've downloaded a file, you can
+              open, move, copy, or execute it just like any other,
+              using <application>Nautilus</application> or your
+              favorite shell or file manager.
             </para>
+
 	    <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.
             </para>
+
 	    <para>
                It can also display <glossterm>live
                documents</glossterm>, which have scripted or
                executable contents&mdash; for example, a working
-               spreadsheet page or a chess game.
+               spreadsheet page or a chess game.  
             </para>
 	    <tip id="badidea-attachment">
 	      <title>Bad Idea</title>
@@ -181,8 +204,9 @@
            </para>
 
 	  <para>
-            There is more to sending mail, though.  In the
-            next few sections, we'll go over additional features,
+            There is quite a bit more to sending mail, though.  In the
+            next few sections, you'll see how
+            <application>Evolution</application> handles additional features,
             including mailing lists, attachments, and forwarding.
           </para>
 
@@ -237,15 +261,27 @@
               to send mail to several people without sharing the
               recipient list, you should use
               <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
-              Carbon Copy", and means that addresses in the
-              <guilabel>BCc:</guilabel> field will receive copies of
-              the message, but they will not receive the list of the
-              other recipients' addresses, nor will other recipients
-              know that they have recieved the message.  When I send a
-              generic message to all my friends and I want them to
-              think I've written a personalized email to every one of
-              them, I put them all in the <guilabel>BCc:</guilabel>
-              list.
+              Carbon Copy", and means that people listed in the
+              <guilabel>BCc:</guilabel> are excluded from the
+              recipient list, although they will receive the message
+              and the list of addresses from the
+              <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
+              fields.  
+
+              <example id="ex-mail-bcc">
+                 <title>Using the BCc: field</title>
+                 <para>
+                   Let's say Tim sends an email to a client, and wants
+                   his supervisor to know what he wrote.  He doesn't,
+                   however, want the client to start writing his
+                   supervisor about the project&mdash; it's Tim's job
+                   to deal with the client.  So Tim puts his
+                   supervisor's email address in the
+                   <guilabel>BCc:</guilabel> field.  That way, the
+                   client has one contact, and the boss stays in the
+                   loop.
+               </para>
+             </example>
             </para>
 	  </sect3>
 
@@ -289,21 +325,24 @@
               <guimenu>MENU</guimenu> menu.  This will allow you to
               choose one or several of the other message recipients in
               addition to the person who originally sent you the
-              message.  
+              message. If there are large numbers of people in the
+              <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
+              fields, this can save substantial amounts of time.  In
+              addition, Reply-To makes it very easy to keep off-topic
+              conversation away from mailing lists and newsgroups.
               <example>
 		<title>Using the Reply-To feature</title>
 		<para>
-                  Returning to the previous example, the client can
-                  decide whether to reply just to Susan, just to Tim,
-                  or to both of them by selecting a menu item, rather
-                  than by cutting and pasting the email addresses.  If
-                  there are large numbers of people in the Cc: fields,
-                  this can save substantial amounts of time.
+                  Returning again to the email Susan sent to Tim and
+                  their client, you'll note that the Reply-To feature
+                  allows the client to decide whether to reply just to
+                  Susan, or to both Tim and Susan by selecting
+                  a menu item, rather than by cutting and pasting the
+                  email addresses. 
                 </para>
 	      </example>
             </para>
 	  </sect3>
-
 	  
 	  <sect3 id="usage-mail-getnsend-send-fancy">
 	    <title>Embellishing that email</title>
@@ -315,7 +354,6 @@
                 spreadhseets or chess games.  This section will tell
                 you how.
             </para>
-
 	    
 	    <sect4 id="usage-mail-getnsend-send-html">
 	      <title>Colors, pictures, and fonts with HTML Mail</title> 
@@ -340,7 +378,7 @@
                   role="html">&lt;BR&gt;Bold Text&lt;/BR&gt</markup>,
                   the the composer will assume you meant exactly that,
                   and not "make this text bold," as a HTML composition
-                  tool would.  For the technically inclined, that
+                  tool would.  For the very technically inclined, that
                   means that when the text <markup
                   role="html">&lt;BR&gt</markup> is sent as HTML, it
                   will be converted to the string
@@ -349,16 +387,18 @@
 	      </note>
 	      <para>
                 Some people do not have HTML-capable mail clients, or
-                prefer not to receive HTML-enhanced mail because it
-                is slower to download and display.  Some people refer
-                to HTML mail as "the root of all evil" and get very
-                angry if you send them HTML mail, which is why the
-                default in <application>Evolution</application> is
-                plain text.  If you have an address book entry for
-                someone who does not wish to receive HTML-enhanced
-                mail, you can note that preference in their address
-                card.  The mailer will automatically strip the HTML
-                tags from any messages you send to that address.
+                prefer not to receive HTML-enhanced mail because it is
+                slower to download and display.
+                <emphasis>Some</emphasis> people refer to HTML mail as
+                "the root of all evil" and get very angry if you send
+                them HTML mail, which is why the default in
+                <application>Evolution</application> is plain text.
+                If you choose to send HTML mail, but have an address
+                book entry for someone who does not wish to receive
+                HTML-enhanced mail, you can note that preference in
+                their address card.  The mailer will automatically
+                strip the HTML tags from any messages you send to that
+                address.
               </para>
 	    </sect4>
       
@@ -369,15 +409,15 @@
                 you can do so by <!--describe process here-->.  If
                 your recipients can read HTML mail, you can put an
                 image inside the mail by dragging the file into the
-                composer window, or by selecting (INSERT DESCRIPTION
-                HERE) (IS THIS CORRECT?).  Still, unless you know what
-                email client the recipient is using, it's best to send
-                a message or attachment in the simplest manner
-                possible.
+                composer window, or by selecting <guimenuitem>Menu
+                Item</guimenuitem> from the <guimenu>Menu</guimenu>
+                menu.  Still, unless you know what email client the
+                recipient is using, it's best to send a message or
+                attachment in the simplest manner possible.
               </para>
 	    </sect4>
 	    <sect4 id="usage-mail-getnsend-send-live">
-	      <title></title>
+	      <title>Live Documents</title>
 	      <para>
                 Later versions of <application>Evolution</application>
                 will allow you to enliven your email with almost any
@@ -529,7 +569,53 @@
             of what those terms mean)
           </para>
           <para>
-            (INSERT the way one creates a search and so forth)
+            To create a search, enter the word or phrase you're
+            looking for in the form field below the toolbar, and
+            choose a search type:
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <guilabel>Body or subject contains:</guilabel> This
+                  will search message subjects and the messages
+                  themselves for the word or phrase you've entered in
+                  the search field.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Body contains:</guilabel> This will search
+                   only in message text, not the subject lines.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Subject contains:</guilabel> This will
+                  show you messages where the search text is in the
+                  subject line.  It will not search in the message body.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Body does not contain:</guilabel> This
+                  finds every email message that does not have the
+                  search text in the message body.  It will still show
+                  messages that have the search text in the subject
+                  line, if it is not also in the body.
+               </para>
+             </listitem>
+
+              <listitem>
+                <para>
+                  <guilabel>Subject does not contain:</guilabel>This
+                  finds every mail whose subject does not
+                  contain the search text.
+               </para>
+             </listitem>
+            </itemizedlist>
+
           </para>
 	</sect2>
     
@@ -611,26 +697,59 @@
 	<sect2 id="usage-mail-organize-filters">
 	  <title>Staying organized: Mail Filters in Evolution</title>
 	  <para>
-            Filters sort your email for you as it arrives in your
-            Inbox, so you don't have to sort them all yourself.
-            People who subscribe to multiple mailing lists find
-            filters especially helpful to sort personal from
-            list-related mail.  To create a filter, go to your
-            <interface>Inbox</interface>.  Then select BLAH BLAH BLAH.
-            This will open the <interface>filters</interface> window.
+            Filters sort your email for you.  People who subscribe to
+            multiple mailing lists, or who often need to refer to
+            messages they have sent, find filters especially helpful
+            to seperate personal from list-related mail, but they're
+            good for anybody who gets more than a few messages a day.
+            To create a filter, go to your
+            <interface>Inbox</interface>.  Then select
+            <guimenuitem>Filter Druid</guimenuitem> from the
+            <guimenu>Tools</guimenu> menu. This will start the a
+            <glossterm> druid</glossterm>, which will allow you to
+            create filters.
           </para>
 
-          <para> 
-            The <interface>filters</interface> window contains the
-            following items: <!--DESCRIBE INTERFACE--> 
+          <para> The <interface>filter druid</interface> window
+            contains a window listing rules, and an option to create a
+            new rule.  To start filtering your mail, click
+            <guibutton>Add</guibutton> to add a filtering rule.
+            You'll decide when it should take place: 
+              <itemizedlist>
+		<listitem>
+                   <para>
+                     <guilabel>When mail arrives:</guilabel> new mail
+		     arrives in the Inbox, and you can filter it from
+		     here.
+                   </para>
+                 </listitem>
+                 <listitem>
+                   <para>
+                     <guilabel> When mail is sent:</guilabel> When you
+                     send mail, you can perform additional actions on
+                     it&mdash; perhaps you keep your Outbox sorted into
+                     subfolders.
+                 </para>
+              </listitem>
+            </itemizedlist>
           </para>
-	  
+
+	  <para>
+           Then, the filter druid will ask you which emails it should
+           act upon.  You can set criteria to include words or phrases
+           in the subject, To:, Cc: or body of the message.  Once
+           you've decided which messages to filter, the druid will ask
+           you the sort of action you wish to take.  More details and
+           screenshots should follow here.
+          </para>
+
+
 	  <note>
 	    <title>Two Notable Filter Features</title>
 	    <para>
               <itemizedlist>
-		<listitem><para>Any email that does not meet filter
-                action criteria remains in the Inbox. </para>
+		<listitem><para>Any incoming email that does not meet
+                filter action criteria remains in the Inbox. </para>
                 </listitem>
 		
 		<listitem><para>If you move a folder, your filters
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 8470189977..3dc91e5a97 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -3,18 +3,23 @@
 
     <title>The Main Window: Evolution Basics</title>
       <para>
-	After <application>Evolution</application> starts up, you will
-	see the <interface>main window</interface>, which looks a lot
-	like in <xref linkend="usage-mainwindow-fig">. On the left of
-	the <interface>main window</interface> are the
-	<interface>shortcut bar</interface> and the
-	<interface>tree-view</interface>.  Just underneath the title
-	bar is a series of menus in the <interface>menu
-	bar</interface>, and below that, the <interface>tool
-	bar</interface> with buttons for different functions. The
-	largest part of the <interface>main window</interface> is
-	taken up by a welcome message.  <!-- para does not end here
-	but after fig! -->
+	
+        Start <application>Evolution</application> by selecting
+	<guimenuitem>Evolution</guimenuitem> from the
+	<guisubmenu>Applications</guisubmenu> of the <guimenu>Main
+	Panel Menu</guimenu>, or by typing
+	<command>evolution</command> at the command-line.After
+	<application>Evolution</application> starts up, you will see
+	the <interface>main window</interface>, which looks a lot like
+	in <xref linkend="usage-mainwindow-fig">. On the left of the
+	<interface>main window</interface> are the <interface>shortcut
+	bar</interface> and the <interface>tree-view</interface>.
+	Just underneath the title bar is a series of menus in the
+	<interface>menu bar</interface>, and below that, the
+	<interface>tool bar</interface> with buttons for different
+	functions. The largest part of the <interface>main
+	window</interface> is taken up by a welcome message.  <!--
+	para does not end here but after fig! -->
 
 <!-- ==============Figure=================================== -->
 
@@ -25,10 +30,10 @@ forth.  Can these things be labelled with little arrows & stuff?
  -->
 
 	<figure id="usage-mainwindow-fig">
-	<title>Evolution Main Window</title>
+	<title>Evolution Main Window and Inbox</title>
 	<screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="mainwindow-pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
 	</figure>
@@ -189,14 +194,14 @@ forth.  Can these things be labelled with little arrows & stuff?
         </para>
 
 	<para>
-          (CHANGE that title! THIS SECTION BELONGS SOMEWHERE ELSE!)
           You can drag the folders inside the tree view to change
           their order or put one folder inside another.  To delete a
           folder, you can drag it into the trash folder.  The same
           goes for individual messages, appointments, and address
           cards, whether they're in the <interface>tree
           view</interface> or not: drag them where you want them, and
-          they will go there. (IS THIS TRUE?)
+          they will go there.
+<!--  ****This paragraph could use some work****  -->
         </para>
 	<para>
           You can also use the <guimenu>right-click menu</guimenu> to
@@ -211,4 +216,4 @@ forth.  Can these things be labelled with little arrows & stuff?
           already.
         </para>
       </sect1>
-    </chapter>
\ No newline at end of file
+    </chapter>
diff --git a/help/C/usage-setup.sgml b/help/C/usage-setup.sgml
index 1290b000bb..3e793fdbcd 100644
--- a/help/C/usage-setup.sgml
+++ b/help/C/usage-setup.sgml
@@ -1,46 +1,126 @@
-   <chapter id="usage-setup">
-      <title>A Quick Start</title>
+   <sect2 id="usage-setup">
+      <title>Mail Setup</title>
       <para>
-        Start <application>Evolution</application> by selecting
-	<guimenuitem>Evolution</guimenuitem> from the
-	<guisubmenu>Applications</guisubmenu> of the <guimenu>Main
-	Panel Menu</guimenu>, or by typing
-	<command>evolution</command> at the command-line.  If this is
-	the first time you have run
-	<application>Evolution</application>, you'll be asked if you
-	want help setting up your email preferences.  If you don't
-	plan to use email, or if you'd rather configure your email
-	preferences later, select <guibutton>No</guibutton>, and it
-	will go away.  You can configure your email preferences later
-	by selecting SOMETHING from SOME MENU.
+        The first time you try to send or receive mail with
+	<application>Evolution</application>, the <interface>mail
+	setup druid</interface> will pop up to help you
+	set up your email preferences.  If you don't plan to use
+	email, or if you'd rather configure your email preferences
+	later, click <guibutton>Cancel</guibutton>.
       </para>
       <para>
-         If you answer yes, it will guide you through the network
-	 configuration process.  It will ask you for the following
-	 information: (FLESH OUT THIS LIST!)
+         The setup <glossterm>druid</glossterm>
+	 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 druid is pictured in <xref
+	 linkend="usage-setup-fig">.
+
+<!-- ==============Figure=================================== -->
+
+	<figure id="usage-setup-fig">
+	<title>Mail Setup Druid</title>
+	<screenshot>
+	  <screeninfo>Evolution Main Window</screeninfo>
+	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	</screenshot>
+	</figure>
+<!-- ==============End of Figure=================================== -->
+
+
+
+  The druid will ask you for the following information:
         <itemizedlist>
-	  <listitem> <para>
-            Name&mdash; Your full name: eg. William Blake
-          </para></listitem>
-
-	  <listitem><para>
-                UserName&mdash; Your user or account name: eg. wblake
-          </para></listitem>
-	  <listitem><para>  
-             Type of Server&mdash; POP vs. SMTP vs....
-          </para></listitem>
+	  <listitem> <para> <guilabel>Name&mdash; </guilabel> Your
+            full name: eg. Eva Lucianne Tester </para></listitem>
+
+	  <listitem><para> <guilabel>Email address&mdash</guilabel>;
+                 Your email address: eg. eltester@helixcode.com
+                 </para></listitem>
+
+	  <listitem>
+	    <para>
+               <guilabel> Organization&mdash;</guilabel> Any
+              organization you represent.  Leave this blank if you
+              wish.
+            </para>
+	  </listitem>
+
+	  <listitem><para> <guilabel>Signature File&mdash;</guilabel> A text
+             file appended to any email you send, typically your name
+             and email address, or a quotation you like.  It should be
+             under three lines of text.</para></listitem>
 	  
 	  <listitem>
 	    <para>
-              TERM&mdash; DESCRIPTION
+              <guilabel>Mail source type&mdash;</guilabel>
+              <application>Evolution</application> supports two mail
+              sources: POP servers, the most common email server type,
+              and UNIX-style MBOX files.  Ask your system
+              administrator which one you use.
             </para>
 	  </listitem>
 	  
 	  <listitem>
 	    <para>
-              TERM&mdash; DESCRIPTION
+                <guilabel>Server&mdash;</guilabel> This should be the
+              name of your mail server, eg.
+              mailserver.organization.org
+            </para>
+	  </listitem>
+	
+	  <listitem>
+	    <para>
+              <guilabel> Username&mdash; </guilabel>Usually, this is
+              the part of your email address before the @ character,
+              and <application>Evolution</application> has selected
+              that value as the default.  If you have a different
+              username, you can enter it here.
+            </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>
+              <guilabel>Authentication&mdash;</guilabel> Select the
+              type of authentication you will use.  You can click
+              <guibutton>Detect supported types</guibutton> to find
+              out which authentication protocols your network allows.
+            </para>
+	  </listitem>
+
+
+	  <listitem>
+	    <para>
+             <guilabel>Mail Transport&mdash;</guilabel> This is the
+              mail sending protocol you will want to use.  Sendmail is
+              the default.
             </para>
 	  </listitem>
 	</itemizedlist>
       </para>
-    </chapter>
\ No newline at end of file
+      <para>
+        To learn how to configure <application>Evolution</application>
+        in greater detail, or to change preferences once you have set
+        them, see <xref linkend="config-prefs">.
+      </para>
+    </sect2>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/help/ChangeLog b/help/ChangeLog
index f20a7856f7..3f83d88d05 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,34 @@
+2000-05-26  Aaron Weber  <aaron@helixcode.com>
+
+	* C/fig/mainwindow-pic.png: new file
+	* C/fig/mail-druid-pic.png: new file
+	* C/fig: New directory, for figure graphics.
+
+	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
+	
+	* C/usage-setup.sgml: More accurate description of druid, and
+	moved to mail section-- see usage-mail.sgml entry.  This is a new
+	location for this entity, and it may move more later.
+	
+
+	* C/usage-mainwindow.sgml: altered description of starting
+	evolution. added screenshot for main-window picture. 
+
+	* C/usage-mail.sgml: added screenshots, added coverage of setup
+	druid and put it into get-and-send section, which is probably not
+	where it should stay.  Also started filter druid coverage and
+	clarified examples, esp. in Bcc: section.
+
+	* C/usage-contact.sgml: Clarified examples.
+
+	* C/preface.sgml: rewording of "what is" and "about book" sections.
+
+	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
+	phrasing in part intros, changed order of Setup-assistant section.
+
+	* C/config-prefs.sgml: changed wording, removed ref. to re-running
+	setup assistant.
+
 2000-05-18  Aaron Weber  <aaron@helixcode.com>
 
 	* C/evo_book_0.1.sgml: removed.