Added a lot of new content. Fixed old content. Validated. Still need to

2001-05-18  Aaron Weber  <aaron@ximian.com>

	* C/menuref.sgml: Added a lot of new content. Fixed old
	content. Validated. Still need to smooth the relation of this
	section with the preface.

2001-05-16  Aaron Weber  <aaron@ximian.com>

	* C/preface.sgml: Changed to include t-shirt offer for feedback.

svn path=/trunk/; revision=9885

8 files changed, 530 insertions, 1200 deletions

diff --git a/doc/C/evolution-faq.sgml b/doc/C/evolution-faq.sgml
index b153ba7c41..4fdb3940c5 100644
--- a/doc/C/evolution-faq.sgml
+++ b/doc/C/evolution-faq.sgml
@@ -300,7 +300,7 @@ export GNOME_PATH=/opt/gnome:/usr
 	    </para>
 
 	    <programlisting>
-file ~/evolution/local/Contacts/addressbook.db
+                file ~/evolution/local/Contacts/addressbook.db
 	    </programlisting>
 
 	    <para>
diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
index 114f2e87d9..144fb60a35 100644
--- a/doc/C/evolution.sgml
+++ b/doc/C/evolution.sgml
@@ -64,7 +64,7 @@ implemented. -->
     </legalnotice>
 
    <releaseinfo>
-      This is version 0.9 of the Evolution manual.
+      This is version 0.10 of the Evolution manual.
    </releaseinfo>
 
   </bookinfo>
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index d82191cb17..a2a4ea1b32 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -34,593 +34,253 @@
     at mail, contacts, or calendar information. 
   </para>
 
+   <sect1 id="menuref-mail">
+     <title>Mail Menus</title>
+     <para>
+           Note that the <guimenu>File</guimenu> menu and the
+	  <guimenu>Help</guimenu> are identical within the
+	  <application>Evolution</application> main window, regardless
+	  of what features you are using. 
 
-
-  <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>File Menu</term>
+          <listitem> <para>
+              <variablelist>
+		<varlistentry>
+		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
+	           Message</guimenuitem></menuchoice></term>
+		  <listitem>
+		    <para>
+                   <keycombo action="simul"><keycap>Ctl</keycap>
+		      <keycap>N</keycap>
+		      </keycombo>
+                     </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Evolution
+		   Window</guimenuitem></menuchoice></term>
+		   <listitem><para><keycombo action="simul">
+		   <keycap>Shft</keycap><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Shortcut</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>S</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
+		 Message</guimenuitem></menuchoice></term>
+	 <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>M</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Appointment</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>A</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Contact</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>C</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Task</guimenuitem></menuchoice></term>
+	  <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Open Selected Items</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>O</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Save As</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Alt</keycap><keycap>S</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>Folder</guisubmenu>
+	<guimenuitem>New Folder</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>F</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Go to Folder</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>G</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Print</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>P</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Close</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
+     </varlistentry>
+	
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Exit</guimenuitem></menuchoice></term>
+  	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Q</keycap></keycombo></para></listitem>
+     </varlistentry>
+    </variablelist>
+     </para>
+    </listitem>
+   </varlistentry>
+    <varlistentry>
+      <term>Edit Menu</term>
+      <listitem><para>
+       <variablelist>
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice></term>
+		  <listitem><para><keycombo action="simul"><keycap>
+	           Ctl</keycap><keycap>A</keycap></keycombo>
+		  </para></listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Invert Selection</guimenuitem></menuchoice></term>	
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>I</keycap></keycombo>
+		  </para></listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>D</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Undelete</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>U</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Read</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Unread</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+        </variablelist>
+      </para> </listitem>
+      </varlistentry>
+      
+    <varlistentry>
+      <term>View Menu</term>
+      <listitem>
 	<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>
+	    <term><menuchoice><guimenu>View</guimenu><guimenuitem>Threaded</guimenuitem></menuchoice></term>
+	    <listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
 	  </varlistentry>
