s/My Evolution/Summary/

2001-08-17  Aaron Weber  <aaron@ximian.com>

	* C/usage-exec-summary.sgml: s/My Evolution/Summary/

	* C/preface.sgml: Moved "Quickref" stuff to Menuref file.

	* C/usage-mainwindow.sgml: removed reference to faq.

	* C/menuref.sgml: Gutted. Filled with "quickref" stuff.

	* C/evolution.sgml: Removed FAQ. Re-added menuref. Menuref is now
	the "quick reference" section.

svn path=/trunk/; revision=12182

6 files changed, 293 insertions, 1450 deletions

diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index c3c5a5fbc2..ae8aebfd5a 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -12,8 +12,8 @@
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
 <!ENTITY CONFIG-ENCRYPTION SYSTEM "config-encryption.sgml">
-<!-- <!ENTITY MENUREF SYSTEM "menuref.sgml"> REMOVED THIS FOR NOW -->
-<!ENTITY FAQ SYSTEM "evolution-faq.sgml">
+<!-- <!ENTITY FAQ SYSTEM "evolution-faq.sgml"> Just link to the web page-->
+<!ENTITY MENUREF SYSTEM "menuref.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
@@ -119,21 +119,8 @@ implemented. -->
     &CONFIG-SYNC;
   </part>
 
-<!-- COMMENTED OUT MENUREF SECTION 
-  <part>  
-    <title>Comprehensive Menu reference</title>
-    <partintro>
-      <para>
-        The following reference covers all, or nearly all, of the
-        menus and menu commands that
-        <application>Evolution</application> has to offer you.
-      </para>
-    </partintro>
- &MENUREF;
-  </part>
-COMMENTED OUT MENUREF -->
-
-  &FAQ;
+<!--  &FAQ; Just link to the webpage -->
+  &MENUREF;
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
@@ -149,4 +136,3 @@ COMMENTED OUT MENUREF -->
 
 
 
-
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index a2a4ea1b32..e053f3250d 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -1,26 +1,17 @@
 <!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+<!DOCTYPE Appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 
-<chapter id="menuref">
-  <title>Menu Reference</title>
+<appendix id="menuref">
+  <title>Quick Reference</title>
   <para>
-    <application>Evolution</application>'s menus may not hold the
-    secret to happiness, they do hold every ability that
-    <application>Evolution</application> has. This section will serve
-    as a reference for all those menus, and the capabilites that they
-    offer you.
-  </para>
-  <para>
-    In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars of their own. 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>Settings</guimenu>,
-    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and
-    <guimenu>Help</guimenu>.
+      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>Ximian Evolution</application>.
+   </para>
 
-  </para>
+<!--  Put this in a note somewhere
   <para>
     Menus in <application>Evolution</application> are
     context-sensitive, which means that they vary depending on what
@@ -33,1106 +24,297 @@
     email message you've recieved. depending on whether you're looking
     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. 
-
-        <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><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><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>
-	        <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><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><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>
-
-
-    </para>       
-
-   </sect1>
-  <sect1 id="menuref-mail-editor">
-    <title>The Message Composer Menus</title>
-    <para>
-      The message composition window has its own set of menus:
-      <guimenu>File</guimenu>, which controls operations on files and
-      data, <guimenu>Edit</guimenu>, for text editing,
-      <guimenu>Format</guimenu>, which controls the file format of
-      messages you send, <guimenu>View</guimenu>, to set how you view
-      the message, and <guimenu>Insert</guimenu>, which holds tools
-      for embedding files and other items in messages.  Here's what's in them:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>The Message Composer's File Menu</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Open</guimenu></term>
-	      <listitem><para>
-		 Open a text file or a draft mail message.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save</guimenu></term>
-	      <listitem><para>
-		 Save a mail message as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save As</guimenu></term>
-	      <listitem><para> 
-		Choose a file name and location for
-		a message you want to save as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save in Folder</guimenu></term>
-	      <listitem><para>
-		 Save a message as a draft, rather than 
-		 as a separate text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insert Text File</guimenu></term>
-	      <listitem><para>
-		   Open a text file and insert it into 
-		   the current message. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Send Now</guimenu></term>
-	      <listitem><para>
-		  Sends the message immediately.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Send Later</guimenu></term>
-	      <listitem><para>
-		  Queue 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Close</guimenu></term>
-	    <listitem><para>
-		 Closes the message composer.  If you have not done so, 
-		 <application>Evolution</application>
-		 will ask you if you want to save your message.
-	      </para></listitem>
-	  </varlistentry>
-	</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>
+-->
+  <sect1 id="quickref-open">
+      <title>Opening or Creating Anything</title>
       <para>
