Variety of updates

svn path=/trunk/; revision=26704

5 files changed, 599 insertions, 938 deletions

diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index ecec742c17..b1065a010e 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -6,7 +6,7 @@
   <title>Evolution Calendar</title>
 
      <para>
-      This chapter will show you how to use the Novell Evolution
+      This chapter will show you how to use the Evolution
       Calendar to manage your schedule alone or in conjunction with
       peers. To learn about importing calendar data, see <xref
       linkend="importing-mail" />, which covers the Import tool.
@@ -15,7 +15,23 @@
     <sect1 id ="usage-calendar-view"> 
     <title>Ways of Looking at your Calendar</title>
     <para>
-       The toolbar offers you four different views of your calendar:
+      In Evolution, you can keep multiple calendars and overlay them
+      one over the next. For example, you might have a schedule of
+      events for work, one for home, and one for your favorite sports
+      team. The shortcut bar lists those calendars, and you can check
+      or uncheck the boxes next to them to show and hide the
+      appointments in your calendar view. By hiding and showing
+      different sets of appointments, you can be sure to avoid
+      conflicts, while keeping a minimum of clutter in your view at
+      any one time.
+    </para>
+    <para>
+      Appointments for each calendar appear as a different color.
+    </para>
+
+    <para>
+      The toolbar offers you four different buttons that can show you
+      different views of your calendar:
        <itemizedlist>
 	<listitem>
 	  <para>
@@ -38,12 +54,9 @@
 	  </para>
 	</listitem>
       </itemizedlist>
-</para>
-<para>
-      Press the calendar-shaped buttons on the right side of the toolbar to
-      switch between views. 
-</para>
-<para>
+    </para>
+
+    <para>
       You can also select an arbitrary range of days in the small
       calendar at the upper right.  To do this, click and drag on the
       days that you wish to view in your calendar.
@@ -58,7 +71,7 @@
         <guilabel>Today</guilabel> button in the toolbar.
     </para>
     <para>
-       To visit a specific date's calendar entries, click
+       To visit calendar entries for a specific date, click
        <guilabel>Go To</guilabel> and select the date in the dialog
        box that appears.
     </para>
@@ -66,19 +79,10 @@
   </sect1>
   <sect1 id="usage-calendar-apts">
     <title>Scheduling With the Evolution Calendar</title>
-    <para>
-      Of course, you'll want to use the calendar to do more than find
-      out what day it is. This section will tell you how to schedule
-      appointments, set alarms, and determine appointment
-      recurrence. If you have installed the Evolution Connector for
-      Microsoft Exchange, you can also read <xref
-      linkend="full-advantage"/> to learn about how to take full
-      advantage of the collaborative group scheduling functions
-      available on the Microsoft Exchange Server.
-    </para>
+
 
     <sect2 id="usage-calendar-apts-basic">
-      <title>Creating appointments</title>
+      <title>Creating Appointments</title>
       <para>
 	To create a new appointment, select
         <menuchoice>
@@ -86,20 +90,9 @@
 	  <guisubmenu>New</guisubmenu> 
 	  <guimenuitem>Appointment</guimenuitem>
 	</menuchoice>