+        </variablelist>
+      </listitem>
+    </varlistentry>
+    
+    <varlistentry>
+      <term>Actions Menu</term>
+      <listitem>
+	<variablelist>
 	  
-	  <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>
+	   <varlistentry>
+	<term><menuchoice><guimenu>Actions</guimenu><guisubmenu>Forward
+			    As</guisubmenu><guimenuitem>Inline</guimenuitem>
+		    </menuchoice> </term>
+		  <listitem>
+		    <para>
+	              <keycombo action="simul">
+			<keycap>Shft</keycap><keycap>Ctl</keycap><keycap>J</keycap>
+		      </keycombo>
+	             </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term><menuchoice>
+		      <guimenu>Actions</guimenu><guisubmenu>Forward As</guisubmenu>
+		      <guimenuitem>Attachment</guimenuitem>
+		  </menuchoice></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-exec">
-   <title>Executive Summary Menus</title>
-   <para>
-     We'll leave this section blank until the UI stabilizes a little
-     more.
-   </para>
-  </sect1>
-
-
-
-  <sect1 id="menuref-mail">
-    <title>Mail Menus</title>
-    <para>
-       <application>Evolution</application> Mail has more specialized
-       menus, and more specialized menu items, than any other part of
-       the application.
-    </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 Mail 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 Mail Settings 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>Virtual Folder Editor</guimenuitem></term>
-	    <listitem><para>
-              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
-               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> 
-               Tools for setting up all your mail account preferences.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
-	    <listitem><para>
-               Tools for newsgroup and IMAP folder subscriptions.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
-	    <listitem><para>
-              This item will cause <application>Evolution</application>
-	      to forget what your password is.
-            </para></listitem>
-	  </varlistentry>
-	  
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-folder">
-      <title>The Mail Folder Menu</title>
-      <para>
-          The items in this menu relate to 
-          <application>Evolution</application> mail folders.
-      </para>
-      <para>
-          You can:
-          <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
-	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  to mark everything in a folder as read, choose this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete All</guimenuitem></term>
-	    <listitem><para>
-	      This is a favorite item of everyone with too much junk-mail: one click, and it 
-	      deletes every message in the current folder. 
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-                 Empties the trash folder, erasing messages permanently. 
-                 Once you've done this, they're gone for good.
-	       </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Configure Folder</guimenuitem></term>
-	    <listitem><para>
-              Use this item to set the file format in which
-              <application>Evolution</application> stores mail. You
-              can choose from standard UNIX-style
-              <systemitem><filename>mbox</filename></systemitem>
-              files, or the
-              <systemitem><filename>mh</filename></systemitem> format.
-              Converting large mailboxes may take a long time, and
-              it's a good idea to have a backup copy beforehand.
-           </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-  <sect2 id="menuref-mail-message">
-      <title>The Mail Message Menu</title>
-      <para>
-          The items in this menu relate to
-          <application>Evolution</application> mail messages. Most of
-          them require you to have a message selected, and are also
-          available by right-clicking on a message in the message
-          list.
-      </para>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Displays the selected message in a new window.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-	      Open the selected message in the message composer.  You
-              can only edit a message you have written: drafts and messages in 
-              the <guilabel>Sent</guilabel> box. 
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-	       Displays the <interface>Print Preview</interface> window, 
-               ready for printing.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy Message</guimenuitem></term>
-	    <listitem><para>
-	       Copy the selected  message to another folder.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-   <sect2 id="menuref-mail-messagelistheader">
-      <title>The Message Heading Right-Click Menu</title>
-      <para>
-         At the top of the message list is the message list heading
-         bar; you can click on an individual heading &mdash;
-         <guilabel>Subject</guilabel>, for example, to have the
-         message list sorted by that attribute.  However, if you right
-         click on a heading, you'll get the following menu:
-      </para>
-
-      <para>
-          <variablelist>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Ascending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list, in ascending order, by the attribute you clicked.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Descending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list in descending order.
-	      </para></listitem>
-	    </varlistentry>
-  
-	  <varlistentry>
-	      <term><guimenuitem>Unsort</guimenuitem></term>
-	      <listitem><para>
-		 Undo any sorting by this attribute, and leave the message list sorted 
-                 by the previous one.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by this Field</guimenuitem></term>
-	      <listitem><para>
-		 Instead of sorting the messages, group them in boxes. 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by Box</guimenuitem></term>
-	      <listitem><para> If you have your messages grouped in
-	      boxes, you can arrange the boxes as well, by choosing
-	      this item.  </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Remove this column</guimenuitem></term>
-	      <listitem><para>
-		 Choose this to remove the column from the message list display.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Field Chooser</guimenuitem></term>
-	      <listitem><para>
-		 Opens a palette of columns. You can drag the columns
-		 you want from the palette into position in the
-		 message list heading bar; red arrows appear
-		 when you get close enough to a possibile position.</para>
-                 
-              <para>
-                 Your options are: 
-                 <itemizedlist>
-                     <listitem><para>
-                         <guiicon>An Envelope</guiicon> which indicates whether a message has been read (closed for unread, open for read).
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>An Exclamation Point</guiicon> for priority
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Penguin</guiicon> which indicates something, although I'm not sure what.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Paper Clip</guiicon> which indicates that there is an attachment to the message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>From</guilabel>, for the <guilabel>From</guilabel> field of a message.
-                     </para></listitem>
-                     <listitem><para>
-                         <guilabel>Subject</guilabel>, for the <guilabel>Subject</guilabel> field of a message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Date</guilabel>, for the date and time a message was sent.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Received</guilabel>, for the date and time you got the message. 
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>To</guilabel>, for the <guilabel>To</guilabel> field.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Size</guilabel>, for a message's size.
-                     </para></listitem>
-		  </itemizedlist>
-             </para>   
-
-	      </listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Alignment</guimenuitem></term>
-	      <listitem><para> Use this item to decide upon the
-	      alignment of the message attributes within their
-	      columns.  </para></listitem>
-	    </varlistentry>
+	        <keycombo action="simul">
+			<keycap>Ctl</keycap><keycap>F</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+		
+		<varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply</guimenuitem>
+		    </menuchoice></term> <listitem><para>
+	        <keycombo action="simul">
+			<keycap>Ctl</keycap><keycap>R</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+
+	   <varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply to All</guimenuitem>
+		    </menuchoice></term>		
+		  <listitem><para>
+	        <keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>R</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+		
+	   <varlistentry>
+	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Move
+			  to Folder</guimenuitem> </menuchoice></term>
+		  <listitem><para> <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>M</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+	
 