-          The <guimenu>Edit</guimenu> menu in the message composer
-          contains the following items.  Keyboard shortcuts are listed
-          next to the items in the menus themselves.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Undo</guimenuitem></term>
-	    <listitem><para>
-                Undoes the last action you performed.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Redo</guimenuitem></term>
-	    <listitem><para>
-               If you change your mind about Undoing something, 
-               you can always use this item.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cut</guimenuitem></term>
-	    <listitem><para>
-                Removes the selected text from the text entry window and 
-                retains it in the system "clipboard" memory, ready for pasting.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy</guimenuitem></term>
-	    <listitem><para>
-              Copies selected text to the system clipboard without deleting it.
-              The text can then be inserted elsewhere with the 
-              <guimenuitem>Paste</guimenuitem> command.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Paste</guimenuitem></term>
-	    <listitem><para>
-                Inserts the contents of the system clipboard at the 
-                location of the cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find</guimenuitem></term>
-	    <listitem><para>
-               Enter a phrase and find your match in your message body.
-               As with <guimenuitem>Find Regex</guimenuitem>, 
-               <guimenuitem>Find Again</guimenuitem>, and
-               <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Regex</guimenuitem></term>
-	    <listitem><para>
-               If you are familiar with <glossterm>regular expressions</glossterm>,
-                often called "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Again</guimenuitem></term>
-	    <listitem><para>
-              Repeats your last search.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Replace</guimenuitem></term>
-	    <listitem><para>
-               Enter a word or phrase and the word or phrase with which you'd like
-               to replace it.  
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-               This item brings up the Message Composer Properties Capplet, 
-               a portion of the GNOME Control Center that determines the 
-               key bindings for the message composer.  Help for this capplet is 
-               available directly from the Control Center.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
+          <variablelist>
+
+	  <varlistentry>
+	    <term>Create a new folder</term>
+	    <listitem>
+	      <para>
+                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
+                <guimenuitem>Folder</guimenuitem></menuchoice> or
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift </keycap>
+		  <keycap>F</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new Shortcut in the Evolution Bar</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>S</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new email message:</term>
+	    <listitem>
+	      <para>
+                Use
+                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
+                Message</guimenuitem>  </menuchoice> or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift </keycap>
+		  <keycap>M</keycap>
+                </keycombo>
+              </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new Appointment</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>A</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term>Enter a new Contact</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>C</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term>Create a new Task</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>T</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
 	  </varlistentry>
 
 	</variablelist>
       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>The Message Composer's Format Menu</title>
-      <para> 
-        The <guimenu>Format</guimenu> menu has only one item:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Toggles HTML mode for the message composer.  When selected, 
-                 the message is displayed and sent in HTML.  If you have written a 
-                 message in HTML and turn HTML off, most formatting will be lost.
-                 <application>Evolution</application> will attempt to preserve spacing
-                 and to remove formatting gracefully, however.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>The Message Composer's View Menu</title>
+    </sect1> 
+    <sect1 id="quickref-mail">
+      <title>Mail Tasks</title>
       <para>
-        The <guimenu>View</guimenu> menu controls the way messages are
-        displayed, and how much of the message, its headers, and
-        attachments appear.  It contains:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Attachments</guimenuitem></term>
-	    <listitem><para> 
-              Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a separate pane
-              of the composition window to show what attachments you are appending
-              to the message. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>The Message Composer's Insert Menu</title>
-      <para>
-        The <guimenu>Insert</guimenu> menu holds tools that allow you
-        to include images, horizontal rules, and other objects
-        in the body of your message. The tools are:
-        <variablelist>
+        Here are the most frequent email tasks, and shortcuts for
+        navigating your mailbox with the keyboard instead of the
+        mouse:
+         <variablelist>
 
-	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
-	    <listitem><para> 
-               This tool will prompt you to select an image file to 
-               insert into your HTML message.  For text messages, this
-               is the same as attaching an image file.
-	    </para></listitem>
+          <varlistentry>
+	    <term>Navigating the Message List with the Keyboard</term>
+	    <listitem>
+	      <para>
+                Press <keycap>N</keycap> to jump to the next unread
+                message. <keycap>P</keycap> goes to the previous
+                unread message.  Use the arrow keys to move up
+                and down along the list of all message.
+                </para>
+	    </listitem>
 	  </varlistentry>
 
