proofing all over.

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

	* C/evolution-guide.sgml: proofing all over.

	* C/config-setupassist.sgml: Minor fixes.

	* C/fig/*  Replaced screenshots (Kevin's screenshots).

	* C/apx-fdl.sgml: Appendix C no more!

svn path=/trunk/; revision=4341

18 files changed, 308 insertions, 208 deletions

diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index 647bf0b49a..e064276be3 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -4,27 +4,27 @@
      <para>
       <application>Evolution</application> was written by:
 <simplelist>
-      <member>Seth Alves: <email>alves@helixcode.com</email></member>
+     <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>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> 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>danw@helixcode.com</email></member>
-    <member> Michael Zucchi: <email>notzed@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> 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>danw@helixcode.com</email></member>
+     <member> Michael Zucchi: <email>notzed@helixcode.com</email></member>
 </simplelist>
 and other dedicated GNOME programmers. 
 </para>
@@ -38,7 +38,7 @@ and other dedicated GNOME programmers.
     </para>
 
    <para>
-     For more information please visit the
+      For more information please visit the
       <application>Evolution</application> <ulink
       url="http://www.helixcode.com/apps/evolution.php3"
       type="http">Web page</ulink>.  Please send all comments,
@@ -47,13 +47,13 @@ and other dedicated GNOME programmers.
       database</ulink>. Instructions for submitting bug reports can be
       found on-line at <ulink
       url="http://bugs.gnome.org/Reporting.html" type="http">
-      http://bugs.gnome.org/Reporting.html</ulink>. If you are using
-      GNOME 1.1 or later, you can also use command
-      <command>bug-buddy</command> for submitting bug reports.
+      http://bugs.gnome.org/Reporting.html</ulink>. You can also use
+      command <command>bug-buddy</command> for submitting bug reports.
     </para>
     <para>
       This manual was written by Aaron Weber
-      (<email>aaron@helixcode.com</email>) with the help of the
+      (<email>aaron@helixcode.com</email>) and Kevin Breit
+      (<email>battery841@mypad.com</email>) with the help of the
       application programmers and the GNOME Documentation Project.
       Please send all comments and suggestions regarding the manual to
       the GNOME Documentation Project at
@@ -67,3 +67,8 @@ and other dedicated GNOME programmers.
       all comments and suggestions regarding this translation to
       SOMEWHERE.  </para> -->
     </appendix>
+
+
+
+
+
diff --git a/help/C/apx-fdl.sgml b/help/C/apx-fdl.sgml
index 7a85c6e4a2..8b49729cfc 100644
--- a/help/C/apx-fdl.sgml
+++ b/help/C/apx-fdl.sgml
@@ -1,4 +1,4 @@
-<appendix id="fdl" label="Appendix - C">
+<appendix id="fdl">
   <title>GNU Free Documentation License</title>
   <para>
     Version 1.1, March 2000
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index e474d54b5c..fb05344813 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -6,7 +6,8 @@
   <glossterm>Attachment</glossterm>
   <glossdef>
    <para>
-    Any file sent with an e-mail for the reciever to download.
+    Any file sent along with an email.  Attachments may be embedded in
+    a message or appended to it.
    </para>
   </glossdef>
  </glossentry>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index de8c8beae7..687a75e9f0 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -20,7 +20,7 @@
         This will open the <interface>mail preferences
         window</interface>, illustrated in <xref
         linkend="config-prefs-mail-fig">.  Mail Preferences are
-        seperated into several categories:
+        separated into several categories:
         <variablelist>
 	<varlistentry>
           <term><guilabel>Identity</guilabel></term>
@@ -133,7 +133,7 @@
         and password, what sort of mail sending and receiving
         protocols your network uses, and the names of the servers
         you'll be using.  If you're switching from another groupware
-        or email progam, you can almost certainly use the same
+        or email program, you can almost certainly use the same
         settings as you did with that program.  Select the
         <guibutton>Sources</guibutton> tab in the
         <interface>Preferences</interface> window to tell
@@ -146,7 +146,7 @@
 	<title>Mail Sources</title>
 	<para>
           The <interface>Mail Sources</interface> tab allows you to
-          edit, add, or delete methods of retreiving mail from
+          edit, add, or delete methods of retrieving mail from
           servers.  Clicking on <guibutton>Add</guibutton> or
           <guibutton>Edit</guibutton> will bring up a dialog box to
           offer you the following options:
@@ -164,8 +164,9 @@
 	      <term> <guilabel>Server:</guilabel></term>
 	      <listitem>
 		<para>
-                  Enter the name of your mail server in this field,
-                  eg: <userinput>mail.mycompany.com</userinput>
+                  Enter the name of your mail server in this field.
+                  For example:
+                  <userinput>mail.mycompany.com</userinput>
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -208,18 +209,21 @@
 	<title>Transports</title>
 	<para>
            The <interface>Transports</interface> tab lets you set how
-           you will send mail.  As of this writing, you have two
-           choices: <guilabel>SMTP</guilabel>, which uses a remote
-           mail server, and <guilabel>sendmail</guilabel>, which uses
-           the <application>sendmail</application> program on your
-           local system.
+           you will send mail.  Evolution currently supports two mail
+           transport options: <guilabel>SMTP</guilabel>, which uses a
+           remote mail server, and <guilabel>sendmail</guilabel>,
+           which uses the <application>sendmail</application> program
+           on your local system.  <application>Sendmail</application>
+           is more difficult to configure, but offers more flexibility
+           than plain <systemitem>SMTP</systemitem>.
         </para>
 	<para>
-            If you choose <guilabel>SMTP</guilabel>, you will need to
-            know the name of your mail server.  Your system
-            administrator or ISP has probably included that
-            information on the piece of paper you lost about five
-            minutes ago.  <application>Evolution</application> can
+            To use <guilabel>SMTP</guilabel>, you'll need to enter the
+            name of your SMTP server, which should look like:
+            <userinput>smtp.isp.net</userinput>.
+         </para>
+         <para>
+            <application>Evolution</application> can
             attempt to determine if you have entered the right server
             name.  To have it do so, check the box labelled
             <guilabel>Test these values before continuing</guilabel>
@@ -488,10 +492,12 @@
 
 
   </sect1>
+
   <sect1 id="config-prefs-general">
     <title>General Preferences</title> 
     <para>
-          Overall Evolution prefs-- whatever else doesn't fit.
+          Additional configuration options will be covered here, as
+          they become available.
         </para>
   </sect1>
 </chapter>
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index 519bd81414..6690c766ad 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -1,4 +1,3 @@
-
     <chapter id="config-setupassist">
       <title>Easy Setup with the Setup Assistant</title>
       <para>
@@ -7,11 +6,7 @@
         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>
@@ -37,7 +32,7 @@
 	<title>Mail Setup Assistant</title>
 	<screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
 	    </graphic>
 	</screenshot>
 	</figure>
@@ -46,73 +41,103 @@
 
 
   The assistant will ask you for the following information:
-        <itemizedlist>
-	  <listitem> <para> <guilabel>Name&mdash; </guilabel> Your
+        <variablelist>
+
+          <varlistentry>
+               <term> <guilabel>Name:</guilabel> </term>
+	  <listitem> <para>Your
             full name: eg. Eva Lucianne Tester </para></listitem>
+         </varlistentry>
 
-	  <listitem><para> <guilabel>Email address&mdash </guilabel>;
+       <varlistentry>
+          <term><guilabel>Email address:</guilabel></term>
+	  <listitem><para>
                  Your email address: eg. eltester@helixcode.com
                  </para></listitem>
+       </varlistentry>
 
+       <varlistentry>
+          <term> <guilabel>Organization:</guilabel></term>
 	  <listitem>
 	    <para>
-               <guilabel> Organization&mdash; </guilabel> Any
-              organization you represent.  Leave this blank if you
-              wish.
+              <guilabel>Organization:</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 three or fewer lines of text.</para></listitem>
-	  
+      </varlistentry>
+
+      <varlistentry>
+	 <term><guilabel>Signature File:</guilabel></term>
+          <listitem>
+            <para> 
+             A text file appended to any email you send.  A
+             signature file typically consists of your name and email
+             address, or a quotation you like.  It should be three or
+             fewer lines of text.</para>
+         </listitem>
+	      </varlistentry>
+
+     <varlistentry>
+           <term> <guilabel>Mail source type:</guilabel></term>
 	  <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
+              <application>Evolution</application> supports three mail
+              sources: POP servers, the most common email server type;
+              IMAP, which stores mail remotely and allows access from
+              multiple locations, and UNIX-style
+              <filename>mbox</filename> files.  Ask your system
               administrator which one you use.
             </para>
 	  </listitem>
-	  
+	  </varlistentry>
+          
+       <varlistentry>
+          <term> <guilabel>Server:</guilabel></term>
 	  <listitem>
 	    <para>
-                <guilabel>Server&mdash; </guilabel> This should be the
-              name of your mail server, eg.
-              mailserver.organization.org
+              This should be the name of your mail server: it should
+              look something like: 
+              <userinput>mailserver.organization.org</userinput>.
             </para>
 	  </listitem>
-	
-	  <listitem>
-	    <para>
-              <guilabel> Username&mdash; </guilabel>Usually, this is
+	</varlistentry>
+
+     <varlistentry>
+	  <term><guilabel>Username:</guilabel></term>
+	<listitem>
+             <para>
+              <guilabel>Username:</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>
+      </varlistentry>
+     
+       <varlistentry>
+            <term><guilabel>Authentication:</guilabel></term> 
+	    <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.
+              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>
+       </varlistentry>
 
-
+      <varlistentry> 
+         <term><guilabel>Mail Transport:</guilabel></term>
 	  <listitem>
 	    <para>
-             <guilabel>Mail Transport&mdash; </guilabel> This is the
-              mail sending protocol you will want to use.  Sendmail is
-              the default.
+              This is the mail sending protocol you will want to use.
+              <application>Evolution</application> supports both SMTP
+              and <application>sendmail</application>.
             </para>
 	  </listitem>
-	</itemizedlist>
+      </varlistentry>
+     </variablelist>
       </para>
       <para>
         To learn how to configure <application>Evolution</application>
@@ -125,3 +150,9 @@
 
 
 
+
+
+
+
+
+
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index c6e844025b..f844db46c0 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -27,13 +27,30 @@
     </authorgroup>
     <copyright>
       <year>2000</year>
-      <holder>Helix Code, Inc. </holder>
+      <holder>Helix Code, Inc., </holder>
       <holder>Kevin Breit</holder>
     </copyright>
     
     <legalnotice>
       <para>
-        PUT THE RIGHT LEGALNOTICE IN HERE
+        Permission is granted to copy, distribute and/or modify this
+        document under the terms of the <citetitle>GNU Free
+        Documentation License</citetitle>, Version 1.1 or any later
+        version published by the Free Software Foundation with no
+        Invariant Sections, no Front-Cover Texts, and no Back-Cover
+        Texts. You may obtain a copy of the <citetitle>GNU Free
+        Documentation License</citetitle> from the Free Software
+        Foundation by visiting <ulink type="http"
+        url="http://www.fsf.org">their Web site</ulink> or by writing
+        to: Free Software Foundation, Inc., 59 Temple Place - Suite
+        330, Boston, MA 02111-1307, USA.
+      </para>
+      <para>
+        Many of the names used by companies to distinguish their
+        products and services are claimed as trademarks. Where those
+        names appear in any GNOME documentation, and those trademarks
+        are made aware to the members of the GNOME Documentation
+        Project, the names have been printed in caps or initial caps.
       </para>
     </legalnotice>
 
@@ -48,7 +65,6 @@
   
   <part id="usage">
     <title>Using Evolution</title>
-    <subtitle>A Guide for Everybody</subtitle> 
      <partintro>
       <para>
         Part one of the <application>Evolution</application> manual
@@ -70,7 +86,6 @@
   </part>
   <part id="config">
   <title>Configuring and Managing Evolution</title>
-    <subtitle>A guide for Power Users and Administrators</subtitle>
     <partintro>
       <para>
         <application>Evolution</application> is highly configurable.
diff --git a/help/C/fig/calendar.png b/help/C/fig/calendar.png
index 91f485aa5f..47354813a2 100644
--- a/help/C/fig/calendar.png
+++ b/help/C/fig/calendar.png
diff --git a/help/C/fig/config-cal.png b/help/C/fig/config-cal.png
index d477f42550..e124196279 100644
--- a/help/C/fig/config-cal.png
+++ b/help/C/fig/config-cal.png
diff --git a/help/C/fig/config-mail.png b/help/C/fig/config-mail.png
index e9e5debc78..ef270858f7 100644
--- a/help/C/fig/config-mail.png
+++ b/help/C/fig/config-mail.png
diff --git a/help/C/fig/contact.png b/help/C/fig/contact.png
index ed41ab0e3d..1610e278a4 100644
--- a/help/C/fig/contact.png
+++ b/help/C/fig/contact.png
diff --git a/help/C/fig/filter-new-fig.png b/help/C/fig/filter-new-fig.png
index 84db72462c..4c612ce5fc 100644
--- a/help/C/fig/filter-new-fig.png
+++ b/help/C/fig/filter-new-fig.png
diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png
index 29af304147..0ff712efa5 100644
--- a/help/C/fig/mainwindow-pic.png
+++ b/help/C/fig/mainwindow-pic.png
diff --git a/help/C/fig/vfolder-createrule-fig.png b/help/C/fig/vfolder-createrule-fig.png
index 6be67ad5eb..571a487ba4 100644
--- a/help/C/fig/vfolder-createrule-fig.png
+++ b/help/C/fig/vfolder-createrule-fig.png
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 60e973a188..a228998027 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -13,6 +13,17 @@
         integral part of the Internet-connected desktop.
       </para>
       <para>
+        As part of the GNOME project,
+        <application>Evolution</application> is free software, and is
+        released under the terms of the GNU Public License (GPL).  As
+        stated previously, the documentation falls under the Free
+        Documentation License (FDL), which is included with this
+        document in <xref linkend="fdl">.  For more information about
+        the GPL and the FDL, visit the Free Software Foundation's
+        website at <ulink
+        url="http://www.fsf.org">http://www.fsf.org</ulink>.
+      </para>
+      <para>
         <application>Evolution</application> is a suite of tools to
         help you work in a group.  You can use it to send, receive,
         and organize email, manage address and other contact
@@ -59,7 +70,10 @@
 	  <listitem>
 	    <para>
                Data must be safe: <application>Evolution</application>
-               must not lose mail or corrupt mailbox files.
+               must not lose mail or corrupt mailbox files.  It will
+               not execute scripts, automatically forward a virus to
+               your entire contacts list, or delete files from your
+               hard disk.
             </para>
           </listitem>
 	</itemizedlist>
@@ -89,10 +103,8 @@
         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
+        guide to <email>aaron@helixcode.com</email>. 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.
@@ -100,15 +112,15 @@
     <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
 
       <para>
-        This book is divided into two sections. The first section is
-        a <link linkend="usage">guided tour</link>&mdash; it will
+        This book is divided into two sections. The first section is a
+        <link linkend="usage">guided tour</link>&mdash; it will
         explain how to use <application>Evolution</application>.  If
         you are new to <application>Evolution</application> or to
         groupware in general, this is the section for you. The second
         section, covering <link linkend="config">configuration</link>,
-        is targeted at advanced users and administrators.  If you are
-        a network administrator, you may find yourself referring to
-        this section frequently.
+        is targeted at more advanced users, but anyone who wants to
+        change the way <application>Evolution</application> looks or
+        acts can benefit from reading it.
       </para>
       <formalpara>
         <title>Typographical conventions</title>
@@ -118,9 +130,19 @@
           <simplelist>
 	    <member><application>Applications</application></member>
 	    <member><command>Commands</command> typed at the command line</member>
-	    <member><guilabel>Labels</guilabel> for menu items and buttons</member>
-	    <member><userinput>Anything you type in</userinput></member>
+	    <member><guilabel>Labels</guilabel> for interface items</member>
+
+            <member> Menu selections look like this:
+                       <menuchoice>
+                          <guimenu>Menu</guimenu>
+                          <guisubmenu>Submenu</guisubmenu> 
+                          <guimenuitem>Menu Item</guimenuitem>
+                     </menuchoice>
+            </member>
+	    <member><guibutton>Buttons</guibutton> you can click</member>
+            <member><userinput>Anything you type in</userinput></member>
 	    <member><computeroutput>Text output from a computer</computeroutput></member>
+
 	  </simplelist>
         </para>
       </formalpara>
@@ -132,3 +154,9 @@
 
 
 
+
+
+
+
+
+
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index f0772e9948..3da93260a5 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -3,7 +3,7 @@
 -->
 
 <chapter id="usage-calendar">
-  <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
+  <title>The Evolution Calendar</title>
   <para>
     To begin using the calendar, select
     <guibutton>Calendar</guibutton> from the <interface>shortcut
@@ -141,9 +141,9 @@ lack of time, resources, and interest.
          complicated, and only applies to calendars on a
          network. <guilabel>Public</guilabel> is the default category,
          and a public event can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> means
-         (SOMETHING), and <guilabel>Confidential</guilabel> means that
-         (SOMETHING ELSE).
+         sharing network.  <guilabel>Private</guilabel> denotes one
+         level of security, and <guilabel>Confidential</guilabel>
+         means that .
       </para>
       <para>
         The <guilabel>Recurrence</guilabel> tab lets you describe
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 07bc5af973..fc5c5781ed 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -11,7 +11,7 @@
       Rolodex.  Of course, it's a lot easier to update
       <application>Evolution</application> than it is to change an
       actual paper book. <application>Evolution</application> also
-      allows easy synchronization with handheld and remote devices.
+      allows easy synchronization with hand-held and remote devices.
       Since <application>Evolution</application> supports most major
       network protocols, including <glossterm>LDAP</glossterm>, it can
       fit into almost any existing network.
@@ -44,8 +44,11 @@
        <guibutton>Contacts</guibutton> in the shortcut bar.  The
        contact manager is illustrated in <xref
        linkend="usage-contact-fig">.  By default, the contact manager
-       shows all your cards in alphabetical order, and in a
-       <glossterm>minicard</glossterm> format.
+       shows all your cards in alphabetical order, in a
+       <glossterm>minicard</glossterm> format.  You can select other
+       views from the <guimenu>View</guimenu> menu, and adjust the
+       width of the colums by clicking and dragging the grey column
+       dividers.
     </para>
 
 
@@ -128,8 +131,7 @@
     	  <guilabel>General</guilabel>, for basic contact information,
     	  and <guilabel>Details</guilabel>, for a more specific
     	  description of the person.  In addition, it contains a full
-    	  menu bar.  FIXME: The contents are still changing rapidly,
-    	  but you should be able to guess what they're for.
+    	  menu bar, which is still evolving rapidly.  <!-- FIXME -->
       </para>
       
       <figure id="usage-contact-editor-fig">
@@ -141,17 +143,17 @@
 	</screenshot>
       </figure>
       
-      <para> 
-        The <guilabel>General</guilabel> tab contains no less
+      <para> The <guilabel>General</guilabel> tab contains no less
         than seven sections, each with an icon: a face, for name and
         company; a telephone for phone numbers; an envelope for email
-        address; a house for postal address; a handshake for contacts
-        (FIXME: I don't understand this feature, and the button
-        doesn't do anything yet.); and a briefcase for categories.
-        You can guess what sort of information belongs in fields like
-        <guilabel>Job Title</guilabel> and <guilabel>Web page
-        address</guilabel>, but there are several parts of the window
-        that are a little more interesting.  </para> <para>
+        address; a house for postal address; a file folder for
+        contacts, and a briefcase for categories.  You can guess what
+        sort of information belongs in fields like <guilabel>Job
+        Title</guilabel> and <guilabel>Web page address</guilabel>,
+        but there are several parts of the window that are a little
+        more interesting.
+     </para>
+      <para>
         <guilabel>Categories</guilabel> feature, which is discussed in
         <xref linkend="usage-contact-organize">, there are a few
         things you'll want to know about: the first of these is the
@@ -228,7 +230,7 @@
         square button for the list of labels, any that you've already
         filled in will be marked.  </para>
 
-    <!--  FIXME: do this whole thing later.
+    <!--  FIXME: do this whole thing right before release 0.4! FIXME.
 	  <variablelist>
 	     <listitem>
 	      <term>
@@ -374,7 +376,7 @@
            add your own.  Just enter the new category's name in the
            text box, then click <guibutton>Categories</guibutton> and
            choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. (FIXME: This isn't quite accurate.)
+           window that appears. 
          </para>
 
          <tip id="usage-contact-categories-multiple">
@@ -425,7 +427,7 @@
     <para>
        To begin sharing a folder of address cards, wait until
        <application>Evolution</application> supports this
-       feature. (FIXME!)
+       feature. <!-- FIXME -->
     </para>
   </sect1>
 
@@ -460,12 +462,14 @@
 	 <application>Evolution</application> will fill in addresses
 	 from your contact manager's address cards if you let it.  In
 	 addition to that, you can send email to everyone in a
-	 particular group by (FIXME: wait for feature implementation,
-	 then document). Future versions of
-	 <application>Evolution</application> will allow you to you
-	 export a group of cards to a spreadsheet, database, or word
-	 processor so you can print address labels or prepare large
-	 postal mailings.
+	 particular group.
+      </para>
+ <!-- FIXME this feature not yet implemented  -->
+      <para>
+         Future versions of <application>Evolution</application> will
+	 allow you to you export a group of cards to a spreadsheet,
+	 database, or word processor so you can print address labels
+	 or prepare large postal mailings.
       </para>
     </sect2>
     <sect2 id="usage-contact-automation-extra">
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index bd00601fb3..2664d121d2 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -18,7 +18,7 @@
        </listitem>
        <listitem>
 	 <para>
-	  It can send and recieve mail in HTML or as plain text, and
+	  It can send and receive mail in HTML or as plain text, and
 	  supports file attachments.
 	 </para>
        </listitem>
@@ -101,15 +101,17 @@
     </sect2>
 
     <sect2 id="usage-mail-getnsend-get">
-      <title>Getting Mail</title>
+      <title>Checking Mail</title>
       <para>
 	To check your email, just click <guibutton>Get
 	mail</guibutton> in the toolbar.  If this is the first time
 	you've done so, the <interface>mail setup
 	assistant</interface> will ask you for the information it
 	needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information). You'll
-	need to enter your password.  Then,
+	linkend="config-setupassist"> for more information).  If
+	you're checking mail over a network (instead of from local
+	<filename>mbox</filename> files), you'll need to enter your
+	email password.  Type it in, click <guibutton>OK</guibutton> and
 	<application>Evolution</application> will download your mail.
 	New mail will appear in your <interface>Inbox</interface>.
 	<!-- FIXME: add mention of Today if Today feature appears -->
@@ -147,10 +149,10 @@
 	  <application>Evolution</application> will provide a link and
 	  icon at the end of the message.  Click on that, and
 	  <application>Evolution</application> will ask you where you
-	  want to put the file.  Once you've chosen one and saved the
-	  file, you can open, move, copy, or execute it just like any
-	  other, using <application>Nautilus</application> or your
-	  favorite shell or file manager.
+	  want to put the file.  Once you've chosen a location and
+	  saved the file, you can open, move, copy, or execute it just
+	  like any other, using <application>Nautilus</application> or
+	  your favorite shell or file manager.
 	</para>
 
 	<para>
@@ -179,14 +181,12 @@
 	 You can start writing a new email message by selecting
 	 <guimenuitem>New Mail</guimenuitem> from the <guimenu>File
 	 Menu</guimenu>, or by pressing the
-	 <guibutton>Send</guibutton> in the Inbox toolbar.  <!-- THIS
-	 IS A BAD BUTTON NAME AND MUST BE FIXED --> When you do so,
-	 the <interface>New Message</interface> window will open, as
-	 shown in <xref linkend="usage-mail-newmsg-fig">.
+	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
+	 When you do so, the <interface>New Message</interface> window
+	 will open, as shown in <xref
+	 linkend="usage-mail-newmsg-fig">.
       </para>
 
-
-
 <!--   ==============Figure=================================== -->
       <figure id="usage-mail-newmsg-fig">
 	<title>New Message Window</title>
@@ -255,7 +255,7 @@
           Alternately, you can click on the
           <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
           <guibutton>Bcc:</guibutton> buttons to get a list of email
-          addresses.  Click the checkboxes next to the addresses, then
+          addresses.  Click the check-boxes next to the addresses, then
           click <guibutton>OK</guibutton>, and the address will be
           added to the appropriate form field.
         </para>
@@ -289,7 +289,7 @@
 	         She puts her co-worker, Tim, in the in the
 	         <guilabel>Cc:</guilabel> field, so that he know
 	         what's going on.  The client can see that Tim also
-	         recieved the message, and knows that he can talk to
+	         received the message, and knows that he can talk to
 	         Tim about the message as well.
 	      </para>
 	    </example>
@@ -444,10 +444,10 @@ with quoted materials and the relevant replies interspersed-->
 	      <listitem>
 		<para>
                   <itemizedlist mark="none">      
-		  <listitem><para><guilabel>B</guilabel> is for bold text</para></listitem>   
-                  <listitem><para><guilabel>I</guilabel> for italics</para></listitem>
-		  <listitem><para><guilabel>U</guilabel> to underline</para></listitem>
-		  <listitem><para><guilabel>S</guilabel> for a strikethrough.</para></listitem>
+		  <listitem><para><guibutton>B</guibutton> is for bold text</para></listitem>   
+                  <listitem><para><guibutton>I</guibutton> for italics</para></listitem>
+		  <listitem><para><guibutton>U</guibutton> to underline</para></listitem>
+		  <listitem><para><guibutton>S</guibutton> for a strikethrough.</para></listitem>
                  </itemizedlist>
                </para>               
 	      </listitem>    
@@ -484,7 +484,7 @@ with quoted materials and the relevant replies interspersed-->
            <itemizedlist>
 	    <listitem>
 	      <para>
-                 <guilabel>Insert Link</guilabel>: Use this tool to
+                 <guimenuitem>Insert Link</guimenuitem>: Use this tool to
                  put hyperlinks in your HTML messages.  When you
                  select it, <application>Evolution</application> will
                  prompt you for the <guilabel>Text</guilabel> that
@@ -494,8 +494,8 @@ with quoted materials and the relevant replies interspersed-->
 	    </listitem>
 	    <listitem>
 	      <para>
-               <guilabel>Insert Image</guilabel>: Select this item to
-               embed image into your email, as was done in the welcome
+               <guimenuitem>Insert Image</guimenuitem>: Select this item to
+               embed an image into your email, as was done in the welcome
                message.  Images will appear at the location of the
                cursor.
               </para>
@@ -554,7 +554,7 @@ possibly never will be due to security evil. -->
 	<para>
 	  The post office forwards your mail for you when you change
 	  addresses, and you can forward mail when you get a letter by
-	  mistake.  The email <guilabel>Forward</guilabel> command
+	  mistake.  The email <guilabel>Forward</guilabel> button
 	  works in much the same way.  It's particularly useful if you
 	  have received a message and you think someone else would
 	  like to see it.  You can forward a message as an attachment
@@ -570,18 +570,19 @@ possibly never will be due to security evil. -->
 	  altered content.
 	</para>
 	<para>
-	  To forward a message, first make sure it is selected by
-	  clicking it once in the message list.  Then, press
+	  To forward a message you are reading, press
 	  <guibutton>Forward</guibutton> on the toolbar, or select
-	  <guimenuitem>Forward</guimenuitem> from the
-	  <guimenu>Message</guimenu> menu.  To forward a message
-	  <glossterm>inline</glossterm> instead of attached, select
-	  <guimenuitem>Forward Inline</guimenuitem> from the
-	  <guimenu>Message</guimenu> menu.  Choose an addressee as you
-	  would when sending a new message; the subject will already
-	  be entered, but you can alter it.  Enter your comments on
-	  the message in the <interface>composition frame</interface>,
-	  and press <guibutton>Send</guibutton>.
+	  <menuchoice> <guimenu>Message</guimenu>
+	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
+	  prefer to forward the message <glossterm>inline</glossterm>
+	  instead of attached, select <menuchoice>
+	  <guimenu>Message</guimenu> <guimenuitem>Forward
+	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
+	  addressee as you would when sending a new message; the
+	  subject will already be entered, but you can alter it.
+	  Enter your comments on the message in the
+	  <interface>composition frame</interface>, and press
+	  <guibutton>Send</guibutton>.
 	</para>
       </sect3>
       <sect3 id="usage-mail-getnsend-ettiquette">
@@ -683,8 +684,7 @@ possibly never will be due to security evil. -->
 	      contacts, and mail can't go into the same
 	      folder. Calendars have to go in calendar folders, mail
 	      in mail folders, and contacts in contact folders.
-              FIXME: should this go in a different section?
-          </para>
+           </para>
 	</note>
       </para>
       <para>
@@ -772,7 +772,7 @@ possibly never will be due to security evil. -->
       <para>
 	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
+	they have sent, find filters especially helpful to separate
 	personal from list-related mail, but they're good for anybody
 	who gets more than a few messages a day.  To create a filter,
 	select <guimenuitem>Filter Assistant</guimenuitem> from the
@@ -781,7 +781,6 @@ possibly never will be due to security evil. -->
 	<interface>filter assistant</interface> is shown in <xref
 	linkend="usage-mail-filters-fig-new">
 
-
        <figure id="usage-mail-filters-fig-new">
 	 <title>Creating a new Filter</title>
 	 <screenshot>
@@ -821,7 +820,7 @@ possibly never will be due to security evil. -->
       <para>
        Then, the filter assistant will ask you which emails it should
        act upon.  You can set criteria based on message size, the
-       sender, primary addressee or cc: list, or words in the subject
+       sender, primary addressee or Cc: list, or words in the subject
        or body of the message.  Once you've decided which messages to
        filter, the assistant will ask you the sort of action you wish
        to take.  You can file, delete, or forward the message, and you
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index bc6b6c27d4..d03aaada50 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -10,7 +10,13 @@
      <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
+     command-line.  The first time you run the program, it will create
+     a directory called <filename>evolution</filename> in your home
+     directory, where it will keep all your
+     <application>Evolution</application>-related files.
+   </para>
+   <para>
+     After <application>Evolution</application> starts
      up, you will see the <interface>main window</interface>, with the
      <interface>Inbox</interface> open.  It should look a lot like the
      picture in <xref linkend="usage-mainwindow-fig">. On the left of
@@ -21,22 +27,16 @@
      bar</interface> with buttons for different functions. The largest
      part of the <interface>main window</interface> is taken up by the
      actual <interface>Inbox</interface>, where messages are listed
-     and displayed for .  If you're running the program for the first
-     time, you'll have just one message: a welcome from Helix Code.
+     and displayed.  If you're running the program for the first time,
+     you'll have just one message: a welcome from Helix Code.
 
 
 <!-- ==============Figure=================================== -->
-
-<!--
-Make sure that this figure meets its descriptions.
-Can these things be labelled with little arrows & stuff?
--->
-
     <figure id="usage-mainwindow-fig">
     <title>Evolution Main Window and Inbox</title>
     <screenshot>
       <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
+      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
 	</graphic>
     </screenshot>
     </figure>
@@ -47,14 +47,14 @@ Can these things be labelled with little arrows & stuff?
     <note>
       <title>The Way Evolution Looks</title>
       <para>
-	The appearance of both
-	<application>Evolution</application> and
-	<application>GNOME</application> is very easy to
-	customize, so your screen might not look like this
-	picture.  You might configure
-	<application>Evolution</application> to start with a
-	different view, or without the <interface>shortcut
-	bar</interface> or <interface>folder view</interface>.
+	The appearance of both <application>Evolution</application>
+	and <application>GNOME</application> is very easy to
+	customize, so your screen might not look like this picture.
+	You might configure <application>Evolution</application> to
+	start with a different view, without the <interface>shortcut
+	bar</interface>, or with the <link
+	linkend="usage-mainwindow-folderbar">folder bar</link>
+	instead.
       </para>
     </note>
   </para>
@@ -95,11 +95,11 @@ Can these things be labelled with little arrows & stuff?
 
 <!--  NOT IMPLEMENTED! 
 	<varlistentry>
-	<term> <guibutton>Today</guibutton></term>
+	<term> <guibutton>Today:</guibutton></term>
 	<listitem>
 	  <para>
 	This will bring up a summary of any new messages you've
-	recieved, along with the tasks and appointments you have
+	received, along with the tasks and appointments you have
 	lined up for today.
       </para>
       </listitem>
@@ -107,7 +107,7 @@ Can these things be labelled with little arrows & stuff?
 -->
 
 	<varlistentry>
-	  <term> <guibutton>Inbox</guibutton></term>
+	  <term> <guibutton>Inbox:</guibutton></term>
 	  <listitem>
 	    <para>
 	      The Inbox will show you all of your email.  Your Inbox
@@ -118,7 +118,7 @@ Can these things be labelled with little arrows & stuff?
 	</varlistentry>
 
 	<varlistentry>
-	  <term><guibutton>Calendar</guibutton></term>
+	  <term><guibutton>Calendar:</guibutton></term>
 	  <listitem>
 	    <para>
 	      The Calendar can store your appointments and To do lists
@@ -129,7 +129,7 @@ Can these things be labelled with little arrows & stuff?
 	</varlistentry>
 
 	<varlistentry>
-	  <term><guibutton>Contacts</guibutton></term>
+	  <term><guibutton>Contacts:</guibutton></term>
 	  <listitem>
 	    <para>
 	      The Contact Manager holds your addresses, phone numbers,
@@ -139,20 +139,22 @@ Can these things be labelled with little arrows & stuff?
 	   </para>
 	  </listitem>
 	</varlistentry>
-<!-- NOT IMPLEMENTED YET
 
+<!-- NOT IMPLEMENTED YET
+       <varlistentry>
 	<listitem>
 	  <para>
-	     The <guibutton>Tasks</guibutton> tool combines a "to
+	     The <guibutton>Tasks:</guibutton> tool combines a "to
 	     do" list with reminders to help you keep track of
 	     daily events.
 	  </para>
 	</listitem>
+      </varlistentry>
 -->
 	<varlistentry>
-	  <term> <guibutton>Notes</guibutton></term>
+	  <term> <guibutton>Notes:</guibutton></term>
 	<listitem>
-	  <para> The notepad is your catch-all tool: use it to take
+	  <para> The note pad is your catch-all tool: use it to take
 	    messages from phone conversations, keep small things
 	    organized, write <glossterm>haiku</glossterm>, or whatever
 	    you like. This feature is not yet implemented, but will be
@@ -188,7 +190,7 @@ Can these things be labelled with little arrows & stuff?
     </tip>
   </sect1>
 
-  <sect1 id="usage-mainwindow-folderview">
+  <sect1 id="usage-mainwindow-folderbar">
     <title>The Folder View</title>
     <para>
       The <interface>folder view</interface> is a more comprehensive
@@ -200,12 +202,12 @@ Can these things be labelled with little arrows & stuff?
       will be three folders at the base.  The first one is
       <guilabel>VFolders</guilabel>, for virtual folders (discussed in
       <xref linkend="usage-mail-organize-vfolders">.  The next one is
-      <guilabel>External Directories</guilabel>, which (FIXME: What is
-      this for?). The most important one is probably
-      <guilabel>Local</guilabel>, which contains all the data that's
-      actually stored on your computer.  If you click on the plus sign
-      plus sign next to the <guilabel>Local</guilabel> folder, you'll
-      see the contents:
+      <guilabel>External Directories</guilabel>, for contact
+      directories stored on a network.  The most important one is
+      probably <guilabel>Local</guilabel>, which you can use to access
+      all the data that's actually stored on your computer.  If you
+      click on the plus sign plus sign next to the
+      <guilabel>Local</guilabel> folder, you'll see the contents:
       <itemizedlist>
 	 <listitem>
 	    <para>
@@ -239,6 +241,17 @@ Can these things be labelled with little arrows & stuff?
     </para>
 
     <para>
+       To create a new folder, select <menuchoice>
+       <guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
+       <guimenuitem>Folder</guimenuitem></menuchoice>.  You'll be asked where you want to
+       put it, and what kind of folder it should be.  You can choose
+       from three types: <guilabel>Mail</guilabel>, for storing mail,
+       <guilabel>Calendar</guilabel> for storing calendars, and
+       <guilabel>Contacts</guilabel> for storing contacts.
+    </para>
+
+<!-- UNIMPLEMENTED 
+    <para>
       Right-clicking will bring up a menu for just about anything
       in GNOME, and <application>Evolution</application> is no
       exception.  If you right-click on a folder, you'll have a
@@ -260,22 +273,20 @@ Can these things be labelled with little arrows & stuff?
 	right-click menu is a good way to find out.
       </para>
     </tip>
+-->
 
     <para>
       Any time new information arrives in a folder, that folder label
       is displayed as bold text.
     </para>
-
     <para>
-      You can move folders and other items using
-      <glossterm>drag-and-drop</glossterm>.  You can drag the folders
-      inside the folder view to change their order or put one folder
-      inside another.  To delete a folder, right-click it and select
+      To delete a folder, 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>folder view</interface>
-      or not: drag them where you want them, and they will go there.
-      <!-- ****This paragraph could use some work**** -->
+      To change the order of folders, or put one inside another, use
+      <glossterm>drag-and-drop</glossterm>.  To move individual
+      messages, appointments, and address cards between folders, you
+      can do the same thing: drag them where you want them, and
+      they'll go.
     </para>
   </sect1>
   <sect1 id="usage-mainwindow-menubar">