added Kevin Breit to author and copyright.

	* C/evolution-guide.sgml: added Kevin Breit to author and
	copyright.

	* C/apx-authors.sgml: Put app authors in a simplelist.

	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
        users to config-setupassist chapter. This and the following changes
	take setup druid coverage out of usage
	section and put it in config section.
	* C/config-setupassist.sgml: Added mail druid coverage from
	usage-setup.sgml.
	* C/usage-setup.sgml: Removed file. contents in
	config-setupassist.sgml.
	* C/evolution-guide.sgml: Removed
	USAGE-SETUP entity (and file usage-setup.sgml.)

svn path=/trunk/; revision=3236

14 files changed, 540 insertions, 412 deletions

diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
index f68b395c9f..7039f6c9c9 100644
--- a/doc/C/apx-authors.sgml
+++ b/doc/C/apx-authors.sgml
@@ -3,30 +3,30 @@
     <title>Authors</title>
      <para>
       <application>Evolution</application> was written by:
-
-      Seth Alves: <email>alves@helixcode.com</email>
-      Anders Carlsson<email>andersca@helixcode.com</email>
-      Damon Chaplin:<email>damon@helixcode.com</email>
-      Clifford R. Conover <email>rusty@zootweb.com</email>
-      Miguel De Icaza: <email>miguel@helixcode.com</email>
-      Arturo Espinoza <email>arturo@nucleu.unam.mx</email>
-      Larry Ewing: <email>lewing@helixcode.com</email>
-      Bertrand Guiheneuf: <email>bertrand@helixcode.com</email>
-      Tuomas Kuosmanen: <email>tigert@gimp.org</email>
-      Christopher J. Lahey: <email>clahey@helixcode.com</email>
-      Matthew Loper:  <email>matt@helixcode.com</email>
-      Dave Mason <email>dcm@redhat.com</email>
-      Federico Mena: <email>federico@helixcode.com</email>
-      Eskil Heyn Olsen<email>deity@eski.dk</email>
-      Nat Friedman: <email>nat@helixcode.com</email>
-      Ettore Perazzoli:<email>ettore@helixcode.com</email>
-      Russell Steinthal: <email>rms39@columbia.edu</email>
-      Peter Teichman: <email>peter@helixcode.com</email>      
-      Chris Toshok: <email>toshok@helixcode.com</email>
-      Radek Doulik: <email>rodo@helixcode.com</email>
-      Dan Winship: <email>winship@helixcode.com</email>
-      Michael Zucchi: <email>notzed@helixcode.com</email>
-
+<simplelist>
+      <member>Seth Alves: <email>alves@helixcode.com</email></member>
+     <member>Anders Carlsson<email>andersca@gnu.org</email></member>
+      <member>Damon Chaplin:<email>damon@helixcode.com</email></member>
+      <member>Clifford R. Conover <email>rusty@zootweb.com</email></member>
+     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
+     <member>Arturo Espinoza <email>arturo@nucleu.unam.mx</email></member>
+     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>
+    <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
+    <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
+    <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
+    <member>Matthew Loper:  <email>matt@helixcode.com</email></member>
+    <member>Dave Mason <email>dcm@redhat.com</email></member>
+    <member> Federico Mena: <email>federico@helixcode.com</email></member>
+    <member>Eskil Heyn Olsen<email>deity@eski.dk</email></member>
+    <member> Nat Friedman: <email>nat@helixcode.com</email></member>
+    <member>Ettore Perazzoli:<email>ettore@helixcode.com</email></member>
+    <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>
+    <member> Peter Teichman: <email>peter@helixcode.com</email></member>     
+    <member> Chris Toshok: <email>toshok@helixcode.com</email></member>
+    <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
+    <member> Dan Winship: <email>winship@helixcode.com</email></member>
+    <member> Michael Zucchi: <email>notzed@helixcode.com</email></member>
+</simplelist>
 and other dedicated GNOME programmers. 
 </para>
     <para>
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index f33cc81de2..ea78865037 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -4,15 +4,122 @@
       <para>
         The setup assistant can gather most of the information
         necessary for <application>Evolution</application>'s daily