-	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
-	    <listitem><para> 
-               Opens the <interface>link creation window</interface>, 
-               which lets you specify the URL and text description
-               for a link in your message.  This only works with HTML 
-               messages.
-	    </para></listitem>
+          <varlistentry>
+	    <term>Move the display up and down in the preview pane</term>
+	    <listitem>
+	      <para>
+                Press the space bar to go a page down.  Press
+                <keycap>Backspace</keycap> to go a page up.
+                </para>
+	    </listitem>
 	  </varlistentry>
 
-	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
-	    <listitem><para>    
-             Opens the<interface> horizontal rule creation dialog</interface>, which lets you
-	     create an HTML horizontal rule.  For more information,
-	     see <xref linkend="usage-mail-getnsend-send-html">.
-             This tool only works with HTML messages.
-	     </para></listitem>
+          <varlistentry>
+	    <term>Reply to a Message</term>
+	    <listitem>
+	      <para>
+                To reply to the sender of the message only:
+                click <guibutton>Reply</guibutton> in the
+                toolbar, or press
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
+                </keycombo>
+                </para>
+	      <para>
+                To reply to the sender and all the other visible
+                recipients of the message, click <guibutton>Reply to
+                All</guibutton> or select the message and press
+                <keycombo action="simul">
+		  <keycap>Shift</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
+                </keycombo>
+              </para>
+	    </listitem>
 	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Text File</guimenuitem></term>
-	    <listitem><para>
-	       Open a text file and insert it into the current message.
-               This tool works with both plain text and HTML messages.
-	      </para></listitem>
+	  
+          <varlistentry>
+	    <term>Forward a Message</term>
+	    <listitem>
+	      <para>
+                Select the message or messages you want to forward,
+                and click <guibutton>Forward</guibutton> in the
+                toolbar, or press
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>F</keycap>
+                </keycombo>
+                </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>
+	    <term>Open a Message in a New Window</term>
+	    <listitem>
+	      <para>
+                Double-click the message you want to view, or select
+                it and press
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>O</keycap>
+                </keycombo>
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	  
-	  <varlistentry>
-	  <term><guimenuitem>Item</guimenuitem></term>
-	  <listitem><para>
-              Description
-           </para></listitem>
+          <varlistentry>
+	    <term>Create Filters and Virtual Folders</term>
+	    <listitem>
+	      <para>
+                Right-click on a message and select "Create Rule..."
+                menu items. You can also create filters and virtual
+                folders in the <guimenu>Tools</guimenu> menu.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
+	
       </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>The Calendar View Menu</title>
+    </sect1>
+    <sect1 id="quickref-cal">
+      <title>Address Book</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>
-  
+        <variablelist>
 	  <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-settings">
-      <title>The Calendar Settings Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
+	    <term></term>
+	    <listitem>
+	      <para>
+		<tip id="new-appt">
+		  <title>New Appointments Fast</title>
+		  <para>
+		    Double-click in a blank space to create a new contact.
+		  </para>
+		</tip>
+	      </para>
+	    </listitem>
+	    </varlistentry>
+	  </variablelist>
 
+        </para>
   </sect1>
+    <sect1 id="quickref-contact">
+        <title>Contact Manager</title>
+        <para>
+	Here are the most frequent tasks that are done in the Contact Manager,
+	with the shortcuts so that you can use these tasks without having to use
+	your mouse:
 
-  <sect1 id="menuref-cal-editor">
-    <title>The Appointment Editor Menus</title>
-    <para>
-    The appointment editor has its own menus, to help you use its
-    wide-ranging abilities.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         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>
-	    <term><guimenuitem>Send</guimenuitem></term>
-	    <listitem><para>
-             Opens a mail message with the appointment attached to it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save</guimenuitem></term>
-	    <listitem><para>
-              Save this appointment in the existing location and name. If you have not yet
-              chosen a location and name, this is the same as <guimenuitem>Save As</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save As</guimenuitem></term>
-	    <listitem><para>
-              Choose a location and name for this appointment, and save it.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete</guimenuitem></term>
-	    <listitem><para>
-              Deletes the appointment.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and move the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and put a copy of the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
+        <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>
-	    <listitem><para>
-             This menu contains two items:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Memo Style</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
+	    <term>Edit a Contact</term>
+	    <listitem>
+	      <para>
+		You can edit a contact two ways:
+		<itemizedlist>
+		  <listitem>
+		    <para>
+		      Click once on the person's address card and you can
+		      edit the person's properties all in the same window.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Double-click on the contact's card and alter their details.
+		    </para>
+		  </listitem>
 		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para> Shows you what your appointment will look
