Included Menu Reference Appendix.

2000-08-23  Aaron Weber  <aaron@helixcode.com>

	* C/evolution-guide.sgml: Included Menu Reference Appendix.

2000-08-22  Aaron Weber  <aaron@helixcode.com>

	* C/usage-mail.sgml: Minor markup changes.

	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
	work, but not bad for an evening.

2000-08-21  Aaron Weber  <aaron@helixcode.com>

	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.

svn path=/trunk/; revision=4978

4 files changed, 765 insertions, 112 deletions

diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
index e064276be3..b07f236b8b 100644
--- a/doc/C/apx-authors.sgml
+++ b/doc/C/apx-authors.sgml
@@ -1,4 +1,3 @@
-
   <appendix id="authors">
     <title>Authors</title>
      <para>
diff --git a/doc/C/apx-menuref.sgml b/doc/C/apx-menuref.sgml
new file mode 100644
index 0000000000..9a5049704c
--- /dev/null
+++ b/doc/C/apx-menuref.sgml
@@ -0,0 +1,478 @@
+<!--
+<!DOCTYPE Appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
+<appendix id="menuref">
+  <title>Menu Reference</title>
+  <para>
+    This section will serve as a reference for every capability that
+    <application>Evolution</application> has.  When menu items are
+    repeated in <application>Evolution</application>, they're repeated
+    here too.
+  </para>
+  <para>
+    From left to right, the menus available to you when you are
+    reading mail are: <guimenu>File</guimenu>,
+    <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
+    <guimenu>Tools</guimenu>, <guimenu>Actions</guimenu>, and
+    <guimenu>Help</guimenu>.  The last of these doesn't change, but
+    the rest of them have contents that will change depending on
+    whether you're looking at mail, contacts, or calendar information.
+    In addition, the editor tools for messages, appointments, and
+    contacts all have menu bars.
+
+  </para>
+  <sect1 id="menuref-universal">
+    <title>Menus that are the same everywhere</title>
+    <para>
+      The <guimenu>File</guimenu> and <guimenu>Help</guimenu> menus in
+      the main <application>Evolution</application> window do not
+      change, because they refer to universal items.  Other menus have
+      contents that change depending on context.
+    </para>
+   
+ <sect2 id="menuref-universal-file">
+      <title>File Menu</title>
+      <para>
+	<variablelist>
+
+	  <varlistentry>
+	    <term><guisubmenu>New...</guisubmenu> Submenu</term>
+	    <listitem><para>
+		<itemizedlist>
+		  <listitem><para>
+		      <guimenuitem>Folder</guimenuitem> &mdash;
+		       Create a new folder. See <xref 
+		       linkend="usage-mainwindow-folderbar">
+		       for more information about folders.
+		    </para></listitem>
+		  <listitem><para>
+		      <guimenuitem>Shortcut</guimenuitem> &mdash;
+		       Create a new Shortcut in the Shortcut Bar.
+		    </para></listitem>
+		  <listitem><para>
+		      <guimenuitem>Mail Message</guimenuitem> &mdash;
+		       Compose a new mail message. Covered in
+		       <xref linkend="usage-mail-getnsend-send">.
+		    </para></listitem>
+		  <listitem><para>
+		      <guimenuitem>Appointment</guimenuitem> &mdash;
+		       Enter a new appointment in your calendar. See <xref
+			linkend="usage-calendar-apts-basic"> for more information.
+		    </para></listitem>
+		  <listitem><para>
+		      <guimenuitem>Task</guimenuitem> &mdash;
+		       Enter a new to-do item in your taskpad. Covered in 
+		       <xref linkend="usage-calendar-todo">.
+		    </para></listitem>
+		</itemizedlist>
+	      </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Go to Folder</guimenuitem></term>
+	    <listitem><para>
+               View the items in a particular folder.
+	    </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Create New Folder</guimenuitem></term>
+	    <listitem><para>
+		 This item doesn't belong here any more.
+	      </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>Print Message</guimenuitem></term>
+	    <listitem><para>
+		 Print the current message.
+	      </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>Exit</guimenuitem></term>
+	    <listitem><para>
+		 Quit using <application>Evolution</application>.
+	      </para></listitem>
+	  </varlistentry>
+	</variablelist>
+       </para>
+    </sect2>
+
+    <sect2 id="menuref-universal-help">
+      <title>The Help Menu</title>
+      <para>
+      <variablelist>
+	<varlistentry>
+	  <term><guimenuitem>Help Index</guimenuitem></term>
+	  <listitem><para>
+             Displays the table of contents for this document.
+           </para></listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guimenuitem>Getting Started</guimenuitem></term>
+	  <listitem><para>
+              A quick look around, and a summary of the things
+              <application>Evolution</application> can do for you.
+           </para></listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guimenuitem>Using the Mailer</guimenuitem></term>
+	  <listitem><para>
+              An in-depth tour of <application>Evolution</application> Mail.
+           </para></listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guimenuitem>Using the Calendar</guimenuitem></term>
+	  <listitem><para>
+             A step-by-step guide to using the Calendar.
+           </para></listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guimenuitem>Using the Contact Manager</guimenuitem></term>
+	  <listitem><para>
+            Find your way around the Contact Manager.
+           </para></listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guimenuitem>Submit Bug Report</guimenuitem></term>
+	  <listitem><para>
+             If you don't report them, they can't fix them.  Select this item to let the 
+             developers know what's wrong.
+           </para></listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guimenuitem>About Evolution</guimenuitem></term>
+	  <listitem><para>
+              Displays a window with information about the application and its authors.
+              This has the same information as <xref linkend="authors">.
+           </para></listitem>
+	  </varlistentry>
+	</variablelist>
+       </para>
+    </sect2>
+  </sect1>
+
+
+  <sect1 id="menuref-mail">
+    <title>Mail Menus</title>
+    <para>
+       All the menus for mail. FIXME: this paragraph needs content.
+    </para>
+   
+    <sect2 id="menuref-mail-edit">
+      <title>The Edit Menu</title>
+      <para>
+        This menu is currently empty.
+      </para>
+    </sect2>
+
+    <sect2 id="menuref-mail-view">
+      <title>The View Menu</title>
+      <para>
+        This menu lets you control the way
+        <application>Evolution</application> displays your information
+        for you.
+        <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
+	    <listitem><para>
+              Toggle the shortcut bar on and off with this item.             
+            </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
+	    <listitem><para>
+             Toggle the folder bar on and off with this item. 
+             See <xref linkend="usage-mainwindow-folderbar"> for 
+             more information about the folder bar.             
+            </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Threaded Message List</guimenuitem></term>
+	    <listitem><para>
+               This item controls whether your message list is displayed by thread 
+               or by other criteria.  The default order is by date; see
+               <xref linkend="usage-mail-listorder"> for information about the
+               order of the message list.
+            </para></listitem>
+	  </varlistentry>
+	</variablelist>
+      </para>
+    </sect2>
+
+    <sect2 id="menuref-mail-tools">
+      <title>The Tools Menu</title>
+      <para>
+      <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Mail Filters</guimenuitem></term>
+	    <listitem><para>
+             Edit your mail filters here.  
+             See <xref linkend="usage-mail-organize-filters">
+             for more information about mail filtering.
+           </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>vFolder Editor</guimenuitem></term>
+	    <listitem><para>
+              Create, edit, and delete vFolders with this tool. 
+              To learn about using vFolders with mail, see 
+              <xref linkend="usage-mail-organize-vfolders">.
+           </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>Mail Configuration</guimenuitem></term>
+	    <listitem><para>
+             This is a poorly named tool.  You can set your identity, 
+             and everything else related to your mail account, here.
+           </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
+	    <listitem><para>
+             Although it's really an Action (FIXME), this item will cause 
+             <application>Evolution</application> to forget what your
+             password is.
+           </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>Configure Folder</guimenuitem></term>
+	    <listitem><para>
+              Another FIXME item, this allows you to set the file format
+              in which <application>Evolution</application> stores mail.
+           </para></listitem>
+	  </varlistentry>
+	</variablelist>
+       </para>
+    </sect2>
+
+    <sect2 id="menuref-mail-actions">
+      <title>The Actions Menu</title>
+      <para>
+          When you select one of the actions from this menu,
+          <application>Evolution</application> will do your bidding,
+          usually to the item you have selected.
+      </para>
+      <para>
+          The actions you can perform are:
+          <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Edit Message</guimenuitem></term>
+	    <listitem><para>
+	      Select a message in the drafts folder before you select this 
+	      item.  You can only edit a message you have written. FIXME: POOR
+	      description of BROKEN behavior. 
+	   </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>View Message</guimenuitem></term>
+	    <listitem><para>
+	       Displays the selected message in a new window.
+	   </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Mark all Messages Read</guimenuitem></term>
+	    <listitem><para>
+	      <application>Evolution</application> keeps track of which messages 
+	      you've seen;  When you don't need to read all those messages, select this item.
+	      You can mark a single message as read by right-clicking it in the message bar.
+	    </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Expunge</guimenuitem></term>
+	    <listitem><para>
+                   Emtpies the trash folder, erasing messages permanently. 
+                   Once you've done this, don't come crying to me if you
+                   want a message back.
+	       </para></listitem>
+	  </varlistentry>
+	</variablelist>
+       </para>
+    </sect2>
+  </sect1>
+  <sect1 id="menuref-cal">
+    <title>The Calendar Menus</title>
+    <para>
+      The Main window of the calendar has the same menus as the main
+      window of the mail client.  However, their contents vary in a
+      number of ways.
+    </para>
+    <sect2 id="menuref-cal-edit">
+      <title>The Calendar Edit Menu</title>
+      <para>
+         The contents of the Edit menu are currently so borked that I
+         refuse to document them right now. (That means FIXME). They
+         should be:
+
+         <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Item</guimenuitem></term>
+	    <listitem><para>
+              Description
+           </para></listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>Item</guimenuitem></term>
+	    <listitem><para>
+              Description
+           </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	  <term><guimenuitem>Item</guimenuitem></term>
+	  <listitem><para>
+              Description
+           </para></listitem>
+	  </varlistentry>
+	</variablelist>
+      </para>
+    </sect2>
+    <sect2 id="menuref-cal-view">
+      <title>The Calendar View Menu</title>
+      <para>
+        The Calendar's <guimenu>View</guimenu> menu contains the following items:
+
+         <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
+	    <listitem><para>
+              Toggle the Shortcut Bar on and off with this item.              
+           </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
+	    <listitem><para>
+             Toggle the folder bar on and off with this item. 
+             See <xref linkend="usage-mainwindow-folderbar"> for 
+             more information about the folder bar.     
+           </para></listitem>
+	  </varlistentry>
+		  
+	  <varlistentry>
+	  <term><guimenuitem>View By Day</guimenuitem></term>
+	  <listitem><para>
+             Switch to the day view for your calendar.
+           </para></listitem>
+	  </varlistentry>	  
+
+	  <varlistentry>
+	  <term><guimenuitem>View Five Days</guimenuitem></term>
+	  <listitem><para>
+             View five calendar days at once. 
+           </para></listitem>
+	  </varlistentry>	  
+
+	  <varlistentry>
+	  <term><guimenuitem>View by Week</guimenuitem></term>
+	  <listitem><para>
+             Switch the calendar view to full week mode.
+           </para></listitem>
+	  </varlistentry>
+  
+	  <varlistentry>
+	  <term><guimenuitem>View By Month</guimenuitem></term>
+	  <listitem><para>
+             Look at a month at a time.
+           </para></listitem>
+	  </varlistentry>
+	</variablelist>
+      </para>
+    </sect2>
+    <sect2 id="menuref-cal-tools">
+      <title>The Calendar Tools Menu</title>
+      <para>
+         This menu is empty.
+      </para>
+    </sect2>
+
+    <sect2 id="menuref-cal-actions">
+      <title>The Calendar Actions Menu</title>
+      <para>
+         This menu is empty.
+      </para>
+    </sect2>
+  </sect1>
+  <sect1>
+    <title>Contact Manager Menus</title>
+    <para>
+      Insert Content Here (FIXME).
+    </para>
+
+    <sect2 id="menuref-contact-edit">
+      <title>Contact Manager Edit Menu</title>
+      <para>
+         This menu is empty.
+      </para>
+    </sect2>
+
+
+    <sect2 id="menuref-contact-view">
+      <title>Contact Manager Edit Menu</title>
+      <para>
+        This menu contains the following items:
+
+         <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
+	    <listitem><para>
+              Toggle the Shortcut Bar on and off with this item.              
+           </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
+	    <listitem><para>
+             Toggle the folder bar on and off with this item. 
+             See <xref linkend="usage-mainwindow-folderbar"> for 
+             more information about the folder bar.     
+           </para></listitem>
+	  </varlistentry>
+		  
+	  <varlistentry>
+	  <term><guimenuitem>As Table</guimenuitem></term>
+	  <listitem><para>
+             View your contacts as a table.  
+             When in table-view mode, this menu item reads 
+             <guimenuitem>As Minicards</guimenuitem>, and changes the view
+             back to the minicard format.
+           </para></listitem>
+	  </varlistentry>	  
+	</variablelist>      
+      </para>
+    </sect2>
+
+   <sect2 id="menuref-contact-tools">
+      <title>Contact Manager Tools Menu</title>
+      <para>
+         This menu is empty.
+      </para>
+    </sect2>
+
+
+
+   <sect2 id="menuref-contact-actions">
+      <title>Contact Manager Tools Menu</title>
+      <para>
+         This menu is broken. (FIXME).
+      </para>
+    </sect2>
+  </sect1>
+</appendix>
+
+
+
+
+
+
+
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 59b50120b9..b9b5f72adb 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -9,12 +9,14 @@
 <!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
