C2004-02-10 Aaron Weber <aaron@ximian.com>

	* C/usage-mail.xml: Fix bugs noted by Dimitrios. Special thanks to him for this patch.
	* C/usage-mail-org.xml: especially to filtering section
	* C/usage-print.xml: Remove, this is not a useful section.
	* C/usage-contacts: spelling
	* C/config-prefs.xml: lots of user-suggested corrections here.
	* C/Makefile.am: delete printing page and related images.

	* Also some places in menuref and so forth.

svn path=/trunk/; revision=24693

12 files changed, 540 insertions, 679 deletions

diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 9ab76082f5..25b037ab15 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -21,8 +21,6 @@ figs = \
 	figures/mail-threaded.png		\
 	figures/mainwindow-pic.png		\
 	figures/newmsg.png			\
-	figures/print-dest.png			\
-	figures/print-preview.png		\
 	figures/replymsg.png			\
 	figures/schedule.png			\
 	figures/summary.png			\
@@ -48,7 +46,6 @@ entities =	\
 	usage-mail-org.xml	\
 	usage-mail.xml		\
 	usage-mainwindow.xml	\
-	usage-print.xml		\
 	usage-sync.xml
 
 include $(top_srcdir)/help/xmldocs.make
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 0e874a15ef..25af814538 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -233,7 +233,7 @@ smtp.omniport.com:143
                      <para>
                    <itemizedlist>
 			  <listitem>
-			    <para>Checking for new mail: If you would
+			    <para><guilabel>Checking for new mail:</guilabel> If you would
 	                     like Evolution
 	                     to check for new mail automatically,
 	                     check the box and select a frequency in
@@ -243,7 +243,7 @@ smtp.omniport.com:143
 
 			  <listitem>
 			    <para>
-                             Message Storage: If you'd like to store
+                             <guilabel>Leave messages on server:</guilabel> If you'd like to store
 	                      copies of your mail on the server, check
 	                      this option.
                            </para>
@@ -251,13 +251,14 @@ smtp.omniport.com:143
 		
 			
                            <listitem>
-			    <para>Store Store status headers in
-			    Elm/Pine/Mutt format: If you would like to
-			    use the X-Status header format used by the
-			    mail clients Elm, Pine, and Mutt, select
-			    this option. This option is useful if you
-			    plan to check your mail with those clients
-			    from time to time.
+                             <para><guilabel>Disable support for all
+                             POP3 extensions:</guilabel> Some email
+                             servers refuse to work with the extended
+                             POP3 command set; select this item to
+                             have Evolution use a more limited set of
+                             interactions with the server. If your
+                             server periodically drops your
+                             connection, this option may help.
                            </para>
 			  </listitem>
 	               </itemizedlist>
@@ -365,16 +366,6 @@ smtp.omniport.com:143
             account, check this box.
           </para>
 	  </listitem>
-
-	   <listitem>
-	    <para><guilabel>Store status headers in Elm/Pine/Mutt format</guilabel>:
-	    If you would like to use the X-Status header format used
-	    by the mail clients Elm, Pine, and Mutt, select this
-	    option. This option is useful if you plan to check your
-	    mail with those clients from time to time.
-	   </para>
-	  </listitem>
-
 	</itemizedlist>
                      </para>
                    </listitem>
@@ -445,14 +436,14 @@ smtp.omniport.com:143
       <title>Folder Settings</title>
       <para>
         There are three sets of folder options. In the first,
-        <guilabel>Defaults</guilabel>, select which folders will be
-        your usual mail, contact, calendar, and task folders. These
-        are the folders opened when you click items in the shortcut
-        bar, and when you want to save a calendar attachment or
-        address card.
+        <guilabel>Default Folders</guilabel>, select which folders will be
+        your usual mail, address book, calendar, and tasks
+        folders. When you save a contact or appointment attached to an
+        email, it will be stored in your default contact or calendar
+        folder.
       </para>
       <para>
-        The <guilabel>Offline Folders</guilabel> are the ones which
+        The <guilabel>Offline Folders</guilabel> are the ones that
         will be cached when you activate the <guilabel>Go
         Offline</guilabel> feature. 
       </para>
@@ -465,7 +456,7 @@ smtp.omniport.com:143
     </sect1>
 
     <sect1 id="config-prefs-mail">
-      <title>Mail Options</title>
+      <title>Mail Preferences</title>
       <para>
         The <guilabel>Mail Options</guilabel> tool lets you choose how
         to display citations, how long to wait before marking a
@@ -502,7 +493,7 @@ smtp.omniport.com:143
              you. 
              <variablelist>
                <varlistentry>
-                 <term>Mark Messages as Read</term>
+                 <term><guilabel>Mark Messages as Read...</guilabel></term>
                  <listitem>
                    <para> 
                    Normally, Evolution will mark a message as read as soon
@@ -514,7 +505,7 @@ smtp.omniport.com:143
                </varlistentry>
            
                <varlistentry>
-                 <term>Default Character Encoding</term>
+                 <term><guilabel>Default Character Encoding</guilabel></term>
                  <listitem>
                    <para>
                      This setting allows you to select character
@@ -527,7 +518,7 @@ smtp.omniport.com:143
                </varlistentry>
            
                <varlistentry>
-                 <term>Quotation Highlight Color</term>
+                 <term><guilabel>Highlight Quotations</guilabel></term>
                  <listitem>
                    <para>
                      Choose a color to highlight quotations from other
@@ -541,7 +532,7 @@ smtp.omniport.com:143
        </varlistentry>
        
        <varlistentry>
-         <term>Deleting Mail</term>
+         <term><guilabel>Deleting Mail</guilabel></term>
          <listitem>
            <para>
              Here, choose whether to delete messages automatically
@@ -552,7 +543,7 @@ smtp.omniport.com:143
        </varlistentry>
            
        <varlistentry>
-         <term>New Mail Notification</term>
+         <term><guilabel>New Mail Notification</guilabel></term>
          <listitem>
            <para>
               Evolution can alert you to the arrival of new mail with
@@ -564,11 +555,11 @@ smtp.omniport.com:143
      </variablelist>
    </para>
    <para>
-     The options in the <guilabel>HTML Mail</guilabel> section are:
+     The options in the <guilabel>HTML Mail</guilabel> tab are:
    <variablelist>
     
        <varlistentry>
-         <term>Loading Images</term>
+         <term><guilabel>Loading Image</guilabel></term>
          <listitem>
            <para>
              You can embed a image in an email and have it load only
@@ -619,7 +610,7 @@ smtp.omniport.com:143
 
 
     <sect1 id="config-prefs-mail-composer">
-      <title>Message Composer Preferences</title>
+      <title>Composer Preferences</title>
       <para>
         There are three  tabs of settings you can change for the
         message composer. The <guilabel>General</guilabel> tab covers shortcuts and
@@ -629,7 +620,7 @@ smtp.omniport.com:143
          <variablelist>
 
 	  <varlistentry>
-	    <term><guilabel>Default Behavior</guilabel></term>
+	    <term>Default Behavior</term>
 	    <listitem>
 	      <para>
                  Choose how you will normally forward and reply
@@ -642,13 +633,13 @@ smtp.omniport.com:143
 
 
 	  <varlistentry>
-	    <term><guilabel>Alerts</guilabel></term>
+	    <term>Alerts</term>
 	    <listitem>
 	      <para>
                  There are two optional alerts here:
                  <variablelist>
 	         <varlistentry>
-		    <term><guilabel>Prompt when sending messages with an empty subject</guilabel></term>
+		    <term><guilabel>Prompt when sending messages with an empty subject line</guilabel></term>
 		    <listitem>
 		      <para>
 			 The composer will warn you if you try to send a
@@ -701,7 +692,7 @@ smtp.omniport.com:143
       <menuchoice><guimenu>Tools</guimenu><guisubmenu>Settings</guisubmenu></menuchoice>,
       click on the <guiicon>Composer preferences</guiicon> icon, then
       select the <guilabel>Spell Checking</guilabel> tab and check the
-      <guilabel>Check spelling while i type</guilabel> box, and
+      <guilabel>Check spelling while I type</guilabel> box, and
       choose a color for your misspelled words.
   </para>
 </sect1>
@@ -732,7 +723,7 @@ smtp.omniport.com:143
 
 
     <sect1 id="config-prefs-cal">