-	  <varlistentry>
-	      <term><guimenuitem>Best Fit</guimenuitem></term>
-	      <listitem><para>
-		 Alters the width of the message list columns to maximize the amount of information displayed.
-	      </para></listitem>
-	    </varlistentry>
+	   <varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Copy to Folder	</guimenuitem>
+		    </menuchoice></term>	
+		  <listitem><para>
+	        <keycombo action="simul"><keycap>>Ctl</keycap><keycap>C</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
 
-	  <varlistentry>
-	      <term><guimenuitem>Format Columns...</guimenuitem></term>
-	      <listitem><para>
-		 This item is not yet available.
-	      </para></listitem>
-	    </varlistentry>
+	
+	   <varlistentry>
+	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Apply
+			  Filters </guimenuitem> </menuchoice></term>
+		  <listitem><para> <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>Y</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
 
+	
+		<varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Expunge
+		  </guimenuitem> </menuchoice></term> <listitem><para>
+		  <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>X</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+	
+		<varlistentry>
+		  <term><menuchoice><guimenu>Help</guimenu><guimenuitem>Index
+		  </guimenuitem> </menuchoice></term>	  
+		  <listitem><para> <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>H</keycap></keycombo>
+		  </para></listitem>
+                 </varlistentry>
+      
+	    </variablelist>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
 
