Made moderate to major stylistic updates to this, apx-gloss.sgml, and to

	* C/evolution-guide.sgml: Made moderate to major stylistic updates
	to this, apx-gloss.sgml, and to all files beginning with "usage,"
	especially wrt HTML mail.

svn path=/trunk/; revision=3714

12 files changed, 1174 insertions, 966 deletions

diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index 80f9b3f14b..713167634a 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -47,6 +47,7 @@
   </glossdef>
  </glossentry>
 
+<!--  Removed pending decision on names
  <glossentry id="druid">
   <glossterm>Druid</glossterm>
   <glossdef>
@@ -58,6 +59,17 @@
    </para>
   </glossdef>
  </glossentry>
+-->
+<glossentry id="emoticon">
+  <glossterm>Emoticon</glossterm>
+  <glossdef>
+   <para>
+     Also called smileys, emoticons are the little sideways faces made
+     of colons and parentheses which people use to convey emotion in email.
+     Examples: :-) or ;(  .
+   </para>
+  </glossdef>
+ </glossentry>
 
  <glossentry id="evolution">
   <glossterm>Evolution</glossterm>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 1e76a74a7d..bd94cef55d 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -1,5 +1,4 @@
 <!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
@@ -108,8 +107,9 @@ standardize on second person, not 1st pers. plural.
         There are three levels of developing for
         <application>Evolution</application>.  You can write actions.
         You can write scripts.  And you can write full-fledged
-        Evolution components.  This paragraph will eventually
-        desfcribe what that means.
+        Evolution components.  This paragraph will eventually describe
+        what that means, if the entire part is not phased out of this
+        manual.
       </para>
     </partintro>
     
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index dbfbe7d8df..6270b16a83 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+
 
 <chapter id="usage-calendar">
   <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
@@ -35,6 +35,9 @@
        here.
     </para>
 
+<!-- ############### FIXME FIXME FIXME ############
+Feature not yet implemented, and may not be implemented due to
+lack of time, resources, and interest.
     <para>
        In addition, <application>Evolution</application> supports
        Hebrew, Muslim, and other calendar formats.  To switch to a
@@ -42,6 +45,7 @@
        <guimenuitem>GUIMENUITEM</guimenuitem> from the
        <guimenu>GUIMENU</guimenu>.
     </para>
+-->
     <para>
        Describe the ways that different calendars can work here, and
        how the different calendars work together.
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 2291e28548..222878b145 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -1,37 +1,39 @@
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
+<!-- uncomment this during validation and debugging -->
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
-  <para>
-     The <application>Evolution</application> contact manager can
-     handle all of the functions of an address book, phone book, or
-     Rolodex.  Of course, <application>Evolution</application> allows
-     easier updates than an actual paper book. <application> Evolution
-     </application> also allows easy synchronization with handheld and
-     remote devices.  Since <application>Evolution</application>
-     supports most major network protocols, including
-     <glossterm>LDAP</glossterm>, it's easy to use over an existing
-     network.
-  </para>
-  <para>
-     Another advantage of the <application>Evolution</application>
-     address book is its integration with the rest of the application.
-     That means that when you look for someone's address, you can also
-     see a history of appointments with that person.  Or, you can get
-     an e-mail with contact information in it and create a new address
-     card on the spot.  In addition, searches and folders and all work
-     in the same way they do in the other components, so you don't
-     have to learn another system for similar tasks.
-  </para>
-  <para>
-     This chapter will cover using the
-     <application>Evolution</application> contact manager to organize
-     any amount of contact information, share addresses over a
-     network, and several ways to save time with everyday tasks.  To
-     learn about configuring the contact manager, see <xref
-     linkend="config-prefs-contact">.
-  </para>
-
+  <abstract>
+    <para>
+      The <application>Evolution</application> contact manager can
+      handle all of the functions of an address book, phone book, or
+      Rolodex.  Of course, <application>Evolution</application> allows
+      easier updates than an actual paper book. <application>
+      Evolution </application> also allows easy synchronization with
+      handheld and remote devices.  Since
+      <application>Evolution</application> supports most major network
+      protocols, including <glossterm>LDAP</glossterm>, it's easy to
+      use over an existing network.
+    </para>
+    <para>
+      Another advantage of the <application>Evolution</application>
+      address book is its integration with the rest of the
+      application.  That means that when you look for someone's
+      address, you can also see a history of appointments with that
+      person.  Or, you can get an e-mail with contact information in
+      it and create a new address card on the spot.  In addition,
+      searches and folders and all work in the same way they do in the
+      other components, so you don't have to learn another system for
+      similar tasks.
+    </para>
+    <para>
+      This chapter will cover using the
+      <application>Evolution</application> contact manager to organize
+      any amount of contact information, share addresses over a
+      network, and several ways to save time with everyday tasks.  To
+      learn about configuring the contact manager, see <xref
+      linkend="config-prefs-contact">.
+    </para>
+  </abstract>
   <sect1 id="usage-contact-basic">
     <title>Getting Started With the Contact Manager</title>	
     
@@ -53,55 +55,93 @@
     </figure>
 
     <para>
-       The contact manager interface is broken into two main parts.
-       The first part is the contact display section.  This can be
-       found at the bottom right panel of
-       <application>Evolution</application>.  This section is where
-       all your contact information is displayed.  Each of these cards
-       are organized into folders.  The second section is the
-       administrative section which spans the top of the <application>
-       Evolution</application> window.  This is where you can add,
-       edit, or delete records.
+       The toolbar for the address book is quite simple:
+
+       <itemizedlist>
+	<listitem><para>
+           Press <guibutton>New</guibutton> for a new contact.
+	</para></listitem>
+
+	<listitem><para>
+           <guibutton>Find</guibutton> brings up an in-depth search window.
+         </para></listitem>
+	
+	<listitem><para>
+	    Press <guibutton>Print</guibutton> to print.
+	</para></listitem>
+        <listitem><para>
+           <guibutton>Delete</guibutton> deletes a selected card.
+        </para></listitem>
+      </itemizedlist>
+    
+       The last feature is <guilabel>Quick Search</guilabel>; to use
+       it, just enter what you're looking for and hit
+       <keycap>Enter</keycap>.  <application>Evolution</application>
+       will show you all the cards that match; if there are none, the
+       display will be blank.  To display <emphasis>all</emphasis> of
+       your contacts, you can leave the <guilabel>Quick
+       Search</guilabel> field blank, and press enter.
+    </para>
+    <para>
+       The rest of the contact manager is taken up by the display of
+       your cards.  You can view it as a table or as a list of
+       cards&mdash; switch between them in the <guimenu>View</guimenu>
+       menu &mdash; and move through them alphabetically alphanumeric
+       buttons and the scrollbar at the right of the window.
+       
     </para>
   </sect1>
   <sect1 id="usage-contact-cards">
     <title>Creating, Deleting, and Adding Cards</title>
     <para>
-      You can create a new card by pressing the <guibutton>New
-      Card</guibutton> button, or by pressing
-      <keysym>KEYSYM</keysym>. The <interface>Contact
-      Editor</interface> window will appear.  It has two tabs,
+      Open up the contact editor by pressing the <guibutton>New
+      Card</guibutton> button.  The window has two tabs,
       <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 with all
-      the items from the main window (IS THIS TRUE?  DESCRIBE MENUBAR
-      AGAIN?)
+      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.
     </para>
+
+    <figure id="usage-contact-editor-fig">
+      <title>Evolution Contact Editor</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Editor</screeninfo>
+	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
+	    </graphic>
+      </screenshot>
+    </figure>
+
     <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; and a
-      briefcase for categories.  The things that go into most of the
-      text fields should be obvious enough, so we'll just describe the
-      more interesting parts of the window.  Aside from the
-      <guilabel>Categories</guilabel> feature, which is discussed in
-      <xref linkend="usage-contact-organize">, there are two things
-      you'll want to know about.
+      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.  The things that
+      go into most of the text fields should be obvious enough, so
+      we'll just describe the more interesting parts of the window.
+      Aside from the <guilabel>Categories</guilabel> feature, which is
+      discussed in <xref linkend="usage-contact-organize">, there are
+      two things you'll want to know about: the first of these is the
+      <guilabel>File As</guilabel> field.
    </para>
+
    <para>
       Type "Eva Lucianne Tester" into the <guilabel>Full
       Name</guilabel> field.  You'll notice that the <guilabel>File
-      As</guilabel> field also fills up, but in a phone-book fashion:
-      Tester, Lucianne.  You can pick "Eva Tester" from the drop-down,
-      or type in your own.  I suggest that you don't enter something
-      entirely different from the actual name, however.  You might
-      forget that you've filed Eva's information under "C" for "Code, Helix."
+      As</guilabel> field also fills up, but in reverse: Tester,
+      Lucianne.  You can pick "Eva Tester" from the drop-down, or, if
+      you prefer, type in your own, such as "Lucianne Tester, Eva".  I
+      suggest that you don't enter something entirely different from
+      the actual name, however.  You might forget that you've filed
+      Eva's information under "F" for "Fictitious Helix Code
+      Employees"
    </para>
    <para>
-      The other little feature I want to mention involves the little
-      squares next to several of the fields.  Click on them and you'll
-      get a menu of different labels; for the fields in the telephone
+      The other feature I want to mention involves the little squares
+      next to several of the fields.  Click on them and you'll get a
+      menu of different labels; for the fields in the telephone
       section, it's a long list involving things like
       <guilabel>Home</guilabel>, <guilabel>Home 2</guilabel>,
       <guilabel>Other Fax</guilabel>, and <guilabel>Pager</guilabel>.
@@ -114,16 +154,7 @@
       labels, any that you've already filled in will be marked.
    </para>
 
-    <figure id="usage-contact-editor-fig">
-      <title>Evolution Contact Editor</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-<!--
+<!--  FIXME: do this whole thing later.
       <variablelist>
          <listitem>
 	  <term>
@@ -149,18 +180,8 @@
         </para>
     
 -->
-
-    <para>
-       You can choose which fields an address card has, and create new
-       fields for cards.  For example,
-       <application>Evolution</application> provides for two line
-       postal addresses by default, but you may have as many or as few
-       lines to an address as you wish.  To change which fields an
-       address card has, choose DESCRIBE HERE HOW TO DO THIS.
-    </para>
-
-    <note>
-      <title>Quick ways to add cards</title>
+    <tip>
+      <title>Contact Shortcuts</title>
       <para>
         You can add cards from within an email message or calendar
         appointment.  While looking at an email, right-click on any
@@ -172,7 +193,7 @@
         Address</guimenuitem>.  (NOTE that feature may change!
         unimplemented!)
       </para>
-    </note>
+    </tip>
     
     <para>
        You delete a card by pressing the <guibutton>Delete
@@ -200,11 +221,11 @@
     <para>
       Another useful UNIMPLEMENTED
       <application>Evolution</application> feature is its ability to
-      recognize when people live together.  If two people in your
-      contact manager share an address, and you change the address for
-      one of them, <application>Evolution</application> will ask you
-      if you wish to change the address for both of them, or just for
-      one.
+      recognize when people live or work together.  If several people
+      in your contact manager share an address, and you change the
+      address for one of them, <application>Evolution</application>
+      will ask you if you wish to change the address for all of them,
+      or just for one.
     </para>
 
     <sect2 id="usage-contact-organize-group">
@@ -264,8 +285,11 @@
            Then, you can refer to all the cards in that category by:
          </para>
 	<para>
-           If the default categories don't suit you, you can add your
-           own.  Here's how:
+           If the master list of categories don't suit you, you can
+           add your own.  Just enter the new category's name in the
+           text box, then click <guibutton>Categories</guibutton>e and
+           choose <guilabel>Add to Master List</guilabel> in the
+           window that appears. (FIXME: This isn't quite accurate.)
          </para>
       </sect3>
     </sect2>
@@ -285,70 +309,66 @@
      <example id="usage-contact-sharing-ex">
 	<title>Sharing Address Cards and Calendar Data</title>
 	  <para>
-	    Ray wants to schedule a meeting with someone at
-	    Company X, so he checks the network for the Company X
-	    address card that states his contacts there.  Since
-	    his company also shares calendars, he then learns that
-	    his co-worker Deanna has already scheduled a meeting
-	    with them next Thursday.  He can either go to the
-	    meeting himself or ask Deanna to discuss his concerns
-	    for him.  Either way, I avoid scheduling an extra
-	    meeting with Company X.
+	    Ray wants to schedule a meeting with Company X, so he
+	    checks the network for the Company X address card so he
+	    knows whom to call there.  Since his company also shares
+	    calendars, he then learns that his co-worker Deanna has
+	    already scheduled a meeting with Company X next Thursday.
+	    He can either go to the meeting himself or ask Deanna to
+	    discuss his concerns for him.  Either way, he avoids
+	    scheduling an extra meeting with Company X.
 	 </para>
       </example>
-
     <para>
-       Of course, you don't want to share all of your cards&mdash;
-       why overload the network with a list of babysitters, or
-       tell everyone on your network you're talking to new job
-       prospects?  <application>Evolution</application> lets you
-       decide which folders you want to make accessible to others.
+       Of course, you don't want to share all of your cards&mdash; why
+       overload the network with a list of babysitters, or tell
+       everyone on your network you're talking to new job prospects?
+       <application>Evolution</application> lets you decide which
+       folders you want to make accessible to others.
     </para>
     <para>
-       To begin sharing a folder of address cards, select (something) <!--
-       DESCRIBE PROCESS HERE -->.  The
-       <interface>Sharing</interface> window will pop up.  It contains:
-       <!--DESCRIBE INTERFACE HERE-->
+       To begin sharing a folder of address cards, wait until
+       <application>Evolution</application> supports this
+       feature. (FIXME!)
     </para>
   </sect1>
 
   <sect1 id="usage-contact-automate">
     <title>Automating the Contact Manager</title>
     <para>
-      The <application>Evolution</application> contact manager
-      can perform a wide variety of tasks for you.  From speeding
-      up basic tasks like adding a new address card to managing
-      mailing lists, you'll find that the contact manager is more
-      than a mere address book.
+       In addition to working with the mailer and the calendar to add
+       new cards quickly, the contact manager can do some pretty cool
+       stuff on its own. (FIXME: This para is terrible)
     </para>
 
     <sect2 id="contact-automation-basic">
       <title>Send me a card: Adding New Cards Quickly</title>
       <para>
-	When you get information in the mail or in a calendar
-	entry, you can add it to an address card.  To do so, right
-	click on any email address or email message, and select
-	<guimenuitem>Add Address Card</guimenuitem> from the menu
-	that appears.  Of course, <application>
-	Evolution</application> adds cards from a hand-held device
-	during HotSync operation.  For more information about
-	that, see <xref linkend="usage-sync">.
+	As noted before, when you get information about a person in
+	the mail or in a calendar entry, you can add it to an address
+	card.  To do so, right click on any email address or email
+	message, and select <guimenuitem>Add Address
+	Card</guimenuitem> from the menu that appears.  Of course,
+	<application> Evolution</application> also adds cards from a
+	hand-held device during HotSync operation.  For more
+	information about that, see <xref linkend="usage-sync">.
       </para>
     </sect2>
 
     <sect2 id="contact-automation-lists">
       <title>Managing a Mailing list</title>
       <para>
-	 You already know that when you are writing an email, you
-	 can address it to one or more people, and that
-	 <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 doing SOMETHING HERE.
-	 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.
+	 You already know that when you are writing an email, you can
+	 address it to one or more people, and that
+	 <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.
       </para>
     </sect2>
     <sect2 id="usage-contact-automation-extra">
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 2215689b31..a0d64b6d74 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,15 +1,14 @@
-
+<!-- uncomment the declaration during validation and debugging
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
   <abstract>
     <title> An Overview of the Evolution Mailer</title>
     <para>
-      Email is an integral part of life these days, and
-      <application>Evolution</application> mail is here to help
-      you keep track of it.  <application>Evolution</application>
-      email is like other email programs in all the ways you would
-      hope:
+       <application>Evolution</application> email is like other email
+       programs in all the ways you would hope:
      <itemizedlist>
        <listitem>
 	 <para>
@@ -25,26 +24,25 @@
        </listitem>
        <listitem>
 	 <para>
-	   It lets you use a wide variety of mail sources, including
-	   IMAP, POP3, and local files.
+	   It supports multiple mail sources, including IMAP, POP3,
+	   and local mbox files.
 	 </para>
        </listitem>
      </itemizedlist>
     </para>
     <para>
-      However, <application>Evolution</application> has some
-      important differences.  First, it's built to handle very
-      large amounts of mail without slowing down or crashing.  We
-      had high mail volumes in mind when we designed our <link
-      linkend="usage-mail-organize-filters">filtering</link> and
-      <link linkend="usage-mail-organize-search">searching</link>
-      functions.  There's also the
-      <application>Evolution</application> <link
-      linkend="usage-mail-organize-vFolders">vFolder</link>, an
-      advanced organizational feature not found in other mail
-      clients.  If you get a lot of mail, or if you keep every
-      message you get in case you need to refer to it later,
-      you'll find that feature especially useful.
+      However, <application>Evolution</application> has some important
+      differences.  First, it's built to handle very large amounts of
+      mail without slowing down or crashing.  Both the <link
+      linkend="usage-mail-organize-filters">filtering</link> and <link
+      linkend="usage-mail-organize-search">searching</link> functions
+      were built for speed and efficiency on gargantuan mail
+      volumes. There's also the <application>Evolution</application>
+      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
+      advanced organizational feature not found in other mail clients.
+      If you get a lot of mail, or if you keep every message you get
+      in case you need to refer to it later, you'll find that feature
+      especially useful.
     </para>
 
     <para>
@@ -89,17 +87,16 @@
 	will change to something a little less counter-intuitive.
       </para>
  <!-- ==============Figure=================================== -->
- <!-- MAKE SURE THIS SCREENSHOT HAS THE WELCOME MESSAGE! -->
+ 
       <figure id="usage-mail-intro-fig">
 	  <title>Evolution Mail</title>
 	  <screenshot>
-	    <screeninfo>Evolution Mail</screeninfo>
-	    <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
+	    <screeninfo>Inbox</screeninfo>
+	    <graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
-<!-- ==============End of Figure===================================
--->
+<!-- ==============End of Figure============================== -->
 
     </sect2>
 
@@ -112,10 +109,9 @@
 	assistant</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>.
+	<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 -->
       </para>
 
       <para>
@@ -131,13 +127,15 @@
 	<para>
 	  If you receive a file attached to an email,
 	  <application>Evolution</application> will display it at the
-	  bottom of the message to which it's attached.  Click on the
-	  attachment icon or text, and
-	  <application>Evolution</application> will ask you where you
-	  want to put the file.  Once you've done that, you can
-	  open, move, copy, or execute it just like any other, using
-	  <application>Nautilus</application> or your favorite shell
-	  or file manager.
+	  bottom of the message to which it's attached.  Text, HTML,
+	  and most images will be displayed in the message itself.
+	  For other files, <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.
 	</para>
 
 	<para>
@@ -147,66 +145,66 @@
 	   turn it off if you prefer.
 	</para>
 
+<!--  ######## Feature will probably not be implemented ******
 	<para>
 	   It can also display <glossterm>live
 	   documents</glossterm>, which have scripted or
 	   executable contents&mdash; for example, a working
 	   spreadsheet page or a chess game.  
-	</para>
-	<tip id="badidea-attachment">
-	  <title>Bad Idea</title>
-	  <para>
-	    Don't worry about security. When someone you don't know
-	    sends you a program by email, assume it's a really cool
-	    game.  Mark it executable and run it, no matter what.
-	  </para>
-	</tip>
+	</para> 
+
+-->
+
       </sect3>
     </sect2>
 
     <sect2 id="usage-mail-getnsend-send">
       <title>Writing and Sending Mail</title>
       <para>
-	 You can start writing a new
-	 email message by selecting <guimenuitem>New
-	 Mail</guimenuitem> from the <guimenu>File Menu</guimenu>,
-	 or by pressing <guibutton>Ctrl-N</guibutton>.  When you do so,
-	 the <interface>New Message</interface> window will open,
-	 as shown in <xref linkend="usage-mail-newmsg-fig">.
+	 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">.
+      </para>
+
 
 
 <!--   ==============Figure=================================== -->
-       <figure id="usage-mail-newmsg-fig">
-	 <title>New Message Window</title>
-	 <screenshot>
+      <figure id="usage-mail-newmsg-fig">
+	<title>New Message Window</title>
+	<screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="newmsg-pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/newmsg-pic" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure=================================== -->
- <!-- Check the alignment of the following paragraph in the PS and HTMl output, 
-as putting the fig inside the paragraph may or may not have fixed an error -->
-      </para>
-      <para>	  
+
+ <!-- Check the alignment of the following paragraph in the PS and
+ HTML output: it's indented for no good reason -->
+      <para>
 	 Enter an address in the <guilabel>To:</guilabel> field, a
-	 message in the <guilabel>Message:</guilabel> field, and
-	 press <guibutton>Send</guibutton>.  That's
-	 easy.  It may even be too easy, which is why I like to
-	 queue my messages up to be sent a few minutes later.
+	 subject in the <guilabel>Subject:</guilabel> and a message in
+	 the big empty box at the bottom of the window, and press
+	 <guibutton>Send</guibutton>.  That's easy.  It may even be
+	 too easy, which is why I like to queue my messages up to be
+	 sent a few minutes later.
 
 	 <tip id="usage-mail-getnsend-send-attach-tip">
 	  <title>Send Now, Send Later</title>
 	  <para>
-	    Evolution will send mail immediately unless you tell
-	    it to do otherwise by selecting <guimenuitem>Send
-	    Later</guimenuitem> from the <guimenu>MENU</guimenu>.
-	    Then, when you press <guibutton>Send &
-	    Receive</guibutton>, all your unsent messages will go
-	    out at once.  I like to use "Send Later" because it
-	    gives me a chance to change my mind about a message
-	    before it goes out.  That way, I don't send anything I'll
-	    regret the next day.
+	    Evolution will send mail immediately unless you tell it to
+	    do otherwise by selecting <guimenuitem>Send
+	    Later</guimenuitem> from the <guimenu>MENU</guimenu> in
+	    the message composition window.  Then, when you press
+	    <guibutton>Send</guibutton>, all your unsent messages will
+	    go out at once.  I like to use "Send Later" because it
+	    gives me a chance to change my mind about a message before
+	    it goes out.  That way, I don't send anything I'll regret
+	    the next day.
 	  </para>
 	  <para>
 	    To learn more about how you can specify message queue
@@ -216,85 +214,89 @@ as putting the fig inside the paragraph may or may not have fixed an error -->
        </para>
 
       <para>
-	There is quite a bit more to sending mail, though.  In the
-	next few sections, you'll see how
-	<application>Evolution</application> handles additional features,
-	including mailing lists, attachments, and forwarding.
+	You can probably guess the purpose of the buttons labelled
+	<guilabel>Cut</guilabel>, <guilabel>Copy</guilabel>,
+	<guilabel>Paste</guilabel> and <guilabel>Undo</guilabel>, but
+	there's a bit more to sending mail that's less obvious.  In
+	the next few sections, you'll see how
+	<application>Evolution</application> handles additional
+	features, including mailing lists, attachments, and
+	forwarding.
       </para>
 
 
       <sect3 id="usage-mail-getnsend-send-to">
 	<title>Choosing Recipients</title>
 	<para>
-	  If you have created address cards in the contact
-	  manager, you can also enter nicknames or other portions
-	  of address data, and
-	  <application>Evolution</application> will complete the
-	  address for you. (INSERT description of UI for this
-	  feature, once it is decided upon). If you enter a name
-	  or nickname that can go with more than one card,
-	  Evolution will open a dialog box to ask you which person
-	  you meant.  (QUESTION: will users be able to drag & drop
-	  address cards to send email?).  For more information
-	  about using email together with the contact manager and
-	  the calendar, see <xref
-	  linkend="usage-contact-automate"> and <xref
+	  If you have created address cards in the contact manager,
+	  you can also enter nicknames or other portions of address
+	  data, and <application>Evolution</application> will complete
+	  the address for you. <!-- (INSERT description of UI for this
+	  feature, once it is decided upon). -->  If you enter a name or
+	  nickname that can go with more than one card, Evolution will
+	  open a dialog box to ask you which person you meant.
+	  <!-- (QUESTION: will users be able to drag & drop address cards
+	  to send email?). -->  For more information about using email
+	  together with the contact manager and the calendar, see
+	  <xref linkend="usage-contact-automate"> and <xref
 	  linkend="usage-calendar-apts-group">.
 	</para>
-	<para>
-	  In addition, you can mark recipients in three different
-	  ways.  The <guilabel>To:</guilabel> field is for the
-	  primary recipients of the message you are going to send.
-	  However, it is considered bad form to have more than a
-	  few email addresses in this section.
-	</para>
-	<para>
-	  If you're writing to one person, but want to keep a
-	  third party up to date, you can use
-	  <guilabel>Cc:</guilabel>.  Hearkening back to the dark
-	  ages when people used typewriters and there were no copy
-	  machines, "Cc" stands for "Carbon Copy."  Use it
-	  whenever you want to share a message you've written to
-	  someone else.
-	  <example>
-	    <title>Using the Cc: field</title>
-	    <para>
-	       Say, for example, Susan sends an email to a client.
-	       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 know that they can talk
-	       to Tim about the message as well.
-	    </para>
-	  </example>
-	</para>
-	<para>
-	  If you have a large number of recipients, or if you want
-	  to send mail to several people without sharing the
-	  recipient list, you should use
-	  <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
-	  Carbon Copy", and means that people listed in the
-	  <guilabel>BCc:</guilabel> are excluded from the
-	  recipient list, although they will receive the message
-	  and the list of addresses from the
-	  <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
-	  fields.  
-
-	  <example id="ex-mail-bcc">
-	     <title>Using the BCc: field</title>
-	     <para>
-	       Let's say Tim sends an email to a client, and wants
-	       his supervisor to know what he wrote.  He doesn't,
-	       however, want the client to start writing his
-	       supervisor about the project&mdash; it's Tim's job
-	       to deal with the client.  So Tim puts his
-	       supervisor's email address in the
-	       <guilabel>BCc:</guilabel> field.  That way, the
-	       client has one contact, and the boss stays in the
-	       loop.
-	   </para>
-	 </example>
-	</para>
+
+	<sect4 id="usage-mail-getnsend-send-to-mult">
+	  <title>Multiple Recipients</title>
+	  <para>
+	    In addition, you can mark recipients in three different
+	    ways.  The <guilabel>To:</guilabel> field is for the
+	    primary recipients of the message you are going to send.
+	    However, it is considered bad form to have more than a few
+	    email addresses in this section.
+	  </para>
+	  <para>
+	    If you're writing to one person, but want to keep a third
+	    party up to date, you can use <guilabel>Cc:</guilabel>.
+	    Hearkening back to the dark ages when people used
+	    typewriters and there were no copy machines, "Cc" stands
+	    for "Carbon Copy."  Use it whenever you want to share a
+	    message you've written to someone else.
+	    <example>
+	      <title>Using the Cc: field</title>
+	      <para>
+	         Say, for example, Susan sends an email to a client.
+	         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 know that they can talk to
+	         Tim about the message as well.
+	      </para>
+	    </example>
+	  </para>
+	  <para>
+	    If you have a large number of recipients, or if you want
+	    to send mail to several people without sharing the
+	    recipient list, you should use
+	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
+	    Copy", and means that people you put in the
+	    <guilabel>Bcc:</guilabel> field get the message, but
+	    nobody else sees their email address.  They will still see
+	    the list of addresses from the <guilabel>To:</guilabel>
+	    and <guilabel>Cc:</guilabel> fields.
+
+	    <example id="ex-mail-bcc">
+	      <title>Using the Bcc: field</title>
+	      <para>
+	         Tim is sending out a message to all of his company's
+	         clients, some of whom are in competition with each
+	         other, and all of whom value their privacy.  If he
+	         puts every address from his address book's "Clients"
+	         category into the <guilabel>To:</guilabel> or
+	         <guilabel>Cc:</guilabel> fields, he'll have made the
+	         <emphasis>entire</emphasis> client list public.
+	         Don't assume it won't happen to you; I got careless
+	         one day and did it myself.
+	     </para>
+	    </example>
+	  </para>
+	</sect4>
       </sect3>
 
    <sect3 id="usage-mail-getnsend-send-reply">
@@ -321,7 +323,7 @@ with quoted materials and the relevant replies interspersed-->
 	 <title>Reply Message Window</title>
 	 <screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="replymsg-pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
@@ -330,131 +332,198 @@ with quoted materials and the relevant replies interspersed-->
 
 	<para>
 	  If a message has several recipients, as in the case of
-	  mailing lists or messages that have been carbon copied,
-	  you may wish to select one of the items under the
-	  <guimenuitem>Reply-To</guimenuitem> submenu on the
-	  <guimenu>MENU</guimenu> menu.  This will allow you to
-	  choose one or several of the other message recipients in
-	  addition to the person who originally sent you the
-	  message. If there are large numbers of people in the
-	  <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
-	  fields, this can save substantial amounts of time.  In
-	  addition, Reply-To makes it very easy to keep off-topic
-	  conversation away from mailing lists and newsgroups.
+	  mailing lists or messages that have been carbon copied, you
+	  may wish to click <guibutton>Reply to All</guibutton>
+	  instead of <guibutton>Reply</guibutton>.  If there are large
+	  numbers of people in the <guilabel>Cc:</guilabel> or
+	  <guilabel>To:</guilabel> fields, this can save substantial
+	  amounts of time.  But be careful, and always make sure you
+	  know who is getting a message: it could be a mailing list
+	  with thousands of subscribers.
 	  <example>
 	    <title>Using the Reply-To feature</title>
 	    <para>
-	      Returning again to the email Susan sent to Tim and
-	      their client, you'll note that the Reply-To feature
-	      allows the client to decide whether to reply just to
-	      Susan, or to both Tim and Susan by selecting
-	      a menu item, rather than by cutting and pasting the
-	      email addresses. 
+	      Susan sends an email to a client, and sends copies to
+	      Tim and to an internal company mailing list of
+	      co-workers.  If Tim wants to make a comment to all of
+	      them, he uses <guibutton>Reply to All</guibutton>, but
+	      if he just wants to tell Susan that he agrees with her,
+              he uses <guibutton>Reply</guibutton>.
 	    </para>
 	  </example>
 	</para>
       </sect3>
 
-      <sect3 id="usage-mail-getnsend-send-fancy">
-	<title>Embellishing that email</title>
+      <sect3 id="usage-mail-getnsend-send-html">
+	<title>Embellish your email with HTML</title>
 	<para>
-	   <application>Evolution</application> allows you to 
-	    make your email more attractive in a number of ways. You
-	    can send messages formatted with HTML, attach any sort
-	    of file to them, and even include live documents, like
-	    spreadhseets or chess games.  This section will tell
-	    you how.
-	</para>
-
-	<sect4 id="usage-mail-getnsend-send-html">
-	  <title>Colors, pictures, and fonts with HTML Mail</title> 
+            You can't normally use text treatments or pictures in
+            emails, which is why you've probably seen people use
+            asterisks for emphasis or use
+            <glossterm>emoticons</glossterm> to convey their
+            feelings.  However, most of the newer email programs can
+            include and display images and text treatments as well as
+            basic alignment and paragraph formatting.
+        </para>
+	<note>
+	  <title>HTML Mail is not a Default Setting</title>
 	  <para>
-	    Most email messages are sent as plain text, but they
-	    can also be sent as HTML, which means they can include
-	    color, text style, and other formatting information.
-	    Evolution will read and display HTML properly without
-	    trouble, and also allows you to send outgoing
-	    email messages as HTML.  To send an HTML message, just
-	    use the composition toolbar to add formatting;
-	    your message text will appear formatted in the composer
-	    window, and the message will be sent as HTML.
+	    Some people do not have HTML-capable mail clients, or
+	    prefer not to receive HTML-enhanced mail because it is
+	    slower to download and display.  <emphasis>Some</emphasis>
+	    people refer to HTML mail as "the root of all evil" and
+	    get very angry if you send them HTML mail, which is why
+	    <application>Evolution</application> sends plain text
+	    unless you explicitly ask for HTML.  To send HTML mail,
+	    you will need to select <guilabel>Send Messages as
+	    HTML</guilabel> in the mail settings dialog box.  See
+	    <xref linkend="config-mail"> for more information.
+          </para>
+	  <para>
+            If you format a message with HTML, but do not have
+	    <guilabel>Send Messages as HTML</guilabel> enabled in your
+	    mail settings, the composer will remove your text styles.
+	    It will, however, preserve indentation and lists.  It will
+	    do the same thing for any individuals in your address book
+	    whom you have marked as preferring not to receive HTML.
+           </para>
+	</note>
+	<para>
+           HTML formatting tools are located just above the
+	   composition frame, and in the <guimenu>Insert</guimenu> and
+	   <guimenu>Format</guimenu> menus.  Your message text will
+	   appear formatted in the composer window, and the message
+	   will be sent as HTML.
 	  </para>
+	  <para>
+            The icons in the toolbar are explained in tool-tips, which
+            appear when you hold your mouse over the buttons.  The
+            buttons fall into four categories:
+            <itemizedlist>
+	      <listitem>
+		<para>
+                  Headers and lists: Choose
+                  <guilabel>Normal</guilabel> for your default text
+                  style, or <guilabel>Header 1</guilabel> through
+                  <guilabel>Header 6</guilabel> for varying sizes of
+                  header.  You can also select
+                  <guilabel>pre</guilabel> for preformatted text
+                  blocks, and three types of <guilabel>List
+                  Item</guilabel>.
+                </para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+                  Text style: <guilabel>B</guilabel> is for bold text,
+                  <guilabel>I</guilabel> for italics,
+                  <guilabel>U</guilabel> for an underline, and
+                  <guilabel>S</guilabel> for a strikethrough.
+                </para>
+	      </listitem>    
+
+	      <listitem>
+		<para>
+                   Alignment: Located next to the text style buttons,
+                   these three paragraph icons should be familiar to
+                   users of most word processing software.  The
+                   leftmost button will make your text left-justified,
+                   the center button, centered, and the right hand
+                   button, right-justified.
+                </para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+                  Indentation rules: The button with the arrow
+                  pointing left will reduce a paragraph's indentation,
+                  and the right arrow will increase its indentation.
+               </para>
+	    </listitem>
+	  </itemizedlist>
+        </para>
+	<para>
+           There are two tools that you can find only in the
+           <guimenu>Insert</guimenu> menu.
+           <itemizedlist>
+	    <listitem>
+	      <para>
+                 <guilabel>Insert Link</guilabel>: Use this tool to
+                 put hyperlinks in your HTML messages.  When you
+                 select it, <application>Evolution</application> will
+                 prompt you for the <guilabel>Text</guilabel> that
+                 will appear, and the <guilabel>Link</guilabel>, where
+                 you should enter the actual web address (URL).
+              </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+               <guilabel>Insert Image</guilabel>: Select this item to
+               embed image into your email, as was done in the welcome
+               message.  Images will appear at the location of the
+               cursor.
+              </para>
+	    </listitem>
+	  </itemizedlist>
+          </para>
 	  <note>
 	    <title>A Technical note on HTML Tags</title>
 	    <para>
-	      You can't use the composer window to create web pages,
-	      at least not if you plan to hand-code them with HTML.
-	      If you enter HTML directly into the composer&mdash; say,
-	      <markup role="html">&lt;B&gt;Bold
-	      Text&lt;/B&gt</markup>, the the composer will assume you
-	      meant exactly that, and not "make this text bold," as a
-	      HTML composition tool would.  For the very technically
-	      inclined, that means that when the text <markup
-	      role="html">&lt;B&gt</markup> is sent as HTML, it will
-	      be converted to the string
-	      <literal>&amp;lt;B&amp;gt;</literal>.  Real gearheads
-	      should wonder how I got all that stuff straight, given
-	      that I'm writing this in SGML.
+	      The composer is a WYSIWYG (What You See Is What You Get)
+	      editor for HTML. That means that if you enter HTML
+	      directly into the composer&mdash; say, <markup
+	      role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
+	      the composer will assume you meant exactly that string
+	      of characters, and not "make this text bold," as an HTML
+	      composition tool or text editor would.
 	    </para>
 	  </note>
-	  <para>
-	    Some people do not have HTML-capable mail clients, or
-	    prefer not to receive HTML-enhanced mail because it is
-	    slower to download and display.
-	    <emphasis>Some</emphasis> people refer to HTML mail as
-	    "the root of all evil" and get very angry if you send
-	    them HTML mail, which is why the default in
-	    <application>Evolution</application> is plain text.
-	    If you choose to send HTML mail, but have an address
-	    book entry for someone who does not wish to receive
-	    HTML-enhanced mail, you can note that preference in
-	    their address card.  The mailer will automatically
-	    strip the HTML tags from any messages you send to that
-	    address.
-	  </para>
-	</sect4>
-
-	<sect4 id="usage-mail-getnsend-send-attach">
+	</sect3>
+	<sect3 id="usage-mail-getnsend-send-attach">
 	  <title>Attachments</title>
 	  <para>
-	    If you want to attach a file to your email message,
-	    you can do so by <!--describe process here-->.  If
-	    your recipients can read HTML mail, you can put an
-	    image inside the mail by dragging the file into the
-	    composer window, or by selecting <guimenuitem>Menu
-	    Item</guimenuitem> from the <guimenu>Menu</guimenu>
-	    menu.  Still, unless you know what email client the
-	    recipient is using, it's best to send a message or
-	    attachment in the simplest manner possible.
-	  </para>
-	</sect4>
-	<sect4 id="usage-mail-getnsend-send-live">
+	    If you want to attach a file to your email message, just
+	    click the button with a paper clip on it, labelled
+	    <guibutton>Attach</guibutton>.
+	    <application>Evolution</application> will then ask you to
+	    select the file.  Do so, and then send the message.  Be
+	    aware that big attachments can take a long time to
+	    download.  
+          </para>
+	</sect3>
+
+<!-- Function not implemented, 
+possibly never will be due to security evil. -->
+<!--
+	<sect3 id="usage-mail-getnsend-send-live">
 	  <title>Live Documents</title>
 	  <para>
 	    Later versions of <application>Evolution</application>
 	    will allow you to enliven your email with almost any
 	    sort of document, and even with entire
 	    applications. At this point, however, this feature has not 
-	    yet been implimented.
+	    yet been implemented.
 	  </para>
-	</sect4>
-      </sect3>
+	</sect3>
+-->
 
       <sect3 id="usage-getnsend-fwd">
 	<title>Forwarding Mail</title>      
 	<para>
-	  <guilabel>Forward</guilabel> is useful if you have
-	  received a message and you think someone else would like
-	  to see it, or if you get a message intended for someone
-	  else.  You can forward a message as an attachment to a
-	  new message (the default way of forwarding) or you can send it
-	  <glossterm>inline</glossterm> as a quoted portion of the
-	  message you are sending.  Attachment forwarding is best
-	  if you want to send the entire message you received,
-	  unaltered.  Inline forwarding is best if you want to
-	  send portions of a message, or if you have a large
-	  number of comments on different sections of the message
-	  you are forwarding.  Remember to note from whom the
+	  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
+	  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
+	  to a new message (this is the default way of forwarding) or
+	  you can send it <glossterm>inline</glossterm> as a quoted
+	  portion of the message you are sending.  Attachment
+	  forwarding is best if you want to send the full, unaltered
+	  message on to someone else.  Inline forwarding is best if
+	  you want to send portions of a message, or if you have a
+	  large number of comments on different sections of the
+	  message you are forwarding.  Remember to note from whom the
 	  message came, and where, if at all, you have removed or
 	  altered content.
 	</para>
@@ -478,6 +547,17 @@ with quoted materials and the relevant replies interspersed-->
 	  I started with ten, but four were "Don't send
 	  <glossterm>spam</glossterm>."
 	  <itemizedlist>
+
+	    <listitem>
+	      <para>
+		 Don't send spam or forward chain mail.  If you must,
+		 watch out for hoaxes and urban legends, and make sure
+		 the message doesn't have multiple layers of email
+		 quotation symbols (&gt;) indicating multiple layers
+		 of careless inline forwarding.
+	      </para>
+	    </listitem>
+
 	    <listitem>
 	      <para>
 		Always begin and close with a salutation. Say
@@ -515,16 +595,6 @@ with quoted materials and the relevant replies interspersed-->
 
 	    <listitem>
 	      <para>
-		 Don't send spam or forward chain mail.  If you
-		 must, verify any rumors, and make sure the
-		 message doesn't have multiple layers of email
-		 quotation symbols (&gt;) indicating multiple
-		 layers of careless inline forwarding.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
 		 When you reply or forward, include just enough of
 		 the previous message to provide context. Not too
 		 much, not too little.
@@ -540,53 +610,59 @@ with quoted materials and the relevant replies interspersed-->
   <sect1 id="usage-mail-organize">
     <title>Organizing Your Mail</title>
     <para>
-      Even if you only get a few email messages a day, you
-      probably want to sort and organize them.  When you get a
-      hundred a day and you want to refer to a message you
-      received six weeks ago, you need to sort and organize them,
-      and <application>Evolution</application> has the tools to
-      help you do it.  
+      Even if you only get a few email messages a day, you probably
+      want to sort and organize them.  When you get a hundred a day
+      and you want to refer to a message you received six weeks ago,
+      you <emphasis>need</emphasis> to sort and organize them.
+      Fortunately, <application>Evolution</application> has the tools
+      to help you do it.
     </para>
 
     <sect2 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
       <para>
 	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  Some, like
-	<guilabel>Inbox</guilabel>, <guilabel>Outbox</guilabel>, and
-	<guilabel>Drafts</guilabel> have already been created for
-	you. If you like, you can create new folders by selecting
-	<guisubmenu>New</guisubmenu> and then
+	address cards and calendars, in folders.  You start out with a
+	few, like <guilabel>Inbox</guilabel>,
+	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
+	but you can create as many as you like.  Create new folders by
+	selecting <guisubmenu>New</guisubmenu> and then
 	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.  You must specify both the name
-	and the type of the folder; a folder can hold mail, calendars,
-	or address cards, but you can't mix them up.  Some people
-	don't like that. Too bad.
+	<guimenu>File</guimenu> menu.
+	<application>Evolution</application> will as you for the name
+	and the type of the folder, and will provide you with a folder
+	tree so you can pick where it goes.
+        <note>
+	  <title>Folders have Limits</title>
+	  <para>
+            A folder can hold mail, calendars, or address cards, but
+	    you can't mix them up.  Also, an email message can be in
+	    only one folder at a time, just like real mail in real
+	    folders.  If you need more flexibility, try vFolders.
+          </para>
+	</note>
       </para>
       <para>
-        The new folders will appear in the <interface>folder
-	view</interface>, and you can drag them wherever you want to
-	relocate them.  You can drag messages around too.  If you
-	create filters with the <interface>filter
-	assistant</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.
+        When you click <guibutton>OK</guibutton>, your new folder will
+	appear in the <interface>folder view</interface>.  You can
+	then put messages in it by dragging and dropping them.  If you
+	create a filter with the <interface>filter
+	assistant</interface>, you can have mail moved to your folder
+	automatically.
       </para>
     </sect2>    
 
     <sect2 id="usage-mail-organize-search">
       <title>Searching for Messages</title>
       <para>
-	Because <application>Evolution</application> automatically
-	creates an index of every email you send or receive, it can
-	search through your old messages and present you with results
-	very quickly.  You can search through just the message
-	subjects, just the message body, or both body and subjet.
+	Most mail clients can search through your messages for you,
+	but <application>Evolution</application> does it faster.  You
+	can search through just the message subjects, just the message
+	body, or both body and subject.
       </para>
       <para>
-	To create a search, enter the word or phrase you're
-	looking for in the form field below the toolbar, and
-	choose a search type:
+	To start searching, enter a word or phrase in the text area
+	right below the toolbar, and choose a search type:
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -633,7 +709,7 @@ with quoted materials and the relevant replies interspersed-->
 
         Then, press <keycap>Enter</keycap>.
         <application>Evolution</application> will show your search
-        results in 
+        results in the message list.
 
       </para>
     </sect2>
@@ -689,14 +765,16 @@ with quoted materials and the relevant replies interspersed-->
 	  </listitem>
 	</itemizedlist>
       </para>
-
+      
       <para>
-       Then, the filter assistant will ask you which emails it should act
-       upon.  You can set criteria to include words or phrases in the
-       subject, To:, Cc: or body of the message. (FIXME: WHAT ELSE?)
-       Once you've decided which messages to filter, the assistant will
-       ask you the sort of action you wish to take.  More details and
-       screenshots should follow here.
+       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
+       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
+       can also have it be exempted from other filters which would
+       otherwise have acted upon it.  
       </para>
 
 
@@ -721,9 +799,9 @@ with quoted materials and the relevant replies interspersed-->
       <title>Getting Really Organized with Virtual Folders</title>
       <para>
 	If you find that filters aren't flexible enough for you, or
-	end up performing the same search again and again, you should
-	consider a virtual folder. Virtual folders, or vFolders, are
-	an advanced way of viewing your email messages within
+	end up performing the same search again and again, consider a
+	virtual folder. Virtual folders, or vFolders, are an advanced
+	way of viewing your email messages within
 	<application>Evolution</application>.  If you get a lot of
 	mail or often forget where you put messages, vFolders can help
 	you stay on top of things.
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index fc2b894a04..99f108aa0f 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,4 +1,4 @@
-
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 <chapter id="usage-mainwindow">
 
   <title>The Main Window: Evolution Basics</title>
@@ -59,30 +59,29 @@ Can these things be labelled with little arrows & stuff?
   <sect1 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
     <para>
-        One of <application>Evolution</application>'s most important
-        job is to give you access to your information, and help you
-        use it quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, that column of buttons on
-        the left hand side of the main window.  There are actually two
-        kinds of buttons in the shortcut bar: familiar looking icons,
-        and the thin rectangles at the top and bottom of the column
-        which separate your shortcuts by category.
+        <application>Evolution</application>'s most important job is
+        to give you access to your information, and help you use it
+        quickly.  One way it does that is through the
+        <interface>shortcut bar</interface>, the column on the left
+        hand side of the main window.  The shortcut bar has two types
+        of buttons: big ones with names like
+        <guilabel>Inbox</guilabel> and <guilabel>Calendar</guilabel>,
+        and small rectangular ones at the top and bottom, which are
+        called category buttons.
     </para>
     <para>
-       The category buttons, labelled <guilabel>Evolution
-       Shortcuts</guilabel> and <guilabel>Internet
-       Directories</guilabel>, slide up and down when you click on
-       them.  When you first start
-       <application>Evolution</application>, you are lookig at the
-       <guilabel>Evolution Shortcuts</guilabel>.  If you click
+       The category buttons are labelled <guilabel>Evolution
+       Shortcuts</guilabel> <guilabel>Internet Directories</guilabel>.
+       When you click on them, they'll slide up and down to give you
+       access to different sorts of shortcuts.  When you first start
+       <application>Evolution</application>, you are looking at the
+       <guilabel>Evolution Shortcuts</guilabel> category.  If you click
        <guilabel>Internet Directories</guilabel>, it will slide up and
        you'll see buttons for the <guilabel>Bigfoot</guilabel> and
        <guilabel>Netcenter</guilabel> directories, as well as any
        others you or your system administrator might have added.
        Click on <guibutton>Evolution Shortcuts</guibutton> to look at
-       the shortcuts again.  Those buttons give you fast access to the
-       major fucntions that <application>Evolution</application>
-       provides for you.
+       the shortcuts again.
     </para>
     <para>
      They are:
@@ -156,36 +155,32 @@ Can these things be labelled with little arrows & stuff?
       covered in <xref linkend="config">.  If you're using the
       keyboard shortcuts you may also want to hide the
       <interface>shortcut bar</interface> by selecting
-      <guimenuitem>Hide/Show Shortcut Bar</guimenuitem> from the
-      <guimenu>MENU</guimenu> menu.
+      the <guimenuitem>Show Shortcut Bar</guimenuitem> toggle in the
+      <guimenu>View</guimenu> menu.
     </para>
  </sect1>
 
   <sect1 id="usage-mainwindow-folderview">
     <title>The Folder View</title>
     <para>
-      The <interface>folder view</interface> is the most comprehensive way to
-      get to your information. It can show you everything you've
-      stored with <application>Evolution</application>&mdash;
-      appointments, address cards, emails, and so forth.
-
-      The <interface>folder view</interface> display presents your
-      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, I have only one: <guilabel>Local</guilabel>.
-      When I click on the plus sign next to the label, I see the
-      contents:
+      The <interface>folder view</interface> is a more comprehensive
+      way to view the information you've stored with
+      <application>Evolution</application>. It displays all your
+      appointments, address cards, and email in a tree that's a lot
+      like a <glossterm>file tree</glossterm>&mdash; it starts small
+      at the top, and branches downwards. 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 your
+	      <guilabel>Calendar</guilabel>, where I keep
 	      appointments and event listings.
 	   </para>
 	 </listitem> 
 	 <listitem>
 	    <para>
-	    <guilabel>Contacts</guilabel>, where your address
+	    <guilabel>Contacts</guilabel>, where address
 	    cards are stored.
 	   </para>
 	 </listitem>
@@ -197,19 +192,19 @@ Can these things be labelled with little arrows & stuff?
 	 </listitem>
 	 <listitem>
 	    <para>
-	     <guilabel>Inbox</guilabel>, for your incoming mail.
-	     This is where you will make the most subfolders.
+	     <guilabel>Inbox</guilabel>, for incoming mail, and all
+	     the rest of my mail folders.
 	   </para>
 	 </listitem>
 	<listitem>
 	    <para>
-	    <guilabel>Outbox</guilabel>, where you can store
-	    copies of mail you have sent, or unsent drafts.
+	    <guilabel>Outbox</guilabel>, which is for 
+	    drafts of messages and mail that's already been sent.
 	   </para>
 	 </listitem>
 	 <listitem>
 	    <para>
-	    <guilabel>Trash</guilabel>, where you can throw things away.
+	    <guilabel>Trash</guilabel>, which is for trash.
 	   </para>
 	 </listitem>
       </itemizedlist>
@@ -231,16 +226,16 @@ Can these things be labelled with little arrows & stuff?
     <tip>
      <title>Context-Sensitive Help</title>
       <para>
-	You can almost always get help on an item by
-	right-clicking it.  If you're not sure what something is,
-	or don't know what you can do with it, right-clicking and
-	choosing <guimenuitem>Help</guimenuitem> is a good way to
-	find out.
+	GNOME 2.0 supports context-sensitive help, which means you can
+	almost always get help on an item by right-clicking it.  If
+	you're not sure what something is, or don't know what you can
+	do with it, choosing <guimenuitem>Help</guimenuitem> from the
+	right-click menu is a good way to find out.
       </para>
     </tip>
 
     <para>
-      If a folder has other folders in it, there will be a plus
+      If a folder has other folders inside it, there will be a plus
       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
@@ -271,12 +266,6 @@ Can these things be labelled with little arrows & stuff?
       they will go there.  <!-- ****This paragraph could use some
       work**** -->
     </para>
-    <para>
-      You can also use the <guimenu>right-click menu</guimenu> to
-      move, rename, and delete folders.
-      <guimenuitem>Delete</guimenuitem> function from the
-      <guimenu>right-click menu</guimenu>.
-    </para>
   </sect1>
   <sect1 id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
@@ -296,14 +285,15 @@ Can these things be labelled with little arrows & stuff?
       cover them later on as we discuss the things you can do with
       <application>Evolution</application>.
     </para>
-  </sect1>
+
+
     <para>
       Once you've familiarized yourself with the <interface>main
       window</interface> you can start doing things with it.
       We'll start with your email inbox: you've got a letter
       waiting for you already.
     </para>
-
+  </sect1>
 </chapter>
 
 
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 80f9b3f14b..713167634a 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -47,6 +47,7 @@
   </glossdef>
  </glossentry>
 
+<!--  Removed pending decision on names
  <glossentry id="druid">
   <glossterm>Druid</glossterm>
   <glossdef>
@@ -58,6 +59,17 @@
    </para>
   </glossdef>
  </glossentry>
+-->
+<glossentry id="emoticon">
+  <glossterm>Emoticon</glossterm>
+  <glossdef>
+   <para>
+     Also called smileys, emoticons are the little sideways faces made
+     of colons and parentheses which people use to convey emotion in email.
+     Examples: :-) or ;(  .
+   </para>
+  </glossdef>
+ </glossentry>
 
  <glossentry id="evolution">
   <glossterm>Evolution</glossterm>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 1e76a74a7d..bd94cef55d 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -1,5 +1,4 @@
 <!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
@@ -108,8 +107,9 @@ standardize on second person, not 1st pers. plural.
         There are three levels of developing for
         <application>Evolution</application>.  You can write actions.
         You can write scripts.  And you can write full-fledged
-        Evolution components.  This paragraph will eventually
-        desfcribe what that means.
+        Evolution components.  This paragraph will eventually describe
+        what that means, if the entire part is not phased out of this
+        manual.
       </para>
     </partintro>
     
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index dbfbe7d8df..6270b16a83 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+
 
 <chapter id="usage-calendar">
   <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
@@ -35,6 +35,9 @@
        here.
     </para>
 
+<!-- ############### FIXME FIXME FIXME ############
+Feature not yet implemented, and may not be implemented due to
+lack of time, resources, and interest.
     <para>
        In addition, <application>Evolution</application> supports
        Hebrew, Muslim, and other calendar formats.  To switch to a
@@ -42,6 +45,7 @@
        <guimenuitem>GUIMENUITEM</guimenuitem> from the
        <guimenu>GUIMENU</guimenu>.
     </para>
+-->
     <para>
        Describe the ways that different calendars can work here, and
        how the different calendars work together.
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 2291e28548..222878b145 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -1,37 +1,39 @@
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
+<!-- uncomment this during validation and debugging -->
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
-  <para>
-     The <application>Evolution</application> contact manager can
-     handle all of the functions of an address book, phone book, or
-     Rolodex.  Of course, <application>Evolution</application> allows
-     easier updates than an actual paper book. <application> Evolution
-     </application> also allows easy synchronization with handheld and
-     remote devices.  Since <application>Evolution</application>
-     supports most major network protocols, including
-     <glossterm>LDAP</glossterm>, it's easy to use over an existing
-     network.
-  </para>
-  <para>
-     Another advantage of the <application>Evolution</application>
-     address book is its integration with the rest of the application.
-     That means that when you look for someone's address, you can also
-     see a history of appointments with that person.  Or, you can get
-     an e-mail with contact information in it and create a new address
-     card on the spot.  In addition, searches and folders and all work
-     in the same way they do in the other components, so you don't
-     have to learn another system for similar tasks.
-  </para>
-  <para>
-     This chapter will cover using the
-     <application>Evolution</application> contact manager to organize
-     any amount of contact information, share addresses over a
-     network, and several ways to save time with everyday tasks.  To
-     learn about configuring the contact manager, see <xref
-     linkend="config-prefs-contact">.
-  </para>
-
+  <abstract>
+    <para>
+      The <application>Evolution</application> contact manager can
+      handle all of the functions of an address book, phone book, or
+      Rolodex.  Of course, <application>Evolution</application> allows
+      easier updates than an actual paper book. <application>
+      Evolution </application> also allows easy synchronization with
+      handheld and remote devices.  Since
+      <application>Evolution</application> supports most major network
+      protocols, including <glossterm>LDAP</glossterm>, it's easy to
+      use over an existing network.
+    </para>
+    <para>
+      Another advantage of the <application>Evolution</application>
+      address book is its integration with the rest of the
+      application.  That means that when you look for someone's
+      address, you can also see a history of appointments with that
+      person.  Or, you can get an e-mail with contact information in
+      it and create a new address card on the spot.  In addition,
+      searches and folders and all work in the same way they do in the
+      other components, so you don't have to learn another system for
+      similar tasks.
+    </para>
+    <para>
+      This chapter will cover using the
+      <application>Evolution</application> contact manager to organize
+      any amount of contact information, share addresses over a
+      network, and several ways to save time with everyday tasks.  To
+      learn about configuring the contact manager, see <xref
+      linkend="config-prefs-contact">.
+    </para>
+  </abstract>
   <sect1 id="usage-contact-basic">
     <title>Getting Started With the Contact Manager</title>	
     
@@ -53,55 +55,93 @@
     </figure>
 
     <para>
-       The contact manager interface is broken into two main parts.
-       The first part is the contact display section.  This can be
-       found at the bottom right panel of
-       <application>Evolution</application>.  This section is where
-       all your contact information is displayed.  Each of these cards
-       are organized into folders.  The second section is the
-       administrative section which spans the top of the <application>
-       Evolution</application> window.  This is where you can add,
-       edit, or delete records.
+       The toolbar for the address book is quite simple:
+
+       <itemizedlist>
+	<listitem><para>
+           Press <guibutton>New</guibutton> for a new contact.
+	</para></listitem>
+
+	<listitem><para>
+           <guibutton>Find</guibutton> brings up an in-depth search window.
+         </para></listitem>
+	
+	<listitem><para>
+	    Press <guibutton>Print</guibutton> to print.
+	</para></listitem>
+        <listitem><para>
+           <guibutton>Delete</guibutton> deletes a selected card.
+        </para></listitem>
+      </itemizedlist>
+    
+       The last feature is <guilabel>Quick Search</guilabel>; to use
+       it, just enter what you're looking for and hit
+       <keycap>Enter</keycap>.  <application>Evolution</application>
+       will show you all the cards that match; if there are none, the
+       display will be blank.  To display <emphasis>all</emphasis> of
+       your contacts, you can leave the <guilabel>Quick
+       Search</guilabel> field blank, and press enter.
+    </para>
+    <para>
+       The rest of the contact manager is taken up by the display of
+       your cards.  You can view it as a table or as a list of
+       cards&mdash; switch between them in the <guimenu>View</guimenu>
+       menu &mdash; and move through them alphabetically alphanumeric
+       buttons and the scrollbar at the right of the window.
+       
     </para>
   </sect1>
   <sect1 id="usage-contact-cards">
     <title>Creating, Deleting, and Adding Cards</title>
     <para>
-      You can create a new card by pressing the <guibutton>New
-      Card</guibutton> button, or by pressing
-      <keysym>KEYSYM</keysym>. The <interface>Contact
-      Editor</interface> window will appear.  It has two tabs,
+      Open up the contact editor by pressing the <guibutton>New
+      Card</guibutton> button.  The window has two tabs,
       <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 with all
-      the items from the main window (IS THIS TRUE?  DESCRIBE MENUBAR
-      AGAIN?)
+      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.
     </para>
+
+    <figure id="usage-contact-editor-fig">
+      <title>Evolution Contact Editor</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Editor</screeninfo>
+	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
+	    </graphic>
+      </screenshot>
+    </figure>
+
     <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; and a
-      briefcase for categories.  The things that go into most of the
-      text fields should be obvious enough, so we'll just describe the
-      more interesting parts of the window.  Aside from the
-      <guilabel>Categories</guilabel> feature, which is discussed in
-      <xref linkend="usage-contact-organize">, there are two things
-      you'll want to know about.
+      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.  The things that
+      go into most of the text fields should be obvious enough, so
+      we'll just describe the more interesting parts of the window.
+      Aside from the <guilabel>Categories</guilabel> feature, which is
+      discussed in <xref linkend="usage-contact-organize">, there are
+      two things you'll want to know about: the first of these is the
+      <guilabel>File As</guilabel> field.
    </para>
+
    <para>
       Type "Eva Lucianne Tester" into the <guilabel>Full
       Name</guilabel> field.  You'll notice that the <guilabel>File
-      As</guilabel> field also fills up, but in a phone-book fashion:
-      Tester, Lucianne.  You can pick "Eva Tester" from the drop-down,
-      or type in your own.  I suggest that you don't enter something
-      entirely different from the actual name, however.  You might
-      forget that you've filed Eva's information under "C" for "Code, Helix."
+      As</guilabel> field also fills up, but in reverse: Tester,
+      Lucianne.  You can pick "Eva Tester" from the drop-down, or, if
+      you prefer, type in your own, such as "Lucianne Tester, Eva".  I
+      suggest that you don't enter something entirely different from
+      the actual name, however.  You might forget that you've filed
+      Eva's information under "F" for "Fictitious Helix Code
+      Employees"
    </para>
    <para>
-      The other little feature I want to mention involves the little
-      squares next to several of the fields.  Click on them and you'll
-      get a menu of different labels; for the fields in the telephone
+      The other feature I want to mention involves the little squares
+      next to several of the fields.  Click on them and you'll get a
+      menu of different labels; for the fields in the telephone
       section, it's a long list involving things like
       <guilabel>Home</guilabel>, <guilabel>Home 2</guilabel>,
       <guilabel>Other Fax</guilabel>, and <guilabel>Pager</guilabel>.
@@ -114,16 +154,7 @@
       labels, any that you've already filled in will be marked.
    </para>
 
-    <figure id="usage-contact-editor-fig">
-      <title>Evolution Contact Editor</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-<!--
+<!--  FIXME: do this whole thing later.
       <variablelist>
          <listitem>
 	  <term>
@@ -149,18 +180,8 @@
         </para>
     
 -->
-
-    <para>
-       You can choose which fields an address card has, and create new
-       fields for cards.  For example,
-       <application>Evolution</application> provides for two line
-       postal addresses by default, but you may have as many or as few
-       lines to an address as you wish.  To change which fields an
-       address card has, choose DESCRIBE HERE HOW TO DO THIS.
-    </para>
-
-    <note>
-      <title>Quick ways to add cards</title>
+    <tip>
+      <title>Contact Shortcuts</title>
       <para>
         You can add cards from within an email message or calendar
         appointment.  While looking at an email, right-click on any
@@ -172,7 +193,7 @@
         Address</guimenuitem>.  (NOTE that feature may change!
         unimplemented!)
       </para>
-    </note>
+    </tip>
     
     <para>
        You delete a card by pressing the <guibutton>Delete
@@ -200,11 +221,11 @@
     <para>
       Another useful UNIMPLEMENTED
       <application>Evolution</application> feature is its ability to
-      recognize when people live together.  If two people in your
-      contact manager share an address, and you change the address for
-      one of them, <application>Evolution</application> will ask you
-      if you wish to change the address for both of them, or just for
-      one.
+      recognize when people live or work together.  If several people
+      in your contact manager share an address, and you change the
+      address for one of them, <application>Evolution</application>
+      will ask you if you wish to change the address for all of them,
+      or just for one.
     </para>
 
     <sect2 id="usage-contact-organize-group">
@@ -264,8 +285,11 @@
            Then, you can refer to all the cards in that category by:
          </para>
 	<para>
-           If the default categories don't suit you, you can add your
-           own.  Here's how:
+           If the master list of categories don't suit you, you can
+           add your own.  Just enter the new category's name in the
+           text box, then click <guibutton>Categories</guibutton>e and
+           choose <guilabel>Add to Master List</guilabel> in the
+           window that appears. (FIXME: This isn't quite accurate.)
          </para>
       </sect3>
     </sect2>
@@ -285,70 +309,66 @@
      <example id="usage-contact-sharing-ex">
 	<title>Sharing Address Cards and Calendar Data</title>
 	  <para>
-	    Ray wants to schedule a meeting with someone at
-	    Company X, so he checks the network for the Company X
-	    address card that states his contacts there.  Since
-	    his company also shares calendars, he then learns that
-	    his co-worker Deanna has already scheduled a meeting
-	    with them next Thursday.  He can either go to the
-	    meeting himself or ask Deanna to discuss his concerns
-	    for him.  Either way, I avoid scheduling an extra
-	    meeting with Company X.
+	    Ray wants to schedule a meeting with Company X, so he
+	    checks the network for the Company X address card so he
+	    knows whom to call there.  Since his company also shares
+	    calendars, he then learns that his co-worker Deanna has
+	    already scheduled a meeting with Company X next Thursday.
+	    He can either go to the meeting himself or ask Deanna to
+	    discuss his concerns for him.  Either way, he avoids
+	    scheduling an extra meeting with Company X.
 	 </para>
       </example>
-
     <para>
-       Of course, you don't want to share all of your cards&mdash;
-       why overload the network with a list of babysitters, or
-       tell everyone on your network you're talking to new job
-       prospects?  <application>Evolution</application> lets you
-       decide which folders you want to make accessible to others.
+       Of course, you don't want to share all of your cards&mdash; why
+       overload the network with a list of babysitters, or tell
+       everyone on your network you're talking to new job prospects?
+       <application>Evolution</application> lets you decide which
+       folders you want to make accessible to others.
     </para>
     <para>
-       To begin sharing a folder of address cards, select (something) <!--
-       DESCRIBE PROCESS HERE -->.  The
-       <interface>Sharing</interface> window will pop up.  It contains:
-       <!--DESCRIBE INTERFACE HERE-->
+       To begin sharing a folder of address cards, wait until
+       <application>Evolution</application> supports this
+       feature. (FIXME!)
     </para>
   </sect1>
 
   <sect1 id="usage-contact-automate">
     <title>Automating the Contact Manager</title>
     <para>
-      The <application>Evolution</application> contact manager
-      can perform a wide variety of tasks for you.  From speeding
-      up basic tasks like adding a new address card to managing
-      mailing lists, you'll find that the contact manager is more
-      than a mere address book.
+       In addition to working with the mailer and the calendar to add
+       new cards quickly, the contact manager can do some pretty cool
+       stuff on its own. (FIXME: This para is terrible)
     </para>
 
     <sect2 id="contact-automation-basic">
       <title>Send me a card: Adding New Cards Quickly</title>
       <para>
-	When you get information in the mail or in a calendar
-	entry, you can add it to an address card.  To do so, right
-	click on any email address or email message, and select
-	<guimenuitem>Add Address Card</guimenuitem> from the menu
-	that appears.  Of course, <application>
-	Evolution</application> adds cards from a hand-held device
-	during HotSync operation.  For more information about
-	that, see <xref linkend="usage-sync">.
+	As noted before, when you get information about a person in
+	the mail or in a calendar entry, you can add it to an address
+	card.  To do so, right click on any email address or email
+	message, and select <guimenuitem>Add Address
+	Card</guimenuitem> from the menu that appears.  Of course,
+	<application> Evolution</application> also adds cards from a
+	hand-held device during HotSync operation.  For more
+	information about that, see <xref linkend="usage-sync">.
       </para>
     </sect2>
 
     <sect2 id="contact-automation-lists">
       <title>Managing a Mailing list</title>
       <para>
-	 You already know that when you are writing an email, you
-	 can address it to one or more people, and that
-	 <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 doing SOMETHING HERE.
-	 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.
+	 You already know that when you are writing an email, you can
+	 address it to one or more people, and that
+	 <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.
       </para>
     </sect2>
     <sect2 id="usage-contact-automation-extra">
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 2215689b31..a0d64b6d74 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,15 +1,14 @@
-
+<!-- uncomment the declaration during validation and debugging
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
   <abstract>
     <title> An Overview of the Evolution Mailer</title>
     <para>
-      Email is an integral part of life these days, and
-      <application>Evolution</application> mail is here to help
-      you keep track of it.  <application>Evolution</application>
-      email is like other email programs in all the ways you would
-      hope:
+       <application>Evolution</application> email is like other email
+       programs in all the ways you would hope:
      <itemizedlist>
        <listitem>
 	 <para>
@@ -25,26 +24,25 @@
        </listitem>
        <listitem>
 	 <para>
-	   It lets you use a wide variety of mail sources, including
-	   IMAP, POP3, and local files.
+	   It supports multiple mail sources, including IMAP, POP3,
+	   and local mbox files.
 	 </para>
        </listitem>
      </itemizedlist>
     </para>
     <para>
-      However, <application>Evolution</application> has some
-      important differences.  First, it's built to handle very
-      large amounts of mail without slowing down or crashing.  We
-      had high mail volumes in mind when we designed our <link
-      linkend="usage-mail-organize-filters">filtering</link> and
-      <link linkend="usage-mail-organize-search">searching</link>
-      functions.  There's also the
-      <application>Evolution</application> <link
-      linkend="usage-mail-organize-vFolders">vFolder</link>, an
-      advanced organizational feature not found in other mail
-      clients.  If you get a lot of mail, or if you keep every
-      message you get in case you need to refer to it later,
-      you'll find that feature especially useful.
+      However, <application>Evolution</application> has some important
+      differences.  First, it's built to handle very large amounts of
+      mail without slowing down or crashing.  Both the <link
+      linkend="usage-mail-organize-filters">filtering</link> and <link
+      linkend="usage-mail-organize-search">searching</link> functions
+      were built for speed and efficiency on gargantuan mail
+      volumes. There's also the <application>Evolution</application>
+      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
+      advanced organizational feature not found in other mail clients.
+      If you get a lot of mail, or if you keep every message you get
+      in case you need to refer to it later, you'll find that feature
+      especially useful.
     </para>
 
     <para>
@@ -89,17 +87,16 @@
 	will change to something a little less counter-intuitive.
       </para>
  <!-- ==============Figure=================================== -->
- <!-- MAKE SURE THIS SCREENSHOT HAS THE WELCOME MESSAGE! -->
+ 
       <figure id="usage-mail-intro-fig">
 	  <title>Evolution Mail</title>
 	  <screenshot>
-	    <screeninfo>Evolution Mail</screeninfo>
-	    <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
+	    <screeninfo>Inbox</screeninfo>
+	    <graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
-<!-- ==============End of Figure===================================
--->
+<!-- ==============End of Figure============================== -->
 
     </sect2>
 
@@ -112,10 +109,9 @@
 	assistant</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>.
+	<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 -->
       </para>
 
       <para>
@@ -131,13 +127,15 @@
 	<para>
 	  If you receive a file attached to an email,
 	  <application>Evolution</application> will display it at the
-	  bottom of the message to which it's attached.  Click on the
-	  attachment icon or text, and
-	  <application>Evolution</application> will ask you where you
-	  want to put the file.  Once you've done that, you can
-	  open, move, copy, or execute it just like any other, using
-	  <application>Nautilus</application> or your favorite shell
-	  or file manager.
+	  bottom of the message to which it's attached.  Text, HTML,
+	  and most images will be displayed in the message itself.
+	  For other files, <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.
 	</para>
 
 	<para>
@@ -147,66 +145,66 @@
 	   turn it off if you prefer.
 	</para>
 
+<!--  ######## Feature will probably not be implemented ******
 	<para>
 	   It can also display <glossterm>live
 	   documents</glossterm>, which have scripted or
 	   executable contents&mdash; for example, a working
 	   spreadsheet page or a chess game.  
-	</para>
-	<tip id="badidea-attachment">
-	  <title>Bad Idea</title>
-	  <para>
-	    Don't worry about security. When someone you don't know
-	    sends you a program by email, assume it's a really cool
-	    game.  Mark it executable and run it, no matter what.
-	  </para>
-	</tip>
+	</para> 
+
+-->
+
       </sect3>
     </sect2>
 
     <sect2 id="usage-mail-getnsend-send">
       <title>Writing and Sending Mail</title>
       <para>
-	 You can start writing a new
-	 email message by selecting <guimenuitem>New
-	 Mail</guimenuitem> from the <guimenu>File Menu</guimenu>,
-	 or by pressing <guibutton>Ctrl-N</guibutton>.  When you do so,
-	 the <interface>New Message</interface> window will open,
-	 as shown in <xref linkend="usage-mail-newmsg-fig">.
+	 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">.
+      </para>
+
 
 
 <!--   ==============Figure=================================== -->
-       <figure id="usage-mail-newmsg-fig">
-	 <title>New Message Window</title>
-	 <screenshot>
+      <figure id="usage-mail-newmsg-fig">
+	<title>New Message Window</title>
+	<screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="newmsg-pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/newmsg-pic" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure=================================== -->
- <!-- Check the alignment of the following paragraph in the PS and HTMl output, 
-as putting the fig inside the paragraph may or may not have fixed an error -->
-      </para>
-      <para>	  
+
+ <!-- Check the alignment of the following paragraph in the PS and
+ HTML output: it's indented for no good reason -->
+      <para>
 	 Enter an address in the <guilabel>To:</guilabel> field, a
-	 message in the <guilabel>Message:</guilabel> field, and
-	 press <guibutton>Send</guibutton>.  That's
-	 easy.  It may even be too easy, which is why I like to
-	 queue my messages up to be sent a few minutes later.
+	 subject in the <guilabel>Subject:</guilabel> and a message in
+	 the big empty box at the bottom of the window, and press
+	 <guibutton>Send</guibutton>.  That's easy.  It may even be
+	 too easy, which is why I like to queue my messages up to be
+	 sent a few minutes later.
 
 	 <tip id="usage-mail-getnsend-send-attach-tip">
 	  <title>Send Now, Send Later</title>
 	  <para>
-	    Evolution will send mail immediately unless you tell
-	    it to do otherwise by selecting <guimenuitem>Send
-	    Later</guimenuitem> from the <guimenu>MENU</guimenu>.
-	    Then, when you press <guibutton>Send &
-	    Receive</guibutton>, all your unsent messages will go
-	    out at once.  I like to use "Send Later" because it
-	    gives me a chance to change my mind about a message
-	    before it goes out.  That way, I don't send anything I'll
-	    regret the next day.
+	    Evolution will send mail immediately unless you tell it to
+	    do otherwise by selecting <guimenuitem>Send
+	    Later</guimenuitem> from the <guimenu>MENU</guimenu> in
+	    the message composition window.  Then, when you press
+	    <guibutton>Send</guibutton>, all your unsent messages will
+	    go out at once.  I like to use "Send Later" because it
+	    gives me a chance to change my mind about a message before
+	    it goes out.  That way, I don't send anything I'll regret
+	    the next day.
 	  </para>
 	  <para>
 	    To learn more about how you can specify message queue
@@ -216,85 +214,89 @@ as putting the fig inside the paragraph may or may not have fixed an error -->
        </para>
 
       <para>
-	There is quite a bit more to sending mail, though.  In the
-	next few sections, you'll see how
-	<application>Evolution</application> handles additional features,
-	including mailing lists, attachments, and forwarding.
+	You can probably guess the purpose of the buttons labelled
+	<guilabel>Cut</guilabel>, <guilabel>Copy</guilabel>,
+	<guilabel>Paste</guilabel> and <guilabel>Undo</guilabel>, but
+	there's a bit more to sending mail that's less obvious.  In
+	the next few sections, you'll see how
+	<application>Evolution</application> handles additional
+	features, including mailing lists, attachments, and
+	forwarding.
       </para>
 
 
       <sect3 id="usage-mail-getnsend-send-to">
 	<title>Choosing Recipients</title>
 	<para>
-	  If you have created address cards in the contact
-	  manager, you can also enter nicknames or other portions
-	  of address data, and
-	  <application>Evolution</application> will complete the
-	  address for you. (INSERT description of UI for this
-	  feature, once it is decided upon). If you enter a name
-	  or nickname that can go with more than one card,
-	  Evolution will open a dialog box to ask you which person
-	  you meant.  (QUESTION: will users be able to drag & drop
-	  address cards to send email?).  For more information
-	  about using email together with the contact manager and
-	  the calendar, see <xref
-	  linkend="usage-contact-automate"> and <xref
+	  If you have created address cards in the contact manager,
+	  you can also enter nicknames or other portions of address
+	  data, and <application>Evolution</application> will complete
+	  the address for you. <!-- (INSERT description of UI for this
+	  feature, once it is decided upon). -->  If you enter a name or
+	  nickname that can go with more than one card, Evolution will
+	  open a dialog box to ask you which person you meant.
+	  <!-- (QUESTION: will users be able to drag & drop address cards
+	  to send email?). -->  For more information about using email
+	  together with the contact manager and the calendar, see
+	  <xref linkend="usage-contact-automate"> and <xref
 	  linkend="usage-calendar-apts-group">.
 	</para>
-	<para>
-	  In addition, you can mark recipients in three different
-	  ways.  The <guilabel>To:</guilabel> field is for the
-	  primary recipients of the message you are going to send.
-	  However, it is considered bad form to have more than a
-	  few email addresses in this section.
-	</para>
-	<para>
-	  If you're writing to one person, but want to keep a
-	  third party up to date, you can use
-	  <guilabel>Cc:</guilabel>.  Hearkening back to the dark
-	  ages when people used typewriters and there were no copy
-	  machines, "Cc" stands for "Carbon Copy."  Use it
-	  whenever you want to share a message you've written to
-	  someone else.
-	  <example>
-	    <title>Using the Cc: field</title>
-	    <para>
-	       Say, for example, Susan sends an email to a client.
-	       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 know that they can talk
-	       to Tim about the message as well.
-	    </para>
-	  </example>
-	</para>
-	<para>
-	  If you have a large number of recipients, or if you want
-	  to send mail to several people without sharing the
-	  recipient list, you should use
-	  <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
-	  Carbon Copy", and means that people listed in the
-	  <guilabel>BCc:</guilabel> are excluded from the
-	  recipient list, although they will receive the message
-	  and the list of addresses from the
-	  <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
-	  fields.  
-
-	  <example id="ex-mail-bcc">
-	     <title>Using the BCc: field</title>
-	     <para>
-	       Let's say Tim sends an email to a client, and wants
-	       his supervisor to know what he wrote.  He doesn't,
-	       however, want the client to start writing his
-	       supervisor about the project&mdash; it's Tim's job
-	       to deal with the client.  So Tim puts his
-	       supervisor's email address in the
-	       <guilabel>BCc:</guilabel> field.  That way, the
-	       client has one contact, and the boss stays in the
-	       loop.
-	   </para>
-	 </example>
-	</para>
+
+	<sect4 id="usage-mail-getnsend-send-to-mult">
+	  <title>Multiple Recipients</title>
+	  <para>
+	    In addition, you can mark recipients in three different
+	    ways.  The <guilabel>To:</guilabel> field is for the
+	    primary recipients of the message you are going to send.
+	    However, it is considered bad form to have more than a few
+	    email addresses in this section.
+	  </para>
+	  <para>
+	    If you're writing to one person, but want to keep a third
+	    party up to date, you can use <guilabel>Cc:</guilabel>.
+	    Hearkening back to the dark ages when people used
+	    typewriters and there were no copy machines, "Cc" stands
+	    for "Carbon Copy."  Use it whenever you want to share a
+	    message you've written to someone else.
+	    <example>
+	      <title>Using the Cc: field</title>
+	      <para>
+	         Say, for example, Susan sends an email to a client.
+	         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 know that they can talk to
+	         Tim about the message as well.
+	      </para>
+	    </example>
+	  </para>
+	  <para>
+	    If you have a large number of recipients, or if you want
+	    to send mail to several people without sharing the
+	    recipient list, you should use
+	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
+	    Copy", and means that people you put in the
+	    <guilabel>Bcc:</guilabel> field get the message, but
+	    nobody else sees their email address.  They will still see
+	    the list of addresses from the <guilabel>To:</guilabel>
+	    and <guilabel>Cc:</guilabel> fields.
+
+	    <example id="ex-mail-bcc">
+	      <title>Using the Bcc: field</title>
+	      <para>
+	         Tim is sending out a message to all of his company's
+	         clients, some of whom are in competition with each
+	         other, and all of whom value their privacy.  If he
+	         puts every address from his address book's "Clients"
+	         category into the <guilabel>To:</guilabel> or
+	         <guilabel>Cc:</guilabel> fields, he'll have made the
+	         <emphasis>entire</emphasis> client list public.
+	         Don't assume it won't happen to you; I got careless
+	         one day and did it myself.
+	     </para>
+	    </example>
+	  </para>
+	</sect4>
       </sect3>
 
    <sect3 id="usage-mail-getnsend-send-reply">
@@ -321,7 +323,7 @@ with quoted materials and the relevant replies interspersed-->
 	 <title>Reply Message Window</title>
 	 <screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="replymsg-pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
@@ -330,131 +332,198 @@ with quoted materials and the relevant replies interspersed-->
 
 	<para>
 	  If a message has several recipients, as in the case of
-	  mailing lists or messages that have been carbon copied,
-	  you may wish to select one of the items under the
-	  <guimenuitem>Reply-To</guimenuitem> submenu on the
-	  <guimenu>MENU</guimenu> menu.  This will allow you to
-	  choose one or several of the other message recipients in
-	  addition to the person who originally sent you the
-	  message. If there are large numbers of people in the
-	  <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
-	  fields, this can save substantial amounts of time.  In
-	  addition, Reply-To makes it very easy to keep off-topic
-	  conversation away from mailing lists and newsgroups.
+	  mailing lists or messages that have been carbon copied, you
+	  may wish to click <guibutton>Reply to All</guibutton>
+	  instead of <guibutton>Reply</guibutton>.  If there are large
+	  numbers of people in the <guilabel>Cc:</guilabel> or
+	  <guilabel>To:</guilabel> fields, this can save substantial
+	  amounts of time.  But be careful, and always make sure you
+	  know who is getting a message: it could be a mailing list
+	  with thousands of subscribers.
 	  <example>
 	    <title>Using the Reply-To feature</title>
 	    <para>
-	      Returning again to the email Susan sent to Tim and
-	      their client, you'll note that the Reply-To feature
-	      allows the client to decide whether to reply just to
-	      Susan, or to both Tim and Susan by selecting
-	      a menu item, rather than by cutting and pasting the
-	      email addresses. 
+	      Susan sends an email to a client, and sends copies to
+	      Tim and to an internal company mailing list of
+	      co-workers.  If Tim wants to make a comment to all of
+	      them, he uses <guibutton>Reply to All</guibutton>, but
+	      if he just wants to tell Susan that he agrees with her,
+              he uses <guibutton>Reply</guibutton>.
 	    </para>
 	  </example>
 	</para>
       </sect3>
 
-      <sect3 id="usage-mail-getnsend-send-fancy">
-	<title>Embellishing that email</title>
+      <sect3 id="usage-mail-getnsend-send-html">
+	<title>Embellish your email with HTML</title>
 	<para>
-	   <application>Evolution</application> allows you to 
-	    make your email more attractive in a number of ways. You
-	    can send messages formatted with HTML, attach any sort
-	    of file to them, and even include live documents, like
-	    spreadhseets or chess games.  This section will tell
-	    you how.
-	</para>
-
-	<sect4 id="usage-mail-getnsend-send-html">
-	  <title>Colors, pictures, and fonts with HTML Mail</title> 
+            You can't normally use text treatments or pictures in
+            emails, which is why you've probably seen people use
+            asterisks for emphasis or use
+            <glossterm>emoticons</glossterm> to convey their
+            feelings.  However, most of the newer email programs can
+            include and display images and text treatments as well as
+            basic alignment and paragraph formatting.
+        </para>
+	<note>
+	  <title>HTML Mail is not a Default Setting</title>
 	  <para>
-	    Most email messages are sent as plain text, but they
-	    can also be sent as HTML, which means they can include
-	    color, text style, and other formatting information.
-	    Evolution will read and display HTML properly without
-	    trouble, and also allows you to send outgoing
-	    email messages as HTML.  To send an HTML message, just
-	    use the composition toolbar to add formatting;
-	    your message text will appear formatted in the composer
-	    window, and the message will be sent as HTML.
+	    Some people do not have HTML-capable mail clients, or
+	    prefer not to receive HTML-enhanced mail because it is
+	    slower to download and display.  <emphasis>Some</emphasis>
+	    people refer to HTML mail as "the root of all evil" and
+	    get very angry if you send them HTML mail, which is why
+	    <application>Evolution</application> sends plain text
+	    unless you explicitly ask for HTML.  To send HTML mail,
+	    you will need to select <guilabel>Send Messages as
+	    HTML</guilabel> in the mail settings dialog box.  See
+	    <xref linkend="config-mail"> for more information.
+          </para>
+	  <para>
+            If you format a message with HTML, but do not have
+	    <guilabel>Send Messages as HTML</guilabel> enabled in your
+	    mail settings, the composer will remove your text styles.
+	    It will, however, preserve indentation and lists.  It will
+	    do the same thing for any individuals in your address book
+	    whom you have marked as preferring not to receive HTML.
+           </para>
+	</note>
+	<para>
+           HTML formatting tools are located just above the
+	   composition frame, and in the <guimenu>Insert</guimenu> and
+	   <guimenu>Format</guimenu> menus.  Your message text will
+	   appear formatted in the composer window, and the message
+	   will be sent as HTML.
 	  </para>
+	  <para>
+            The icons in the toolbar are explained in tool-tips, which
+            appear when you hold your mouse over the buttons.  The
+            buttons fall into four categories:
+            <itemizedlist>
+	      <listitem>
+		<para>
+                  Headers and lists: Choose
+                  <guilabel>Normal</guilabel> for your default text
+                  style, or <guilabel>Header 1</guilabel> through
+                  <guilabel>Header 6</guilabel> for varying sizes of
+                  header.  You can also select
+                  <guilabel>pre</guilabel> for preformatted text
+                  blocks, and three types of <guilabel>List
+                  Item</guilabel>.
+                </para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+                  Text style: <guilabel>B</guilabel> is for bold text,
+                  <guilabel>I</guilabel> for italics,
+                  <guilabel>U</guilabel> for an underline, and
+                  <guilabel>S</guilabel> for a strikethrough.
+                </para>
+	      </listitem>    
+
+	      <listitem>
+		<para>
+                   Alignment: Located next to the text style buttons,
+                   these three paragraph icons should be familiar to
+                   users of most word processing software.  The
+                   leftmost button will make your text left-justified,
+                   the center button, centered, and the right hand
+                   button, right-justified.
+                </para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+                  Indentation rules: The button with the arrow
+                  pointing left will reduce a paragraph's indentation,
+                  and the right arrow will increase its indentation.
+               </para>
+	    </listitem>
+	  </itemizedlist>
+        </para>
+	<para>
+           There are two tools that you can find only in the
+           <guimenu>Insert</guimenu> menu.
+           <itemizedlist>
+	    <listitem>
+	      <para>
+                 <guilabel>Insert Link</guilabel>: Use this tool to
+                 put hyperlinks in your HTML messages.  When you
+                 select it, <application>Evolution</application> will
+                 prompt you for the <guilabel>Text</guilabel> that
+                 will appear, and the <guilabel>Link</guilabel>, where
+                 you should enter the actual web address (URL).
+              </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+               <guilabel>Insert Image</guilabel>: Select this item to
+               embed image into your email, as was done in the welcome
+               message.  Images will appear at the location of the
+               cursor.
+              </para>
+	    </listitem>
+	  </itemizedlist>
+          </para>
 	  <note>
 	    <title>A Technical note on HTML Tags</title>
 	    <para>
-	      You can't use the composer window to create web pages,
-	      at least not if you plan to hand-code them with HTML.
-	      If you enter HTML directly into the composer&mdash; say,
-	      <markup role="html">&lt;B&gt;Bold
-	      Text&lt;/B&gt</markup>, the the composer will assume you
-	      meant exactly that, and not "make this text bold," as a
-	      HTML composition tool would.  For the very technically
-	      inclined, that means that when the text <markup
-	      role="html">&lt;B&gt</markup> is sent as HTML, it will
-	      be converted to the string
-	      <literal>&amp;lt;B&amp;gt;</literal>.  Real gearheads
-	      should wonder how I got all that stuff straight, given
-	      that I'm writing this in SGML.
+	      The composer is a WYSIWYG (What You See Is What You Get)
+	      editor for HTML. That means that if you enter HTML
+	      directly into the composer&mdash; say, <markup
+	      role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
+	      the composer will assume you meant exactly that string
+	      of characters, and not "make this text bold," as an HTML
+	      composition tool or text editor would.
 	    </para>
 	  </note>
-	  <para>
-	    Some people do not have HTML-capable mail clients, or
-	    prefer not to receive HTML-enhanced mail because it is
-	    slower to download and display.
-	    <emphasis>Some</emphasis> people refer to HTML mail as
-	    "the root of all evil" and get very angry if you send
-	    them HTML mail, which is why the default in
-	    <application>Evolution</application> is plain text.
-	    If you choose to send HTML mail, but have an address
-	    book entry for someone who does not wish to receive
-	    HTML-enhanced mail, you can note that preference in
-	    their address card.  The mailer will automatically
-	    strip the HTML tags from any messages you send to that
-	    address.
-	  </para>
-	</sect4>
-
-	<sect4 id="usage-mail-getnsend-send-attach">
+	</sect3>
+	<sect3 id="usage-mail-getnsend-send-attach">
 	  <title>Attachments</title>
 	  <para>
-	    If you want to attach a file to your email message,
-	    you can do so by <!--describe process here-->.  If
-	    your recipients can read HTML mail, you can put an
-	    image inside the mail by dragging the file into the
-	    composer window, or by selecting <guimenuitem>Menu
-	    Item</guimenuitem> from the <guimenu>Menu</guimenu>
-	    menu.  Still, unless you know what email client the
-	    recipient is using, it's best to send a message or
-	    attachment in the simplest manner possible.
-	  </para>
-	</sect4>
-	<sect4 id="usage-mail-getnsend-send-live">
+	    If you want to attach a file to your email message, just
+	    click the button with a paper clip on it, labelled
+	    <guibutton>Attach</guibutton>.
+	    <application>Evolution</application> will then ask you to
+	    select the file.  Do so, and then send the message.  Be
+	    aware that big attachments can take a long time to
+	    download.  
+          </para>
+	</sect3>
+
+<!-- Function not implemented, 
+possibly never will be due to security evil. -->
+<!--
+	<sect3 id="usage-mail-getnsend-send-live">
 	  <title>Live Documents</title>
 	  <para>
 	    Later versions of <application>Evolution</application>
 	    will allow you to enliven your email with almost any
 	    sort of document, and even with entire
 	    applications. At this point, however, this feature has not 
-	    yet been implimented.
+	    yet been implemented.
 	  </para>
-	</sect4>
-      </sect3>
+	</sect3>
+-->
 
       <sect3 id="usage-getnsend-fwd">
 	<title>Forwarding Mail</title>      
 	<para>
-	  <guilabel>Forward</guilabel> is useful if you have
-	  received a message and you think someone else would like
-	  to see it, or if you get a message intended for someone
-	  else.  You can forward a message as an attachment to a
-	  new message (the default way of forwarding) or you can send it
-	  <glossterm>inline</glossterm> as a quoted portion of the
-	  message you are sending.  Attachment forwarding is best
-	  if you want to send the entire message you received,
-	  unaltered.  Inline forwarding is best if you want to
-	  send portions of a message, or if you have a large
-	  number of comments on different sections of the message
-	  you are forwarding.  Remember to note from whom the
+	  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
+	  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
+	  to a new message (this is the default way of forwarding) or
+	  you can send it <glossterm>inline</glossterm> as a quoted
+	  portion of the message you are sending.  Attachment
+	  forwarding is best if you want to send the full, unaltered
+	  message on to someone else.  Inline forwarding is best if
+	  you want to send portions of a message, or if you have a
+	  large number of comments on different sections of the
+	  message you are forwarding.  Remember to note from whom the
 	  message came, and where, if at all, you have removed or
 	  altered content.
 	</para>
@@ -478,6 +547,17 @@ with quoted materials and the relevant replies interspersed-->
 	  I started with ten, but four were "Don't send
 	  <glossterm>spam</glossterm>."
 	  <itemizedlist>
+
+	    <listitem>
+	      <para>
+		 Don't send spam or forward chain mail.  If you must,
+		 watch out for hoaxes and urban legends, and make sure
+		 the message doesn't have multiple layers of email
+		 quotation symbols (&gt;) indicating multiple layers
+		 of careless inline forwarding.
+	      </para>
+	    </listitem>
+
 	    <listitem>
 	      <para>
 		Always begin and close with a salutation. Say
@@ -515,16 +595,6 @@ with quoted materials and the relevant replies interspersed-->
 
 	    <listitem>
 	      <para>
-		 Don't send spam or forward chain mail.  If you
-		 must, verify any rumors, and make sure the
-		 message doesn't have multiple layers of email
-		 quotation symbols (&gt;) indicating multiple
-		 layers of careless inline forwarding.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
 		 When you reply or forward, include just enough of
 		 the previous message to provide context. Not too
 		 much, not too little.
@@ -540,53 +610,59 @@ with quoted materials and the relevant replies interspersed-->
   <sect1 id="usage-mail-organize">
     <title>Organizing Your Mail</title>
     <para>
-      Even if you only get a few email messages a day, you
-      probably want to sort and organize them.  When you get a
-      hundred a day and you want to refer to a message you
-      received six weeks ago, you need to sort and organize them,
-      and <application>Evolution</application> has the tools to
-      help you do it.  
+      Even if you only get a few email messages a day, you probably
+      want to sort and organize them.  When you get a hundred a day
+      and you want to refer to a message you received six weeks ago,
+      you <emphasis>need</emphasis> to sort and organize them.
+      Fortunately, <application>Evolution</application> has the tools
+      to help you do it.
     </para>
 
     <sect2 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
       <para>
 	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  Some, like
-	<guilabel>Inbox</guilabel>, <guilabel>Outbox</guilabel>, and
-	<guilabel>Drafts</guilabel> have already been created for
-	you. If you like, you can create new folders by selecting
-	<guisubmenu>New</guisubmenu> and then
+	address cards and calendars, in folders.  You start out with a
+	few, like <guilabel>Inbox</guilabel>,
+	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
+	but you can create as many as you like.  Create new folders by
+	selecting <guisubmenu>New</guisubmenu> and then
 	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.  You must specify both the name
-	and the type of the folder; a folder can hold mail, calendars,
-	or address cards, but you can't mix them up.  Some people
-	don't like that. Too bad.
+	<guimenu>File</guimenu> menu.
+	<application>Evolution</application> will as you for the name
+	and the type of the folder, and will provide you with a folder
+	tree so you can pick where it goes.
+        <note>
+	  <title>Folders have Limits</title>
+	  <para>
+            A folder can hold mail, calendars, or address cards, but
+	    you can't mix them up.  Also, an email message can be in
+	    only one folder at a time, just like real mail in real
+	    folders.  If you need more flexibility, try vFolders.
+          </para>
+	</note>
       </para>
       <para>
-        The new folders will appear in the <interface>folder
-	view</interface>, and you can drag them wherever you want to
-	relocate them.  You can drag messages around too.  If you
-	create filters with the <interface>filter
-	assistant</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.
+        When you click <guibutton>OK</guibutton>, your new folder will
+	appear in the <interface>folder view</interface>.  You can
+	then put messages in it by dragging and dropping them.  If you
+	create a filter with the <interface>filter
+	assistant</interface>, you can have mail moved to your folder
+	automatically.
       </para>
     </sect2>    
 
     <sect2 id="usage-mail-organize-search">
       <title>Searching for Messages</title>
       <para>
-	Because <application>Evolution</application> automatically
-	creates an index of every email you send or receive, it can
-	search through your old messages and present you with results
-	very quickly.  You can search through just the message
-	subjects, just the message body, or both body and subjet.
+	Most mail clients can search through your messages for you,
+	but <application>Evolution</application> does it faster.  You
+	can search through just the message subjects, just the message
+	body, or both body and subject.
       </para>
       <para>
-	To create a search, enter the word or phrase you're
-	looking for in the form field below the toolbar, and
-	choose a search type:
+	To start searching, enter a word or phrase in the text area
+	right below the toolbar, and choose a search type:
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -633,7 +709,7 @@ with quoted materials and the relevant replies interspersed-->
 
         Then, press <keycap>Enter</keycap>.
         <application>Evolution</application> will show your search
-        results in 
+        results in the message list.
 
       </para>
     </sect2>
@@ -689,14 +765,16 @@ with quoted materials and the relevant replies interspersed-->
 	  </listitem>
 	</itemizedlist>
       </para>
-
+      
       <para>
-       Then, the filter assistant will ask you which emails it should act
-       upon.  You can set criteria to include words or phrases in the
-       subject, To:, Cc: or body of the message. (FIXME: WHAT ELSE?)
-       Once you've decided which messages to filter, the assistant will
-       ask you the sort of action you wish to take.  More details and
-       screenshots should follow here.
+       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
+       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
+       can also have it be exempted from other filters which would
+       otherwise have acted upon it.  
       </para>
 
 
@@ -721,9 +799,9 @@ with quoted materials and the relevant replies interspersed-->
       <title>Getting Really Organized with Virtual Folders</title>
       <para>
 	If you find that filters aren't flexible enough for you, or
-	end up performing the same search again and again, you should
-	consider a virtual folder. Virtual folders, or vFolders, are
-	an advanced way of viewing your email messages within
+	end up performing the same search again and again, consider a
+	virtual folder. Virtual folders, or vFolders, are an advanced
+	way of viewing your email messages within
 	<application>Evolution</application>.  If you get a lot of
 	mail or often forget where you put messages, vFolders can help
 	you stay on top of things.
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index fc2b894a04..99f108aa0f 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -1,4 +1,4 @@
-
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 <chapter id="usage-mainwindow">
 
   <title>The Main Window: Evolution Basics</title>
@@ -59,30 +59,29 @@ Can these things be labelled with little arrows & stuff?
   <sect1 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
     <para>
-        One of <application>Evolution</application>'s most important
-        job is to give you access to your information, and help you
-        use it quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, that column of buttons on
-        the left hand side of the main window.  There are actually two
-        kinds of buttons in the shortcut bar: familiar looking icons,
-        and the thin rectangles at the top and bottom of the column
-        which separate your shortcuts by category.
+        <application>Evolution</application>'s most important job is
+        to give you access to your information, and help you use it
+        quickly.  One way it does that is through the
+        <interface>shortcut bar</interface>, the column on the left
+        hand side of the main window.  The shortcut bar has two types
+        of buttons: big ones with names like
+        <guilabel>Inbox</guilabel> and <guilabel>Calendar</guilabel>,
+        and small rectangular ones at the top and bottom, which are
+        called category buttons.
     </para>
     <para>
-       The category buttons, labelled <guilabel>Evolution
-       Shortcuts</guilabel> and <guilabel>Internet
-       Directories</guilabel>, slide up and down when you click on
-       them.  When you first start
-       <application>Evolution</application>, you are lookig at the
-       <guilabel>Evolution Shortcuts</guilabel>.  If you click
+       The category buttons are labelled <guilabel>Evolution
+       Shortcuts</guilabel> <guilabel>Internet Directories</guilabel>.
+       When you click on them, they'll slide up and down to give you
+       access to different sorts of shortcuts.  When you first start
+       <application>Evolution</application>, you are looking at the
+       <guilabel>Evolution Shortcuts</guilabel> category.  If you click
        <guilabel>Internet Directories</guilabel>, it will slide up and
        you'll see buttons for the <guilabel>Bigfoot</guilabel> and
        <guilabel>Netcenter</guilabel> directories, as well as any
        others you or your system administrator might have added.
        Click on <guibutton>Evolution Shortcuts</guibutton> to look at
-       the shortcuts again.  Those buttons give you fast access to the
-       major fucntions that <application>Evolution</application>
-       provides for you.
+       the shortcuts again.
     </para>
     <para>
      They are:
@@ -156,36 +155,32 @@ Can these things be labelled with little arrows & stuff?
       covered in <xref linkend="config">.  If you're using the
       keyboard shortcuts you may also want to hide the
       <interface>shortcut bar</interface> by selecting
-      <guimenuitem>Hide/Show Shortcut Bar</guimenuitem> from the
-      <guimenu>MENU</guimenu> menu.
+      the <guimenuitem>Show Shortcut Bar</guimenuitem> toggle in the
+      <guimenu>View</guimenu> menu.
     </para>
  </sect1>
 
   <sect1 id="usage-mainwindow-folderview">
     <title>The Folder View</title>
     <para>
-      The <interface>folder view</interface> is the most comprehensive way to
-      get to your information. It can show you everything you've
-      stored with <application>Evolution</application>&mdash;
-      appointments, address cards, emails, and so forth.
-
-      The <interface>folder view</interface> display presents your
-      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, I have only one: <guilabel>Local</guilabel>.
-      When I click on the plus sign next to the label, I see the
-      contents:
+      The <interface>folder view</interface> is a more comprehensive
+      way to view the information you've stored with
+      <application>Evolution</application>. It displays all your
+      appointments, address cards, and email in a tree that's a lot
+      like a <glossterm>file tree</glossterm>&mdash; it starts small
+      at the top, and branches downwards. 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 your
+	      <guilabel>Calendar</guilabel>, where I keep
 	      appointments and event listings.
 	   </para>
 	 </listitem> 
 	 <listitem>
 	    <para>
-	    <guilabel>Contacts</guilabel>, where your address
+	    <guilabel>Contacts</guilabel>, where address
 	    cards are stored.
 	   </para>
 	 </listitem>
@@ -197,19 +192,19 @@ Can these things be labelled with little arrows & stuff?
 	 </listitem>
 	 <listitem>
 	    <para>
-	     <guilabel>Inbox</guilabel>, for your incoming mail.
-	     This is where you will make the most subfolders.
+	     <guilabel>Inbox</guilabel>, for incoming mail, and all
+	     the rest of my mail folders.
 	   </para>
 	 </listitem>
 	<listitem>
 	    <para>
-	    <guilabel>Outbox</guilabel>, where you can store
-	    copies of mail you have sent, or unsent drafts.
+	    <guilabel>Outbox</guilabel>, which is for 
+	    drafts of messages and mail that's already been sent.
 	   </para>
 	 </listitem>
 	 <listitem>
 	    <para>
-	    <guilabel>Trash</guilabel>, where you can throw things away.
+	    <guilabel>Trash</guilabel>, which is for trash.
 	   </para>
 	 </listitem>
       </itemizedlist>
@@ -231,16 +226,16 @@ Can these things be labelled with little arrows & stuff?
     <tip>
      <title>Context-Sensitive Help</title>
       <para>
-	You can almost always get help on an item by
-	right-clicking it.  If you're not sure what something is,
-	or don't know what you can do with it, right-clicking and
-	choosing <guimenuitem>Help</guimenuitem> is a good way to
-	find out.
+	GNOME 2.0 supports context-sensitive help, which means you can
+	almost always get help on an item by right-clicking it.  If
+	you're not sure what something is, or don't know what you can
+	do with it, choosing <guimenuitem>Help</guimenuitem> from the
+	right-click menu is a good way to find out.
       </para>
     </tip>
 
     <para>
-      If a folder has other folders in it, there will be a plus
+      If a folder has other folders inside it, there will be a plus
       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
@@ -271,12 +266,6 @@ Can these things be labelled with little arrows & stuff?
       they will go there.  <!-- ****This paragraph could use some
       work**** -->
     </para>
-    <para>
-      You can also use the <guimenu>right-click menu</guimenu> to
-      move, rename, and delete folders.
-      <guimenuitem>Delete</guimenuitem> function from the
-      <guimenu>right-click menu</guimenu>.
-    </para>
   </sect1>
   <sect1 id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
@@ -296,14 +285,15 @@ Can these things be labelled with little arrows & stuff?
       cover them later on as we discuss the things you can do with
       <application>Evolution</application>.
     </para>
-  </sect1>
+
+
     <para>
       Once you've familiarized yourself with the <interface>main
       window</interface> you can start doing things with it.
       We'll start with your email inbox: you've got a letter
       waiting for you already.
     </para>
-
+  </sect1>
 </chapter>