-       <title>Calendar and Task List Settings</title>
+       <title>Calendar and Tasks Settings</title>
        <para>
           The calendar configuration tool has two tabs
           <guilabel>General</guilabel> and
@@ -752,7 +743,7 @@ smtp.omniport.com:143
         </para>
 
       <para>
-        The <guilabel>General</guilabel> tab lets you set the
+        The General tab lets you set the
         following:
         <variablelist>
 	  <varlistentry>
@@ -776,11 +767,9 @@ smtp.omniport.com:143
 	    <term><guilabel>Work Week</guilabel></term>
 	    <listitem>
 	      <para>
-                When does your work day start, and when does it end?
-		In the day and week views,
-		Evolution displays all the
+		In the day and week views, Evolution displays all the
 		hours in the range you select here, even if there are
-		no appointments for those times.  Of course, you can
+		no appointments for those times.  You can
 		still schedule an appointment outside of these hours,
 		and if you do, the display will be extended to show
 		it.
@@ -830,7 +819,7 @@ smtp.omniport.com:143
        </para>
 
       <para>
-	The <interface>Display</interface> section lets you choose how
+	The Display tab lets you choose how
 	your appointments and tasks will appear in your calendar.
       </para>
       <para>The display properties you can set are:
@@ -840,9 +829,9 @@ smtp.omniport.com:143
 	    <term><guilabel>Time divisions</guilabel></term>
 	    <listitem>
               <para>
-		Sets the increments shown on the daily view in the
-		calendar.  You can set this to be anywhere from five
-		minutes to an hour, in five minute increments.</para>
+                Sets the time increments shown as fine lines on the
+                daily view in the calendar.
+              </para>
             </listitem>
 	  </varlistentry>
 
@@ -850,8 +839,7 @@ smtp.omniport.com:143
 	    <term><guilabel>Show appointment end times in week and month views</guilabel></term>
 	    <listitem>
 	      <para>
-		If there is space,
-		Evolution will show the end
+		If there is space, Evolution will show the end
 		times in the week and month views for each
 		appointment.
               </para>
@@ -881,8 +869,7 @@ smtp.omniport.com:143
 	   <term><guilabel>Tasks due today</guilabel></term>
 	    <listitem>
 	      <para>
-		Configures what color to set your tasks that are due
-		today to.
+                Select the color for tasks due today.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -894,11 +881,24 @@ smtp.omniport.com:143
 	      </para>
 	    </listitem>
 	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guilabel>Hide Completed Tasks</guilabel></term>
+	    <listitem>
+	      <para>
+                Check this box to have completed tasks hidden after a
+                period of time measured in days, hours,
+                or minutes.  If you leave the box unchecked,
+                completed tasks will remain in your task list, marked
+                as complete.
+	      </para>
+	    </listitem>
+	  </varlistentry>
 	</variablelist>
       </para>
   </sect1>
   <sect1 id="config-prefs-contact">