-	  <varlistentry>
-	      <term><guimenuitem>Customize
-	      Views...</guimenuitem></term> <listitem><para> Opens a
-	      dialog box that lets you choose a complex set of
-	      arrangements for your message list, so you can combine
-	      sorting and grouping in as many ways as you like.
-	      </para></listitem>
-	    </varlistentry>
 
-          </variablelist>
-      </para>
-   </sect2>
-  </sect1>
+    </para>       
 
+   </sect1>
   <sect1 id="menuref-mail-editor">
     <title>The Message Composer Menus</title>
     <para>
@@ -699,6 +359,14 @@
 	</variablelist>
       </para>
     </sect2>
+
+
+<sect2 id="menuref-tasklist">
+      <title>Task List Shortcuts and Menus</title>
+      <para>
+      </para>
+</sect2>
+        
     <sect2 id="menuref-mail-editor-edit">
       <title>The Message Composer's Edit Menu</title>
       <para>
@@ -992,10 +660,10 @@
     <sect2 id="menuref-cal-editor-file">
       <title>The Appointment Editor's File Menu</title>
       <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
-         that is identical to that in the 
-         <link linkend="menuref-universal-file">main window's file menu</link>.
-         Its other contents are:
+         This menu contains several items, including a
+         <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu></menuchoice>
+         submenu that is identical to that in the main window.  The
+         other contents are:
          <variablelist>
 
 	  <varlistentry>
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 67e9fcfe69..53ac7f6a76 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -121,17 +121,14 @@
     <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
       <para>
         This version of the <application>Evolution</application>
-        User's Guide is a <emphasis>draft</emphasis>. It describes
-        version 0.6 of the software.  It is missing huge
-        chunks of information, and many of the features it describes
-        are unimplemented.  All the content is subject to change,
-        especially if you help.  Please send comments on the guide to
-        <email>aaron@ximian.com</email>. If you would like to work
-        on the guide please contact me or see the GNOME Documentation
-        project <ulink
+        User's Guide is a <emphasis>draft</emphasis>.  Please send
+        comments on the guide to <email>aaron@ximian.com</email>. The
+        first person to send me some good constructive criticism wins
+        a free Ximian t-shirt. Include preferred shirt size and postal
+        address. If you would like to work on the guide please contact
+        me or see the GNOME Documentation project <ulink
         url="http://developer.gnome.org/projects/gdp">web
-        site</ulink>.  This paragraph will be removed in later
-        versions of the manual.
+        site</ulink>.
       </para>
     <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
 
@@ -179,18 +176,17 @@
   <sect1 id="commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
-        You might want to copy this section and tape it to
-        the wall next to your computer: it's a very short summary of
-        most of the things you'll want to do with
-        <application>Evolution</application>, and pointers to the
-        sections of the book where you'll find more in-depth
-        description of those tasks.
+        You might want to copy this section and tape it to the wall
+        next to your computer: it's a very short summary of most of
+        the things you'll want to do with
+        <application>Evolution</application>.  Read <xref
+        linkend="menuref"> if you would like a complete list of
+        keyboard shortcuts for menu commands.
     </para>
+
     <sect2 id="quickref-newthings">
       <title>Opening or Creating Anything</title>
       <para>
-         Here are the keyboard shortcuts and menu items you're most
-         likely to use:
          
           <variablelist>
 
@@ -308,7 +304,8 @@
                 Click <guibutton>Get Mail</guibutton> in the
                 toolbar. There is no keyboard shortcut for this task,
                 but you can ask <application>Evolution</application>
-                to check for new mail periodically. To do so, FIXME.
+                to check for new mail periodically in the
+                <guilabel>Mail Settings</guilabel> dialog.
                 </para>
 	    </listitem>
 	  </varlistentry>