-	    like if you print it. See <xref linkend="usage-print">
-	    for details on printing and the Print Preview function.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-              Prints the appointment without preview.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
+               </para>
+	    </listitem>
+	    </varlistentry>
+	  </variablelist>
+	
+	<variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Close</guimenuitem></term>
-	    <listitem><para>
-             Close the appointment editor window.
-           </para></listitem>
+	    <term>Deleting a Contact</term>
+	    <listitem>
+	      <para>
+		Right click on a contact and click <guilabel>Delete</guilabel>
+		or select a contact and press the <guibutton>Delete</guibutton>
+		on the <guilabel>toolbar</guilabel>.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>The Appointment Editor's Edit Menu</title>
-      <para>
-         FIXME: this menu is copied and pasted entirely from somewhere
-         else.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>The Appointment Editor's View Menu</title>
-      <para>
-         This menu allows you to look at different appointments, and
-         set the way you look at them, without having to move back to
-         the <interface>Main Window</interface>. It contains:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previous</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               prior to the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Next</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               scheduled to occur after the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendar</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Toolbars</guisubmenu></term>
-	    <listitem><para>
-             The <guisubmenu>Toolbars</guisubmenu> submenu 
-             allows you to choose which toolbars
-             are displayed in the 
-             <interface>Appointment Editor</interface>. They are:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Standard</guimenuitem> &mdash;
-                    Toggle the standard toolbar on and off.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formatting</guimenuitem> &mdash;
-                    Toggle the formatting toolbar on and off.
-                   </para></listitem>
 	
-		  <listitem><para>
-                    <guimenuitem>Customize</guimenuitem> &mdash;
-                    Select the contents of the formatting and standard toolbars.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>The Appointment Editor's Insert Menu</title>
-      <para>
-        This menu contains: (FIXME: Insert Content Here)
+	
         <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>File</guimenuitem></term>
-	    <listitem><para>
-             Choose a file to append to your appointment or appointment request.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Object</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>The Appointment Editor's Format Menu</title>
-      <para>
-         This menu contains two items, neither of which
-         have any functionality yet:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Font</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Paragraph</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>The Appointment Editor's Tools Menu</title>
-      <para>
-         This menu contains four items, including the
-         <guisubmenu>Forms</guisubmenu> submenu, which allows you to
-         alter calendar forms and create your own entries.  None of
-         this works yet, though.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Spelling</guimenuitem></term>
-	    <listitem><para>
-              Checks the spelling of your calendar entry.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Check Names</guimenuitem></term>
-	    <listitem><para> Checks the names listed here against
-	    those in your address book.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Address Book</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
-	    <listitem><para>
-               The Forms submenu lets you alter the
-	       appearance of Calendar Forms. 
-           </para></listitem>
+	    <term>Email a Contact</term>
+	    <listitem>
+	      <para>
+		Right click on a contact and select 
+		<guilabel>Send message to contact</guilabel>.
+               </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>The Appointment Editor's Actions Menu</title>
-      <para>
-        This menu contains:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
-	    <listitem><para>
-              Brings up the <interface>Meeting Invitation</interface> window, 
-              described in <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancel Invitation</guimenuitem></term>
-	    <listitem><para>
-              Cancels the event, notifying all attendees.  You may be prompted 
-              to specify an invitation message.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with the current event attached.
-           </para></listitem>
-	  </varlistentry>
-
+	
+        <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Forward as Text</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with a text description of the current
-              event included in the message body.
-           </para></listitem>
+	    <term></term>
+	    <listitem>
+	      <para>
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
   </sect1>
-
-  <sect1>
-    <title>Contact Manager Menus</title>
-    <para>
-     The contact manager has six menus: <guimenu>File</guimenu>,
-     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
-     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
-     <guimenu>Help</guimenu>.
-    </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 View 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> / <guimenuitem>As Minicards</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 contains one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Search for
-	    Contacts</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="contact-search"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains only one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="config-prefs-contact-ldap-add"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>The Contact Editor Menus</title>
-    <para>
-       This window has only one menu: the file menu.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Contact Editor File Menu</title>
-      <para>
-         This menu contains five items:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Save</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Save As</guimenuitem></term>
-	  <listitem><para>
-              Allows you to save the contact as an external 
-              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Print</guimenuitem></term>
-	  <listitem><para>
-             Prints the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Delete</guimenuitem></term>
-	  <listitem><para>
-             Deletes the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Close</guimenuitem></term>
-	  <listitem><para>
-              Closes the Contact Editor without saving.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
+</appendix>
\ No newline at end of file
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index b4423432e1..f1f14584b5 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -36,24 +36,6 @@
         website at <ulink
         url="http://www.fsf.org">http://www.fsf.org</ulink>.
       </para>