+<!ENTITY APX-MENUREF SYSTEM "apx-menuref.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
 <!ENTITY APX-FDL SYSTEM "apx-fdl.sgml">
 <!ENTITY APX-GPL SYSTEM "apx-gpl.sgml">
 
+
 ]>
 
 
@@ -112,6 +114,8 @@
     &CONFIG-PREFS;
     &CONFIG-SYNC;
   </part>
+
+  &APX-MENUREF;
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index de2f3b0a23..8785231686 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -44,21 +44,20 @@
       in case you need to refer to it later, you'll find that feature
       especially useful.
     </para>
+  </abstract>
 
-    <para>
+  <sect1 id="usage-mail-getnsend">
+    <title>Reading, Getting and Sending Mail</title>
+    <sect2 id="usage-mail-getnsend-read">
+      <title>Reading Mail</title>
+      <para>
        You can start reading email by clicking
        <guibutton>Inbox</guibutton> in the shortcut bar.  By
        default, the <interface>Inbox</interface> is open when you
        start <application>Evolution</application>, and the first
        time you see your inbox, there's a message in it from Helix
        Code welcoming you to the application.
-    </para>
-  </abstract>
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Reading, Getting and Sending Mail</title>
-    <sect2 id="usage-mail-getnsend-read">
-      <title>Reading a Message</title>
+      </para>
       <para>
 	The first time you open your
 	<application>Evolution</application>