diff --git a/help/C/evolution-faq.sgml b/help/C/evolution-faq.sgml
index b153ba7c41..4fdb3940c5 100644
--- a/help/C/evolution-faq.sgml
+++ b/help/C/evolution-faq.sgml
@@ -300,7 +300,7 @@ export GNOME_PATH=/opt/gnome:/usr
 	    </para>
 
 	    <programlisting>
-file ~/evolution/local/Contacts/addressbook.db
+                file ~/evolution/local/Contacts/addressbook.db
 	    </programlisting>
 
 	    <para>
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index 114f2e87d9..144fb60a35 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -64,7 +64,7 @@ implemented. -->
     </legalnotice>
 
    <releaseinfo>
-      This is version 0.9 of the Evolution manual.
+      This is version 0.10 of the Evolution manual.
    </releaseinfo>
 
   </bookinfo>
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index d82191cb17..a2a4ea1b32 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -34,593 +34,253 @@
     at mail, contacts, or calendar information. 
   </para>
 
+   <sect1 id="menuref-mail">
+     <title>Mail Menus</title>
+     <para>
+           Note that the <guimenu>File</guimenu> menu and the
+	  <guimenu>Help</guimenu> are identical within the
+	  <application>Evolution</application> main window, regardless
+	  of what features you are using. 
 
-
-  <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>File Menu</term>
+          <listitem> <para>
+              <variablelist>
+		<varlistentry>
+		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
+	           Message</guimenuitem></menuchoice></term>
+		  <listitem>
+		    <para>
+                   <keycombo action="simul"><keycap>Ctl</keycap>
+		      <keycap>N</keycap>
+		      </keycombo>
+                     </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Evolution
+		   Window</guimenuitem></menuchoice></term>
+		   <listitem><para><keycombo action="simul">
+		   <keycap>Shft</keycap><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Shortcut</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>S</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
+		 Message</guimenuitem></menuchoice></term>
+	 <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>M</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Appointment</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>A</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Contact</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>C</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Task</guimenuitem></menuchoice></term>
+	  <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Open Selected Items</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>O</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Save As</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Alt</keycap><keycap>S</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guisubmenu>Folder</guisubmenu>
+	<guimenuitem>New Folder</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>F</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Go to Folder</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>G</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Print</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>P</keycap></keycombo></para></listitem>
+     </varlistentry>
+
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Close</guimenuitem></menuchoice></term>
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
+     </varlistentry>
+	
+     <varlistentry>
+	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Exit</guimenuitem></menuchoice></term>
+  	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Q</keycap></keycombo></para></listitem>
+     </varlistentry>
+    </variablelist>
+     </para>
+    </listitem>
+   </varlistentry>
+    <varlistentry>
+      <term>Edit Menu</term>
+      <listitem><para>
+       <variablelist>
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice></term>
+		  <listitem><para><keycombo action="simul"><keycap>
+	           Ctl</keycap><keycap>A</keycap></keycombo>
+		  </para></listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Invert Selection</guimenuitem></menuchoice></term>	
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>I</keycap></keycombo>
+		  </para></listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>D</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Undelete</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>U</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Read</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+	
+	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Unread</guimenuitem></menuchoice></term>		
+	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
+		  </para>
+		  </listitem></varlistentry>
+        </variablelist>
+      </para> </listitem>
+      </varlistentry>
+      
+    <varlistentry>
+      <term>View Menu</term>
+      <listitem>
 	<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>
+	    <term><menuchoice><guimenu>View</guimenu><guimenuitem>Threaded</guimenuitem></menuchoice></term>
+	    <listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
 	  </varlistentry>
+        </variablelist>
+      </listitem>
+    </varlistentry>
+    
+    <varlistentry>
+      <term>Actions Menu</term>
+      <listitem>
+	<variablelist>
 	  