-        operation. If you chose not to use it the first time you ran
-        <application>Evolution</application>, you can run it again by
-        doing SOMETHING HERE.
+        operation. If you prefer more detailed or advanced
+        configuration, see <xref linkend="config-prefs">
       </para>
       <para>
          This paragraph will describe all information required by the
          setup assistant. It will include a long itemized list, and a
          screenshot or two.
       </para>
+   <sect1 id="config-setupassist-mail">
+      <title>Mail Setup</title>
+      <para>
+        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>
+         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> <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>
+              <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>
+                <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>
+      <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>
+    </sect1>
+
     </chapter>
 
 
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 9df4a2a170..1e76a74a7d 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -1,7 +1,6 @@
 <!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-SETUP SYSTEM "usage-setup.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
@@ -25,8 +24,15 @@
 <book id="index">
   <bookinfo>
     <title>A User's Guide to Evolution</title>
-    <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-    <copyright><year>2000</year><holder>Helix Code, Inc.</holder></copyright>
+    <authorgroup>
+     <author><firstname>Aaron</firstname><surname>Weber</surname></author>
+      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
+
+   </authorgroup>
+    <copyright>
+      <year>2000</year><holder>Helix Code, Inc.</holder>
+      <holder>Kevin Breit</holder>
+    </copyright>
     
     <legalnotice>
       <para>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 88e92756fe..2dd289e4c3 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -47,7 +47,9 @@
            You can start reading email by clicking
            <guibutton>Inbox</guibutton> in the shortcut bar.  By
            default, the <interface>Inbox</interface> is open when you
-           start <application>Evolution</application>.
+           start <application>Evolution</application>, and the first
+           time you see your inbox, there's a message in it from Helix
+           Code welcoming you to the application.
         </para>
       </abstract>
    
@@ -92,29 +94,34 @@
 	    </graphic>
 	    </screenshot>
 	  </figure>
-   <!-- ==============End of Figure=================================== -->
+   <!-- ==============End of Figure===================================
+   -->
           </para>
 	</sect2>
 
-        &USAGE-SETUP;
+
  	
 	<sect2 id="usage-mail-getnsend-get">
 	  <title>Getting Mail</title>
 	  <para>
             To check your email, just click <guibutton>Send and
-            Receive</guibutton> in the toolbar.
-            <application>Evolution</application> will download your
-            mail for you and send any mail you've marked ready to
-            send. New mail will appear in your
+            Receive</guibutton> in the toolbar.  If this is the first
+            time you've done so, the <interface>mail druid</interface>
+            will ask you for the information it needs to check your
+            mail (see <xref linkend="config-setupassist"> for more
+            information).  Then, <application>Evolution</application>
+            will download your mail for you and send any mail you've
+            marked ready to send. New mail will appear in your
             <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 learn how to do that, have a
-            look at <xref linkend="config-prefs-network">, or ask your
-            system administrator.
+            If you get an error message instead of mail, 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">
@@ -125,7 +132,8 @@
               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.
+              favorite shell or file manager. (This text will change
+              to fit app behavior, once features are implemented.)
             </para>
 
 	    <para>
@@ -541,20 +549,24 @@
 	<sect2 id="usage-mail-organize-folders">
 	  <title>Getting Organized with Folders</title>
 	  <para>
-            You can create new folders by selecting
-            <guimenuitem>ITEM</guimenuitem> from the
-            <guimenu>MENU</guimenu>, or by pressing
+            Mail, as well as address cards and calendars, is kept in
+            folders.  If you like, you can create new folders by
+            selecting <guisubmenu>New</guisubmenu> and then
+            <guimenuitem>Folder</guimenuitem> from the
+            <guimenu>File</guimenu> menu, or by pressing
             <keysym>COMBO</keysym>.  (Will there be a dialog box to
             determine name and location? Must wait for feature to
-            describe) The new folders will appear in the
+            describe.) The new folders will appear in the
             <interface>tree view</interface>, and you can drag them
             wherever you want to relocate them.  You can move messages