-      <para>
-        <note>
-           <title>This is a Beta release</title>
-           <para>
-             <application>Evolution</application> is now on the home
-             stretch to version 1.0.  Please help prepare for the 1.0
-             release by reporting bugs to us at <ulink
-             url="http://bugzilla.ximian.com">bugzilla.ximian.com</ulink>. There
-             are detailed bug reporting instructions in <xref
-             linkend="evolution-faq">.
-          </para>
-          <para>
-            Please send comments on the guide to
-            <email>aaron@ximian.com</email>. The first person to send
-            some good suggestions gets a free Ximian t-shirt.
-          </para>
-        </note>
-      </para>
 
       <para>
         <application>Evolution</application> can help you work in a
@@ -184,308 +166,4 @@
         </para>
       </formalpara>
   </sect1>
-
-  <sect1 id="quickref-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>.
-    </para>
-    
-    <sect2 id="quickref-newthings">
-      <title>Opening or Creating Anything</title>
-      <para>
-	
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new folder</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Enter a new Contact</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Create a new Task</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for
-        navigating your mailbox with the keyboard instead of the
-        mouse:
-         <variablelist>
-
-          <varlistentry>
-	    <term>Navigating the Message List with the Keyboard</term>
-	    <listitem>
-	      <para>
-                Press <keycap>N</keycap> to jump to the next unread
-                message. <keycap>P</keycap> goes to the previous
-                unread message.  Use the arrow keys to move up
-                and down along the list of all message.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Display the next page of a message in the preview pane</term>
-	    <listitem>
-	      <para>
-                Press the space bar.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message</term>
-	    <listitem>
-	      <para>
-                To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message</term>
-	    <listitem>
-	      <para>
-                Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or select
-                it and press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Create Filters and Virtual Folders</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select "Create Rule..."
-                menu items. You can also create filters and virtual
-                folders in the <guimenu>Tools</guimenu> menu.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-      </para>
-    </sect2>
-    <sect2 id="quickref-cal">
-      <title>Address Book</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-		<tip id="new-appt">
-		  <title>New Appointments Fast</title>
-		  <para>
-		    Double-click in a blank space to create a new contact.
-		  </para>
-		</tip>
-	      </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-  </sect2>
-    <sect2 id="quickref-contact">
-        <title>Contact Manager</title>
-        <para>
-	Here are the most frequent tasks that are done in the Contact Manager,
-	with the shortcuts so that you can use these tasks without having to use
-	your mouse:
-
-        <variablelist>
-	  <varlistentry>
-	    <term>Edit a Contact</term>
-	    <listitem>
-	      <para>
-		You can edit a contact two ways:
-		<itemizedlist>
-		  <listitem>
-		    <para>
-		      Click once on the person's address card and you can
-		      edit the person's properties all in the same window.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Double-click on the contact's card and alter their details.
-		    </para>
-		  </listitem>
-		</itemizedlist>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-	
-	<variablelist>
-	  <varlistentry>
-	    <term>Deleting a Contact</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and click <guilabel>Delete</guilabel>
-		or select a contact and press the <guibutton>Delete</guibutton>
-		on the <guilabel>toolbar</guilabel>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-	
-        <variablelist>
-	  <varlistentry>
-	    <term>Email a Contact</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and select 
-		<guilabel>Send message to contact</guilabel>.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
 </preface>
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index 76724e4362..dc4a5d3160 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -1,23 +1,23 @@
 <chapter id="usage-exec-summary">
-   <title>My Evolution</title>
+   <title>Using the Ximian Evolution Summary</title>
     <para>
-       My Evolution is designed to show you a
+       The Ximian Evolution Summary is designed to show you a
        summary of important information: the appointments for a given
-       day, important email, and so forth. To see your My Evolution, 
-       click on the <guibutton>My Evolution</guibutton>
+       day, important email, and so forth. To see the Summary, 
+       click on the <guibutton>Summary</guibutton>
        button in the shortcut bar, or select the