-	  <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>
+	   <varlistentry>
+	<term><menuchoice><guimenu>Actions</guimenu><guisubmenu>Forward
+			    As</guisubmenu><guimenuitem>Inline</guimenuitem>
+		    </menuchoice> </term>
+		  <listitem>
+		    <para>
+	              <keycombo action="simul">
+			<keycap>Shft</keycap><keycap>Ctl</keycap><keycap>J</keycap>
+		      </keycombo>
+	             </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term><menuchoice>
+		      <guimenu>Actions</guimenu><guisubmenu>Forward As</guisubmenu>
+		      <guimenuitem>Attachment</guimenuitem>
+		  </menuchoice></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-exec">
-   <title>Executive Summary Menus</title>
-   <para>
-     We'll leave this section blank until the UI stabilizes a little
-     more.
-   </para>
-  </sect1>
-
-
-
-  <sect1 id="menuref-mail">
-    <title>Mail Menus</title>
-    <para>
-       <application>Evolution</application> Mail has more specialized
-       menus, and more specialized menu items, than any other part of
-       the application.
-    </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 Mail 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 Mail Settings 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>Virtual Folder Editor</guimenuitem></term>
-	    <listitem><para>
-              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
-               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> 
-               Tools for setting up all your mail account preferences.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
-	    <listitem><para>
-               Tools for newsgroup and IMAP folder subscriptions.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
-	    <listitem><para>
-              This item will cause <application>Evolution</application>
-	      to forget what your password is.
-            </para></listitem>
-	  </varlistentry>
-	  
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-folder">
-      <title>The Mail Folder Menu</title>
-      <para>
-          The items in this menu relate to 
-          <application>Evolution</application> mail folders.
-      </para>
-      <para>
-          You can:
-          <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
-	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  to mark everything in a folder as read, choose this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete All</guimenuitem></term>
-	    <listitem><para>
-	      This is a favorite item of everyone with too much junk-mail: one click, and it 
-	      deletes every message in the current folder. 
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-                 Empties the trash folder, erasing messages permanently. 
-                 Once you've done this, they're gone for good.
-	       </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Configure Folder</guimenuitem></term>
-	    <listitem><para>
-              Use this item to set the file format in which
-              <application>Evolution</application> stores mail. You
-              can choose from standard UNIX-style
-              <systemitem><filename>mbox</filename></systemitem>
-              files, or the
-              <systemitem><filename>mh</filename></systemitem> format.
-              Converting large mailboxes may take a long time, and
-              it's a good idea to have a backup copy beforehand.
-           </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-  <sect2 id="menuref-mail-message">
-      <title>The Mail Message Menu</title>
-      <para>
-          The items in this menu relate to
-          <application>Evolution</application> mail messages. Most of
-          them require you to have a message selected, and are also
-          available by right-clicking on a message in the message
-          list.
-      </para>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Displays the selected message in a new window.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-	      Open the selected message in the message composer.  You
-              can only edit a message you have written: drafts and messages in 
-              the <guilabel>Sent</guilabel> box. 
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-	       Displays the <interface>Print Preview</interface> window, 
-               ready for printing.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy Message</guimenuitem></term>
-	    <listitem><para>
-	       Copy the selected  message to another folder.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-   <sect2 id="menuref-mail-messagelistheader">
-      <title>The Message Heading Right-Click Menu</title>
-      <para>
-         At the top of the message list is the message list heading
-         bar; you can click on an individual heading &mdash;
-         <guilabel>Subject</guilabel>, for example, to have the
-         message list sorted by that attribute.  However, if you right
-         click on a heading, you'll get the following menu:
-      </para>
-
-      <para>
-          <variablelist>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Ascending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list, in ascending order, by the attribute you clicked.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Descending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list in descending order.
-	      </para></listitem>
-	    </varlistentry>
-  
-	  <varlistentry>
-	      <term><guimenuitem>Unsort</guimenuitem></term>
-	      <listitem><para>
-		 Undo any sorting by this attribute, and leave the message list sorted 
-                 by the previous one.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by this Field</guimenuitem></term>
-	      <listitem><para>
-		 Instead of sorting the messages, group them in boxes. 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by Box</guimenuitem></term>
-	      <listitem><para> If you have your messages grouped in
-	      boxes, you can arrange the boxes as well, by choosing
-	      this item.  </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Remove this column</guimenuitem></term>
-	      <listitem><para>
-		 Choose this to remove the column from the message list display.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Field Chooser</guimenuitem></term>
-	      <listitem><para>
-		 Opens a palette of columns. You can drag the columns
-		 you want from the palette into position in the
-		 message list heading bar; red arrows appear
-		 when you get close enough to a possibile position.</para>
-                 
-              <para>
-                 Your options are: 
-                 <itemizedlist>
-                     <listitem><para>
-                         <guiicon>An Envelope</guiicon> which indicates whether a message has been read (closed for unread, open for read).
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>An Exclamation Point</guiicon> for priority
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Penguin</guiicon> which indicates something, although I'm not sure what.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Paper Clip</guiicon> which indicates that there is an attachment to the message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>From</guilabel>, for the <guilabel>From</guilabel> field of a message.
-                     </para></listitem>
-                     <listitem><para>
-                         <guilabel>Subject</guilabel>, for the <guilabel>Subject</guilabel> field of a message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Date</guilabel>, for the date and time a message was sent.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Received</guilabel>, for the date and time you got the message. 
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>To</guilabel>, for the <guilabel>To</guilabel> field.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Size</guilabel>, for a message's size.
-                     </para></listitem>
-		  </itemizedlist>
-             </para>   
-
-	      </listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Alignment</guimenuitem></term>
-	      <listitem><para> Use this item to decide upon the
-	      alignment of the message attributes within their
-	      columns.  </para></listitem>
-	    </varlistentry>
+	        <keycombo action="simul">
+			<keycap>Ctl</keycap><keycap>F</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+		
+		<varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply</guimenuitem>
+		    </menuchoice></term> <listitem><para>
+	        <keycombo action="simul">
+			<keycap>Ctl</keycap><keycap>R</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+
+	   <varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply to All</guimenuitem>
+		    </menuchoice></term>		
+		  <listitem><para>
+	        <keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>R</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+		
+	   <varlistentry>
+	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Move
+			  to Folder</guimenuitem> </menuchoice></term>
+		  <listitem><para> <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>M</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+	
 