-            into them by dragging, or by selecting them and choosing
-            <guimenuitem>ITEM</guimenuitem> from the
-            <guimenu>MENU</guimenu>.  An email message can be in only
-            one folder at a time, just like real mail in real folders.
-            This is also the case for folders of address cards and calendar
-            information.
+            into the folders by dragging and dropping, or by selecting
+            them and choosing <guimenuitem>ITEM</guimenuitem> from the
+            <guimenu>MENU</guimenu>.  If you create filters with the
+            <interface>filter druid</interface>, you can have mail
+            moved to a folder automatically.  An email message can be in
+            only one folder at a time, just like real mail in real
+            folders.  This is also the case for folders of address
+            cards and calendar information.
           </para>
 	</sect2>    
 
@@ -718,17 +730,18 @@
               <itemizedlist>
 		<listitem>
                    <para>
-                     <guilabel>When mail arrives:</guilabel> new mail
-		     arrives in the Inbox, and you can filter it from
-		     here.
+                     <guilabel>When mail arrives:</guilabel> Select
+		     this option to have messages filtered as they
+		     arrive.
                    </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.
+                     <guilabel>When mail is sent:</guilabel> Select
+                     this option to filter your outgoing mail.  You
+                     can use this feature to keep your
+                     <interface>Outbox</interface> as organized as
+                     your <interface>Inbox</interface>.
                  </para>
               </listitem>
             </itemizedlist>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 3dc91e5a97..a917f3a71f 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -144,14 +144,47 @@ forth.  Can these things be labelled with little arrows & stuff?
           data like a <glossterm>file tree</glossterm>&mdash; it
           starts small at the top, and branches downwards. There are a
           few folders you will always see, because they're at the top.
-          On my computer, they are: (ch. to itemizedlist w/descriptions?)
-          <simplelist>
-	    <member>Local Mail</member>
-	    <member>Remote Mail</member>
-	    <member>Address Book</member>
-	    <member>Calendar</member>
-	    <member>Trash</member>
-	  </simplelist>.
+          On my computer, I have only one: <guilabel>Local</guilabel>.
+          When I click on the plus sign next to the label, I see the
+          contents:
+          <itemizedlist>
+             <listitem>
+                <para>
+                  <guilabel>Calendar</guilabel>, where you'll find the
+                  appointments and event listings.
+               </para>
+             </listitem> 
+             <listitem>
+                <para>
+                <guilabel>Contacts</guilabel>, where your address
+                cards are stored.
+               </para>
+             </listitem>
+             <listitem>
+                <para>
+              <guilabel>Directories</guilabel>, for directories, which
+              have not been implemented yet.
+               </para>
+             </listitem>
+             <listitem>
+                <para>
+                 <guilabel>Inbox</guilabel>, for your incoming mail.
+                 This is where you will make the most subfolders.
+               </para>
+             </listitem>
+            <listitem>
+                <para>
+                <guilabel>Outbox</guilabel>, where you can store
+                copies of mail you have sent, or unsent drafts.
+               </para>
+             </listitem>
+             <listitem>
+                <para>
+                <guilabel>Trash</guilabel>, where you can throw things away.
+               </para>
+             </listitem>
+          </itemizedlist>
+
         </para>
 
 	<para>
@@ -179,10 +212,11 @@ forth.  Can these things be labelled with little arrows & stuff?
 	
 	<para>
           If a folder has other folders in it, there will be a plus
-          sign next to it. Click on the plus sign, and you will see
-          the other folders inside.  This may change in the future to
-          something more attractive, like triangles that drop down as
-          you click on them to display the rest of the tree.
+          sign next to it. Click on the plus sign, and the folder will
+          open to let you see the other folders inside.  This may
+          change in the future to something more attractive, like
+          triangles that drop down as you click on them to display the
+          rest of the tree.
         </para>
 
 	<para>
@@ -194,14 +228,19 @@ forth.  Can these things be labelled with little arrows & stuff?
         </para>
 
 	<para>