-       <guilabel>My Evolution</guilabel> folder in the folder
+       <guilabel>Summary</guilabel> folder in the folder
        bar.
     </para>
 
     <sect1 id="exec-intro">
-      <title>Introducing My Evolution</title>
+      <title>Introducing Summary</title>
       <para>
-        The first thing you'll want to do with My Evolution
+        The first thing you'll want to do with Summary
         is add a service. Go to
       <menuchoice>
 	<guimenu>Tools</guimenu>
-	<guimenuitem>My Evolution Settings</guimenuitem>
+	<guimenuitem>Summary Settings</guimenuitem>
       </menuchoice>
       then select one of the available
       services.  Services may vary depending upon your system, but
@@ -78,7 +78,7 @@
 	      Choose
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenuitem>My Evolution Settings</guimenuitem>
+		<guimenuitem>Summary Settings</guimenuitem>
 	      </menuchoice>
 	      from the menubar.
 	    </para>
@@ -101,14 +101,14 @@
     <sect2 id="delete-components">
       <title>Deleting Components</title>
       <para>
-	To remove a service from My Evolution, do the following:
+	To remove a service from Summary, do the following:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
 	      Choose
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenuitem>My Evolution Settings</guimenuitem>
+		<guimenuitem>Summary Settings</guimenuitem>
 	      </menuchoice>
 	      from the menubar.
 	    </para>
@@ -131,10 +131,10 @@
 	your needs.  For instance, you may choose that you want to use different
 	city choices than the default settings.
 	<application>Evolution</application> lets you configure all the
-	components in My Evolution.
+	components in Summary.
       </para>
       <sect3 id="modifying-components-mail">
-	<title>Customizing My Evolution Mail Summary</title>
+	<title>Customizing Summary Mail Summary</title>
 	<para>
 	  To modify mail:
 	  <orderedlist numeration="arabic">
@@ -143,7 +143,7 @@
 		Choose
 		<menuchoice>
 		  <guimenu>Tools</guimenu>
-		  <guimenuitem>My Evolution Settings</guimenuitem>
+		  <guimenuitem>Summary Settings</guimenuitem>
 		</menuchoice>
 		from the menubar.
 	      </para>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 8cfd78905e..737dce63b1 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -42,16 +42,16 @@
     <para>
       However, <application>Evolution</application> has some important
       differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  Both the <link
+      mail.  Both the <link
       linkend="usage-mail-organize-filters">filtering</link> and <link
       linkend="usage-mail-organize-search">searching</link> functions
       were built for speed and efficiency on gargantuan volumes of
       mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">Virtual
-      Folder</link>, an advanced organizational feature not found in
-      mainstream mail clients.  If you get a lot of mail, or if you keep
-      every message you get in case you need to refer to it later,
-      you'll find this feature especially useful.
+      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
+      advanced organizational feature not found in mainstream mail
+      clients.  If you get a lot of mail, or if you keep every message
+      you get in case you need to refer to it later, you'll find this
+      feature especially useful.
     </para>
   </abstract>
 
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index fe8f3458eb..38b3cdd1af 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -251,8 +251,8 @@
 	<application>Evolution</application> cannot import directly.
 	To import files from Outlook 2000, you will need to boot to
 	Windows, import the files into Mozilla mail, then reboot and
-	import from Mozilla.  Please see the <xref linkend="evolution-faq">FAQ for more
-	information.
+	import from Mozilla.  Please see the FAQ at the Ximian website
+	for more information.
       </para>
     </note>     
 
@@ -630,10 +630,9 @@
 	</note>
 
     <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
+      Right-clicking will bring up a menu for just about anything in
+      <application>Evolution</application>.  If you right-click on a
+      folder, you'll have a menu with the following options:
       <itemizedlist>
 	<listitem><para><guimenuitem>View</guimenuitem>, to view the folder. </para></listitem>
 	<listitem><para><guimenuitem>Open in New Window</guimenuitem>, to see it in a new Evolution window. </para></listitem>
@@ -644,10 +643,8 @@
 	<listitem><para><guimenuitem>Create New Folder</guimenuitem>, to create another folder in the same location. </para></listitem>
 	<listitem><para><guimenuitem>Add to Shortcut Bar</guimenuitem>, to add the folder to your shortcut bar. </para></listitem>
 	<listitem><para><guimenuitem>Properties</guimenuitem>, to view or change the folder properties. </para></listitem>
-
       </itemizedlist>
     </para>
-
     <para>
       You can also rearrange folders and messages by dragging and
       dropping them.