-	  <varlistentry>
-	      <term><guimenuitem>Best Fit</guimenuitem></term>
-	      <listitem><para>
-		 Alters the width of the message list columns to maximize the amount of information displayed.
-	      </para></listitem>
-	    </varlistentry>
+	   <varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Copy to Folder	</guimenuitem>
+		    </menuchoice></term>	
+		  <listitem><para>
+	        <keycombo action="simul"><keycap>>Ctl</keycap><keycap>C</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
 
-	  <varlistentry>
-	      <term><guimenuitem>Format Columns...</guimenuitem></term>
-	      <listitem><para>
-		 This item is not yet available.
-	      </para></listitem>
-	    </varlistentry>
+	
+	   <varlistentry>
+	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Apply
+			  Filters </guimenuitem> </menuchoice></term>
+		  <listitem><para> <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>Y</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
 
+	
+		<varlistentry>
+		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Expunge
+		  </guimenuitem> </menuchoice></term> <listitem><para>
+		  <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>X</keycap>
+		      </keycombo>
+	         </para></listitem>
+		</varlistentry>
+	
+		<varlistentry>
+		  <term><menuchoice><guimenu>Help</guimenu><guimenuitem>Index
+		  </guimenuitem> </menuchoice></term>	  
+		  <listitem><para> <keycombo
+		  action="simul"><keycap>Ctl</keycap><keycap>H</keycap></keycombo>
+		  </para></listitem>
+                 </varlistentry>
+      
+	    </variablelist>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
 