-    <title>Directory Server Settings</title>
+    <title>Directory Servers</title>
     <para>
         Address book settings are limited to the usage and
         configuration of directory servers (LDAP and
@@ -909,33 +909,46 @@ smtp.omniport.com:143
     </para>
       
       <para>
-	To add a new <glossterm linkend="ldap">LDAP</glossterm> server
-	to your available contact folders:
+        To add a new address book, either local or remote, do the following:
     </para>
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Select 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem>
-	      </menuchoice>
-	      and click the <guilabel>Directory Servers</guilabel>
-	      shortcut button.
+              Open the address book by clicking the
+              <guilabel>Contacts</guilabel> button.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click the <guilabel>Add</guilabel> button on the right
-	      side to open a Directory Server addition assistant.
+              Right-click on the list of address books and select <guimenuitem>New Address</guimenuitem>
 	    </para>
 	  </listitem>
+          <listitem>
+            <para>
+            Select a name and group for the address book. The name is
+              for display only. </para>
+
+            </listitem>
+
+            <listitem>
+              <para>
+                Click <guilabel>Forward</guilabel>.  If the address book is stored locally,
+              in the <guilabel>On This Computer</guilabel> group, then
+              you don't have to provide any more information. Click
+              <guilabel>OK</guilabel> and you are done.
+              </para>
+            </listitem>
+
+
 	  <listitem>
+
 	    <para>
-	      Enter the server information as requested by the assistant:
+              If you are creating an <glossterm
+              linkend="ldap">LDAP</glossterm> server, enter the server information
+            as requested by the assistant:
 	    <variablelist>
 		<varlistentry>
-		  <term>Server name</term>
+                  <term><guilabel>Server name</guilabel></term>
 		  <listitem>
 		    <para>
 		      Address of the server where the address book is located.
@@ -943,18 +956,19 @@ smtp.omniport.com:143
 		  </listitem>
 		</varlistentry>
 		<varlistentry>
-		  <term>Login Method</term>
+                  <term><guilabel>Login Method</guilabel></term>
 		  <listitem>
 		    <para>
 		      Specify whether your login is anonymous, using
                       an email address, or a "distinguished name." If
-                      the login is not anonymous, enter the login name
-                      required by the server.
+                      the login is not anonymous, enter the email
+                      address or distinguished name (DN) required by
+                      the server.
 		    </para>
 		  </listitem>
 		</varlistentry>
 		<varlistentry>
-		  <term>Port</term>
+                  <term><guilabel>Port</guilabel></term>
 		  <listitem>
 		    <para>
 		      The internet port
@@ -965,7 +979,7 @@ smtp.omniport.com:143
 		  </listitem>
 		</varlistentry>
                 <varlistentry>
-                  <term>Use SSL/TLS</term>
+                  <term><guilabel>Use SSL/TLS</guilabel></term>
 		  <listitem>
 		    <para>
                       SSL and TLS are security mechanisms. If you
@@ -981,7 +995,7 @@ smtp.omniport.com:143
 
 
 		<varlistentry>
-		  <term>Search base</term>
+                  <term><guilabel>Search base</guilabel></term>
 		  <listitem>
 		    <para>
 		      The <glossterm linkend="search-base">search
@@ -992,7 +1006,7 @@ smtp.omniport.com:143
 		  </listitem>
 		</varlistentry>
 		<varlistentry>
-		  <term>Search scope</term>
+                  <term><guilabel>Search scope</guilabel></term>
 		  <listitem>
 		    <para>
                       The <glossterm linkend="search-scope">search
@@ -1023,7 +1037,7 @@ smtp.omniport.com:143
                 </varlistentry>
 
                 <varlistentry>
-                  <term>Timeout Limit</term>
+                  <term><guilabel>Timeout (minutes)</guilabel></term>
 		  <listitem>
 		    <para>
                       This is the maximum time Evolution will attempt to
@@ -1034,7 +1048,7 @@ smtp.omniport.com:143
 
 
                 <varlistentry>
-                  <term>Download Limit</term>
+                  <term><guilabel>Download Limit</guilabel></term>
 		  <listitem>
 		    <para>
 		      Set the maximum number of results for a given
@@ -1048,7 +1062,7 @@ smtp.omniport.com:143
 
 
                 <varlistentry>
-                  <term>Display name</term>
+                  <term><guilabel>Display name</guilabel></term>
 		  <listitem>
 		    <para>
 		      This is the name you will use to label this
@@ -1062,14 +1076,7 @@ smtp.omniport.com:143
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guilabel>OK</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>OK</guilabel> to permanently make
-	      changes or <guilabel>Apply</guilabel> to temporarily
-	      set the changes.
+	      Click <guilabel>Apply</guilabel>.
 	    </para>
 	  </listitem>
 	</orderedlist>
diff --git a/help/C/config-sync.xml b/help/C/config-sync.xml
index 6f6a7db9e7..410cb400ce 100644
--- a/help/C/config-sync.xml
+++ b/help/C/config-sync.xml
@@ -2,20 +2,12 @@
      <title>Setting up your synchronization system</title> 
      <para>
         Synchronization presents you with two issues you'll need to
-        address. 
-        <simplelist>
-          <member>
-            Your computer needs to recognize and access your handheld.
-            At this time, Ximian Evolution only
-            supports Palm-OS devices like the Palm Pilot and the
-            Handspring Visor.
-          </member>
-          <member>
-           You should decide what sort of synchronization behavior you
-           want.
-          </member>
-        </simplelist>
-    </para>
+        address. First, your computer needs to recognize and access
+       your handheld.  At this time, Ximian Evolution only supports
+       PalmOS devices like the Palm Pilot and the Handspring Visor.
+       Secondly, you should decide what sort of synchronization
+       behavior you want.
+     </para>
 
     <para>
        If you haven't used a handheld device with your computer
@@ -31,7 +23,7 @@
        <userinput>chmod 777 /dev/ttyUSB0</userinput>.
     </para>
     <para>
-        Once your computer and your Palm-OS device are talking happily
+        Once your computer and your PalmOS device are talking happily
         to each other, select the <glossterm
         linkend="conduit">conduits</glossterm> you want under the
         <guilabel>Pilot Conduits</guilabel> section of the Control
diff --git a/help/C/evolution-1.5.xml b/help/C/evolution-1.5.xml
index af43ca88da..c39ec0f034 100644
--- a/help/C/evolution-1.5.xml
+++ b/help/C/evolution-1.5.xml
@@ -14,7 +14,6 @@
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.xml">
 <!ENTITY USAGE-EXCHANGE SYSTEM "usage-exchange.xml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.xml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.xml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.xml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.xml">
 <!ENTITY MENUREF SYSTEM "menuref.xml">
@@ -32,11 +31,12 @@
 <!-- Almost every chapter is an entity.  Files, Chapter id's, and
 entity names correspond.  APX is for appendix.  -->
 
-<!-- STYLE RULES: Use "guilabel" instead of "guibutton everywhere. -->
-<!-- "Address Book" is two words. -->
-<!-- The "application" tag is not used around "Evolution." -->
-<!-- filenames use  command tags so they appear in the same font as commands -->
-<!-- there is one bar and it is the Shortcut Bar. The folder bar is dead. -->
+<!-- STYLE RULES:
+* Use "guilabel" instead of "guibutton" everywhere.
+* "Address Book" is two words, used instead of "Contacts" where possible.
+* The "application" tag is not used around "Evolution."
+* Filenames use  command tags so they appear in the same font as commands 
+* There is one bar and it is the Shortcut Bar. The folder bar is dead. -->
 
 <!-- FIXME, TODO:   take new screenshots, -->
 
@@ -95,7 +95,6 @@ entity names correspond.  APX is for appendix.  -->
     &USAGE-CALENDAR;
     &USAGE-EXCHANGE;
     &USAGE-SYNC; 
-    &USAGE-PRINT;
   </part>
   <part id="config">
   <title>Configuring and Managing Ximian Evolution</title>
diff --git a/help/C/figures/print-dest.png b/help/C/figures/print-dest.png
deleted file mode 100644
index d8fcbff75a..0000000000
--- a/help/C/figures/print-dest.png
+++ /dev/null
diff --git a/help/C/figures/print-preview.png b/help/C/figures/print-preview.png
deleted file mode 100644
index 7745d53553..0000000000
--- a/help/C/figures/print-preview.png
+++ /dev/null
diff --git a/help/C/menuref.xml b/help/C/menuref.xml
index 86f687383b..3bd09b9d19 100644
--- a/help/C/menuref.xml
+++ b/help/C/menuref.xml
@@ -22,20 +22,19 @@
 	    <term>New Item:</term>
 	    <listitem>
 	      <para>
-                Press <keycombo action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> to open a new item
+                Press <keycombo action="simul"> <keycap>Ctrl</keycap>		  <keycap>N</keycap></keycombo> to open a new item
 		  for whatever part of Ximian
 		  Evolution you're working on. In mail,
 		  that means you'll create a new message. If you're
 		  looking at your address book, <keycombo
 		  action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> creates a new contact
+		  <keycap>N</keycap></keycombo> creates a new contact
 		  card, and in the calendar, a new appointment.
                 </para>
 	    </listitem>
 	  </varlistentry>
 
-
+<!--
 	  <varlistentry>
 	    <term>Create a new folder:</term>
 	    <listitem>
@@ -50,7 +49,7 @@
                 </para>
 	    </listitem>
 	  </varlistentry>
-
+-->
 	  <varlistentry>
 	    <term>Create a new Shortcut in the Evolution Bar:</term>
 	    <listitem>
@@ -225,11 +224,11 @@
 	    <listitem>
 	      <para>
                 Double-click the message you want to view, or select
-                it and press <keycap>Return</keycap>
+                it and press <keycap>Return</keycap> or
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>O</keycap>
-                </keycombo>
+                </keycombo>.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -275,7 +274,7 @@
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
 		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
+		  <guimenuitem>Appointment</guimenuitem> </menuchoice> or
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>Shift</keycap>
@@ -379,15 +378,17 @@
 	    <listitem>
 	      <para>
                   Double-click in any blank space in the contact
-                  manager to create a new address card.  You can also
+                  manager to create a new address card, or right-click anywhere
+	      in the address book and select <guilabel>New
+		Contact</guilabel>. You can also select
                   use <menuchoice><guimenu>File</guimenu>
                   <guisubmenu>New</guisubmenu>
-                  <guimenuitem>Contact</guimenuitem> </menuchoice> or
+                  <guimenuitem>Contact</guimenuitem> </menuchoice> or press 
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>Shift</keycap>
 		  <keycap>C</keycap>
-                </keycombo>
+                </keycombo>.
 	      </para>
 	    </listitem>
 	  </varlistentry>
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index 8f2464413c..d489ffb6e7 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -232,7 +232,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    The globe - Miscellanious notes
+	    The globe - Miscellaneous notes
 	  </para>
 	</listitem>
       </itemizedlist>
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index f700e69103..7573d3cbaa 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -10,14 +10,14 @@
     </para>
 
   <sect1 id="importing-mail-and-settings">
-    <title>Importing Your Old Email and Settings</title>
+    <title>Importing Your Old Email</title>
     <para>
       Evolution allows you to import old
-      email and data so that you don't need to worry about losing your
-      old information.
+      email and contacts so that you don't need to worry about losing
+      your old information.
     </para>
     <sect2 id="importing-mail">
-      <title>Importing Email and Other Data</title>
+      <title>Importing Single Files</title>
       <para>
         Ximian Evolution can import the
         following types of files:
@@ -87,17 +87,18 @@
           </listitem>
           <listitem>
             <para>
-              Click <guilabel>Next</guilabel> after reading the Welcome screen.
+              Click <guilabel>Forward</guilabel> after reading the welcome screen.
             </para>
           </listitem>
           <listitem>
             <para>
-              Select <guilabel>Import a single file</guilabel>.
+              Select <guilabel>Import a single file</guilabel> and click <guilabel>Forward</guilabel>.
             </para>
           </listitem>
           <listitem>
             <para>
-              Find the file that you wish to import into Evolution.
+              Indicate the file that you wish to import into Evolution
+              and click <guilabel>Forward.</guilabel>
             </para>
           </listitem>
           <listitem>
@@ -109,12 +110,10 @@
       </para>
     </sect2>
     <sect2 id="importing-preferences">
-      <title>Importing Preferences</title>
+      <title>Importing Multiple Files</title>
       <para>
-        Evolution can import all your old
-        mail, contacts, and other information from other applications,
-        making your transition to Evolution
-        easy.
+        Evolution automates the import process for several
+        applications it can recognize.
       </para>
       <para>
         To import your old information:
@@ -126,30 +125,20 @@
           </listitem>
           <listitem>
             <para>
-              Click <guilabel>Next</guilabel> after reading the Welcome screen.
+              Click <guilabel>Forward</guilabel> after reading the welcome screen.
             </para>
           </listitem>
           <listitem>
             <para>
-              Select <guilabel>Import data and settings from older programs</guilabel>.
+              Select <guilabel>Import data and settings from older
+            programs</guilabel> and click <guilabel>Forward</guilabel>.
             </para>
           </listitem>
+         
           <listitem>
             <para>
-              The left-most column shows the application which your
-              information will be imported from.  You then select
-              checkboxes on each component to import different
-              properties of each application.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guilabel>Next</guilabel>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guilabel>Import</guilabel>
+              Evolution will search for old mail programs it
+              recognizes and, if possible, import data from them.
             </para>
           </listitem>
         </orderedlist>
@@ -195,11 +184,12 @@
 	<note>
 	  <title>Netscape Users</title>
 	  <para>
-	    Before importing mail from Netscape, make sure you select
+            Mozilla and Netscape users will need to choose
 	    <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-		Folders</guimenuitem></menuchoice>. If you don't,
+		Folders</guimenuitem></menuchoice> from within
+            Netscape or Mozilla. Otherwise,
 	    Ximian Evolution will import and undelete
-	    the messages in your Trash folders.
+	    the messages in Trash folders.
 	  </para>
 	</note>     
 	
@@ -210,34 +200,11 @@
   <sect1 id="usage-mail-organize-columns">
     <title>Sorting Mail with Column Headers</title>
     <para>
-      By default, the message list has columns with the following
-      headings: an envelope icon indicating whether you have read
-      or replied to a message, an exclamation point indicating priority, and the
-      <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-      <guilabel>Date</guilabel> fields. You can change their order
-      and remove them by dragging and dropping them.  
-      
-      To add columns:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Right click on the column header
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guimenuitem>Add a Column</guimenuitem>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click and drag a column you want into a space between
-	    existing column headers.  A red arrow will show you where
-	    the column will be placed.
-	  </para>
-	</listitem>
-      </orderedlist>
-      </para>
+      The message list normally has columns to indicate whether a
+      message has been read, whether it has attachments, how important
+      it is, and the sender, date, and subject. You can change their
+      order and remove them by dragging and dropping them.
+    </para>
       <para>
 	Right-click on one of the column headers to get a list of
 	options:
@@ -256,6 +223,16 @@
 	      </para></listitem>
 	  </varlistentry>
 	  
+	  <varlistentry>
+	    <term><guimenuitem>Unsort</guimenuitem>:</term>
+	    <listitem><para>
+            Removes sorting from the message list. <!-- displaying
+            messages in the order they exist on disk. This is
+            typically the order in which the messages
+            were added to the mailbox file, and is therefore similar
+            to, but not exactly the same as, sorting by date. -->
+	      </para></listitem>
+	  </varlistentry>
 	<varlistentry>
 	  <term><guimenuitem>Remove this
 	      Column</guimenuitem>:</term> 
@@ -268,16 +245,39 @@
 	  </listitem>
 	</varlistentry>
 	  
-	  <varlistentry>
-	    <term><guimenuitem>Customize Current
-	      View</guimenuitem>:</term> <listitem><para> Choose this
-	      item to pick a more complex sort order for messages, or
-	      to choose which columns of information about your
-	      messages you wish to display
-            </para></listitem>
-	</varlistentry>
-	</variablelist>
-      </para>
+	<varlistentry>
+	  <term><guimenuitem>Add a Column</guimenuitem>:</term> 
+	  <listitem>
+	    <para>
+              When you select this item, a dialog box appears, listing
+              the possible columns.  Drag the column you want into a
+              space between existing column headers.  A red arrow will
+              show you where the column will be placed.
+            </para>
+          </listitem>
+        </varlistentry>	
+	  
+	<varlistentry>
+	  <term><guimenuitem>Best Fit</guimenuitem>:</term> 
+	  <listitem>
+	    <para>
+              Automatically adjusts the widths of the columns for the
+              most efficient use of space.
+            </para>
+          </listitem>
+        </varlistentry>	
+	  
+        <varlistentry>
+          <term><guimenuitem>Customize Current
+          View</guimenuitem>:</term> <listitem><para> Choose this
+          item to pick a more complex sort order for messages, or
+          to choose which columns of information about your
+          messages you wish to display
+        </para></listitem>
+      </varlistentry>
+
+    </variablelist>
+  </para>
 
       <sect2 id="usage-mail-organize-columns-followup">
         <title>Column Sorting with the Follow Up Feature</title>
@@ -336,12 +336,10 @@
 	few mail folders, such as <guilabel>Inbox</guilabel>,
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
 	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	Ximian Evolution will ask you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
+        right clicking on the folder list and selecting 
+        <guimenuitem>New Folder</guimenuitem>. Evolution will
+        ask you for the name and the type of the folder, and will
+        provide you with a folder tree so you can pick where it goes.
       </para>
       <para>
         When you click <guilabel>OK</guilabel>, your new folder will
@@ -375,43 +373,61 @@
     <title>Searching for Messages</title>
     <para>
       Most mail clients can search through your messages for you,
-      but Ximian Evolution does it faster. You
-      can search through just the message subjects, just the message
-      body, or both body and subject.
+      but Ximian Evolution does it faster than most, thanks to its
+      automatic search index.
     </para>
     <para>
       To start searching, enter a word or phrase in the text area
       right below the toolbar, and choose a search type:
       <variablelist>
 	<varlistentry>
-	  <term><guilabel>Body or subject contains</guilabel>:</term>
+	  <term><guilabel>Subject contains:</guilabel></term>
 	  <listitem>
 	    <para>
-	      This will search message subjects and the messages
-	      themselves for the word or phrase you've entered in
-	      the search field.
+	      This will show you messages where the search text is
+	      in the subject line.  It will not search in the
+	      message body.
 	    </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term> <guilabel>Body contains</guilabel>:</term>
+	  <term><guilabel>Subject does not contain:</guilabel></term>
 	  <listitem>
 	    <para>
-	      This will search only in message text, not the subject
-	      lines.
+              Finds messages that do not contain the search text in
+              the subject.
 	    </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><guilabel>Subject contains:</guilabel></term>
+	  <term><guilabel>Sender contains:</guilabel></term>
 	  <listitem>
 	    <para>
-	      This will show you messages where the search text is
-	      in the subject line.  It will not search in the
-	      message body.
+              Finds messages that do not contain the search text in
+              the subject.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Recipients contain:</guilabel></term>
+	  <listitem>
+	    <para>
+              Finds messages with the search text in the To: and Cc:
+              headers.
 	    </para>
 	  </listitem>
 	</varlistentry>
+
+	<varlistentry>
+	  <term> <guilabel>Body contains</guilabel>:</term>
+	  <listitem>
+	    <para>
+	      This will search only in message text, not the subject
+	      lines.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
 	<varlistentry>
 	  <term><guilabel>Body does not contain:</guilabel></term>
 	  <listitem>
@@ -424,50 +440,46 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><guilabel>Subject does not contain:</guilabel></term>
+	  <term><guilabel>Body or subject contains</guilabel>:</term>
+	  <listitem>
+	    <para>
+	      This will search message subjects and the messages
+	      themselves for the word or phrase you've entered in
+	      the search field.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Message contains:</guilabel></term>
 	  <listitem>
 	    <para>
-	      This finds every mail whose subject does not contain
-	      the search text.
+              Searches the message body and all headers for the
+              entered text.
 	    </para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
       
       When you've entered your search phrase, press
-      <keycap>Enter</keycap>.  Ximian Evolution
-      will show your search results in the message list.
+      <keycap>Enter</keycap> or click the <guilabel>Find
+      Now</guilabel> button. Evolution will show your search results
+      in the message list.
     </para>
     
     <para>
-      If you think you'll want to return to a search again, you can
-      save it and execute it later. Just click <guilabel> Save
-      Search</guilabel> from the <guimenu>Search</guimenu> menu. Then,
-      you can run that search on any folder by selecting it from the
-      <guimenu>Search</guimenu> menu. You may also want to create a
+      For more complex search rules, select
+      <guilabel>Advanced</guilabel> from the
+      <guilabel>Search</guilabel> menu. You may want to create a
       vFolder instead; see <xref
       linkend="usage-mail-organize-vfolders" /> for more detail.
     </para>
 
       <para>
-         When you're done with the search, go back to seeing all your
-         messages by choosing <guimenuitem>Show All</guimenuitem> from
-         the <guilabel>Search</guilabel> drop-down box, or enter a
-         blank search.
+        When you're done with the search, go back to seeing all your
+        messages by clicking the <guimenuitem>Clear</guimenuitem> button, 
+        or by entering a blank search.
       </para>
 
-      <para>
-        If you'd like to perform a more complex search, open the
-        advanced search dialog by selecting
-        <guilabel>Advanced...</guilabel> from the
-        <guilabel>Search</guilabel> drop-down menu.  Then, create your
-        search criteria (each with the same options you saw in the
-        regular search bar), and decide whether you want to find
-        messages that match all of them, or messages that match even
-        one. Then, click <guilabel>Search</guilabel> to go and find
-        those messages.
-     </para>
-
      <para>
         You'll see a similar approach to sorting messages when you
         create filters and vFolders in the next few sections.
@@ -602,7 +614,7 @@
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Click 
+              Select
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
 		<guimenuitem>Filters</guimenuitem>
@@ -617,9 +629,14 @@
 	  <listitem>
 	    <para>
 	      Name your filter in the <guilabel>Rule name</guilabel> field.
-	      For each filter criterion, you must first select 
-	      which of the following parts of the message you want the filter to 
-	      examine:
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Define the criteria for the filter in the
+            <guilabel>If</guilabel> section.  For each filter
+            criterion, you must first select which of the following
+            parts of the message you want the filter to examine:
 	      
 	      <itemizedlist>
 		<listitem><para>
@@ -671,38 +688,6 @@
 		  </para>
 
 <para>
-
-   <figure id="usage-mail-filter-fig-createrule">
-	<title>Creating a Mail Filter</title>
-	<screenshot>
-	  <screeninfo>Creating a Mail Filter</screeninfo>
-	    <mediaobject>
-	      <imageobject>
-		<imagedata fileref="figures/filter-new-fig" format="PNG"
-			   srccredit="Aaron Weber"/>
-	      </imageobject>
-	    </mediaobject>
-	  </screenshot>
-	</figure>
-
-      <note id="lots-of-filters">
-        <title>What if Multiple Filters Match One Message?</title>
-         <para>
-            If you have several filters that match a single message,
-            they will all be applied to the message, in order, unless
-            one of the filters has the action <guilabel>Stop
-            Processing</guilabel>. If you use that action in a
-            filter, the messages that it affects will not be touched
-            by other filters.
-         </para>
-         <para>
-           When you first open the filters dialog, you are shown the
-           list of filters sorted in the order in which they will be
-           applied. You can move them up and down in the priority list
-           by clicking the <guilabel>Up</guilabel> and
-           <guilabel>Down</guilabel> buttons.
-         </para>
-      </note>
 </para>
 		</listitem>
 	
@@ -733,16 +718,38 @@
         the scores you seek.
 		  </para></listitem>
 		
+
+		<listitem>
+		  <para>
+                    Label - Messages may have labels of
+                    <guilabel>Important</guilabel>,
+                    <guilabel>Work</guilabel>,
+                    <guilabel>Personal</guilabel>, <guilabel>To
+                    Do</guilabel>, or <guilabel>Later</guilabel>. You
+                    can set these labels with other filters or by hand.
+		  </para>
+		</listitem>
+
 		<listitem>
 		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
+		    Size (kB) - Sorts based on the size of the message in kilobytes.
 		  </para>
 		</listitem>
 
 		<listitem>
 		  <para>
-		    Status - Filters according to the status of a message, such as
-		    'New'.
+                    Status - Filters according to the status of a
+                    message.  Status may be <guilabel>Replied
+                  To</guilabel>, <guilabel>Draft</guilabel>,
+                  <guilabel>Important</guilabel>,
+                  <guilabel>Read</guilabel>, or
+                  <guilabel>Junk</guilabel>.
+		  </para>
+		</listitem>
+		
+		<listitem>
+		  <para>
+		    Flagged - Check whether the message is flagged for follow-up or not.
 		  </para>
 		</listitem>
 		
@@ -788,11 +795,29 @@
 		
 		<listitem>
 		  <para>
-		    Source Account - Filter messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
-		  </para>
+                    Source Account - Filter messages according the
+                    server you got them from.  This is most useful if
+                    you use multiple POP mail accounts.
+                  </para>
+		</listitem>
+
+		
+		<listitem>
+		  <para>
+                    Pipe Message to Shell Command - Evolution can use
+                    an external command to process a message, then
+                    process it based on the return value. Commands
+                    used in this way must return an integer. This is
+                    most commonly used to add an external junk mail
+                    filter.
+                  </para>
+		</listitem>
+
+		<listitem>
+		  <para>
+                    Junk Test - Filter based on the results of the
+                    junk mail test.
+                  </para>
 		</listitem>
 	      </itemizedlist>
 	    </para>
@@ -806,7 +831,8 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the actions for the filter in the <guilabel>Then</guilabel>
+              Select the actions for the filter in the
+              <guilabel>Then</guilabel>
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
@@ -824,11 +850,6 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Forward to Address - Select this, enter an address, and the addressee will
-		    get a copy of the message.
-		  </para></listitem>
-
-		<listitem><para>
 		    Delete - Marks the message for deletion.  You can still get the message
 		    back, at least until you <guimenuitem>Expunge</guimenuitem> your
 		    mail yourself.
@@ -846,11 +867,49 @@
 		  </para></listitem>
 		
 		<listitem><para> 
-		    Assign Score - If you know that all mail with
-		    "important" somewhere in the message body line is
-		    important, you can give it a high priority score. In a subsequent filter you can 
-		    then arrange your messages by their priority score.
+		    Assign Score - Assign the message a numeric score. 
+		  </para></listitem>
+
+		<listitem><para> 
+		    Adjust Score - Change the numeric score by the amount you set here.
 		  </para></listitem>
+
+
+		<listitem><para> 
+		    Set Status - Set the status of the message.  Status may be <guilabel>Replied
+                  To</guilabel>, <guilabel>Draft</guilabel>,
+                  <guilabel>Important</guilabel>,
+                  <guilabel>Read</guilabel>, or
+                  <guilabel>Junk</guilabel>.
+		  </para></listitem>
+
+		<listitem><para> 
+		    Unset Status - If the message has a status value,
+                set it to the opposite. If that status value is not
+                set, do nothing.
+		  </para></listitem>
+
+		<listitem><para> 
+                Beep - Make the system beep.
+		  </para></listitem>
+
+		<listitem><para> 
+                Play Sound - Select a sound file, and Evolution will play it.
+		  </para></listitem>
+
+		<listitem><para> 
+                Shell Command - Run a shell command. No return value
+                is expected.
+              </para></listitem>
+
+		<listitem><para> 
+                Pipe Message to Shell Command - Send the message to a
+                shell command. No return value is expected. This
+                feature can be used to create automatic web postings
+                from email messages or to perform additional message
+                post-processing not supported by Evolution.
+              </para></listitem>
+
 	      </itemizedlist>
 	    </para>
 	  </listitem>
@@ -862,24 +921,68 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guilabel>OK</guilabel>.
+	      Click <guilabel>OK</guilabel> in the filter editor dialog.
+	    </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>
+              Click <guilabel>OK</guilabel> in the filter manager
+            window.
 	    </para>
 	  </listitem>
+
 	</orderedlist>
       </para>
       
       <note id="when-filters-go-wrong">
         <title>When Are Filters Applied?</title>
          <para>
-           If you use Ximian Connector to store your mail on an
-           Exchange server, filters are not applied until you open
+           For POP mail, filters are applied as messages are
+           downloaded. For IMAP mail, filters are applied to new
+           messages when you enter the INBOX folder. On Exchange
+           servers, filters are not applied until you enter
            your INBOX folder and select
            <menuchoice><guimenu>Actions</guimenu><guimenuitem>Apply
            Filters</guimenuitem></menuchoice> or press
-           <keycombo><keycap>Ctrl</keycap><keycap>Y</keycap></keycombo>
+           <keycombo><keycap>Ctrl</keycap><keycap>Y</keycap></keycombo>.
+           To force your filters to act on all messages in the folder,
+           select the entire folder
+           (<keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>)
+           and then apply the filters
+           (<keycombo><keycap>Ctrl</keycap><keycap>Y</keycap></keycombo>.)
          </para>
       </note>
 
+
+   <figure id="usage-mail-filter-fig-createrule">
+	<title>Creating a Mail Filter</title>
+	<screenshot>
+	  <screeninfo>Creating a Mail Filter</screeninfo>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref="figures/filter-new-fig" format="PNG"
+			   srccredit="Aaron Weber"/>
+	      </imageobject>
+	    </mediaobject>
+	  </screenshot>
+	</figure>
+
+         <para>
+            If you have several filters that match a single message,
+            they will all be applied to the message, in order, unless
+            one of the filters has the action <guilabel>Stop
+            Processing</guilabel>. If you use that action in a
+            filter, the messages that it affects will not be touched
+            by other filters.
+         </para>
+         <para>
+           When you first open the filters dialog, you are shown the
+           list of filters sorted in the order in which they will be
+           applied. You can move them up and down in the priority list
+           by clicking the <guilabel>Up</guilabel> and
+           <guilabel>Down</guilabel> buttons.
+         </para>
    </sect2>
    
    <sect2 id="filters-edit">
@@ -931,15 +1034,23 @@
 	      Select
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
+		<guimenuitem>Filters</guimenuitem>
 	    </menuchoice>
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the filter and press <guilabel>Delete</guilabel>.
+	      Select the filter and press <guilabel>Remove</guilabel>.
 	    </para>
 	  </listitem>
+
+	  <listitem>
+	    <para>
+              Click <guilabel>OK</guilabel> in the filter manager
+            window.
+	    </para>
+	  </listitem>
+
 	</orderedlist>
       </para>
       <para>
@@ -985,11 +1096,10 @@
 
       <para>
 	As messages that meet the vFolder criteria arrive or are
-	deleted, Ximian Evolution will
-	automatically place them in and remove them from the
-	vFolder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any vFolders which display it.
+	deleted, Evolution will automatically adjust the vFolder
+        contents.  When you delete a message, it gets erased from the
+        folder in which it actually exists, as well as any vFolders
+        that display it.
       </para>
 
       <para>
@@ -1008,9 +1118,8 @@
     <note id="unmatched-vfolder">
       <title>The "Unmatched" vFolder</title>
       <para>
-	 The Unmatched vFolder is the mirror of all your other
-         vFolders: it displays whatever messages are not matched by
-         other vFolders.
+        The Unmatched vFolder is the opposite of the others: it
+        displays whatever messages are not matched by other vFolders.
       </para>
       <para>
         If you use remote email storage like IMAP or Microsoft
@@ -1056,7 +1165,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guilabel>Add</guilabel>
+              Click <guilabel>Add</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -1099,14 +1208,6 @@
 		    Subject - The subject line of the message.
 		  </para></listitem>
 
-<!--		No, can't vfolder on arbitrary headers
-		<listitem><para>
-		    Specific Header - The vFolder can look at any header you
-		    want, even obscure or custom ones. Enter the header name
-		    in the first text box, and put your search text in the
-		    second one.
-		  </para></listitem>
--->	
 
 		<listitem><para>
 		    Message Body - Search in the actual text of the message.
@@ -1146,63 +1247,52 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have vFolders set the
-		    priority of messages you receive, and then have other
-		    vFolders 
-		    applied only to those messages which have a certain priority.
+		    Score - a numeric score that you can assign to
+                messages using filters
 		  </para></listitem>
 		
 		<listitem>
 		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
+		    Size (kB) - Sorts based on the size of the message in kilobytes.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
 		    Status - Searches according to the status of a message, such as
-		    'New'.
+		    'Draft'.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Attachments - Create a vFolder based on  whether or not you have an
-		    attachment in the email.
+                    Follow Up - Checks whether you have flagged the message for follow up.
 		  </para>
 		</listitem>
-		
+
 		<listitem>
 		  <para>
-		    Mailing List - Search based on the mailing list it came from.
+		    Attachments - Create a vFolder based on  whether or not you have an
+		    attachment in the email.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Source Account - Search messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
+		    Mailing List - Search based on the mailing list it came from.
 		  </para>
 		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
+              </itemizedlist>
+            </para>
+          </listitem>
+          <listitem>
 	    <para>
-	      Select the folder sources.  You can select:
+	      Select the folders in which this vFolder will search. Your options are:
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    Specific folders only
-		    <note>
-		      <para>
-			If you select specific folders only, you need to specify the
-			source folders in the box below.
-		      </para>
-		    </note>
+		    Specific folders only - Use individual folders for the vFolder to
+                        use as its sources.
 		  </para>
 		</listitem>
 		<listitem>
@@ -1212,26 +1302,23 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    With all active remote folders
-		  </para>
+		    With all active remote folders - Remote folders
+                    are considered active if you are connected to the
+                    server; you must be connected to your mail server
+                    for the vFolder to include any messages from that
+                    source.
+                  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    With all local and active folders
+		    With all local and active remote folders
 		  </para>
 		</listitem>
 	      </itemizedlist>
-	      
 	    </para>
 	  </listitem>
 	</orderedlist>
       </para>
-      <para>
-	Remote folders are considered active if you are connected to the
-	server; you must be connected to your mail server for the vFolder to
-	include any messages from that source.
-      </para>
-   
     </sect2>
   </sect1>
 </chapter>
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 21de0b77a1..4f2d747663 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -266,7 +266,7 @@
 
 
     <para>
-      To check your email, press the <guilabel>Check Mail</guilabel>
+      To check your email, press the <guilabel>Send/Receive</guilabel>
       button.  If this is your first time checking mail, or you
       haven't asked Evolution to store your
       password, you'll be prompted for the password.  Enter your
@@ -369,7 +369,7 @@
 	 <listitem>
 	   <para>
 	     Click the downward pointing arrow on the attachment icon
-	     and select <guimenuitem>Save to Disk</guimenuitem>.
+	     and select <guimenuitem>Save As...</guimenuitem>.
 	   </para>
 	 </listitem>
 	 <listitem>
@@ -407,6 +407,11 @@
 	</orderedlist>
       </para>
       <para>
+          The options available for an attachment will vary depending
+        on the type of attachment. For example, attached email
+        messages can be replied to or forwarded, while attached
+        compressed archive files can be opened in the File Roller
+        application.
       </para>
       </sect3>
 
@@ -419,7 +424,11 @@
          will display the image inside the message.  You can create
          messages like this by using the
          <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>
-         tool in the message composer.
+         tool in the message composer (you must have HTML mail enabled
+         to do this-- select
+         <menuchoice><guimenu>Format</guimenu><guimenuitem>HTML</guimenuitem></menuchoice>
+         to turn HTML composition on and off). Alternately, just drag
+         an image into the message composition area.
       </para>
 
       <para>
@@ -444,12 +453,13 @@
          load remotely hosted images more often, select
          <menuchoice>
 	   <guimenu>Tools</guimenu>
-	   <guimenuitem>Settings</guimenuitem> </menuchoice> and go to
-	   the mail settings tool. There, click the <guilabel>HTML
+           <guimenuitem>Settings</guimenuitem> </menuchoice> and click the <guilabel>Mail Preferences</guilabel>
+	   button. There, click the <guilabel>HTML
            Mail</guilabel> tab and select one of the items there:
-<guilabel>Never load images off the net</guilabel>, <guilabel>Load
-images if sender is in address book</guilabel>, or <guilabel>Always
-load images off the net.</guilabel>
+           <guilabel>Never load images off the net</guilabel>,
+           <guilabel>Load images if sender is in address
+           book</guilabel>, or <guilabel>Always load images off the
+           net.</guilabel>
       </para>
       <note id="http-proxy">
 	<title>Loading Images from the Net through an HTTP Proxy</title>
@@ -690,24 +700,22 @@ load images off the net.</guilabel>
 	  </orderedlist>
 	</para>
 	<para>
-          You can drag a file into the address area or, if it is
-          already displayed, the attachment display area, of the composer
+          You can drag a file into the address area or to the
+          attachment portion of the composer
           window. If you are attaching an image and wish to send it
           inline rather than attached, drag the image into the text
           composition area of the composer window. Non-image files
           cannot be dragged into the text composition area.
         </para>
         <para>
-            To hide the display of files you've attached to the
-            message, unselect <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Show
-            Attachments</guimenuitem> </menuchoice>; to show them
-            again, select <guimenuitem>Show Attachments</guimenuitem>.
+           The attachment display area is at the bottom of the
+          composer window; you can expand or shrink it by clicking the
+          small triangle in its upper right corner.
         </para>
         <para>
             When you send the message, a copy of the attached file
-            will go with it.  Be aware that big attachments can take a
-            long time to download.
+            will go with it.  Be aware that big attachments may take a
+          long time to send and receive.
         </para>
        </sect3>
 
@@ -797,12 +805,6 @@ load images off the net.</guilabel>
           with more than one card, Evolution will open a dialog box to
           ask you which person you meant. 
 
-<!-- 
-     Also, Evolution will add a
-          domain to any unqualified addresses.  By default, this is
-          your domain, but you can choose which one mail preferences
-          dialog. NOTE: ex-feature, may be reinstated, but probably not. 
--->
           </para>
 
           <para>
@@ -1099,7 +1101,7 @@ load images off the net.</guilabel>
                   selected, the color will apply to whatever you type
                   next.  You can select a background color or image by
                   right-clicking on the message background and
-                  selecting <menuchoice> <guimenuitem>Style</guimenuitem> 
+                  selecting <menuchoice> <guimenu>Style</guimenu> 
                   <guimenuitem>Page Style</guimenuitem>
                    </menuchoice>.
                </para>
@@ -1118,7 +1120,9 @@ load images off the net.</guilabel>
 		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
                   messages.  If you don't want special link text, you can just enter the address
                   directly, and Evolution
-                  will recognize it as a link.  To add a link:
+                  will recognize it as a link.  To add a link, first make sure you have enabled
+                  HTML mode by selecting <menuchoice> <guimenu>Format</guimenu> <guimenuitem>
+                    HTML</guimenuitem></menuchoice>.
 		<orderedlist numeration="arabic">
 		  <listitem>
 		    <para>
@@ -1247,7 +1251,7 @@ load images off the net.</guilabel>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term>Insert Table</term>
+            <term><guimenuitem>Insert Table</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Inserts a table into the text to help divide two
@@ -1301,21 +1305,21 @@ load images off the net.</guilabel>
 	    </listitem>
 	  </varlistentry>
           <varlistentry>
-            <term>Templates</term>
+            <term><guimenuitem>Templates</guimenuitem></term>
             <listitem>
               <para>
-          Evolution not only allows you to
-	  decorate your email with HTML text and graphics, but
-	  provides you with prebuilt templates for you to use when
-	  making these improvements.  You can use these to emphasize a
-	  point or frame an image in an attractive manner.
-        </para>
-	<para>
-	  To include a template into your HTML based email:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Make sure that the
+                Evolution not only allows you to
+                decorate your email with HTML text and graphics, but
+                provides you with prebuilt templates for you to use when
+                making these improvements.  You can use these to emphasize a
+                point or frame an image in an attractive manner.
+              </para>
+              <para>
+                To include a template into your HTML based email:
+                <orderedlist numeration="arabic">
+                  <listitem>
+                    <para>
+                      Make sure that the
 		<menuchoice>
 		  <guimenu>
 		    Format
@@ -1428,11 +1432,11 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
           <itemizedlist>
             <listitem>
               <para>
-                 Don't send spam or forward chain mail.  If you must,
-                 watch out for hoaxes and urban legends, and make sure
-                 the message doesn't have multiple layers of
-                 greater-than signs, (&gt;) indicating multiple layers
-                 of careless in-line forwarding.
+                 Don't forward chain letters.  If you must, watch out for
+                hoaxes and urban legends, and make sure the message
+                doesn't have multiple layers of greater-than signs,
+                (&gt;) indicating multiple layers of careless in-line
+                forwarding.
               </para>
             </listitem>
 
@@ -1652,17 +1656,22 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 
       <para>
 	You can use encryption in two different ways:
-        <simplelist>
-          <member>
+        <itemizedlist>
+          <listitem>
+            <para>
+
              Encrypt the entire message, so that nobody but the recipient can read it.
-          </member>
-          <member>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
             Attach an encrypted signature to a plain text message, so
             that the recipient can read the message without decrypting
             it, and only needs decryption to verify the sender's
-            identity. 
-           </member>
-         </simplelist>
+            identity.
+            </para>
+          </listitem> 
+        </itemizedlist>
       </para>
 
 	<example> 
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index f614ac2c0b..a303cc11d8 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -27,8 +27,8 @@
       <para>
         With Ximian Evolution, you can
         accomplish your most common daily tasks faster.  For example, it
-        takes only one or two clicks to enter an appointment or an
-        address card sent to you by email, or to send email to a contact
+        takes only one or two clicks to enter appointment or
+        contact information sent to you by email, or to send email to a contact
         or appointment.  Ximian Evolution
         makes displays faster and more efficient, so searches are faster
         and memory usage is lower.  People who get lots of mail will
@@ -593,7 +593,7 @@
 	files:
           <variablelist>
            <varlistentry>
-	    <term>VCard (.vcf, gcrd):</term>
+	    <term>VCard (.vcf, .gcrd):</term>
 	    <listitem>
 	      <para>
 	         The address book format used by the GNOME, KDE, and
@@ -882,7 +882,7 @@ standard mbox file format, which
         Ximian Evolution's most important job is
         to give you access to your information and help you use it
         quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
+        shortcut bar, the column on the left
         hand side of the main window.  The  buttons with names
         like <guilabel>Mail</guilabel> and
         <guilabel>Contacts</guilabel> are the shortcuts. Above them
@@ -902,124 +902,32 @@ standard mbox file format, which
     </para>
 
     <para>
-       
-      A typical <guilabel>Local</guilabel> folder contains the following folders:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-         <listitem>
-	    <para>
-	    <guilabel>Drafts</guilabel>, for messages you started and didn't finish.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail. 
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Outbox</guilabel>, for messages you have written
-	    but not yet sent.  This will be empty unless you use
-	    Ximian Evolution while offline.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Sent</guilabel>, for sent mail.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Tasks</guilabel>, for your task list. Portions
-            of your task list are reflected in the calendar, as well
-            as in the summary folder.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, a vFolder view of all the
-	    messages you have marked for deletion but not yet
-	    <glossterm linkend="expunge">expunged</glossterm>.
-	   </para>
-	 </listitem>
-      </itemizedlist>
-
+       If you get large volumes of mail, you'll want more folders than
+       just your Inbox; you can also create multiple calendar, task,
+      or address book folders. 
     </para>
-    <tip id="foldertips">
-    <title>Navigating without the Shortcut Bar</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use the <keycap>Tab</keycap>
-         key to switch from one part of the window to another.
-       </para>
-     </tip>
-
     <para>
-       If you get large volumes of mail, you'll want more folders than
-       just your Inbox.  To create a new folder:
+      To create a new folder:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Select
-	      <menuchoice> <guimenu>File</guimenu>
-		<guisubmenu>New</guisubmenu>
-		<guimenuitem>Folder</guimenuitem></menuchoice>
-	or press the keyboard shortcut 
+              Right click on the list of folders, and select 
+              <guilabel>New Folder</guilabel>.
+                <!--  FIXME: this was taken out: or press the keyboard shortcut  
                 <keycombo action="simul">
 		<keycap>Shift</keycap>
 		<keycap>Ctrl</keycap>
-		<keycap>E</keycap>
-	      </keycombo>.
+		<keycap>F</keycap>
+	      </keycombo>.  -->
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the name of the folder in the <guilabel>Folder
+	      Enter the name of the folder in the <guilabel>Folder
 		Name</guilabel> field.
 	    </para>
 	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder type.  The available options are.
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    Calendar
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Contacts
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Mail
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Tasks
-		  </para>
-		</listitem>
-	      </itemizedlist>
-
-	    </para>
-	  </listitem>
+	 
 	  <listitem>
 	    <para>
 	      Choose the location of the new folder.
@@ -1027,7 +935,7 @@ standard mbox file format, which
 	  </listitem>
 	</orderedlist>
       </para>
-    
+
     <sect3 id="subfolders">
     <title>Subfolders</title>
       <para>
@@ -1036,28 +944,18 @@ standard mbox file format, which
 	organizational system.
       </para>
 
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-              Calendars must go in calendar folders, mail in mail
-	      folders, and contacts in contact folders.
-           </para>
-	</note>
-
     <para>
       Right-clicking will bring up a menu for just about anything in
       Ximian Evolution.  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 view the folder in another window. </para></listitem>
+	<listitem><para><guimenuitem>Copy</guimenuitem>, to copy the folder to another place. When you select this item, Evolution offers a choice of locations to copy to. </para></listitem>
 	<listitem><para><guimenuitem>Move</guimenuitem>, to move the folder to another location. </para></listitem>
-	<listitem><para><guimenuitem>Copy</guimenuitem>, to duplicate the folder. </para></listitem>
 	<listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder and all its contents. </para></listitem>
+	<listitem><para><guimenuitem>New Folder</guimenuitem>, to create another folder in the same location. </para></listitem>
 	<listitem><para><guimenuitem>Rename</guimenuitem>, to change its name. </para></listitem>
-	<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>
+        <listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder.</para></listitem>
+        <listitem><para><guimenuitem>Properties</guimenuitem>, which lets you check the number of total and unread messages in a folder, and, for remote folders, lets you decide whether to copy the folder to your local system for offline operation.</para></listitem>
       </itemizedlist>
     </para>
     <para>
@@ -1076,7 +974,7 @@ standard mbox file format, which
     <sect2 id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
     <para>
-      The <interface>menu bar</interface>'s contents will always
+      The menu bar's contents will always
       provide all the possible actions for any given view of your
       data.  If you're looking at your Inbox, most of the menu items
       will relate to mail; some will relate to other components of
@@ -1126,18 +1024,12 @@ standard mbox file format, which
        <varlistentry>
           <term> <guimenu>Tools</guimenu>:</term>
           <listitem><para>
-             Tools for configuring, changing, and
-          setting up  go here.  For mail, that means things like
-           and the
-          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration.
-          </para></listitem>
+             For all components of Evolution, you can access the
+          settings and configuration options in the tools menu. You
+          can also find things like filter settings and the Virtual
+          Folder editor.</para></listitem>
         </varlistentry>
 
-
-
        <varlistentry>
           <term> <guimenu>Search</guimenu>:</term>
           <listitem><para>
@@ -1152,17 +1044,16 @@ standard mbox file format, which
        <varlistentry>
           <term> <guimenu>Help</guimenu>:</term>
           <listitem><para>
-             Select among these items to open the 
-             Help Browser 
-             and read the Ximian Evolution manual.
+             Select among these items to open the
+             Ximian Evolution manual.
           </para></listitem>
         </varlistentry>
       </variablelist>
    </para>
 
    <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
+      Once you've familiarized yourself with the main
+      window you can start doing things with it.  We'll
       start with the <guilabel>Summary</guilabel>, which provides a
       quick overview of your Ximian
       Evolution information.
@@ -1256,9 +1147,9 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </para>
 
       <para>
-     If you find the <interface>view pane</interface> too small, you can resize
+     If you find the view pane too small, you can resize
         the pane, enlarge the whole window, or double-click on the
-        message in the <interface>message list</interface> to have it
+        message in the message list to have it
         open in a new window.  To change the sizes of a pane, just click
         and hold on the divider between the two panes.  Then you can drag
         up and down to select the size of the panes.
@@ -1292,8 +1183,8 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       <title>Introducing the Calendar</title>
       <para>
        To begin using the calendar, click the 
-       <guilabel>Calendar</guilabel> button in the <interface>shortcut
-       bar</interface>.  By default, the calendar starts showing
+       <guilabel>Calendar</guilabel> button in the shortcut
+       bar.  By default, the calendar starts showing
        today's schedule on a ruled background.  At the upper right,
        there's a monthly calendar you can use to switch days.  Below
        that, there's a <guilabel>Task</guilabel> pad, where you can
@@ -1320,9 +1211,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </para>
   
       <para>
-	The <guilabel>Appointment List</guilabel> is responsible for showing you all of
-	your scheduled appointments, whether they are all day appointments or simply one time
-	appointments that last a half an hour.
+	The appointment list displays all your scheduled appointments.
       </para>
 
       <para>
@@ -1331,13 +1220,9 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </para>
 
       <para>
-        The <guilabel>Task List</guilabel> compliments the
-        <guilabel>Appointment List </guilabel> as it keeps track of
-        tasks which don't have a time associated with them. Tasks can
-        have complex notes associated with them, and you can also note
-        their completeness on a percentage scale. To display more
-        information about your notes, drag the column border to the
-        left. For a very detailed view of your tasks, click the
+        Tasks are distinct from appointments in that they generally
+        don't have times associated with them. You can see a larger
+        view of your task list by clicking the
         <guilabel>Tasks</guilabel> button in the shortcut bar.
       </para>
 
@@ -1347,11 +1232,11 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </para>
 
       <para>
-	The month pane is a small view of your calendar by month.  To
-	display more months here, drag the column border to the left.
-	To view a specific series of days, select them in the month 
-	view and they will display all the planned events in the 
-	<interface>Appointment List</interface>. 
+	The month pane is a small view of a calendar month.
+        To display additional months, drag the column border to
+        the left. You can also select a range of days in the month
+        pane to get a custom range of days displayed in the
+        appointment list.
       </para>
 
       <para>
@@ -1366,8 +1251,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
         The Ximian Evolution address book
         can handle all of the functions of an address book, phone
         book, or Rolodex.  Of course, it's a lot easier to update
-        Ximian Evolution than it is to
-        change an actual paper book. Ximian
+        Evolution than it is to change an actual paper book. Ximian
         Evolution also allows easy synchronization with
         hand-held devices and functions with <glossterm
         linkend="ldap">LDAP</glossterm> directories on a network.
@@ -1375,15 +1259,15 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       <para>
         Another advantage of the Ximian Evolution
         address book is its integration with the rest of the
-        application.  For example, you can create an address card from
-        an email just by right-clicking on the sender's email address.
+        application.  For example, you can right-click on an email
+        address in Evolution mail to create a contact entry instantly.
       </para>
       <para>
         To open your address book, click on
         <guilabel>Contacts</guilabel> in the shortcut bar.  <xref
         linkend="usage-contact-fig"/> shows the address book in all its
         organizational glory.  By default, the address book shows all
-        your cards in alphabetical order, in a <glossterm
+        your contacts in alphabetical order, in a <glossterm
         linkend="minicard">minicard</glossterm> view.  You can select
         other views from the <guimenu>View</guimenu> menu, and adjust
         the width of the columns by clicking and dragging the gray
@@ -1409,7 +1293,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
 
       <para>
         The largest section of the address book lists your
-        contacts. You can also search through the cards in the same way
+        contacts. You can also search through the contacts in the same way
         that you search email folders, with the search tool on the
         right side of the toolbar.
       </para>
diff --git a/help/C/usage-print.xml b/help/C/usage-print.xml
deleted file mode 100644
index 143e32feec..0000000000
--- a/help/C/usage-print.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<chapter id="usage-print">
-  <title>Printing with Evolution</title>
-  <para>
-    If you've printed from most any other
-    Gnome application, you should be able
-    to print from Evolution without much
-    trouble.
-  </para>
-  <para>
-    Whether you're printing a message, a calendar page, or a selection
-    of address cards, you can choose to print directly to a printer,
-    or save the print output to a <glossterm
-    linkend="postscript">postscript</glossterm> file.  You can also
-    use the preview feature to see how your printed output will look.
-  </para>
-  
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guilabel>Print Preview</guilabel> appears both as a button in
-      the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that shows you what would happen if
-      you were to print the current message, calendar, appointment, or
-      address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (the <guilabel>Fit</guilabel> button)
-      or match the width of the page and the window (the
-      <guilabel>Fit Width</guilabel> button).  None of these buttons
-      changes the way the page will be printed, but they do let you
-      get a better look.  If you're satisfied with the way the your paper
-      looks, click <guilabel>Print</guilabel> to send your document
-      on its way.  If you'd like to change it, just close the
-      <guilabel>Print Preview</guilabel> window and make the changes
-      you want from your mail, calendar, or address book.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-preview" format="PNG" srccredit="Aaron Weber"/>
-	</imageobject></mediaobject>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest"/>, lets you choose the format for
-       printing&mdash; <guilabel>Generic Postscript</guilabel>,
-       whether to write to a PDF file, and whether to print to a file
-       or to an actual printer in Generic Postscript.  If you choose a
-       printer, you'll be asked for the printer command (probably
-       <command>lpr</command>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-
-	<note id="windows-ps">
-	  <title>Printing to PostScript?</title>
-	  <para>
-           PostScript is the file format used by most laser printers,
-           and in UNIX world is the easiest way to print to a file.
-           However, most systems running Microsoft Windows can't
-           recognize or handle PostScript files.  You'll need to print
-           to PDF if you want to share your file with Windows users.
-	  </para>
-	</note>
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-dest" format="PNG" srccredit="Aaron Weber"/>
-	</imageobject></mediaobject>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guilabel>Print</guilabel> to print,
-      <guilabel>Preview</guilabel> to have a look (or another look)
-      at the preview, or <guilabel>Cancel</guilabel> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-