@@ -75,10 +74,10 @@
         <variablelist>
 	 
          <varlistentry>
-	    <term><guimenuitem>View Message</guimenuitem> </term>  
+	    <term><guimenuitem>Open in New Window</guimenuitem> </term>  
 	    <listitem><para> 
                Select this item to view the message in
-               the view pane of the <application>Evolution</application>
+               a new <application>Evolution</application>
                window. 
             </para></listitem>
 	  </varlistentry>
@@ -141,38 +140,124 @@
                 from a folder tree.
              </para></listitem>
            </varlistentry>
-	  </variablelist>
-      </para>
-      
-      <para>
-         You can also select the order in which messages appear in
-         that list.  To sort by sender, subject, or date, click on the
-         bars with those labels at the top of the message list.  If
-         you click twice, you'll sort them in reverse order.
-      </para>
+
+	  <varlistentry>
+	    <term><guimenuitem>vFolder for Subject</guimenuitem></term>
+	    <listitem><para>
+	     Select this item to create a pre-fabricated vFolder based on
+	     the current message's Subject line.
+	   </para></listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>vFolder for Sender</guimenuitem></term>
+	    <listitem><para>
+	     Select this item to create a pre-fabricated vFolder based on
+	     who sent the current message.
+	   </para></listitem>
+	 </varlistentry>
+	 <varlistentry>
+	   <term><guimenuitem>vFolder for Recipients</guimenuitem></term>
+	   <listitem><para>
+	     Select this item to create a pre-fabricated vFolder based on
+	   who the recipients are.
+	   </para></listitem>
+	 </varlistentry>
+	 <varlistentry>
+	   <term><guimenuitem>Filter for Subject</guimenuitem></term>
+	   <listitem><para>
+	     Select this item to create a pre-fabricated filter based on
+	     the current message's Subject line.
+	   </para></listitem>
+	 </varlistentry>
+	 <varlistentry>
+	   <term><guimenuitem>Filter for Sender</guimenuitem></term>
+	   <listitem><para>
+	     Select this item to create a pre-fabricated filter based on
+	     who sent the current message.
+	   </para></listitem>
+	 </varlistentry>
+	 <varlistentry>
+	   <term><guimenuitem>Filter for Recipients</guimenuitem></term>
+	   <listitem><para>
+	     Select this item to create a pre-fabricated filter based on
+	     who the recipients are.
+	   </para></listitem>
+	 </varlistentry>
+      </variablelist>
+     </para>
+    
+      <note id="usage-mail-listorder">
+	<title>The Order of the Message List</title>
+	<para>
+          You can also select the order in which messages appear in
+          that list.  To sort by sender, subject, or date, click on the
+          bars with those labels at the top of the message list.  If
+          you click twice, you'll sort them in reverse order.
+        </para>
+	<para>
+          Aside from sorting the messages, you can opt to have the
+          messages threaded. Select <menuchoice>
+          <guimenu>View</guimenu> <guimenuitem>Threaded Message
+          List</guimenuitem> </menuchoice> to turn the threaded view
+          on or off.  If the option selected,
+          <application>Evolution</application> will attempt to
+          associate related messages by using the
+          <systemitem>References</systemitem>,
+          <systemitem>In-Reply-To</systemitem>, and
+          <systemitem>Subject</systemitem> message headers.  Messages
+          which are related are then placed next to each other, so
+          that it's easier to follow the thread of a conversation from
+          message to message.
+        </para>
+      </note>
       <para>