-          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
+          Moving and deleting folders and other items works in one of
+          two ways: using <glossterm>drag-and-drop</glossterm> or by
+          right-clicking and selecting an item from the
+          <interface>right-click menu</interface>.  You can drag the
+          folders inside the tree view to change their order or put
+          one folder inside another.  To delete a folder, drag it into
+          the trash folder or right-click it and select
+          <guimenuitem>Delete</guimenuitem> from the menu that pops
+          up.  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.
-<!--  ****This paragraph could use some work****  -->
+          they will go there.  <!-- ****This paragraph could use some
+          work**** -->
         </para>
 	<para>
           You can also use the <guimenu>right-click menu</guimenu> to
@@ -212,8 +251,14 @@ forth.  Can these things be labelled with little arrows & stuff?
 	<para>
           Once you've familiarized yourself with the <interface>main
           window</interface> you can start doing things with it.
-          We'll start with email: you've got a letter waiting for you
-          already.
+          We'll start with your email inbox: you've got a letter
+          waiting for you already.
         </para>
       </sect1>
     </chapter>
+
+
+
+
+
+
diff --git a/doc/C/usage-setup.sgml b/doc/C/usage-setup.sgml
deleted file mode 100644
index 3e793fdbcd..0000000000
--- a/doc/C/usage-setup.sgml
+++ /dev/null
@@ -1,126 +0,0 @@
-   <sect2 id="usage-setup">
-      <title>Mail Setup</title>
-      <para>
-        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>
-         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> <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>
-              <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>
-                <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>
-      <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 3f83d88d05..d56b709778 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,22 @@
+2000-05-27  Aaron Weber  <aaron@helixcode.com>
+
+	* C/evolution-guide.sgml: added Kevin Breit to author and
+	copyright.
+
+	* C/apx-authors.sgml: Put app authors in a simplelist.
+
+	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
+        users to config-setupassist chapter. This and the following changes 
+	take setup druid coverage out of usage 
+	section and put it in config section. 
+	* C/config-setupassist.sgml: Added mail druid coverage from
+	usage-setup.sgml.
+	* C/usage-setup.sgml: Removed file. contents in
+	config-setupassist.sgml.  
+	* C/evolution-guide.sgml: Removed
+	USAGE-SETUP entity (and file usage-setup.sgml.)
+
+	
 2000-05-26  Aaron Weber  <aaron@helixcode.com>
 
 	* C/fig/mainwindow-pic.png: new file
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index f68b395c9f..7039f6c9c9 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -3,30 +3,30 @@
     <title>Authors</title>
      <para>
       <application>Evolution</application> was written by:
-
-      Seth Alves: <email>alves@helixcode.com</email>
-      Anders Carlsson<email>andersca@helixcode.com</email>
-      Damon Chaplin:<email>damon@helixcode.com</email>
-      Clifford R. Conover <email>rusty@zootweb.com</email>
-      Miguel De Icaza: <email>miguel@helixcode.com</email>
-      Arturo Espinoza <email>arturo@nucleu.unam.mx</email>
-      Larry Ewing: <email>lewing@helixcode.com</email>
-      Bertrand Guiheneuf: <email>bertrand@helixcode.com</email>
-      Tuomas Kuosmanen: <email>tigert@gimp.org</email>
-      Christopher J. Lahey: <email>clahey@helixcode.com</email>
-      Matthew Loper:  <email>matt@helixcode.com</email>
-      Dave Mason <email>dcm@redhat.com</email>
-      Federico Mena: <email>federico@helixcode.com</email>
-      Eskil Heyn Olsen<email>deity@eski.dk</email>
-      Nat Friedman: <email>nat@helixcode.com</email>
-      Ettore Perazzoli:<email>ettore@helixcode.com</email>
-      Russell Steinthal: <email>rms39@columbia.edu</email>
-      Peter Teichman: <email>peter@helixcode.com</email>      
-      Chris Toshok: <email>toshok@helixcode.com</email>
-      Radek Doulik: <email>rodo@helixcode.com</email>
-      Dan Winship: <email>winship@helixcode.com</email>
-      Michael Zucchi: <email>notzed@helixcode.com</email>
-
+<simplelist>
+      <member>Seth Alves: <email>alves@helixcode.com</email></member>
+     <member>Anders Carlsson<email>andersca@gnu.org</email></member>
+      <member>Damon Chaplin:<email>damon@helixcode.com</email></member>
+      <member>Clifford R. Conover <email>rusty@zootweb.com</email></member>
+     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
+     <member>Arturo Espinoza <email>arturo@nucleu.unam.mx</email></member>
+     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>
+    <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
+    <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
+    <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
+    <member>Matthew Loper:  <email>matt@helixcode.com</email></member>
+    <member>Dave Mason <email>dcm@redhat.com</email></member>
+    <member> Federico Mena: <email>federico@helixcode.com</email></member>
+    <member>Eskil Heyn Olsen<email>deity@eski.dk</email></member>
+    <member> Nat Friedman: <email>nat@helixcode.com</email></member>
+    <member>Ettore Perazzoli:<email>ettore@helixcode.com</email></member>
+    <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>
+    <member> Peter Teichman: <email>peter@helixcode.com</email></member>     
+    <member> Chris Toshok: <email>toshok@helixcode.com</email></member>
+    <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
+    <member> Dan Winship: <email>winship@helixcode.com</email></member>
+    <member> Michael Zucchi: <email>notzed@helixcode.com</email></member>
+</simplelist>
 and other dedicated GNOME programmers. 
 </para>
     <para>
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index f33cc81de2..ea78865037 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -4,15 +4,122 @@
       <para>
         The setup assistant can gather most of the information
         necessary for <application>Evolution</application>'s daily
-        operation. If you chose not to use it the first time you ran
-        <application>Evolution</application>, you can run it again by
-        doing SOMETHING HERE.
+        operation. If you prefer more detailed or advanced
+        configuration, see <xref linkend="config-prefs">
       </para>
       <para>
          This paragraph will describe all information required by the
          setup assistant. It will include a long itemized list, and a
          screenshot or two.
       </para>
+   <sect1 id="config-setupassist-mail">
+      <title>Mail Setup</title>
+      <para>
+        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>
+         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> <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>
+              <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>
+                <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>
+      <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>
+    </sect1>
+
     </chapter>
 
 
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 9df4a2a170..1e76a74a7d 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -1,7 +1,6 @@
 <!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-SETUP SYSTEM "usage-setup.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
@@ -25,8 +24,15 @@
 <book id="index">
   <bookinfo>
     <title>A User's Guide to Evolution</title>
-    <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-    <copyright><year>2000</year><holder>Helix Code, Inc.</holder></copyright>
+    <authorgroup>
+     <author><firstname>Aaron</firstname><surname>Weber</surname></author>
+      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
+
+   </authorgroup>
+    <copyright>
+      <year>2000</year><holder>Helix Code, Inc.</holder>
+      <holder>Kevin Breit</holder>
+    </copyright>
     
     <legalnotice>
       <para>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 88e92756fe..2dd289e4c3 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -47,7 +47,9 @@
            You can start reading email by clicking
            <guibutton>Inbox</guibutton> in the shortcut bar.  By
            default, the <interface>Inbox</interface> is open when you
-           start <application>Evolution</application>.
+           start <application>Evolution</application>, and the first
+           time you see your inbox, there's a message in it from Helix
+           Code welcoming you to the application.
         </para>
       </abstract>
    
@@ -92,29 +94,34 @@
 	    </graphic>
 	    </screenshot>
 	  </figure>
-   <!-- ==============End of Figure=================================== -->
+   <!-- ==============End of Figure===================================
+   -->
           </para>
 	</sect2>
 
-        &USAGE-SETUP;
+
  	
 	<sect2 id="usage-mail-getnsend-get">
 	  <title>Getting Mail</title>
 	  <para>
             To check your email, just click <guibutton>Send and