-	  <varlistentry>
-	      <term><guimenuitem>Customize
-	      Views...</guimenuitem></term> <listitem><para> Opens a
-	      dialog box that lets you choose a complex set of
-	      arrangements for your message list, so you can combine
-	      sorting and grouping in as many ways as you like.
-	      </para></listitem>
-	    </varlistentry>
 
-          </variablelist>
-      </para>
-   </sect2>
-  </sect1>
+    </para>       
 
+   </sect1>
   <sect1 id="menuref-mail-editor">
     <title>The Message Composer Menus</title>
     <para>
@@ -699,6 +359,14 @@
 	</variablelist>
       </para>
     </sect2>
+
+
+<sect2 id="menuref-tasklist">
+      <title>Task List Shortcuts and Menus</title>
+      <para>
+      </para>
+</sect2>
+        
     <sect2 id="menuref-mail-editor-edit">
       <title>The Message Composer's Edit Menu</title>
       <para>
@@ -992,10 +660,10 @@
     <sect2 id="menuref-cal-editor-file">
       <title>The Appointment Editor's File Menu</title>
       <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
-         that is identical to that in the 
-         <link linkend="menuref-universal-file">main window's file menu</link>.
-         Its other contents are:
+         This menu contains several items, including a
+         <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu></menuchoice>
+         submenu that is identical to that in the main window.  The
+         other contents are:
          <variablelist>
 
 	  <varlistentry>
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 67e9fcfe69..53ac7f6a76 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -121,17 +121,14 @@
     <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
       <para>
         This version of the <application>Evolution</application>
-        User's Guide is a <emphasis>draft</emphasis>. It describes
-        version 0.6 of the software.  It is missing huge
-        chunks of information, and many of the features it describes
-        are unimplemented.  All the content is subject to change,
-        especially if you help.  Please send comments on the guide to
-        <email>aaron@ximian.com</email>. If you would like to work
-        on the guide please contact me or see the GNOME Documentation
-        project <ulink
+        User's Guide is a <emphasis>draft</emphasis>.  Please send
+        comments on the guide to <email>aaron@ximian.com</email>. The
+        first person to send me some good constructive criticism wins
+        a free Ximian t-shirt. Include preferred shirt size and postal
+        address. If you would like to work on the guide please contact
+        me or see the GNOME Documentation project <ulink
         url="http://developer.gnome.org/projects/gdp">web
-        site</ulink>.  This paragraph will be removed in later
-        versions of the manual.
+        site</ulink>.
       </para>
     <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
 
@@ -179,18 +176,17 @@
   <sect1 id="commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
-        You might want to copy this section and tape it to
-        the wall next to your computer: it's a very short summary of
-        most of the things you'll want to do with
-        <application>Evolution</application>, and pointers to the
-        sections of the book where you'll find more in-depth
-        description of those tasks.
+        You might want to copy this section and tape it to the wall
+        next to your computer: it's a very short summary of most of
+        the things you'll want to do with
+        <application>Evolution</application>.  Read <xref
+        linkend="menuref"> if you would like a complete list of
+        keyboard shortcuts for menu commands.
     </para>
+
     <sect2 id="quickref-newthings">
       <title>Opening or Creating Anything</title>
       <para>
-         Here are the keyboard shortcuts and menu items you're most
-         likely to use:
          
           <variablelist>
 
@@ -308,7 +304,8 @@
                 Click <guibutton>Get Mail</guibutton> in the
                 toolbar. There is no keyboard shortcut for this task,
                 but you can ask <application>Evolution</application>
-                to check for new mail periodically. To do so, FIXME.
+                to check for new mail periodically in the
+                <guilabel>Mail Settings</guilabel> dialog.
                 </para>
 	    </listitem>
 	  </varlistentry>