-         Aside from sorting the messages, you can opt to have the
-         messages threaded. Select <menuchoice>
-         <guimenu>View</guimenu> <guimenuitem>Threaded Message
-         List</guimenuitem> </menuchoice> to turn the threaded view on
-         or off.  If the option selected,
-         <application>Evolution</application> will attempt to
-         associate related messages by using the
-         <systemitem>References</systemitem>,
-         <systemitem>In-Reply-To</systemitem>, and
-         <systemitem>Subject</systemitem> message headers.  Messages
-         which are related are then placed next to each other, so that
-         it's easier to follow the thread of a conversation from
-         message to message.
+         Other actions you can perform are listed, appropriately, in
+         the <guimenu>Actions</guimenu> menu in the menu bar:
+         <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Mark all Messages Read</guimenuitem></term>
+	    <listitem><para>
+               <application>Evolution</application> keeps track of which 
+                messages you have read, and which ones you haven't: 
+                When you've looked at a message for more than a few seconds, 
+                it's no longer marked as new.  If you want to mark all mail 
+                in a folder as read, select this item.
+             </para></listitem>
+	    </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>View Message</guimenuitem></term>
+	    <listitem><para>
+                <guimenuitem>View Message</guimenuitem> opens the selected message 
+                in its own window.
+             </para></listitem>
+	    </varlistentry>	  
+	  <varlistentry>
+	    <term><guimenuitem>Edit Message</guimenuitem></term>
+	    <listitem><para>
+               Only available for messages you have written (drafts and
+               mail in the <guilabel>Outbox</guilabel>, this item opens the message
+               in a new mail composition window.
+             </para></listitem>
+	    </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>Expunge</guimenuitem></term>
+	    <listitem><para>
+               Clicking the <guibutton>Delete</guibutton> button marks 
+               messages for deleteion. <guimenuitem>Expunge</guimenuitem> 
+               wipes them off the face of the earth.               
+             </para></listitem>
+	    </varlistentry>
+	  </variablelist>
       </para>
       <para>
-	Go ahead and click on the message in the <interface>message
-	list</interface>.  That selects the message.  Then click on
-	the <guibutton>Delete</guibutton> button in the tool bar.  The
-	message now has a line through it, because you've marked it
-	for deletion.  If you really want to get rid of it, choose
-	<guimenuitem>Expunge</guimenuitem> from the
-	<guimenu>Tools</guimenu> menu.  That will delete it
+	Now that you've had a look around the
+	<interface>Inbox</interface>, select the welcome message in
+	the <interface>message list</interface> by clicking on it
+	once.  Then click on the <guibutton>Delete</guibutton> button
+	in the tool bar.  The message now has a line through it,
+	because you've marked it for deletion.  If you really want to
+	get rid of it, choose <guimenuitem>Expunge</guimenuitem> from
+	the <guimenu>Actions</guimenu> menu.  That will delete it
 	permanently. If you want to keep it, click
 	<guibutton>Delete</guibutton> again, and it will no longer be
 	marked as deleted.  At some point in the future, this feature
@@ -300,39 +385,75 @@
 	 <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> 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
-	    and filter behavior, see <xref linkend="config-prefs-mail">.
-	  </para>
-	 </tip>
        </para>
-
-      <para>
-	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-delay">
+	<title>Saving Messages for Later</title>
+	<para>
+	   Evolution will send mail immediately unless you tell it to
+	   do otherwise by selecting <menuchoice>
+	   <guimenu>File</guimenu> <guimenuitem>Send
+	   Later</guimenuitem></menuchoice>.  That will add messages to the
+	   <guilabel>Outbox</guilabel> queue.  Then, when you press
+	   <guibutton>Send</guibutton> in another message, or
+	   <guibutton>Get Mail</guibutton> in the main mail window,
+	   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>
+           You can also choose to save messages as drafts or as text
+           files.  Choose
+           <menuchoice>
+             <guimenu>File</guimenu>
+             <guimenuitem>Save</guimenuitem>
+	  </menuchoice>
+          or <guimenuitem>Save As</guimenuitem> to save your message
+          as a text file. If you prefer to keep your message in a
+          folder (the <guilabel>Drafts</guilabel> folder would be the
+          obvious place), you can select <menuchoice>
+          <guimenu>File</guimenu> <guimenuitem>Save In
+          Folder</guimenuitem> </menuchoice>.
+        </para>
+	<para>
+	   To learn more about how you can specify message queue and
+	   filter behavior, see <xref linkend="config-prefs-mail">.
+	</para>
+	
+	<para>
+	  You can probably guess the purpose of the buttons labelled
+	  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
+	  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
+	  and <guibutton>Redo</guibutton> , but there's a bit more to
+	  sending mail that's less obvious.  In the next few sections,
+	  you'll see how <application>Evolution</application> handles
+	  additional features, including mailing lists, attachments,
+	  and forwarding.
+        </para>
+      </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 drag it from your desktop into the message window, or
+	    click the button in the toolbar with a paper clip on it,
+	    labelled <guibutton>Attach</guibutton>.  If you click the
+	    <guibutton>Attach</guibutton> button,
+	    <application>Evolution</application> will open a file
+	    selection dialog box, to ask you which file you want to
+	    send.  Select the file and click <guilabel>OK</guilabel>.
+        </para>
+	<para>
+            To see what files you've attached to the message you're
+            composing, select <menuchoice> <guimenu>View</guimenu>
+            <guimenuitem>Show Attachments</guimenuitem> </menuchoice>.
+        </para>
+	<para>
+            When you send the message, a copy of the attached file
+	    will go with it.  Be aware that big attachments can take a
+	    long time to download.
+          </para>
+	</sect3>
       <sect3 id="usage-mail-getnsend-send-to">
 	<title>Choosing Recipients</title>
 	<para>
@@ -340,9 +461,13 @@
 	  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.
+	  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.
+	  <!-- (NOT YET) Also, <application>Evolution</application>
+	  will add a domain to any unqualified addresses.  By default,
+	  this is your domain, but you can choose which one mail
+	  preferences dialog. -->
         </para>
         <para>
           Alternately, you can click on the
@@ -362,11 +487,11 @@
 	<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.
+	    You can address your email 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
@@ -471,7 +596,61 @@ with quoted materials and the relevant replies interspersed-->
 	  </example>
 	</para>
       </sect3>
+      <sect3 id="usage-mail-getnsend-send-find">
+        <title>Searching and Replacing with the Composer</title>
+	<para>
+           You're probably familiar with search and replace features,
+           and if you come from a Linux or Unix background, you
+           probably know what <guimenuitem>Find Regex</guimenuitem>
+           does.  If you aren't among the lucky who already know,
+           here's a quick rundown of an important section of the
+           <guimenu>Edit</guimenu> menu.
+        </para>
+	<para>
+           <variablelist>
+	    <varlistentry>
+	      <term><guimenuitem>Find</guimenuitem></term>
+	      <listitem><para> Enter a word or phrase, and
+	      <application>Evolution</application> will find it
+              in your message.
+	      </para></listitem>
+	    </varlistentry>
+	    
+	    <varlistentry>
+	      <term><guimenuitem>Find Regex</guimenuitem></term>
+	      <listitem>
+		<para>
+                  Regular expressions, often called "regex" for short,
+                  are a powerful way of expressing complicated
+                  statements using metacharacters or wildcard symbols.
+                  For example, the statement
+                  <userinput>fly*so[a|u]p</userinput> means "any
+                  phrase beginning with 'fly' and ending in 'soup' or
+                  'soap'", so you'd find both "fly in my soup" and
+                  "fly in my soap."  There's not room here to go into
+                  depth here, but if you want, have a look at the
+                  documentation for the <command>grep</command>
+                  command.
+                </para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term><guimenuitem>Find Again</guimenuitem></term>
+	      <listitem><para>
+                   Select this item to repeat the last search you performed.
+              </para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term><guimenuitem>Replace</guimenuitem></term>
+	      <listitem><para> Find something, replace it with
+	      something else.  </para></listitem>
+	    </varlistentry>
 
+	  </variablelist>
+            
+        </para>
+      </sect3>
       <sect3 id="usage-mail-getnsend-send-html">
 	<title>Embellish your email with HTML</title>
 	<para>
@@ -493,18 +672,13 @@ with quoted materials and the relevant replies interspersed-->
 	    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 <menuchoice> <guimenuitem>
-	    HTML</guimenuitem></menuchoice> in the mail settings dialog box.  See
-	    <xref linkend="config-prefs-mail-other"> for more information.
+	    you will need to select <menuchoice>
+	    <guimenu>Format</guimenu> <guimenuitem>
+	    HTML</guimenuitem></menuchoice>.  Alternately, you can set
+	    your default mail format preferences in the mail
+	    configuration dialog.  See <xref
+	    linkend="config-prefs-mail-other"> 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.  The
-	    same is true for individuals in your address book whom you
-	    have not marked as wanting to receive HTML mail.
-           </para>
 	</note>
 	<para>
            HTML formatting tools are located just above the
@@ -625,24 +799,7 @@ with quoted materials and the relevant replies interspersed-->
 	    </para>
 	</note>
       </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 drag it from your desktop into the message window, or
-	    click the button in the toolbar with a paper clip on it,
-	    labelled <guibutton>Attach</guibutton>.  If you click the
-	    <guibutton>Attach</guibutton> button,
-	    <application>Evolution</application> will open a file
-	    selection dialog box, to ask you which file you want to
-	    send.  Select the file and click <guilabel>OK</guilabel>.
-          </para>
-	<para>
-            When you send the message, a copy of the file will
-	    go with it.  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. -->
@@ -706,8 +863,8 @@ possibly never will be due to security evil. -->
 	      <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
+		 the message doesn't have multiple layers of
+		 greater-than signs, (&gt;) indicating multiple layers
 		 of careless inline forwarding.
 	      </para>
 	    </listitem>
@@ -722,7 +879,8 @@ possibly never will be due to security evil. -->
 
 	    <listitem>
 	      <para>
-		ALL CAPS MEANS YOU'RE SHOUTING!
+		ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
+		message in capital letters.  It hurts people's ears.
 	      </para>
 	    </listitem>
 
@@ -1130,3 +1288,17 @@ possibly never will be due to security evil. -->
 
   </sect1>
 </chapter>
+
+
+
+
+
+
+
+
+
+
+
+
+
+