-            Receive</guibutton> in the toolbar.
-            <application>Evolution</application> will download your
-            mail for you and send any mail you've marked ready to
-            send. New mail will appear in your
+            Receive</guibutton> in the toolbar.  If this is the first
+            time you've done so, the <interface>mail druid</interface>
+            will ask you for the information it needs to check your
+            mail (see <xref linkend="config-setupassist"> for more
+            information).  Then, <application>Evolution</application>
+            will download your mail for you and send any mail you've
+            marked ready to send. New mail will appear in your
             <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 learn how to do that, have a
-            look at <xref linkend="config-prefs-network">, or ask your
-            system administrator.
+            If you get an error message instead of mail, 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">
@@ -125,7 +132,8 @@
               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.
+              favorite shell or file manager. (This text will change
+              to fit app behavior, once features are implemented.)
             </para>
 
 	    <para>
@@ -541,20 +549,24 @@
 	<sect2 id="usage-mail-organize-folders">
 	  <title>Getting Organized with Folders</title>
 	  <para>
-            You can create new folders by selecting
-            <guimenuitem>ITEM</guimenuitem> from the
-            <guimenu>MENU</guimenu>, or by pressing
+            Mail, as well as address cards and calendars, is kept in
+            folders.  If you like, you can create new folders by
+            selecting <guisubmenu>New</guisubmenu> and then
+            <guimenuitem>Folder</guimenuitem> from the
+            <guimenu>File</guimenu> menu, or by pressing
             <keysym>COMBO</keysym>.  (Will there be a dialog box to
             determine name and location? Must wait for feature to
-            describe) The new folders will appear in the
+            describe.) The new folders will appear in the
             <interface>tree view</interface>, and you can drag them
             wherever you want to relocate them.  You can move messages
-            into them by dragging, or by selecting them and choosing
-            <guimenuitem>ITEM</guimenuitem> from the
-            <guimenu>MENU</guimenu>.  An email message can be in only
-            one folder at a time, just like real mail in real folders.
-            This is also the case for folders of address cards and calendar
-            information.
+            into the folders by dragging and dropping, or by selecting
+            them and choosing <guimenuitem>ITEM</guimenuitem> from the
+            <guimenu>MENU</guimenu>.  If you create filters with the
+            <interface>filter druid</interface>, you can have mail
+            moved to a folder automatically.  An email message can be in
+            only one folder at a time, just like real mail in real
+            folders.  This is also the case for folders of address
+            cards and calendar information.
           </para>
 	</sect2>    
 
@@ -718,17 +730,18 @@
               <itemizedlist>
 		<listitem>
                    <para>
-                     <guilabel>When mail arrives:</guilabel> new mail
-		     arrives in the Inbox, and you can filter it from
-		     here.
+                     <guilabel>When mail arrives:</guilabel> Select
+		     this option to have messages filtered as they
+		     arrive.
                    </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.
+                     <guilabel>When mail is sent:</guilabel> Select
+                     this option to filter your outgoing mail.  You
+                     can use this feature to keep your
+                     <interface>Outbox</interface> as organized as
+                     your <interface>Inbox</interface>.
                  </para>
               </listitem>
             </itemizedlist>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 3dc91e5a97..a917f3a71f 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -144,14 +144,47 @@ forth.  Can these things be labelled with little arrows & stuff?
           data like a <glossterm>file tree</glossterm>&mdash; it
           starts small at the top, and branches downwards. There are a
           few folders you will always see, because they're at the top.