-	or click the <guilabel>New Appointment</guilabel> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the menu bar, tool bar, and
-	window full of choices for you.
+        click the <guilabel>New</guilabel> button on the left end
+        of the toolbar, or double-click in a blank space in the calendar.
       </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
 
       <para>
         Your appointment must have a starting and ending date (by
@@ -115,10 +108,14 @@
         multiple columns in the day view of the calendar.
       </para>
       <para>
+        If you have more than one calendar, be sure to select the
+        calendar in which you want to save the appointment. 
+      </para>
+      <para>
 	Evolution supports the use of
-	timezones.  If you share calendar files with friends or
+	time zones.  If you share calendar files with friends or
 	co-workers, it is quite possible you will need to configure
-	your timezone.  To configure your timezone:
+	your tim ezone.  To configure your time zone:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
@@ -145,10 +142,10 @@
 	</orderedlist>
       </para>
       <para>
-	You can also configure timezone information specific to the
+	You can also configure time zone information specific to the
 	Start and End time in each appointment.  To do that, simply
 	create a new appointment and click on a globe to customize the
-	timezone that the time exists in. For example, if you live in
+	time zone that the time exists in. For example, if you live in
 	New York but have a telephone meeting set for noon with
 	someone in California, you need to make sure that you're not
 	calling each other a few hours off.  Setting time-zones on a
@@ -215,32 +212,34 @@
         </note>
 
       <para>
-         <guilabel>Classification</guilabel> 
-         only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public appointment can be viewed by anyone on the calendar
+         If you are using a a calendar on a GroupWise or
+        Exchange server, select a <guilabel>Classification</guilabel>
+      for the appointment, to determine who can view it.
+      <guilabel>Public</guilabel> is the default category, and a
+      public appointment can be viewed by      anyone on the calendar
          sharing network.  <guilabel>Private</guilabel> denotes one
          level of security, and <guilabel>Confidential</guilabel> an even 
-         higher level.
-      </para>
-      <para>
-	Evolution can handle free/busy
-	scheduling Using the Evolution Connector on a Microsoft Exchange
-	2000 server. For more information about Evolution Connector, see
-	<xref linkend="usage-exchange"/>.
+         higher level. The different levels vary depending on your
+      server settings; check with your system administrator or adjust
+      your delegation settings.
       </para>
+     
       <para>
-	To set your appointment to be free or busy, simply click the
-	box in the <guilabel>Show Time As</guilabel> section in the
-	<guilabel>Appointment Editor</guilabel>.
-      </para>
+	If you are using a GroupWise or Exchange server, other people
+        on the server can check your schedule to see if you are
+        available at any given time. If you have an appointment that
+        is flexible or that you wish to designate as "Free" rather
+        than "Busy" time, check the <guilabel>Free</guilabel> box in
+      the<guilabel>Show Time As</guilabel> section.  Normally,
+      appointments display as "Busy."
+       </para>
       <para>
-        Evolution lets you categorize your
-	appointments, which can help if you lead a busy life.  The bottom
-	section of the <guilabel>Appointment</guilabel> tab is where your
-	categorization is done.
-      </para>
-      
+        You can categorize appointments in the same way you can
+        categorize contacts. Click the <guilabel>Categories</guilabel>
+      button opens up a checklist. Check the box next to each category
+      that matches the appointment you are creating. 
+    </para> 
+
       <tip>
       <title>Adding a New Appointment Category</title>
 	<para>
@@ -250,24 +249,22 @@
 	</para>
       </tip>
 
-      <para> 
-     The purpose of categories is to let you view all appointments
-	 which have similar activities.  To do this, in the calendar view,
-	 change <guilabel>Any field contains</guilabel> to <guilabel>Has
-	 category</guilabel> and enter your category at right.
-      </para>
-
-      <para>
-	Clicking on the <guilabel>Categories</guilabel> button opens up the category
-	list.  To associate a category to an appointment, simply click the check box. 
-      </para>
       <para>
 	Once you've selected your categories, click <guilabel>OK</guilabel> to
 	assign these categories to the appointment.  The categories you selected are now
 	listed in the text box to the right of the <guilabel>Categories...</guilabel>
 	button.
       </para>
-
+ 
+   <para>
+      Appointments with categories will appear
+      with icons in the calendar display, and you can also search
+      for appointments by category. To display only the appointments
+      in a particular category, select <guilabel>Category
+    Is</guilabel> in the search bar at the top of the calendar, and
+    select a category.
+      </para>
+      
       <para>
         The <guilabel>Recurrence</guilabel> tab lets you describe
         repetition in appointments ranging from once every day up to once
@@ -276,7 +273,7 @@
         <guilabel>Exceptions</guilabel>, pick individual days when the
         appointment will <emphasis>not</emphasis> recur. Make your
         selections from left to right, and you'll form a sentence:
-        "Every two weeks on Monday and Friday until January 3, 2003"
+        "Every two weeks on Monday and Friday until January 3, 2008"
         or "Every month on the first Friday for 12 occurrences."
       </para>
 
@@ -286,15 +283,15 @@
 	If you want, you can alter an appointment
 	summary in the calendar view by clicking on it and typing. You
 	can change other settings by right-clicking on the appointment then
-	choosing <guimenuitem>Open</guimenuitem>.
+	choosing <guimenuitem>Open</guimenuitem>, or double-clicking
+        the appointment.
       </para>
     </sect2>
     <sect2 id="usage-calendar-rsvp">
-      <title>Sending an RSVP with the Calendar</title>
+      <title>Sending a Meeting Invitation</title>
       <para>
-	Evolution can be used to schedule
-	group meetings and help you manage responses to meeting
-	requests.
+	Evolution can be used to schedule group meetings and help you
+        manage responses to meeting requests.
       </para>
       <para>
 	When you create a meeting or group appointment, you can
@@ -387,7 +384,7 @@
 	to your calendar if you accept.
       </para>
 
- <para>
+      <para>
         Note, however, that if you add a meeting to your calendar,
         there are some limitations: only the organizer of a meeting
         can add participants in a meeting. Your only options, as a
@@ -480,6 +477,7 @@
       </para>
     </sect2>
  ########## END UNIMPLEMENTED FEATURESET ############ -->
+
     <sect2 id="usage-calendar-freebusy">
       <title>Scheduling Meetings and The Free/Busy View</title>
       <para>
@@ -548,10 +546,15 @@
 	<guilabel>Schedule Grid</guilabel>
       </para>
       <para>
-	The <guilabel>Schedule Grid</guilabel> shows the invitee's
-	published Free/Busy information.  This is where you compare
-	people's schedules to find free time to schedule the
-	appointment.
+	The <guilabel>Schedule Grid</guilabel> shows the published
+      Free/Busy information for the people you have invited.  This is
+      where you compare people's schedules to find free time to
+      schedule the appointment. Individuals will only have visible
+      scheduling information if they use the same GroupWise or
+      Exchange server you do (that is, if they are in the same
+      organization as you), or if they publish free/busy information
+      at a URL you can reach and you have entered that URL into their
+      contact card using the contact editor.
       </para>
       <para>
 	<inlinemediaobject>
@@ -602,6 +605,34 @@
 
   </sect1>
 
+  <sect1 id="usage-calendar-multiple">
+    <title>Multiple Calendars and Web Calendars</title>
+
+    <para>
+      To create a new calendar, select 
+      <menuchoice>
+	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
+	<guimenuitem>Calendar</guimenuitem>
+      </menuchoice>. If the calendar is one you plan to store locally,
+      you need only provide a name and color. If it is a remote
+      calendar, enter the name, color, URL, and a refresh
+      frequency. The refresh frequency determines how often Evolution
+      will check to see if the calendar has changed. If you are
+      working with someone who publishes an online calendar, you may
+      want to check for updates every thirty minutes. On the other
+      hand, if you have displayed a sports team schedule in your
+      calendar, you may not need to refresh it more than once a week,
+      if at all.
+    </para>
+    <para>
+      The website <ulink
+      url="http://icalshare.com">icalshare.com</ulink> has an extensive list
+    of shared online calendars, including national and religious
+    holidays, phases of the moon, sports, and local and regional events.
+    </para>
+  </sect1>
+
+
   <sect1 id="usage-calendar-todo">
    <title>The Task Pad</title>
     <para>
@@ -683,78 +714,22 @@
       remove columns from the display.
     </para>
     <sect2 id="task-folders">
-      <title>Folders for Your Tasks</title>
-      <para>
-	Like any other component in
-	Evolution, you can create a folder
-	to help organize your tasks.  To do this:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open the <guilabel>Folders Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>Tasks</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Right click on <guilabel>Tasks</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <menuchoice><guimenuitem>Create New Folder</guimenuitem></menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the folder name.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>OK</guilabel>
-	    </para>
-	  </listitem>
-	</orderedlist>
+      <title>Task Groups</title>
+      <para>
+        As with calendars, you can create multiple task groups. Task
+        groups are more easily organized in the dedicated
+        <guilabel>Tasks</guilabel> tool. Each task group is assigned a
+        color, and in the <guilabel>Tasks</guilabel> tool shortcut bar
+        you can hide and show task groups just like calendars. In the
+        calendar display task pad, tasks from all visible task groups
+        will appear, color coded by group.  To create a new task
+        group, select <menuchoice><guimenu>New</guimenu>
+        <guimenuitem>Task Group</guimenuitem></menuchoice>. You will
+        be prompted for a name, color, and location for the task
+        group. If the task group is online, you will need to provide
+        the URL for it.
       </para>
     </sect2>
   </sect1>
 
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       Evolution permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Lucy, the office manager for a small company, has one calendar
-        for her own schedule. She maintains one for the conference
-        room, to schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Cubs are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Folder</guimenuitem>
-      </menuchoice>.
-       You'll need to tell the <guilabel>New Folder</guilabel> dialog that the new folder should be of the calendar type.  You can place the calendar in any calendar folder and access it
-       from the folder view.
-    </para>
-    <para>
-       Each calendar folder can hold only one calendar.
-    </para>
-  </sect1>
 </chapter>
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index 743e3bc77c..43c4f6a036 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -18,62 +18,13 @@
       </para>
 
     <para>
-       The toolbar for the contacts tool has the following items:
-       <itemizedlist>
-	<listitem><para>
-	  Click <guilabel>New Contact</guilabel> to create a new card, or double-click 
-	  in a blank space in the contact list. 
-	</para></listitem>
-
-	<listitem><para>
-           Click <guilabel>New List</guilabel> to create a new
-        contacts list, which is a convenient handle for a group of
-        other contact cards.
-	</para></listitem>
-
-	<listitem><para> The <guiicon>printer</guiicon> icon sends one
-	    or more of your cards to the printer.  </para></listitem>
-
-        <listitem><para> The <guiicon>stop sign</guiicon> icon stops loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       Your contact information fills the rest of the display.  Move
-       through the cards alphabetically with the buttons and the
-       scrollbar to the right of the window. Of course, if you have
-       more than a few people listed, you'll want some way of finding
-       them more quickly, which is why there's a search feature.
-    </para>
-
-    <para>
-      When you click on a card, the bottom portion of the page will
-      show more detailed information about the contact. There is also
-      a <guilabel>Map</guilabel> button, which you can click to bring
-      up a web page with a map of the contact's main postal address.
+     Double-click on a card to display all its details.
     </para>
 
 
   <sect1 id="usage-contact-cards">
     <title>The Contact Editor</title>
-    <para>
-      To delete a contact:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Click once on the contact.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Press the <guilabel>Delete</guilabel> button.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
+
     <para>
        If you want to add or change cards, you'll use the contact
        editor.  To change a card that already exists, double click on
@@ -85,22 +36,21 @@
     
     <para>
       The contact editor window has three tabs,
-      <guilabel>General</guilabel>, for basic contact information,
-      <guilabel>Details</guilabel>, for a more specific description of
-      the person, and <guilabel>Collaboration</guilabel> for
-      information about scheduling and working closely with them.  In
-      addition, it contains a <guimenu>File</guimenu> menu and an
-      <guimenu>Actions</guimenu> menu. Under
-      <guimenu>Actions</guimenu> you will find <guimenuitem>Forward
+      <guilabel>Contact</guilabel>, for basic contact information,
+      <guilabel>Personal Information</guilabel>, for a more specific description of
+      the person, including URLs for their calendar and free/busy information, 
+      and <guilabel>Mailing Address</guilabel>.
+      In the 
+      <guimenu>Actions</guimenu> menu you will find <guimenuitem>Forward
       Contact</guimenuitem>, which opens a new message with the card
       already attached, and <guimenuitem>Send Message to
       Contact</guimenuitem>, which will open a new message to the
-      contact.
+      contact's email address.
       </para>
       <para>
-      The toolbar is relatively simple: <guilabel>Save and
+        From the contact editor toolbar, you can <guilabel>Save and
       Close</guilabel>, <guilabel>Print</guilabel>,
-      <guilabel>Close</guilabel>, and <guilabel>Delete</guilabel>.
+      <guilabel>Close</guilabel>, or <guilabel>Delete</guilabel> the contact.
       </para>
    
     
@@ -114,128 +64,7 @@
 	</imageobject></mediaobject>
       </screenshot>
     </figure>
-    
-    <para> The <guilabel>General</guilabel> tab has seven sections,
-      each with an icon: a face, for name and company; a telephone
-      for phone numbers; an envelope for email address; a globe for
-      web page address; a house for postal address; a file folder
-      for contacts, and a briefcase for categories. 
-    </para>
-    <para>
-     <variablelist>
-	
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guilabel>Full
-                    Name</guilabel> field, but you can also click the
-                    <guilabel>Full Name</guilabel> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		            Enter the first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  Enter the middle name or initial, if any.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   Enter the last name (surname).
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Enter suffixes such as "Jr." or "III."
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	      </itemizedlist>
-	      </para>
-		<para>
-		  The <guilabel>Full Name</guilabel> field also
-		  interacts with the <guilabel>File As</guilabel>
-		  box to help you organize your contacts.
-		</para>
-	    <para>
-		  To see how it works, type a name in the
-		  <guilabel>Full Name</guilabel> field. As an example,
-		  we'll use <userinput>John
-		  T. Doe</userinput>.  You'll notice that the
-		  <guilabel>File As</guilabel> field also fills in,
-		  but in reverse: <computeroutput>Doe,
-		  John</computeroutput>.  You can pick
-		  <computeroutput>John Doe</computeroutput> from
-		  the drop-down, or type in your own, such as
-		  <userinput>T. Doe, John</userinput>.
-		</para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Multiple Values for Fields:</term>
-            <listitem>
-	      <para>
-                If you click on the downward pointing triangle buttons
-                next to the <guilabel>Primary Email</guilabel> field,
-                you can also choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, Evolution will store
-                them all.  Entries that have information in them have
-                a check mark next to them.  The buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool; for
-       information on that, read <xref
-       linkend="usage-contact-organize"/>.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is much simpler:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    The briefcase - Describes the person's professional life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The face - Describes the person's personal life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The globe - Miscellaneous notes
-	  </para>
-	</listitem>
-      </itemizedlist>
+
 
       <tip>
 	<title>Contact Shortcuts</title>
@@ -248,21 +77,110 @@
 	  from the menu.
 	</para>
       </tip>
+
+
+    
+    <para>
+      Most of the items in the contact editor simply display the
+      information you enter, but some of them have additional
+      features:
+    </para>
+
+
+
+    <para>
+     <variablelist>
+	
+	<varlistentry>
+	  <term>Full Name</term>
+	  <listitem>
+	    <para>
+              Enter the name of your contact here.  You can enter a
+              name into the <guilabel>Full Name</guilabel> field, but
+            you can also click the <guilabel>Full Name</guilabel>
+            button to bring up a small dialog box with a few text
+            boxes for first and last names, titles like "Mr." or "Her
+            Excellency," and suffixes like "Jr."
+          </para>
+
+          <para>
+            The <guilabel>Full Name</guilabel> field also
+          interacts with the <guilabel>File Under</guilabel>
+          box to help you organize your contacts and to handle
+          multi-word surnames.
+        </para>
+        <para>
+          To see how it works, type a name in the
+          <guilabel>Full Name</guilabel> field. As an example,
+          we'll use <userinput>Miguel de Icaza</userinput>.  You'll notice that the
+          <guilabel>File Under</guilabel> field also fills in,
+          but in reverse: <computeroutput>Icaza, Miguel de
+        </computeroutput>.  If you had entered <userinput>John Q.
+        Doe</userinput>, the contacts editor would have
+        correctly guessed that the entry should be filed under
+        "Doe, John Q." However, Miguel's surname, "de Icaza,"
+        has two words, and so to get proper sorting you must enter
+        <userinput>de Icaza, Miguel</userinput> in the
+        <guilabel>File As</guilabel> entry.
+      </para>
+	  </listitem>
+        </varlistentry>
+        
+
+        <varlistentry>
+          <term>Where</term>
+          <listitem>
+            <para>
+              Select one of your address books as the location for
+              this contact. You may not be able to write to all
+              available address books, especially those on a network.
+          </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Categories</term>
+          <listitem>
+            <para>
+              Click the <guilabel>Categories</guilabel> button to
+            select categories for this card. If you assign contact
+            categories, you can then search for contacts using those
+            categories. For more information on contact categories,
+            read <xref linkend="usage-contact-organize"/>.
+          </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Free/Busy and Calendar URLs</term>
+          <listitem>
+            <para>
+              Click the <guilabel>Personal Information</guilabel> tab
+            to enter web addresses for the contact. If the contact
+            publishes Free/Busy or calendar data online, using a
+            server other than Exchange or GroupWise, you can enter the
+            address for those servers here. Once you do so, you will
+            be able to check their schedule when creating appointments
+            in the calendar.
+          </para>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
     </para>
+
+
   </sect1>
 
   <sect1 id="contact-search">
     <title>Searching for Contacts</title>
-    <para>
-      Evolution allows searching through contacts
-      quickly and easily.
-    </para>
+    
     <para>
       To search through contacts:
       <orderedlist numeration="arabic">
 	<listitem>
 	  <para>
-	    Select your search focus in the search bar.
+	    Select your search type in the search bar.
 	  </para>
 	</listitem>
 	<listitem>
@@ -278,25 +196,21 @@
       </orderedlist>
     </para>
     <para>
-      To perform a complex search through your contacts:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Open
-	    <menuchoice>
-	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Search for contacts</guimenuitem>
-	    </menuchoice>
-	  </para>
-	</listitem>
-	<listitem>
+      For a more complex search, select
+      <menuchoice>
+        <guimenu>Search</guimenu>
+        <guimenuitem>Advanced</guimenuitem>
+      </menuchoice> and select criteria that describe your desired contact:
+    </para>
+    <orderedlist>
+        <listitem>
 	  <para>
 	    Name the rule in the <guilabel>Rule Name</guilabel> field.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Setup your criteria information in the <guilabel>If</guilabel> section.
+	    Setup your criteria  in the <guilabel>If</guilabel> section.
 	  </para>
 	</listitem>
 	<listitem>
@@ -311,10 +225,12 @@
 	  </para>
 	</listitem>
       </orderedlist>
-    </para>
+
     <para>
-      To show all your contacts, select <guilabel>Show All</guilabel> in the
-      <guilabel>Search Bar</guilabel> or search with an empty query.
+      To show all your contacts, Click <guilabel>Clear</guilabel> in the
+    search bar, press
+    <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>B</keycap></keycombo>
+    or search with an empty query.
     </para>
 
   </sect1>
@@ -322,14 +238,10 @@
   <sect1 id="usage-contact-organize">
     <title>Organizing your Contacts</title>
     <para>
-      Just as you can search mail, you can search contacts, although the
-      contacts tool does not use folders or virtual folders. You can,
-      however, create several contact groups, which are basically
-      the same thing as folders or or individual address books.
-      Contact groups may be on your own computer or on the
-      network. Within a given contact group, you can have several
-      categories of contacts. To learn about categories, read <xref
-      linkend="usage-contact-organize-group-category" />.
+      Just as you can search mail, you can search contacts. You can
+      also create several individual address books, or contact groups.
+      Within a given contact group, you can have several
+      categories of contacts. 
     </para>
 
 <!-- UNIMPLEMENTED FEATURE
@@ -344,56 +256,35 @@
 -->
 
     <sect2 id="usage-contact-organize-group">
- 	<title>Contact Groups</title>
+ 	<title>Contacts Groups</title>
 	<para>
            The simplest way to organize contacts is to create
-          additional groups of contacts.  If you've read <xref
-	   linkend="usage-mainwindow"/> then you already know that you
-	   can create a new folder by right-clicking in the shortcut
-        bar and choosing <guilabel>New Contact Group</guilabel>. For
-        contact groups on your computer, you only need a name. For
-        contacts on the network, you will need to provide more
-        information about the contacts server you are trying to access.
+          additional groups of contacts. You can create a new one by
+          selecting <menuchoice><guimenu>New</guimenu>
+        <guimenuitem>Contacts Group</guimenuitem></menuchoice> For
+        contacts groups on your computer, you only need to provide a
+        name. For contacts on the network, you will need to provide
+        more information about the contacts server you are trying to
+        access.
 	 </para>
 	<para>
           To move a card from one group to another, just drag it there
           from the main display of contacts. Note that you will not be
           able to change the contents of most network contact groups.
          </para>
-      </sect2>
-      
-      <sect2 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  
-           That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guilabel>Categories</guilabel> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
 
-       <!-- Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guilabel>Categories</guilabel> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
+         <tip id="lists-vs-groups">
+           <title>Contact Lists and Contact Groups</title>
+         <para>
+           Contacts groups are not the same as contact lists. A
+           contact group is like a folder or address book full of contacts.  A
+           contact list is a single contact which contains other
+           contacts, and is most often used to email several people at once.
          </para>
-       -->
+       </tip>
 
       </sect2>
+      
 
       <sect2 id="usage-contact-organize-group-list">
 	<title>Creating a List of Contacts</title>
@@ -403,8 +294,18 @@
           every member of the list. This differs from a network
           mailing list in that it exists only on your computer as a
           convenience to you, rather than as an actual email address
-          managed by a mailing list application on a server. To
-          create a list of contacts:
+          managed by a mailing list application on a server.
+        </para>
+        <para>
+          For example, you could create one card for each family
+          member, then add
+           those cards to a contact list called "Family." Then,
+           instead of entering each person's email address
+           individually, you could send email to "Family" and the
+           message would go to all of them.
+        </para>
+        <para> 
+        To create a list of contacts:
 
          <orderedlist numeration="arabic">
 	    <listitem>
@@ -464,10 +365,41 @@
            and select <guimenuitem>Send Message to List</guimenuitem>.
         </para>
         <para>
-           Novell Evolution cannot store contact lists on Exchange
+           Evolution cannot store contact lists on Microsoft Exchange
            servers.
         </para>
-    </sect2>
+      </sect2>
+
+      <sect2 id="usage-contact-organize-group-category">
+	<title>Grouping with Categories</title>
+	<para>
+           The other way to group cards is to mark them as belonging
+           to different categories.  That means that you
+           can mark a card as being in several categories or no
+           category at all.  For example, you put a friend's
+           card in the "Business" category, because he works with you,
+           the "Friends" category, because he's a friend, and
+          the "Frequent" category, because you call him often, but can
+          never remember the number.
+        </para>
+	<para>
+           To mark a card as belonging to a category, click the
+           <guilabel>Categories</guilabel> button at the lower
+           right.  From the dialog box that appears, you can check as
+           many or as few categories as you like.
+        </para>
+
+	<para>
+
+           If the master list of categories doesn't suit you, you can
+           add your own.  Just enter the new category's name in the
+           text box, then click <guilabel>Categories</guilabel> and
+           choose <guilabel>Edit Master Category List</guilabel> in the
+           window that appears. 
+         </para>
+
+      </sect2>
+
   </sect1>
   
   <sect1 id="usage-contact-sharing">
@@ -485,9 +417,8 @@
     <para>
        To learn how to add a remote directory to your available
        contact folders, see <xref linkend="config-prefs-contact"/>.
-       Once you have a LDAP connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar.  It will work
+      Remote groups of contacts appear under the <guilabel>On LDAP
+    Servers</guilabel> item in the shortcut bar.  They work
        exactly like a local folder of cards, with the following
        exceptions:
        <itemizedlist>
@@ -496,7 +427,7 @@
 	    <para>
               Network folders are only available when you are
               connected to the network.  If you use a laptop or have a
-              modem connection, you may wish to copy or cache the
+              modem connection, you may wish to copy or cache some of the
               network directory.  You do this by dragging and dropping
               your desired contacts into the local contacts list.
 	    </para>
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 4e9e3cec1b..822d564e81 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -23,7 +23,7 @@
         following types of 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
@@ -39,8 +39,7 @@
 	    <listitem>
 	      <para>
 		A format for storing calendar files.  iCalendar is used by 
-		PalmOS based handhelds, Novell
-                Evolution, and 
+		PalmOS based handhelds, Evolution, and 
 		<application>Microsoft Outlook</application>.
 	      </para>
 	    </listitem>
@@ -58,7 +57,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term>LDAP Data Interchange Format (LDIF):</term>
+            <term>LDAP Data Interchange Format (.LDIF):</term>
             <listitem>
               <para>
                 A standard data format for contact cards.
@@ -67,7 +66,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term>MBox (mbox):</term>
+            <term>MBox (.mbox or null extension):</term>
             <listitem>
               <para>
                 The email box format used by Mozilla, Netscape,
@@ -103,7 +102,7 @@
           </listitem>
           <listitem>
             <para>
-              Click <guilabel>Import</guilabel>
+              Click <guilabel>Import</guilabel>.
             </para>
           </listitem>
         </orderedlist>
@@ -150,9 +149,12 @@
 	  <para>
 	    Microsoft Outlook, and versions of Outlook Express after
 	    version 4, use proprietary formats that Novell
-	      Evolution cannot read or import.  For contacts,
-	    you may have to email them to yourself and import them that
-	    way.  For email, there is a simpler workaround:
+            Evolution cannot read or import. One migration method that
+            works well is to use the
+            <application>Outport</application> application (see <ulink
+            url="http://outport.sourceforge.net">outport.sourceforge.net</ulink>
+            for information) under Winodws. YOu can also import data
+            into another Windows mail client such as Mozilla:
 	    <orderedlist numeration="arabic">
 	      
 	      <listitem>
@@ -172,9 +174,7 @@
 	      
 	      <listitem>
 		<para>
-		  Use the Novell Evolution import
-		  tool to import the files.  There's more information about
-		  why this works, and how, at the Novell support website.
+		  Use the Evolution import tool to import the files.
 		</para>
 	      </listitem>
 	    </orderedlist>
@@ -186,10 +186,10 @@
 	  <para>
             Mozilla and Netscape users will need to choose
 	    <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-		Folders</guimenuitem></menuchoice> from within
-            Netscape or Mozilla. Otherwise,
+		Folders</guimenuitem></menuchoice> from within the
+            Netscape or Mozilla mail tool. Otherwise,
 	    Novell Evolution will import and undelete
-	    the messages in Trash folders.
+	    the messages in your Trash folders.
 	  </para>
 	</note>     
 	
@@ -212,27 +212,14 @@
 	<varlistentry>
 	  <term><guimenuitem>Sort Ascending</guimenuitem>:</term>
 	  <listitem><para>
-	      Sorts the messages top to bottom.
+          Sorts the messages top to bottom. Similarly,
+          <guimenuitem>Sort Descending</guimenuitem> reverses the
+          order, and <guilabel>Unsort</guilabel> removes sorting from
+          this column, reverting to the order of messages as they were
+          added to the folder.
 	    </para></listitem>
 	</varlistentry>
 	  
-	  <varlistentry>
-	    <term><guimenuitem>Sort Descending</guimenuitem>:</term>
-	    <listitem><para>
-		Sorts the messages bottom to top.
-	      </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> 
@@ -272,7 +259,7 @@
           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
+          messages you wish to display.
         </para></listitem>
       </varlistentry>
 
@@ -293,8 +280,8 @@
         want to remind yourself about. Several are provided for you, such as
         <guilabel>Call</guilabel>, <guilabel>Forward</guilabel>, and
         <guilabel>Reply</guilabel>, but you can enter your own note or
-        action if you wish. You may set a deadline date for the flag
-        as well, if you wish.
+        action if you wish. You may set a deadline for the flag
+        as well.
       </para>
       <para>
         Once you have added a flag, you can mark it as complete or
@@ -305,8 +292,9 @@
 
       <para>
          When you read a flagged message, its flag status will be
-         displayed right at the top, before the message headers. An
-        overdue message might tell you <guilabel>Overdue: Call by April 07, 2003, 5:00 PM</guilabel>
+         displayed at the top, before the message headers. An
+        overdue message might tell you <guilabel>Overdue: Call by
+      April 07, 2003, 5:00 PM</guilabel>
       </para>
 
       <para>
@@ -321,7 +309,7 @@
       <para>
 	If you prefer a simpler way to remind yourself about messages, you can
 	mark them as "Important" by right-clicking on them and selecting
-	<guilabel>Mark Important</guilabel>
+	<guilabel>Mark Important</guilabel>.
       </para>
 
       </sect2>
@@ -337,9 +325,7 @@
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
 	but you can create as many as you like.  Create new folders by
         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.
+        <guimenuitem>New Folder</guimenuitem>.
       </para>
       <para>
         When you click <guilabel>OK</guilabel>, your new folder will
@@ -403,8 +389,7 @@
 	  <term><guilabel>Sender contains:</guilabel></term>
 	  <listitem>
 	    <para>
-              Finds messages that do not contain the search text in
-              the subject.
+              Finds messages whose From: header contains a match for your search text.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -518,7 +503,7 @@
 
   <variablelist>
     <varlistentry>
-      <term>Check Incoming Mail</term>
+      <term>Check incoming mail for junk</term>
       <listitem>
       <para>
         This option turns automatic junk mail filtering on or off.
@@ -527,31 +512,19 @@
   </varlistentry>
 
   <varlistentry>
-      <term>Do Not Check Incoming Mail for IMAP Accounts</term>
-      <listitem>
-      <para>
-        Evolution must download mail to determine whether it is junk
-        mail, so junk mail filtering can slow IMAP performance as it
-        downloads every message in its entirity. To turn filtering off
-        for IMAP mail, but leave it on for other mail accounts, select
-        this box.
-      </para>
-    </listitem>
-  </varlistentry> 
-
-  <varlistentry>
-    <term>Local Tests Only</term>
+    <term>Include remote tests</term>
     <listitem>
       <para>
-        This option skips tests that require a network connection,
+        This option uses tests that require a network connection,
         such as checking to see if a message is in a list of known
         junk messages, or if the sender or gateway are blacklisted by
-        anti-spam organizations. Selecting this option will increase
-        the speed of operation, but may decrease accuracy.
+        anti-spam organizations. Remote tests add to the amount of
+        time it takes to check for junk mail, but increase accuracy.
       </para>
     </listitem>
   </varlistentry>
-  
+
+<!-- This is apparently gone _____________________________
   <varlistentry>
     <term>Use Daemon</term>
     <listitem>
@@ -575,7 +548,9 @@
       </para>
     </listitem>
   </varlistentry>
-     
+__________________________     -->
+
+
 </variablelist>
 </sect1>
 
@@ -603,22 +578,24 @@
                 creation. Right-click on the message in the message
                 list, and select one of the items under the
                 <guimenuitem>Create Rule from Message</guimenuitem>
-                submenu.
+                submenu. Creating a rule based on a message opens the filter 
+                creation tool with some of the information about the
+                message already filled in for your convenience.
 	      </para>
 	    </tip>
 
     <sect2 id="usage-mail-org-filters-new">
-      <title>Making New Filters</title>
+      <title>Creating New Filter Rules</title>
       <para>
-	To create a new filter:
+	To create a new filter rule:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
               Select
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenuitem>Filters</guimenuitem>
-	      </menuchoice>
+		<guimenuitem>Filters...</guimenuitem>
+	      </menuchoice>.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -711,14 +688,6 @@
 		    with the dates you specify.
 		  </para></listitem>
 		
-		<listitem><para>
-        Score - Set the message score to any whole number greater than
-        0.  To use filters with scoring, use one filter to score a
-        message, and then apply other filters only to messages with
-        the scores you seek.
-		  </para></listitem>
-		
-
 		<listitem>
 		  <para>
                     Label - Messages may have labels of
@@ -730,6 +699,17 @@
 		  </para>
 		</listitem>
 
+		<listitem><para>
+                Score - Set the message score to any whole number greater than
+                0.  You can have one filter set or change a message
+                score, and then set up another filter to move the
+                messages you have scored. A message score is not based
+                on anything in particular: it is simply a number you
+                can assign to messages so other filters can process them.
+              </para></listitem>
+		
+
+
 		<listitem>
 		  <para>
 		    Size (kB) - Sorts based on the size of the message in kilobytes.
@@ -749,36 +729,35 @@
 		
 		<listitem>
 		  <para>
-		    Flagged - Check whether the message is flagged for follow-up or not.
+		    Flagged - Check whether the message is flagged for follow-up.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Attachments - Create a filter based on whether or not you 
+		    Attachments - Create a filter based on whether you 
 		    have an attachment in the email.
 		  </para>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Mailing List - Filter based on the mailing list it came from.
-		  </para>
-		  <note>
-		    <title>How Does Filtering on Mailing Lists Work?</title>
-		    <para>
-		      Filtering on mailing list actually looks for a
-		      specific mailing-list header called the
-		      <computeroutput>X-BeenThere</computeroutput>
+		    Mailing List - Filter based on the mailing list
+                    the message came from. This filter may miss
+                    messages from some list servers, because Filtering
+                    it checks for the
+                    <computeroutput>X-BeenThere</computeroutput>
 		      header, used to identify mailing lists or other
-		      redistributors of mail.
+                    redistributors of mail. Mail from list servers
+                    which do not set
+                    <computeroutput>X-BeenThere</computeroutput>
+                    properly will not be caught by these filters.
 		    </para>
-		  </note>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Regex Match  - If you know your way around a
+		    Regex Match: If you know your way around a
 		    <link
 		    linkend="regular-expression">regex</link>, or
 		    regular expression, put your knowledge to use
@@ -836,23 +815,21 @@
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
-		    Move to Folder - If you select this item, Novell Evolution
-		    will put the messages into a folder you specify.  Click the 
+		    Move to Folder - Move the message into a folder you specify.  Click the 
 		    <guilabel>&lt;click here to select a folder&gt;</guilabel> button
-		    to select a folder. 
+		    to select the destination folder. 
 		  </para></listitem>
 
 		<listitem><para>
-		    Copy to Folder - If you select this item, Novell Evolution
-		    will put the messages into a folder you specify.  Click the 
+		    Copy to Folder - Put a copy of the message into a folder you specify.  Click the 
 		    <guilabel>&lt;click here to select a folder&gt;</guilabel> button
-		    to select a folder. 
+		    to select the destination folder. 
 		  </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.
+		    Delete - Marks the message for deletion.  The
+                message can be undeleted until you manually
+                <guimenuitem>Expunge</guimenuitem> or <guimenuitem>Empty Trash</guimenuitem>.
 		  </para></listitem>
 		
 		<listitem><para>
@@ -862,8 +839,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Assign Color - Select this item, and Novell Evolution
-		    will mark the message with whatever color you please.
+		    Assign Color - Mark the message with a color of your choice.
 		  </para></listitem>
 		
 		<listitem><para> 
@@ -874,7 +850,6 @@
 		    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>,
@@ -885,8 +860,8 @@
 
 		<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.
+                unset it. If a status value is not set, do
+                nothing. 
 		  </para></listitem>
 
 		<listitem><para> 
@@ -898,6 +873,10 @@
 		  </para></listitem>
 
 		<listitem><para> 
+                Run Program - Evolution will run an application.
+		  </para></listitem>
+
+		<listitem><para> 
                 Pipe to Program - Send the message to a program of your choice. No return value
                 is expected. This feature can be used to create automatic web postings
                 from email messages or to perform additional message
@@ -909,19 +888,19 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Set Status - If you want to add multiple actions for this filter, press
+	      Add Action - If you want to add multiple actions for this filter, press
 	      <guilabel>Add action</guilabel> and repeat the previous step.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guilabel>OK</guilabel> in the filter editor dialog.
+              Click <guilabel>OK</guilabel> in the <guilabel>Add a Rule</guilabel> dialog.
 	    </para>
 	  </listitem>
 
 	  <listitem>
 	    <para>
-              Click <guilabel>OK</guilabel> in the filter manager
+              Click <guilabel>OK</guilabel> in the <guilabel>Filters</guilabel>
             window.
 	    </para>
 	  </listitem>
@@ -964,7 +943,7 @@
 
          <para>
             If you have several filters that match a single message,
-            they will all be applied to the message, in order, unless
+            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
@@ -1004,16 +983,19 @@
 	      Change the desired settings.
 	    </para>
 	  </listitem>
+
 	  <listitem>
 	    <para>
-	      Press <guilabel>OK</guilabel> in the filter editor window.
+              Click <guilabel>OK</guilabel> in the <guilabel>Add a Rule</guilabel> dialog.
 	    </para>
 	  </listitem>
+
 	  <listitem>
 	    <para>
-	      Press <guilabel>OK</guilabel> in the filter manager window.
+              Click <guilabel>OK</guilabel> in the <guilabel>Filters</guilabel>
+            window.
 	    </para>
-	  </listitem>
+	  </listitem>	 
 	</orderedlist>
       </para>
     </sect2>
@@ -1113,7 +1095,7 @@
       <title>The "Unmatched" vFolder</title>
       <para>
         The Unmatched vFolder is the opposite of the others: it
-        displays whatever messages are not matched by other vFolders.
+        displays whatever messages do not appear in other vFolders.
       </para>
       <para>
         If you use remote email storage like IMAP or Microsoft
@@ -1131,7 +1113,7 @@
       <para>
 	To organize his mailbox, Jim sets up a virtual folder for emails from
 	his friend and co-worker Anna.  He has another one for messages that
-	have ximian.com in the address and Novell Evolution in the subject line, so he
+	have novell.com in the address and Novell Evolution in the subject line, so he
 	can keep a record of what people from work send him about
 	Evolution.  If Anna sends him a message about
 	anything other than Novell Evolution, it only shows up in the "Anna" folder.
@@ -1172,7 +1154,8 @@
 	    <para>
 	      Select your search criteria. For each criterion, you
 	      must first select which of the following parts of the
-	      message you want the search to examine:
+	      message you want the search to examine. The criteria are
+              similar to those for filters:
 
       <figure id="usage-mail-vfolder-fig-createrule">
 	<title>Selecting a vFolder Rule</title>
@@ -1210,8 +1193,7 @@
 		<listitem>
 		  <para>
 		    Expression - For programmers only: match a message according to an
-		    expression you write in the Scheme language, used to
-		    define vFolders in Novell Evolution.
+		    expression you write in Scheme. 
 		  </para>
 		</listitem>
 		
@@ -1310,6 +1292,12 @@
 	      </itemizedlist>
 	    </para>
 	  </listitem>
+          <listitem>
+            <para>
+              Click <guilabel>OK</guilabel> in the vFolder editing tool and in the vFolder list dialog boxes.
+            </para>
+          </listitem>
+
 	</orderedlist>
       </para>
     </sect2>
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index e5d07cf8bb..bf64bbb633 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -22,7 +22,7 @@
     <title>Reading Mail</title>    
     <para>
       If you are not already viewing mail, switch to the mail tool by clicking the
-      <guilabel>Email</guilabel> button in the shortcut bar.  To read a message,
+      <guilabel>Mail</guilabel> button in the shortcut bar.  To read a message,
       select it in the message list; if you'd like to see it in its
       own window, double-click on it, or press <keycap>Return</keycap> or 
       <keycombo action="simul">
@@ -35,8 +35,8 @@
       <tip id="spaceandbs">
 	<title>Reading Mail with the Keyboard</title>
 	<para>
-	  You can click the space bar to page down while you're reading
-	  an email, and press backspace to page up in an email. 
+          You can click the space bar to page down while you're reading
+          an email, and press <keycap>Backspace</keycap> to page up in an email. 
 	</para>
     
         <para>
@@ -75,11 +75,11 @@
       <tip id="view-headers">
 	<title>Email Headers</title>
 	<para>
-	  To look at the complete headers for email messages, select
+	  To look at the complete headers for a message, select
           <menuchoice><guimenu>View</guimenu><guisubmenu>Message
 	  Display</guisubmenu><guimenuitem>Show Full
 	  Headers</guimenuitem></menuchoice>. To see absolutely every
-	  bit, choose
+	  bit of the message data, choose
 	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
 	  Display</guisubmenu><guimenuitem>Show Email Source
 	  </guimenuitem></menuchoice>.
@@ -110,24 +110,16 @@
     </sect2>
     
     <sect2 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. 
-	To delete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click the message to select it
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press delete button or right click on the message and
-	      choose <guilabel>Delete</guilabel>.
-	    </para>
+      <title>Deleting Mail</title>
+      <para>
+        Once you've read your mail, you may want to get rid of
+        it.  To delete a message, select it and press the
+        <keycap>Delete</keycap> key, click the trash button, 
+        or right click on the message and choose
+        <guilabel>Delete</guilabel>.
+      </para>
 	    <note>
-	      <title>Why do I still see deleted mail?</title>
+              <title>Hide and Show Deleted Messages</title>
 	      <para>
 		When you press <guilabel>Delete</guilabel> or click
 		the trash button, your mail isn't actually deleted,
@@ -137,17 +129,16 @@
 		for deletion.
 	      </para>
               <para>
-                 If you don't like this behavior, select
+                 To show deleted messages, select the
                  <menuchoice><guimenu>View</guimenu><guimenuitem>Hide
-                 Deleted Messages</guimenuitem></menuchoice>. Then,
-                 you will only see deleted messages when you look in
-                 your <guilabel>Trash</guilabel> folder.
+                 Deleted Messages</guimenuitem></menuchoice> toggle. You can also find 
+                 deleted messages in the your
+                 <guilabel>Trash</guilabel> folder. 
               </para>
 	    </note>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
+            <para>
+	      To permanently erase all the deleted messages in a
+              folder, select
 	      <menuchoice>
 		<guimenu>Actions</guimenu>
 		<guimenuitem>Expunge</guimenuitem>
@@ -156,12 +147,12 @@
 	      <keycombo action="simul">
 		<keycap>Ctrl</keycap>
 		<keycap>E</keycap>
-	      </keycombo>
+	      </keycombo>.  To expunge all folders at once, select     <menuchoice>
+		<guimenu>Actions</guimenu>
+		<guimenuitem>Empty Trash</guimenuitem>
+	      </menuchoice>
 	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <note>
+          <note>
 	<title>Trash is Actually a vFolder?</title>
 	<para>
 	  Both local and IMAP Trash folders are actually vFolders that
@@ -185,37 +176,22 @@
     <sect2 id="usage-mail-getnsend-undelete">
       <title>Undeleting Messages</title>
       <para>
-	To undelete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select a message you have marked for deletion.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <keycombo
-	      action="simul"><keycap>Ctrl</keycap><keycap>U</keycap>
-	      </keycombo>
-	      or choose
-	      <menuchoice>
+        You can undelete a message that has been deleted but not expunged. To undelete a message, select it and 
+        press <keycombo action="simul"><keycap>Ctrl</keycap><keycap>U</keycap></keycombo>
+      or choose <menuchoice>
 		<guimenu>Edit</guimenu>
 		<guimenuitem>Undelete</guimenuitem>
 	      </menuchoice>
-
-	    </para>
+            </para>
 	    <note>
 	      <title>What does Undelete actually do?</title>
 	      <para>
                 If you have marked a message for deletion, undeleting
 		it will unmark it, and the message will be removed
-		from the Trash folder. However, it can't bring back
+		from the Trash folder. However, you cannot undelete
 		messages that have been expunged.
 	      </para>
 	    </note>
-	  </listitem>
-	</orderedlist>
-      </para>
     </sect2>
   </sect1>
 
@@ -229,45 +205,10 @@
       <interface>setup assistant</interface> will ask you for the
       information it needs to check your email.
     </para>
-    <para>
-      The assistant will give you several dialog boxes where you configure:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    your personal information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your outgoing email server information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your mail account identity name
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-
-
-   <figure id="usage-mail-druid-pic">
-	<title>Mail Setup Assistant</title>
-	<screenshot>
-	  <screeninfo>Mail Setup Assistant</screeninfo>
-	    <mediaobject>
-	      <imageobject>
-		<imagedata fileref="figures/mail-druid-pic" format="PNG"
-			   srccredit="Aaron Weber"/>
-	      </imageobject>
-	    </mediaobject>
-	  </screenshot>
-	</figure>
-
+ 
 
     <para>
-      To check your email, press the <guilabel>Send/Receive</guilabel>
-      button.  If this is your first time checking mail, or you
+      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
       password and your email will be downloaded.
@@ -302,7 +243,7 @@
                    <para>
                       In Evolution, select
                       <menuchoice><guimenu>Tools</guimenu><guimenuitem>
-                      Settings</guimenuitem></menuchoice>, go to the
+                      Settings</guimenuitem></menuchoice>. Go to the
                       Mail Accounts configuration tool, and pick the account
                       you'd like to use to share mail. You may want to
                       create a new account just for this source of
@@ -331,10 +272,10 @@
        <sect2 id="usage-mail-getnsend-get-news">
 	  <title>Using Evolution for News</title>
 	<para>
-	  Newsgroups are so similar to email that there's no reason not
-	  to read them side by side.  If you want to do that, add a
-	  news source to your configuration the same way you would add a mail
-	account, selecting <guilabel>NNTP</guilabel> as the source type. 
+	  USENET newsgroups are so similar to mail that it's often convenient to read 
+          news and mail side by side. You can add a news source, called an
+          NNTP server, the same way you would a new email account, selecting
+	<guilabel>USENET News</guilabel> as the source type. 
 	The news server will appear as a remote mail server, and each news
 	group works like an IMAP folder.  When you click 
 	<guilabel>Send/Receive</guilabel>, Evolution will 
@@ -368,7 +309,7 @@
      <title>Saving or Opening Attachments</title>
      <para>
         If you get an attachment with an email message,
-        Ximian Evolution can help you save
+         Evolution can help you save
         it or open it with the appropriate applications.
      </para>
      <para>
@@ -394,15 +335,10 @@
       </para>
 
       <para>
-	To Open an Attachment in a Program:
+	To open an attachment using another application:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Open the mail message with the attachment you want to read.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
 	      Click the arrow next the attachment icon.
 	    </para>
 	  </listitem>
@@ -416,8 +352,9 @@
       </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
+        on the type of attachment and the applications your system has
+        installed. For example, attached word processor files can be
+        opened in OpenOffice.org or another word processor, while
         compressed archive files can be opened in the File Roller
         application.
       </para>
@@ -432,22 +369,18 @@
          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 (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
+         tool in the message composer. Alternately, just drag
          an image into the message composition area.
       </para>
 
       <para>
-         If the image isn't included in the message, but is, instead,
-         a link to an image, Evolution can 
-         download the image from the Internet for you.  However,
-         Evolution will not display the
-         image unless you ask it to. This is because remotely hosted
-         images can be slow to load and display, and can even be used
-         by spammers to track who reads their email.  Having images
-         not load automatically helps protect your privacy.
+        Some images are linked in to messages, rather than being part
+        of them.  Evolution can download those images from the
+        Internet, but will not do so unless you request it
+        specifically. This is because remotely hosted
+        images can be slow to load and display, and can even be used
+        by spammers to track who reads their email.  Having images
+        not load automatically helps protect your privacy.
       </para>
       <para>
 	 If you want the images to load for one message, select 
@@ -457,7 +390,7 @@
 	   <guimenuitem>Load Images</guimenuitem>
          </menuchoice>.  
 
-         If you want Ximian Evolution to
+         If you want Evolution to
          load remotely hosted images more often, select
          <menuchoice>
 	   <guimenu>Tools</guimenu>
@@ -474,23 +407,23 @@
            If you use an HTTP proxy (as in many large organizations),
           Evolution must be able to find
            it through the <systemitem>gnome-vfs</systemitem> subsystem
-           before it can load images from the Internet.  This is also
-           the case if you wish to access weather and news information
-           through the Summary tool. 
+           before it can load images from the Internet. 
          </para>
          <para>
-           If you are using GNOME 1.4, you will need to configure this
-           in the Nautilus <guilabel>Preferences</guilabel>
-         dialog. However, in GNOME 2.0 and later, you can use the
-         GNOME Control Center. Select
+           
+           To set up your proxy, go to the GNOME Control Center by  selecting
          <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
          from your menu panel or from the GNOME menu, and then click
-         the <guilabel>Network Proxies</guilabel> button in the
-         <guilabel>System Settings</guilabel> category. Select the
+         the <guilabel>Network Proxies</guilabel> button. Select the
          <guilabel>Use an HTTP network proxy</guilabel> check box and
          then enter information about your proxy. If you are not sure,
-         check with your ISP or system administrator.
+         check with your ISP or system administrator. If you are not
+         using GNOME, or are not sure how to access the control
+         center, you can run the command
+         <command>gnome-network-preferences</command> to start the
+         proxy settings tool.
        </para>
+
       </note>
      </sect3>
     </sect2>
@@ -502,11 +435,11 @@
          You can start writing a new email message by selecting
          <menuchoice> <guimenu>File</guimenu>
          <guisubmenu>New</guisubmenu> <guimenuitem>
-         Mail Message</guimenuitem></menuchoice>, or by pressing the
-         <guilabel>New</guilabel> button in the Inbox toolbar.
-         When you do so, the <interface>New Message</interface> window
-         will open, as shown in <xref
-         linkend="usage-mail-newmsg-fig"/>.
+         Mail Message</guimenuitem></menuchoice>, or, while you are in
+         the Mail tool,
+         pressing<keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo>
+         or clicking the <guilabel>New</guilabel> button in the
+         toolbar.
       </para>
 
 <!--   ==============Figure=================================== -->
@@ -534,7 +467,7 @@
 
       <para>
         If you want to write in a non-Latin alphabet while using a
-        Latin keyboard, try selecting a different an input method in
+        Latin keyboard, try selecting a different input method in
         the message composer. Right-click on the message composition
         area and select from the <guimenu>Input Methods</guimenu>
       menu, then begin typing. The actual keys vary by language and
@@ -546,29 +479,31 @@
     </para>
 
       <para>
-        For greater language display capabilities, check your
-        character settings. In both the mail composer and mail reader
-        settings dialogs, you can select from dozens of character
-        sets. If you aren't sure which one to choose, go ahead and
-        choose UTF-8, which offers the greatest range of character
-        displays for the greatest range of languages.
+        For greater language display capabilities, select
+        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Settings</guimenuitem></menuchoice> and check 
+        the character set choices in the <guilabel>Mail
+        Preferences</guilabel> and <guilabel>Composer
+        Preferences</guilabel> sections.  If you aren't sure which one
+        to choose, go ahead and choose UTF-8, which offers the
+        greatest range of character displays for the greatest range of
+        languages.
       </para>
 
+      <note><title>What is a character set?</title>
+    
       <para>
-        To delve a little deeper into the issue, a character set is a
-        computer's version of an alphabet. One of the most popular
-        early character sets was called ASCII. It consisted of 128
-        numbers, letters, and assorted symbols used by computers for
-        almost everything. It was convenient, and didn't take up much
-        space, but it didn't handle Cyrillic, Kanjii, or other
-        non-Latin alphabets. Programmers developed a
-        variety of mostly incompatible ways to work around their
-        language display problems, and today, many human languages
-        have their own specific character sets, and items written in
-        other character sets will display incorrectly.  Eventually,
-        standards organizations developed the Unicode character sets
-        (UTF-7 and UTF-8) to provide a single compatible set of codes
-        for everyone.
+        A character set is a computer's version of an alphabet. In the
+        past, the ASCII character set was used almost
+        universally. However, it contained only 128 characters,
+        meaning it was unable to display characters in Cyrillic,
+        Kanjii, or other non-Latin alphabets. To get around language
+        display problems, programmers developed a variety of mostly
+        incompatible ways to work around their language display
+        problems, and today, many human languages have their own
+        specific character sets, and items written in other character
+        sets will display incorrectly.  Eventually, standards
+        organizations developed the Unicode character set UTF-8 to
+        provide a single compatible set of codes for everyone.
       </para>
 
       <para>
@@ -585,6 +520,8 @@
         offers the widest range of characters for the widest range of
         languages.
       </para>
+    </note>
+
 
     </sect2>
 
@@ -600,9 +537,9 @@
        <itemizedlist>
           <listitem>
              <para>
-                If you are offline,
+               If you are offline when you click <guilabel>Send</guilabel>, 
                 Evolution will add your
-                messages to the <guilabel>Outbox</guilabel> queue. The
+                message to the <guilabel>Outbox</guilabel> queue. The
                 next time you connect to the Internet and send or
                 receive mail, that message will be sent.
             </para>
@@ -620,7 +557,11 @@
 
         <listitem><para> 
          If you prefer to save your message as a text file,
-         choose <guimenuitem>Save As</guimenuitem> and then choose a
+         choose 	
+        <menuchoice>
+          <guimenu>File</guimenu>
+          <guimenuitem>Save As...</guimenuitem>
+        </menuchoice> and then choose a
          file name.
            </para>
 	  </listitem>
@@ -636,7 +577,7 @@
         storage systems like GroupWise, IMAP or Exchange,
         in situations where you will not be connected to
         the network at all times. It will keep a local copy of one or
-        more folders, and allow you to compose messages, storing them
+        more folders and allow you to compose messages, storing them
         in your Outbox to be sent the next time you connect.
       </para>
      
@@ -649,13 +590,10 @@
       </para>
 
       <para>
-        To mark a folder for offline use, select <menuchoice>
-        <guimenu>Tools</guimenu>
-        <guimenuitem>Settings</guimenuitem> </menuchoice> and then
-        click the <guilabel>Folder Settings</guilabel> icon. In the
-        <guilabel>Offline Folders</guilabel> tab, click the check-box
-        next to the folders that you would like to use while you are
-        offline. 
+        To mark a folder for offline use, right click on the folder and 
+        select <guilabel>Properties</guilabel>, then check the box
+      marked <guilabel>Copy folder content locally for offline
+      operation.</guilabel>
       </para>
 
       <para>
@@ -678,31 +616,23 @@
            
        </sect2>
     <sect2 id="usage-mail-getnsend-send-compose">
-      <title>More About Mail Composition</title>
-      <para>
-        In the next few sections, you'll see how
-	Evolution handles advanced email
-	features, including large recipient lists, attachments, and
-	forwarding.
-      </para>
-      <sect3 id="usage-mail-getnsend-send-attach">
         <title>Attachments</title>
         <para>
 	  To attach a file to your email:
 	  <orderedlist numeration="arabic">
 	    <listitem>
 	      <para>
-		Push the attach button in the composer toolbar
+		Push the attach button in the composer toolbar.
 	      </para>
 	    </listitem>
 	    <listitem>
 	      <para>
-		Select the file you want to attach
+		Select the file you want to attach.
 	      </para>
 	    </listitem>
 	    <listitem>
 	      <para>
-		Press <guilabel>OK</guilabel>
+		Press <guilabel>OK</guilabel>.
 	      </para>
 	    </listitem>
 	  </orderedlist>
@@ -725,22 +655,18 @@
             will go with it.  Be aware that big attachments may take a
           long time to send and receive.
         </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-send-to-types">
-	<title>Specifying Recipients for Email</title>
+       </sect2>
+       <sect2 id="usage-mail-getnsend-send-to-types">
+	<title>Specifying Extra Recipients for Email</title>
         <para>
 	  Evolution, like most email
 	   programs, recognizes three types of addressee: primary
 	   recipients, secondary recipients, and hidden ("blind")
-	   recipients.
-         </para>
-         <para>
-            The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  To send mail to
-            more than one or two people, you can use the
-            <guilabel>Cc:</guilabel> field.
+	   recipients.  The simplest way to direct a message is to put
+          the email address or addresses in the
+          <guilabel>To:</guilabel> field, which denotes primary
+          recipients.  To send mail to more than one or two people,
+          you can use the <guilabel>Cc:</guilabel> field.
           </para>
           <para>
             Hearkening back to the dark ages when people used
@@ -779,7 +705,7 @@
 	    <orderedlist numeration="arabic">
 	      <listitem>
                 <para>
-		  Open a composer window
+		  Open a composer window.
 			 </para>
 			 </listitem>
 			 <listitem>
@@ -788,7 +714,7 @@
 			 <menuchoice>
 			 <guimenu>View</guimenu>
 			 <guimenuitem>Reply To</guimenuitem>
-			 </menuchoice>
+			 </menuchoice>.
 			 </para>
 			 </listitem>
 			 <listitem>
@@ -800,9 +726,9 @@
 			 </orderedlist>			 
 	  </para>
 	</tip>
-        </sect3>
+        </sect2>
 			 
-        <sect3 id="usage-mail-getnsend-send-to">
+        <sect2 id="usage-mail-getnsend-send-to">
 	      <title>Choosing Recipients Quickly</title>
 	      <para>
 		If you have created address cards in the contacts tool,
@@ -838,7 +764,6 @@
             linkend="contact-automation-basic"/> and <xref
             linkend="usage-calendar-apts"/>.
           </para>
-        </sect3>
       </sect2>
 
       <sect2 id="usage-mail-getnsend-send-reply">
@@ -931,8 +856,8 @@
         <title>Searching and Replacing with the Composer</title>
         <para>
            You are probably familiar with search and replace features
-           in any sort of text-editing software, and if you come from
-           a Linux or Unix background, you may know what
+           in any sort of text-editing software, and if you're familiar with
+	regular expressions, you may already know what
            <guimenuitem>Find Regex</guimenuitem> does.  If you aren't
            among the lucky who already know, here's a quick rundown of
            the automated text searching features that the message
@@ -952,9 +877,11 @@
               <term><guimenuitem>Find Regex</guimenuitem></term>
               <listitem>
                 <para>
-                  Find a regex, also called a
+                  Find a complex pattern of characters, called a
                   <link linkend="regular-expression">regular
-                  expression</link>, in your composer window.
+                  expression</link> or "regex" in your composer
+                  window. If you're not sure what a regular expression
+                  is, you're probably better off ignoring this feature.
                </para>
              </listitem>
             </varlistentry>
@@ -962,7 +889,8 @@
             <varlistentry>
               <term><guimenuitem>Find Again</guimenuitem></term>
               <listitem><para>
-                   Select this item to repeat the last search you performed.
+                   Select this item to repeat the last search you
+              performed.
               </para></listitem>
             </varlistentry>
 
@@ -978,7 +906,7 @@
         </para>
 
         <para>
-            For all of these menu items, you can choose whether or not
+            For all of these menu items, you can choose whether 
             to <guilabel>Search Backwards</guilabel> in the document
             from the point where your cursor is.  For all but the
             regular expression search (which doesn't need it), you are
@@ -1025,9 +953,9 @@
       </para>
       <para>
 	HTML formatting tools are located in the toolbar just above
-	the space where you'll actually compose the message, and
-	they also appear in the <guimenu>Insert</guimenu> and
-	<guimenu>Format</guimenu> menus.
+	the space where you'll actually compose the message. They also
+        appear in the <guimenu>Insert</guimenu> and
+      <guimenu>Format</guimenu> menus.
       </para>
       <para>
 	The icons in the toolbar are explained in <link
@@ -1072,6 +1000,7 @@
 		selected, the style will apply to whatever you type
 		next.  The buttons are:
 		<itemizedlist mark="none">
+<listitem><para>Push <guiicon>TT</guiicon> for "typewriter text," which is approximately the same as the Courier monospaced serif font.</para></listitem>
 		  <listitem><para>Push <guiicon>bold A</guiicon> for bold text</para></listitem>
 		  <listitem><para>Push <guiicon>italic A</guiicon> for italics</para></listitem>
 		  <listitem><para>Push <guiicon>underlined A</guiicon> to underline</para></listitem>
@@ -1088,8 +1017,8 @@
 		paragraph icons should be familiar to users of most
 		word processing software.  The leftmost button will
 		make your text aligned to the left, the center
-		button, centered, and the right hand button,
-		aligned on the right side.
+		button will center, and the right button will
+		align the text on the right side.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -1098,7 +1027,7 @@
               <term>Indentation rules</term>
               <listitem>
                 <para>
-                  The button with the arrow pointing left will reduce
+                  The button with the arrow pointing left will decrease
                   a paragraph's indentation, and the right arrow will
                   increase its indentation.
                </para>
@@ -1109,8 +1038,8 @@
               <term>Color Selection</term>
               <listitem>
                 <para>
-                  At the far right is the color section tool.  The
-                  colored box displays the current text color; to
+                  At the far right is the color section tool, where a 
+                  colored box displays the current text color. To
                   choose a new one, click the arrow button just to the
                   right. If you have text selected, the color will
                   apply to the selected text.  If you do not have text
@@ -1126,8 +1055,12 @@
           </variablelist>
         </para>
         <para>
-	The <guimenu>Insert</guimenu> gives you opinions which let you
-           spruce up your email to make it more interesting:
+          Under the <guilabel>Insert</guilabel> menu, there are
+        several more items you can use to style your email. To use
+        these and other HTML formatting tools, first make sure you have
+        enabled HTML mode with <menuchoice>
+        <guimenu>Format</guimenu> <guimenuitem>
+                    HTML</guimenuitem></menuchoice>.
 	<variablelist>
 	  <varlistentry>
 	    <term><guimenuitem>Insert Link</guimenuitem></term>
@@ -1136,9 +1069,7 @@
 		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, first make sure you have enabled
-                  HTML mode by selecting <menuchoice> <guimenu>Format</guimenu> <guimenuitem>
-                    HTML</guimenuitem></menuchoice>.
+                  will recognize it as a link. 
 		<orderedlist numeration="arabic">
 		  <listitem>
 		    <para>
@@ -1178,16 +1109,7 @@
 	      <para>
 		To insert an image into your email:
 		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
+	
 		  <listitem>
 		    <para>
 		      Click the <guilabel>Insert Image</guilabel> button in the toolbar, or select		   
@@ -1221,16 +1143,7 @@
 	      <para>
 		To insert a rule:
 		<orderedlist numeration="arabic">
-       		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
+
 		  <listitem>
 		    <para>
 		      Click the <guilabel>Rule</guilabel> button in the <guilabel>Toolbar</guilabel>.
@@ -1276,16 +1189,7 @@
 	      <para>
 		To insert a table:
 		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
+
 		  <listitem>
 		    <para>
 		      Click the <guilabel>Table</guilabel> button in the <guilabel>Toolbar</guilabel>.
@@ -1293,15 +1197,18 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Select the table <guilabel>Template</guilabel>
-                    you wish to use.  Each has a slightly different feel and
-                    layout.
+		      Select the number of rows and columns for the
+                      table, and the width and height of the
+                      table. You may also choose padding and spacing
+                      for table cells, as with a standard HTML
+                      table. If you are not familiar with HTML
+                      table options, the default values are probably fine.
 		    </para>
 		  </listitem>
+
 		  <listitem>
 		    <para>
-                      If you so desire, you may change the number of
-                      rows, columns, spacing of each cell, and so forth.
+                      Choose a background image or color, if you like.
 		    </para>
 		  </listitem>
 		  <listitem>
@@ -1311,12 +1218,9 @@
 		  </listitem>
 		</orderedlist>
 	      </para>
-
                 <para>
                   Once the table is in place, you can right-click on
-                  it and get a list of ways to alter it, such as
-                  changing its background color, expanding it, or
-                  deleting a row or cell.
+                  it and get a list of ways to alter it.
                 </para>
 	    </listitem>
 	  </varlistentry>
@@ -1333,24 +1237,11 @@
               <para>
                 To include a template into your HTML based email:
                 <orderedlist numeration="arabic">
-                  <listitem>
-                    <para>
-                      Make sure that the
-		<menuchoice>
-		  <guimenu>
-		    Format
-		  </guimenu>
-		  <guimenuitem>
-		    HTML
-		  </guimenuitem>
-		</menuchoice>
-		selector is checked.
-	      </para>
-	    </listitem>
+ 
 	    <listitem>
 	      <para>
-		Click the <guilabel>HTML Template</guilabel> button in the 
-		<guilabel>Toolbar</guilabel> or select 		
+		Click the <guilabel>Template</guilabel> button in the 
+		toolbar or select 		
 		<menuchoice>
 		  <guimenu>
 		  Insert
@@ -1427,7 +1318,7 @@
           <menuchoice> <guimenu>Actions</guimenu>
           <guimenuitem>Forward</guimenuitem> </menuchoice>, or press
           <keycombo
-action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
+action="simul"><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>.  If
           you prefer to forward the message <link
           linkend="inline">inline</link>
           instead of attached, select <menuchoice>
@@ -1506,21 +1397,14 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
     </sect2>
   </sect1>
   <sect1 id="rsvp-stuff">
-    <title>RSVPs in Mail</title>
+    <title>Meetings Invitations by Mail</title>
     <para>
       If you create an event in the calendar component, you can then
       send invitations to the attendee list through the
-      Ximian Evolution email tool.  The
+      Evolution email tool.  The
       invitation card is sent as an attachment in iCal format.
     </para>
-    <para>
-      If you click on the attachment button and click the
-      <guimenuitem>View Inline</guimenuitem>, Ximian
-      Evolution will show you information about the
-      meeting, and let you respond to the meeting in several ways.
-      Select the response that you would like, and then click the
-      <guilabel>OK</guilabel> button.
-   </para>
+   
    <para>
   Your options are:
       <variablelist>
@@ -1574,7 +1458,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
   </sect1>
 
   <sect1 id="usage-mail-subscriptions">
-    <title>Subscription Management</title>
+    <title>IMAP Subscriptions Manager</title>
     <para>
       Since IMAP folders exist on the server, and opening them or
       checking them takes time, you need fine-grained control over the
@@ -1634,12 +1518,11 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 
   <sect1 id="encryption">
     <title>Encryption</title>
-    <sect2 id="encryption-whatis">
-      <title>What is Encryption?</title>
+   
       <para>
 	Encryption is an ancient method of keeping information safe
 	from prying eyes. Evolution helps
-	you you protect your privacy by using
+	you protect your privacy by using
 	gpg, an implementation of strong
 	<link linkend="public-key-encryption">Public Key
 	Encryption.</link>
@@ -1731,9 +1614,6 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	  </orderedlist>
 	</para>
       </tip>
-    </sect2>
-
-
 
     <sect2 id="encryption-keygen">
       <title>Making Encryption Keys</title>
@@ -1871,10 +1751,10 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
     <sect2 id="encrypt-getting-key">
       <title>Getting and Using Public Keys</title>
       <para>
-	To encrypt a message to your someone else you'll need to use
-	their public key in combination with your private key.
-	Evolution does that for you, but
-	you still need to get their key and add it to your keyring.
+	To send an encrypted message, you'll need to use
+	the recipient's public key in combination with your private key.
+	Evolution handles the encryption, but you need to get their public
+        key and add it to your keyring.
      </para>
      <para>
         To get public keys from a public key server, enter the
@@ -1904,8 +1784,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	</menuchoice>
 	and select the <guilabel>Mail Accounts</guilabel> button, then
 	select the account you want to use securely, and click the
-	<guilabel>Edit</guilabel> button. Then, select the
-	<guilabel>Security</guilabel> tab in the account dialog.   In the
+	<guilabel>Edit</guilabel> button. In the
 	<guilabel>Security</guilabel> tab is a section labeled
 	<guilabel>Pretty Good Privacy</guilabel>.  Enter your key ID
 	and click <guilabel>OK</guilabel>.  Your key is now
@@ -1915,22 +1794,14 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
       <note>
 	<title>What is my Key ID again?</title>
 	<para>
-	  Evolution requires that you know your key ID.  If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a console window.  Your key ID will be an eight character string with random numbers and letters.
+          Evolution requires that you know your key ID.  If you don't
+          remember it, you can find it by typing <command>gpg
+        --list-keys</command> in a console window.  Your key ID will be an
+        eight character string with random numbers and letters.
 	</para>
       </note>
     </sect2>
 
-    <sect2 id="encrypt-sending">
-      <title>Sending Encrypted Messages</title>
-      <para>
-	As you know, you can use encryption to hide the entire
-	message, or just to verify your signature. Once you've
-	generated your public and private keys, and have the public
-	keys of the people to whom you want to send mail, here's what
-	to do:
-      </para>
-    </sect2>
-    
     <sect2 id="sign-msg">
       <title>Signing a Message</title>
       <para>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 79549dd3a2..dbac4ccfdc 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -676,19 +676,18 @@ folders, you
 
       <sect2 id="fourth-step">
         <title>Importing Mail (Optional)</title>
-        <para>
-          If Novell Evolution finds mail or
+        <para>If Novell Evolution finds mail or
           address files from another application, it will offer to
-          import them. You should be aware of a few caveats before you
-          begin:
-        </para>
+          import them. For a full description of the import feature, see <xref
+	  linkend="importing-mail" />.
+      </para>
 
         <para>
           <application>Microsoft Outlook</application>, and versions of
           <application>Outlook Express</application> after
           version 4, use proprietary formats that Novell
           Evolution cannot read or import.  To import information, you
-          may wish to use the <application>Outport</application> under
+          may wish to use the <application>Outport</application> tool under
           Windows. See the instructions in <xref
           linkend="outlook-migration-mail" />.
         </para>
@@ -725,109 +724,6 @@ folders, you
     </sect2>
 
 
-    <sect2 id="importing-mail-from-clients">
-      <title>Importing Data from Other Mail Clients</title>
-      <para>
-        If you have mail in another mail client that was not detected by
-        the automatic import tool, you can still keep your old
-        mail by using the <guilabel>Import</guilabel> tool after you
-      have finished setting up your account. Mail import is only
-      relevant for POP mail accounts and for some local contact and
-      calendar information; if you used IMAP, Exchange, or GroupWise
-      before you switched to Evolution, you can skip this step entirely.
-    </para>
-    <para>
-      You will need to know what kind of file your old mail client uses,
-      and you will need to have access to those files. Evolution can
-      import the following types of files:
-          <variablelist>
-           <varlistentry>
-	    <term>VCard (.vcf, .gcrd):</term>
-	    <listitem>
-	      <para>The contact format used by the GNOME, KDE, and
-	         many other contact management applications. You
-	         should be able to export to VCard format from any
-                 address book or contact application. Failing that, export to CSV
-                format and use the <command>csv2vcard</command>
-              utility before importing.</para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Microsoft Outlook Express 4 (.mbx):</term>
-	    <listitem>
-	      <para>
-                Email file format used by Microsoft
-                <application>Outlook Express 4</application>. For
-                other versions of Microsoft Outlook and Outlook
-                Express, see the workaround described in the note
-                below.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>MBox (mbox):</term>
-	    <listitem>
-	      <para>
-	       The email box format used by Mozilla, Netscape,
-	       Novell Evolution, Eudora, and many other email clients.
-  	     </para>
-	    </listitem>
-	  </varlistentry>
-       </variablelist>
-     </para>
-     <para>
-     To import data from another application:
-	<orderedlist numeration="arabic">
-          <listitem>
-	    <para>
-              Open the mail importer tool by selecting
-	      <menuchoice>
-		<guimenu>File</guimenu>
-		<guimenuitem>Import</guimenuitem>
-	      </menuchoice>
-	      or pressing
-	      <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>I</keycap>
-	      </keycombo>. 
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>Next</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select <guilabel>Import a Single File</guilabel>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>Browse</guilabel> and select the file
-              you would like to import. Many mail clients store mail
-            in
-            <filename>~/mbox</filename> or <filename
-            class="directory">~/Maildir</filename>. <application>KMail</application>
-            uses the <filename>~/Mail</filename> directory.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When prompted for an import destination, choose
-	      a folder.  You can also create a new folder and
-              import to that.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-      You will need to repeat this process for each mail folder
-      you wish to import, so it can be slightly tedious.
-      </para>
-    </sect2>
   </sect1>
   
   <sect1 id="ui-intro">