-          On my computer, they are: (ch. to itemizedlist w/descriptions?)
-          <simplelist>
-	    <member>Local Mail</member>
-	    <member>Remote Mail</member>
-	    <member>Address Book</member>
-	    <member>Calendar</member>
-	    <member>Trash</member>
-	  </simplelist>.
+          On my computer, I have only one: <guilabel>Local</guilabel>.
+          When I click on the plus sign next to the label, I see the
+          contents:
+          <itemizedlist>
+             <listitem>
+                <para>
+                  <guilabel>Calendar</guilabel>, where you'll find the
+                  appointments and event listings.
+               </para>
+             </listitem> 
+             <listitem>
+                <para>
+                <guilabel>Contacts</guilabel>, where your address
+                cards are stored.
+               </para>
+             </listitem>
+             <listitem>
+                <para>
+              <guilabel>Directories</guilabel>, for directories, which
+              have not been implemented yet.
+               </para>
+             </listitem>
+             <listitem>
+                <para>
+                 <guilabel>Inbox</guilabel>, for your incoming mail.
+                 This is where you will make the most subfolders.
+               </para>
+             </listitem>
+            <listitem>
+                <para>
+                <guilabel>Outbox</guilabel>, where you can store
+                copies of mail you have sent, or unsent drafts.
+               </para>
+             </listitem>
+             <listitem>
+                <para>
+                <guilabel>Trash</guilabel>, where you can throw things away.
+               </para>
+             </listitem>
+          </itemizedlist>
+
         </para>
 
 	<para>
@@ -179,10 +212,11 @@ forth.  Can these things be labelled with little arrows & stuff?
 	
 	<para>
           If a folder has other folders in it, there will be a plus
-          sign next to it. Click on the plus sign, and you will see
-          the other folders inside.  This may change in the future to
-          something more attractive, like triangles that drop down as
-          you click on them to display the rest of the tree.
+          sign next to it. Click on the plus sign, and the folder will
+          open to let you see the other folders inside.  This may
+          change in the future to something more attractive, like
+          triangles that drop down as you click on them to display the
+          rest of the tree.
         </para>
 
 	<para>
@@ -194,14 +228,19 @@ forth.  Can these things be labelled with little arrows & stuff?
         </para>
 
 	<para>
-          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
+          Moving and deleting folders and other items works in one of
+          two ways: using <glossterm>drag-and-drop</glossterm> or by
+          right-clicking and selecting an item from the
+          <interface>right-click menu</interface>.  You can drag the
+          folders inside the tree view to change their order or put
+          one folder inside another.  To delete a folder, drag it into
+          the trash folder or right-click it and select
+          <guimenuitem>Delete</guimenuitem> from the menu that pops
+          up.  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.
-<!--  ****This paragraph could use some work****  -->
+          they will go there.  <!-- ****This paragraph could use some
+          work**** -->
         </para>
 	<para>
           You can also use the <guimenu>right-click menu</guimenu> to
@@ -212,8 +251,14 @@ forth.  Can these things be labelled with little arrows & stuff?
 	<para>
           Once you've familiarized yourself with the <interface>main
           window</interface> you can start doing things with it.
-          We'll start with email: you've got a letter waiting for you
-          already.
+          We'll start with your email inbox: you've got a letter
+          waiting for you already.
         </para>
       </sect1>
     </chapter>
+
+
+
+
+
+
diff --git a/help/C/usage-setup.sgml b/help/C/usage-setup.sgml
deleted file mode 100644
index 3e793fdbcd..0000000000
--- a/help/C/usage-setup.sgml
+++ /dev/null
@@ -1,126 +0,0 @@
-   <sect2 id="usage-setup">
-      <title>Mail Setup</title>
-      <para>
-        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>
-         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> <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>
-              <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>
-                <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>
-      <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 3f83d88d05..d56b709778 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,22 @@
+2000-05-27  Aaron Weber  <aaron@helixcode.com>
+
+	* C/evolution-guide.sgml: added Kevin Breit to author and
+	copyright.
+
+	* C/apx-authors.sgml: Put app authors in a simplelist.
+
+	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
+        users to config-setupassist chapter. This and the following changes 
+	take setup druid coverage out of usage 
+	section and put it in config section. 
+	* C/config-setupassist.sgml: Added mail druid coverage from
+	usage-setup.sgml.
+	* C/usage-setup.sgml: Removed file. contents in
+	config-setupassist.sgml.  
+	* C/evolution-guide.sgml: Removed
+	USAGE-SETUP entity (and file usage-setup.sgml.)
+
+	
 2000-05-26  Aaron Weber  <aaron@helixcode.com>
 
 	* C/fig/mainwindow-pic.png: new file