remove old graphic files help/C/evolution-1.5.xml updated style notes,

2004-01-07 Aaron Weber <aaron@ximian.com>
	*  help/C/Makefile.am: remove old graphic files
	* help/C/evolution-1.5.xml  updated style notes, date, version
	* help/C/apx-authors.xml: fix <application> usage
	* help/C/apx-gloss.xml: fix <application> and <guibutton> usage
	* help/C/config-prefs.xml:  same
	* help/C/config-sync.xml:  same
	* help/C/menuref.xml:  same
	* help/C/usage-calendar.xml:  same
	* help/C/usage-contact.xml:  same
	* help/C/usage-exchange.xml:  same
	* help/C/usage-mail-org.xml:  same
	* help/C/usage-mail.xml:  same
	* help/C/usage-print.xml:  same
	* help/C/usage-sync.xml :  same
	* help/C/usage-mainwindow.xml same, plus
	* help/C/preface.xml same, plus removed Summary
	* help/C/topic.dat Remove Summary
	* help/C/usage-exec-summary.xml:  Remove summary
	* help/C/figures/folder-bar.png: delete
	* help/C/figures/summary.png: delete

svn path=/trunk/; revision=24098

20 files changed, 861 insertions, 1126 deletions

diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 3bddfc7991..b048eeeafc 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -9,7 +9,6 @@ figs = \
 	figures/exchange-receive.png		\
 	figures/exchange-delegation.png		\
 	figures/filter-new-fig.png		\
-	figures/folder-bar.png			\
 	figures/full-1.png			\
 	figures/full-2.png			\
 	figures/full-3.png			\
diff --git a/help/C/apx-authors.xml b/help/C/apx-authors.xml
index 24856e2fc3..3c20953afc 100644
--- a/help/C/apx-authors.xml
+++ b/help/C/apx-authors.xml
@@ -1,18 +1,18 @@
   <appendix id="authors">
     <title>Authors</title>
      <para>
-      <application>Evolution</application> was written by the Ximian
+      Evolution was written by the Ximian
       Evolution team and numerous other dedicated GNOME programmers.
       You can see their names by selecting <menuchoice>
       <guimenu>Help</guimenu> <guimenuitem>About</guimenuitem>
       </menuchoice> from any Evolution window.
      </para>
     <para>
-      The <application>Evolution</application> code owes a great debt
+      The Evolution code owes a great debt
        to the <application>GNOME-pim</application> and
        <application>GNOME-Calendar</application> applications, and to
        <application>KHTMLW</application>.  The developers of
-       <application>Evolution</application> acknowledge the efforts
+       Evolution acknowledge the efforts
        and contributions of all who worked on those projects.
     </para>
 
@@ -25,8 +25,8 @@
 
    <para>
       For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.ximian.com/products/ximian_evolution/"
+      Evolution <ulink
+      url="http://www.ximian.com/products/evolution/"
       type="http">Web page</ulink>.  Please send all comments,
       suggestions, and bug reports to the <ulink
       url="http://bugzilla.ximian.com" type="http">Ximian bug tracking
diff --git a/help/C/apx-gloss.xml b/help/C/apx-gloss.xml
index d4f12e1a4c..e2c41a38d3 100644
--- a/help/C/apx-gloss.xml
+++ b/help/C/apx-gloss.xml
@@ -1,3 +1,216 @@
+<appendix id="outlook-migration">
+  <title>Outlook to Evolution Migration</title>
+  <para>If you are using Microsoft Outlook, but not Microsoft Exchange,
+    this section will help you switch to Evolution.</para>
+
+  <sect1 id="outlook-migration-mail">
+    <title>Migrating Local Outlook Mail Folders</title>
+    <para>Exchange and IMAP mail is stored on the server, so you do not
+      need to migrate it to your Linux partition. However, if you have
+      stored mail on your computer, you may wish to make it accessible to
+      Evolution.</para>
+    <para>First, while using Windows, prepare your messages for
+      import:</para>
+
+    <orderedlist>
+
+      <listitem><para>Clean up your mail: Delete messages and folders you
+          do not need, and select <menuchoice>
+          <guimenu>File</guimenu>
+          <guisubmenu>Folders</guisubmenu>
+          <guisubmenu>Properties</guisubmenu>
+          <guisubmenu>Advanced</guisubmenu>
+          <guimenuitem>Compact</guimenuitem>
+        </menuchoice> to erase old, deleted messages from your PST
+        file.</para></listitem>
+
+    <listitem>
+      <para>If you nest your folders one inside another, you may wish to
+        rename subfolders so that you can tell which folder they
+        belong to. You will have to re-nest them after you load them
+        into Evolution.</para>
+    </listitem>
+
+      <listitem><para>Import the files into Mozilla Mail (or
+          another mailer, such as Netscape or Eudora, that uses the
+          standard mbox format). Linux mailers cannot do this task,
+          because it requires a library available only under
+          Windows. In Mozilla, import by selecting
+          <menuchoice><guimenu>Window</guimenu> <guisubmenu>Mail &amp;
+          Newsgroups</guisubmenu> <guisubmenu>Tools</guisubmenu>
+          <guimenuitem>Import</guimenuitem> </menuchoice>.</para></listitem>
+
+      <listitem>
+        <para>Mozilla will create a set of files in the directory
+<filename>Windows\Application_Data\Mozilla\Profiles\(User
+Name)\(Random Letters)\Mail\Local Folders\Outlook
+Mail\</filename>. The data files are those that have no
+file extension.</para>
+
+        <para>If you are using Windows XP or Windows 2000, your
+          Windows hard drive is probably in the NTFS format,
+          which some Linux systems will not read without additional
+          software. You may find it simpler to copy the mail folders to a
+          different drive or to burn a CD.</para>
+      </listitem>
+    </orderedlist>
+    
+    <para>Now that you have your mail in a format Evolution can
+      understand, reboot to Linux. Then:</para>
+      <orderedlist>
+        <listitem><para>Mount your Windows drive or the
+            disk where you saved the mail files.</para></listitem>
+        
+        <listitem><para>Copy all the mail files into your home directory or
+            another convenient place.</para></listitem>
+        
+        <listitem><para>Start Evolution.</para></listitem>
+
+        <listitem><para>
+            Press
+            <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap>
+            <keycap>F</keycap></keycombo> or select <menuchoice>
+            <guimenu>File</guimenu><guisubmenu>New</guisubmenu>
+            <guimenuitem>Folder</guimenuitem></menuchoice> to create
+            the folders you want. This is where your previous
+            organization pays off.
+          </para></listitem>
+      </orderedlist>
+
+      <para>Now you are ready to import the data files:</para>
+      <orderedlist>
+        <listitem>
+          <para>In Evolution, open the file import assistant by selecting
+            <menuchoice>
+              <guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.</para>
+        </listitem>
+
+        <listitem><para>
+            Click <guilabel>Next</guilabel>, and select
+          <guilabel>Import a single file</guilabel>. 
+          </para></listitem>
+        <listitem><para>
+             Leave the file
+            type as <guilabel>automatic</guilabel> and click
+            <guilabel>Browse</guilabel> to select the data
+            file. Remember, the data files are the files that have no
+            file extension.
+          </para></listitem>
+
+        <listitem>
+          <para>Select the folder where you want to put the imported data
+            file.</para>
+        </listitem>
+        <listitem>
+          <para>Repeat the import steps until you have imported all your
+            mail.</para>
+        </listitem>
+    </orderedlist>
+  </sect1>
+
+
+  <!--
+  <sect1 id="outlook-import-contacts">
+    <title>Importing Contacts from Outlook</title>
+
+    <para>
+       To import contacts, you will again have to use Mozilla as an
+      intermediary. This time, you will use Outlook to save your data
+      to a comma separated value (CSV) file, then import it to
+      Mozilla. From Mozilla, you will save it as an an LDIF file,
+      which Evolution will import.
+    </para>
+    <orderedlist>
+      <listitem>
+        <para>
+          In Windows, export each Outlook address book as .csv. It is
+          best to select the <guilabel>Export All Fields</guilabel> option,
+        rather than choose a subset of fields. Be aware that if you
+        have multiple address books, Outlook will suggest the same
+        name for each exported file, so be sure to choose a new name
+        each time you export a new address book.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+        </para>
+      </listitem>
+    </orderedlist>
+
+  </sect1>      
+Basically, the .cvs files will contain a top line with column titles
+(one per record field), and as many lines as there are contact entries
+(records). (Sorry, no idea about "groups" of contacts as subsets of an
+address book. Can you help?)
+
+A bit of massaging is useful, because while the Outlook set of columns is very comprehensive, other programs like Mozilla and Evolution have fewer and not entirely consistent, field names.
+
+For example,
+
+* Outlook offers 3 fields for email, Evolution just two, so I move the 3rd Outlook email address to the Notes field.
+
+* Outlook offers First, Middle, Last name fields, the others just First, Last, so I add the Middle Name to the First Name field.
+
+* Outlook offers three lines for the street address, instead of two (although the 3rd is rarely used, since most data end up in the City, State, ZIP/Postcode, Country fields).
+
+2) Switch to Linux. Start OpenOffice.org Calc. Open all the .csv files. A dialog will let you choose the right separators.
+
+3) Copy all records (lines) from all books (if you have multiple books) into the same file, using header lines to separate them. Thus you will massage all books in one shot. Save it.
+
+
+4.1) For names, add a few columns (by header, to write in the 1st line) FIRSTNAMECALC, FIRSTNAMENEW, SPACE.
+
+4.2) In the 1st record under SPACE insert a space; under FIRSTNAMECALC insert the formula:
+
+=CONCATENATE([cell under FIRSTNAME];[cell under SPACE];[cell under MIDDLE NAME])
+
+4.3) Copy these two cells all the way down to the last record. Check if first and middle names have been merged OK.
+
+4.4) Copy the whole FIRSTNAMECALC column.
+
+4.5) Paste-Special it over the FIRSTNAMENEW column, as "strings" - i.e. just the result, without formula.
+
+4.6) Rename this column to FIRSTANDMIDDLE, delete the FIRSTNAMECALC, FIRTSTNAME, MIDDLENAME, SPACE columns.
+
+If you care about those things (Continental Europe?), you may likewise concatenate more fields, as to have the FIRSTNAME column contain the whole sequence: Title First-Name Middle-Name (perhaps a space and comma) Suffix.
+
+
+5.1 - 5.6) For the 3rd email: first check if some exist. If they do, repear the procedure like for the names, until the 3rd email addresses are attached to the end of the Notes field.
+
+Likewise, depending on the data you actually have, you may want to plan to enter it into fields that may not be ideal, but at least similar.
+
+6) Seek & delete all empty columns, so at later steps you won't risk importing lots of nothing, and leave out lots of something.
+
+7) Save the file as many times as there are address books you want to have. Specify .csv, but select TAB as field separator and select double quote (") for text marker. 
+
+8) Open each file, delete the excess records (lines) but KEEP THE TOP LINE where the column names are, save it as before, and finally once the file is saved, CHANGE THE FILENAME ENDING TO .tab - Mozilla likes them that way. For some reason, it won't recognize a tab-separated file that is not named in .tab, as if Calc did not mark it the file-type properly. This is not exactly Unix-like, but that's how it works. It may be a quirk of my setup, as one can instruct a filemanager to recognize filetypes from the 3-letter subfixes, like in Windows.
+
+9) Start Mozilla, import all the first address book as "single file".
+
+10) Carefully select which destination field (left colum) will suck up which source fields (right column). You do that by moving the destination fields. IMPORTANT: least you go nuts, start from the top and work your way down. Punch OK. Peruse the results. Don't do more imports until satisfied. Field mapping is sticky, so you'll do it only once.
+
+11) Repeat for the other files.  (I still have some doubts: sometimes contacts end up in the main Contacts folder istead of the one I select.  I still need to investigate.  Hints anyone?)
+    -->
+
+
+</appendix>
+
 <glossary id="apx-gloss">
   
   <title>Glossary</title>
@@ -28,7 +241,7 @@
   <glossdef>
    <para>
      Pre-fetching procedure that allows
-     <application>Evolution</application> to refer to data quickly.
+     Evolution to refer to data quickly.
      It enables faster searches and decreases memory usage for
      data displays.
    </para>
@@ -82,7 +295,7 @@
   <glossterm>Evolution:</glossterm>
   <glossdef>
    <para>
-    <application>Evolution</application> is the <acronym> GNOME
+    Evolution is the <acronym> GNOME
     </acronym> groupware application.
    </para>
   </glossdef>
@@ -93,7 +306,7 @@
   <glossdef>
    <para>
     To run a program.  Any file that can be run is called an
-    executable.  <application>Evolution</application> can download
+    executable.  Evolution can download
     executable attachments, but before they can be run, the files must
     be marked as executable with a shell or file manager.  This
     security precaution prevents the automatic or accidental execution
@@ -134,7 +347,7 @@
   <glossterm>Filter:</glossterm>
   <glossdef>
    <para>
-    Within <application>Evolution</application>, a filter is a method
+    Within Evolution, a filter is a method
     of sorting mail automatically when it's downloaded.  You can create filters to perform
     one or more actions on a message that meets any (or all) of a wide
     range of criteria.
@@ -159,7 +372,7 @@
     Groupware is a term describing an application which helps groups
     of people work together.  Typically, a groupware application will
     have several productivity features built into one program,
-    including: email, calendar, and addressbook tools.
+    including: email, calendar, and address book tools.
    </para>
   </glossdef>
  </glossentry>
@@ -192,7 +405,7 @@
   <glossdef>
    <para>
     <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
+    Evolution uses to manage the calendar
     section.
    </para>
   </glossdef>
@@ -261,8 +474,7 @@
   <glossterm>Nautilus:</glossterm>
   <glossdef>
    <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym>.
+    <application>Nautilus</application> is the file manager for <acronym>GNOME</acronym>.
    </para>
   </glossdef>
  </glossentry>
@@ -372,7 +584,7 @@
     <glossdef>
       <para>
 	As its name implies, <application>sendmail</application> is a
-	program which sends mail.  <application>Evolution</application>
+	program which sends mail.  Evolution
 	can use it instead of <glossterm>SMTP:</glossterm>; some people
 	prefer it because it offers more flexibility, but is more
 	difficult to set up.
@@ -385,7 +597,7 @@
     <glossterm>Shortcut Bar:</glossterm>
     <glossdef>
       <para>
-	A portion of <application>Evolution</application> which offers
+	A portion of Evolution which offers
 	users fast access to the most frequently used portions of the
 	application.
       </para>
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 582cfbab57..0e874a15ef 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -5,7 +5,7 @@
         Perhaps your mail server has changed names.  Perhaps you've
         grown tired of a certain layout for your appointments.
         Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
+        Evolution settings.  This chapter
         will tell you how to do just that.
       </para>
       <para>
@@ -122,19 +122,6 @@
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term><guiicon>Summary Preferences</guiicon></term>
-	<listitem>
-	  <para>
-             Set the mail folders, news feeds, schedule summary
-             length, and weather locations to be displayed here. For
-             news feeds, enter the web address of any RDF
-            file. Summary customization is covered in <xref
-            linkend="customizing-summary" /> rather than in this
-            chapter.
-          </para>
-	</listitem>
-      </varlistentry>
 
       <varlistentry>
 	<term><guiicon>Out of Office</guiicon></term>
@@ -154,7 +141,7 @@
    <sect1 id="config-prefs-mail-identity">
       <title>Working with Mail Accounts</title> 
       <para>
-         <application>Ximian Evolution</application> allows you to
+         Ximian Evolution allows you to
          maintain multiple accounts, or identities.  This is useful
          want to keep personal and professional email separate, or if
          you wear several hats at work. When you are writing an email
@@ -164,23 +151,23 @@
        </para>
 
        <para>
-         Clicking <guibutton>Send/Receive</guibutton> will refresh any
+         Clicking <guilabel>Send/Receive</guilabel> will refresh any
          IMAP, <filename>mh</filename>, or
          <filename>mbox</filename> listings
          and check and download mail from all POP servers.  In other
-         words, <guibutton>Send/Receive</guibutton> gets your mail, no
+         words, <guilabel>Send/Receive</guilabel> gets your mail, no
          matter how many sources you have, or what types they are.  If
          you don't want to check mail for a given account, select it
          in the <guilabel>Mail Accounts</guilabel> tab and click the
-         <guibutton>Disable</guibutton> button.
+         <guilabel>Disable</guilabel> button.
        </para>
        
       <para>
-         To add a new account, simply click <guibutton>Add</guibutton>
+         To add a new account, simply click <guilabel>Add</guilabel>
          to open the mail configuration assistant. To alter an
          existing identity, select it in the
          <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton> to open the account editor
+         <guilabel>Edit</guilabel> to open the account editor
          dialog.
       </para>
 
@@ -211,8 +198,8 @@
              that already exist on your desktop computer.  If you use
              a server, it may permit or require you to use a Secure
              Socket Layer (SSL) connection.  To turn SSL connections
-             on, just click the <guibutton>Use Secure Connection
-             (SSL)</guibutton> button.
+             on, just click the <guilabel>Use Secure Connection
+             (SSL)</guilabel> button.
 
 <note id="config-arbitrary-port">
 <title>Specifying Port Numbers</title>
@@ -247,7 +234,7 @@ smtp.omniport.com:143
                    <itemizedlist>
 			  <listitem>
 			    <para>Checking for new mail: If you would
-	                     like <application>Evolution</application>
+	                     like Evolution
 	                     to check for new mail automatically,
 	                     check the box and select a frequency in
 	                     minutes.
@@ -344,14 +331,14 @@ smtp.omniport.com:143
          <itemizedlist>
 	  <listitem>
 	    <para><guilabel>Checking for new mail</guilabel>: If you would like
-	    <application>Evolution</application> to check for new mail
+	    Evolution to check for new mail
 	    automatically, check the box and select a frequency in
 	    minutes.  
             </para>
 	  </listitem>
 
 	  <listitem>
-	    <para>If you want <application>Evolution</application>
+	    <para>If you want Evolution
 	    to check for new messages in <emphasis>all</emphasis> your
 	    IMAP folders, make sure the <guilabel>Check for new
 	    messages in all folders</guilabel> box is selected.</para>
@@ -426,8 +413,8 @@ smtp.omniport.com:143
               Here, you can decide where this account will store the
               messages that it has sent, and the messages that you
               save as drafts. If you wish to revert to the "factory"
-              settings, click the <guibutton>Restore
-            Defaults</guibutton> button.
+              settings, click the <guilabel>Restore
+            Defaults</guilabel> button.
             </para>
             <para>
               If you wish to send someone a copy of every message from
@@ -466,8 +453,8 @@ smtp.omniport.com:143
       </para>
       <para>
         The <guilabel>Offline Folders</guilabel> are the ones which
-        will be cached when you activate the <guibutton>Go
-        Offline</guibutton> feature. 
+        will be cached when you activate the <guilabel>Go
+        Offline</guilabel> feature. 
       </para>
       <para>
         Select one or more folders of contacts for your
@@ -589,7 +576,7 @@ smtp.omniport.com:143
              patterns to confirm "live" addresses and invade your
              privacy. You may elect never to load images
              automatically, to load images only if the sender is in
-             your addressbook, or always load images.
+             your address book, or always load images.
            </para>
            <para>
              If you have chosen not to load images automatically, you
@@ -625,7 +612,7 @@ smtp.omniport.com:143
    <para>
      The <guilabel>Colors</guilabel> tab lets you select different
    color labels for individual messages. You can return to the default
-   settings by clicking the <guibutton>Restore Defaults</guibutton>
+   settings by clicking the <guilabel>Restore Defaults</guilabel>
    button.
  </para>
 </sect1>
@@ -714,7 +701,7 @@ smtp.omniport.com:143
       <menuchoice><guimenu>Tools</guimenu><guisubmenu>Settings</guisubmenu></menuchoice>,
       click on the <guiicon>Composer preferences</guiicon> icon, then
       select the <guilabel>Spell Checking</guilabel> tab and check the
-      <guibutton>Check spelling while i type</guibutton> box, and
+      <guilabel>Check spelling while i type</guilabel> box, and
       choose a color for your misspelled words.
   </para>
 </sect1>
@@ -727,14 +714,14 @@ smtp.omniport.com:143
             reason not to keep them right next to your mail.  When you
             first select the <guilabel>News Servers</guilabel> tab,
             you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
+            on the right: <guilabel>Add</guilabel>,
+            <guilabel>Edit</guilabel>, and
+            <guilabel>Delete</guilabel>.
           </para>
           <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
+            Click <guilabel>Add</guilabel> to add a news server; you
             will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
+            <guilabel>OK</guilabel>, and you're done.  You can have
             as many news servers as you like, of course.  News servers
             will appear next to your IMAP servers in the
             <interface>folder bar</interface>.
@@ -791,7 +778,7 @@ smtp.omniport.com:143
 	      <para>
                 When does your work day start, and when does it end?
 		In the day and week views,
-		<application>Evolution</application> displays all the
+		Evolution displays all the
 		hours in the range you select here, even if there are
 		no appointments for those times.  Of course, you can
 		still schedule an appointment outside of these hours,
@@ -864,7 +851,7 @@ smtp.omniport.com:143
 	    <listitem>
 	      <para>
 		If there is space,
-		<application>Evolution</application> will show the end
+		Evolution will show the end
 		times in the week and month views for each
 		appointment.
               </para>
@@ -913,11 +900,11 @@ smtp.omniport.com:143
   <sect1 id="config-prefs-contact">
     <title>Directory Server Settings</title>
     <para>
-        Addressbook settings are limited to the usage and
+        Address book settings are limited to the usage and
         configuration of directory servers (LDAP and
       Exchange). To learn how to set autocompletion options, see <xref
       linkend="config-prefs-folders" />.
-      Other addressbook controls are available in the addressbook
+      Other address book controls are available in the address book
       window itself.
     </para>
       
@@ -933,13 +920,13 @@ smtp.omniport.com:143
 		<guimenu>Tools</guimenu>
 		<guimenuitem>Settings</guimenuitem>
 	      </menuchoice>
-	      and click the <guibutton>Directory Servers</guibutton>
+	      and click the <guilabel>Directory Servers</guilabel>
 	      shortcut button.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click the <guibutton>Add</guibutton> button on the right
+	      Click the <guilabel>Add</guilabel> button on the right
 	      side to open a Directory Server addition assistant.
 	    </para>
 	  </listitem>
@@ -951,7 +938,7 @@ smtp.omniport.com:143
 		  <term>Server name</term>
 		  <listitem>
 		    <para>
-		      Address of the server where the addressbook is located.
+		      Address of the server where the address book is located.
 		    </para>
 		  </listitem>
 		</varlistentry>
@@ -971,7 +958,7 @@ smtp.omniport.com:143
 		  <listitem>
 		    <para>
 		      The internet port
-		      <application>Evolution</application> connects to
+		      Evolution connects to
 		      in order to access the LDAP database.  This is
 		      normally 389.
 		    </para>
@@ -1075,13 +1062,13 @@ smtp.omniport.com:143
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>OK</guibutton>.
+	      Click <guilabel>OK</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>OK</guibutton> to permanently make
-	      changes or <guibutton>Apply</guibutton> to temporarily
+	      Click <guilabel>OK</guilabel> to permanently make
+	      changes or <guilabel>Apply</guilabel> to temporarily
 	      set the changes.
 	    </para>
 	  </listitem>
diff --git a/help/C/config-sync.xml b/help/C/config-sync.xml
index 6a6503a670..6f6a7db9e7 100644
--- a/help/C/config-sync.xml
+++ b/help/C/config-sync.xml
@@ -6,7 +6,7 @@
         <simplelist>
           <member>
             Your computer needs to recognize and access your handheld.
-            At this time, <application>Ximian Evolution</application> only
+            At this time, Ximian Evolution only
             supports Palm-OS devices like the Palm Pilot and the
             Handspring Visor.
           </member>
@@ -19,8 +19,8 @@
 
     <para>
        If you haven't used a handheld device with your computer
-       before, you'll need to run the GNOME <application>Control
-       Center</application> by selecting
+       before, you'll need to run the GNOME Control
+       Center by selecting
        <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>,
        and make sure that <application>Pilot Link</application> is
        properly configured. You will need to make sure that you have
@@ -36,16 +36,16 @@
         linkend="conduit">conduits</glossterm> you want under the
         <guilabel>Pilot Conduits</guilabel> section of the Control
         Center.  You may use conduits to synchronize data with several
-        applications; the <application>Ximian Evolution</application>
+        applications; the Ximian Evolution
         conduits are labeled <guilabel>EAddress</guilabel>, for the
-        contacts in your addressbook, <guilabel>ECalendar</guilabel>,
+        contacts in your address book, <guilabel>ECalendar</guilabel>,
         for your calendar, and <guilabel>ETodo</guilabel>, for your
         task list.
     </para>
    <para>
       To enable a conduit, click the
-        <guibutton>Enable</guibutton> to enable it, and click
-        <guibutton>Settings</guibutton> to change what it will do when
+        <guilabel>Enable</guilabel> to enable it, and click
+        <guilabel>Settings</guilabel> to change what it will do when
         activated.  Your options may vary depending on the conduit,
         but typically they will be:
 
diff --git a/help/C/evolution-1.5.xml b/help/C/evolution-1.5.xml
index 654a177da1..f2eb2bc621 100644
--- a/help/C/evolution-1.5.xml
+++ b/help/C/evolution-1.5.xml
@@ -8,7 +8,6 @@
 <!ENTITY GPL SYSTEM "apx-gpl.xml">
 <!ENTITY PREFACE SYSTEM "preface.xml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.xml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.xml">
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.xml">
 <!ENTITY USAGE-MAIL-ORG SYSTEM "usage-mail-org.xml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.xml">
@@ -24,15 +23,23 @@
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.xml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.xml">
 
-<!ENTITY appversion "1.4">
-<!ENTITY docversion "1.4">
-<!ENTITY pubdate "May, 2003">
+<!ENTITY appversion "1.5">
+<!ENTITY docversion "1.5">
+<!ENTITY pubdate "January, 2004">
 
 ]>
 
 <!-- Almost every chapter is an entity.  Files, Chapter id's, and
 entity names correspond.  APX is for appendix.  -->
 
+<!-- STYLE RULES: Use "guilabel" instead of "guibutton everywhere. -->
+<!-- "Address Book" is two words. -->
+<!-- The "application" tag is not used around "Evolution." -->
+<!-- filenames use  command tags so they appear in the same font as commands -->
+<!-- there is one bar and it is the Shortcut Bar. The folder bar is dead. -->
+
+<!-- FIXME, TODO: Expand spam checking doc, update security docs   take new screenshots. -->
+
 <book id="index">
   <bookinfo>
     <title>A User's Guide to Ximian Evolution 1.4</title>
@@ -55,8 +62,7 @@ entity names correspond.  APX is for appendix.  -->
 
     <legalnotice id="legalnotice">
       <para>
-         Please note that legal and licensing information is in <xref
-         linkend="preface" /> due to formatting issues with its
+         Please note that legal and licensing information is in <xref linkend="preface" /> due to formatting issues with its
          previous location.
        </para>
     </legalnotice>
@@ -73,8 +79,8 @@ entity names correspond.  APX is for appendix.  -->
     <title>Getting Started with Ximian Evolution</title>
      <partintro>
       <para>
-        Part one of the <application>Ximian Evolution</application> manual
-        describes how to use <application>Ximian Evolution</application> for
+        Part one of the Ximian Evolution manual
+        describes how to use Ximian Evolution for
         email, contact management, and appointment and task
         scheduling.  You'll find as you go along that there's more
         than one way to do things, and you can pick whichever method
@@ -83,7 +89,6 @@ entity names correspond.  APX is for appendix.  -->
     </partintro>
 
     &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
     &USAGE-MAIL;
     &USAGE-MAIL-ORG;
     &USAGE-CONTACT;
@@ -96,12 +101,12 @@ entity names correspond.  APX is for appendix.  -->
   <title>Configuring and Managing Ximian Evolution</title>
     <partintro>
       <para>
-        <application>Ximian Evolution</application> is highly
+        Ximian Evolution is highly
         configurable.  Usually, when developers say that, they mean
         that they didn't test it out thoroughly and have left it to
         other programmers to "configure" themselves a working
-        system. In the case of <application>Ximian
-        Evolution</application>, "configurable" means that, while you
+        system. In the case of Ximian
+        Evolution, "configurable" means that, while you
         can expect the program to work perfectly well with the default
         settings, it's also easy to alter its behavior in a wide
         variety of ways, so that it fits your needs exactly.  This
diff --git a/help/C/figures/folder-bar.png b/help/C/figures/folder-bar.png
deleted file mode 100644
index c2cabe61fa..0000000000
--- a/help/C/figures/folder-bar.png
+++ /dev/null
diff --git a/help/C/figures/summary.png b/help/C/figures/summary.png
deleted file mode 100644
index 03781dc548..0000000000
--- a/help/C/figures/summary.png
+++ /dev/null
diff --git a/help/C/menuref.xml b/help/C/menuref.xml
index c9365a94e0..86f687383b 100644
--- a/help/C/menuref.xml
+++ b/help/C/menuref.xml
@@ -8,7 +8,7 @@
       You might want to copy this section and tape it to the wall
       next to your computer: it's a very short summary of most of
       the things you'll want to do with
-      <application>Ximian Evolution</application>.
+      Ximian Evolution.
    </para>
 
 
@@ -24,10 +24,10 @@
 	      <para>
                 Press <keycombo action="simul"> <keycap>Ctrl</keycap>
 		  <keycap>N</keycap> </keycombo> to open a new item
-		  for whatever part of <application>Ximian
-		  Evolution</application> you're working on. In mail,
+		  for whatever part of Ximian
+		  Evolution you're working on. In mail,
 		  that means you'll create a new message. If you're
-		  looking at your addressbook, <keycombo
+		  looking at your address book, <keycombo
 		  action="simul"> <keycap>Ctrl</keycap>
 		  <keycap>N</keycap> </keycombo> creates a new contact
 		  card, and in the calendar, a new appointment.
@@ -151,7 +151,7 @@
 	    <listitem>
 	      <para>
                 Press <keycap>F9</keycap>, click the
-                <guibutton>Send/Receive</guibutton> button in the
+                <guilabel>Send/Receive</guilabel> button in the
                 toolbar, or choose
                 <menuchoice><guimenu>Actions</guimenu> 
                  <guimenuitem>Send/Receive</guimenuitem></menuchoice>.
@@ -185,7 +185,7 @@
 	    <listitem>
 	      <para>
                 To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
+                click <guilabel>Reply</guilabel> in the
                 toolbar, or press
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
@@ -194,8 +194,8 @@
                 </para>
 	      <para>
                 To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
+                recipients of the message, click <guilabel>Reply to
+                All</guilabel> or select the message and press
                 <keycombo action="simul">
 		  <keycap>Shift</keycap>
 		  <keycap>Ctrl</keycap>
@@ -210,7 +210,7 @@
 	    <listitem>
 	      <para>
                 Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
+                and click <guilabel>Forward</guilabel> in the
                 toolbar, or press
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
@@ -320,9 +320,9 @@
         </para>
   </sect1>
     <sect1 id="quickref-contact">
-        <title>Addressbook</title>
+        <title>Address Book</title>
         <para>
-	Here are shortcuts for the most frequent addressbook actions:
+	Here are shortcuts for the most frequent address book actions:
         <variablelist>
 	  <varlistentry>
 	    <term>Edit a Contact:</term>
@@ -353,7 +353,7 @@
 	    <listitem>
 	      <para>
 		Right click on a contact and click <guilabel>Delete</guilabel>
-		or select a contact and press the <guibutton>Delete</guibutton>
+		or select a contact and press the <guilabel>Delete</guilabel>
 		on the toolbar.
 	      </para>
 	    </listitem>
@@ -394,4 +394,5 @@
 	</variablelist>
       </para>
   </sect1>
-</appendix>
\ No newline at end of file
+</appendix>
+
diff --git a/help/C/preface.xml b/help/C/preface.xml
index 2d49b50e26..e6f54f60b5 100644
--- a/help/C/preface.xml
+++ b/help/C/preface.xml
@@ -6,12 +6,12 @@
         This book is divided into two parts, with several
         appendices. The first part is a <link linkend="usage">guided
         tour</link>, which will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
+        Evolution.  If you are new to
+        Evolution or to groupware in
         general, this section is for you. The second section, covering
         <link linkend="config">configuration</link>, is targeted at
         more advanced users, but anyone who wants to change the way
-        <application>Evolution</application> looks or acts can benefit
+        Evolution looks or acts can benefit
         from reading it.  
       </para>
       </sect1>
@@ -21,9 +21,7 @@
 	<para>
           In this book, we'll mark some words with special typography:
           <simplelist>
-	    <member><application>Applications</application></member>
 	    <member><command>Commands</command> you type at the command line</member>
-	    <member><guilabel>Labels</guilabel> for buttons and other portions of the graphical interface</member>
 
             <member> Menu selections look like this:
                        <menuchoice>
@@ -32,11 +30,10 @@
                           <guimenuitem>Menu Item</guimenuitem>
                      </menuchoice>
             </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-	  <member><glossterm linkend="apx-gloss">Words</glossterm>
+	    <member><guilabel>Buttons and item labels</guilabel> in the user interface</member> 
+            <member><userinput>Anything you type in</userinput></member> 
+            <member><command>File names or text output from the computer</command></member>
+            <member><glossterm linkend="apx-gloss">Words</glossterm>
             that are defined in the <xref linkend="apx-gloss"/>.</member>
 	  </simplelist>
 </para>
@@ -93,11 +90,8 @@ Examples are also set off from the rest of the text.  They look like this:
     <sect1 id="whats-new-in-one-two">
       <title>What's New in Evolution &appversion;</title>
       <para>
-        If you're already familiar with Ximian Evolution 1.2, there
-        are a number of new features in this version. Most of the
-        changes, however, have been made behind the scenes, as we
-        moved to the GNOME 2 platform. Ximian Connector for Microsoft
-        Exchange also has new features, described in <xref linkend="new-in-connector" />.
+        Even if you're already familiar with earlier versions,
+        Evolution &appversion; has a lot of new features to offer. 
         You can find a complete list of bugs fixed and features added
         in the Evolution release notes at the <ulink
         url="http://developer.ximian.com">Ximian Developer
@@ -105,7 +99,7 @@ Examples are also set off from the rest of the text.  They look like this:
     </para>
         <variablelist>
 	  <varlistentry>
-	    <term>Better Fonts</term>
+	    <term>Junk Mail (Spam) Filtering</term>
 	    <listitem>
 	      <para>
                 Ximian Evolution &appversion; uses the same font
@@ -116,34 +110,54 @@ Examples are also set off from the rest of the text.  They look like this:
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Cleaner Shutdowns</term>
+	    <term>GroupWise Connectivity with no Additional Software</term>
 	    <listitem>
 	      <para>
-                We have fixed several bugs that caused Evolution to
-                continue to occupy system resources when it was not
-                running.
+                Now you can access GroupWise servers as well as IMAP
+                and POP mail servers, with no additional installation
+                required. Connection to Microsoft Exchange 2000 and
+                2003 servers is possible with the Ximian Connector.
               </para>
 	    </listitem>
 	  </varlistentry>
 
 
 	  <varlistentry>
-	    <term>Mail Composer HTML Improvements</term>
+            <term>User Interface Updates</term>
 	    <listitem>
 	      <para>
-                 The message composer has continued to improve.
+                The shortcut bar has been replaced with small buttons
+                at the bottom of the folder bar. The folder bar now
+                only displays data for the current function, instead
+                of putting all data together in one tree.
               </para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>New Graphics and Icons</term>
+            <term>Security: S/MIME and Signatures</term>
 	    <listitem>
 	      <para>
-                We've added new graphics and icons.
+                Security with encryption and cryptographic signatures
+                has never been easier or stronger.
               </para>
 	    </listitem>
 	  </varlistentry>
+
+
+	  <varlistentry>
+            <term>Hiding the "Evolution" Directory</term>
+	    <listitem>
+	      <para>
+                The <command>~/evolution/</command>
+                directory has been moved to
+                <command>~/.evolution</command>, and therefore
+                normally tucked out of sight in most directory
+                listings.
+              </para>
+	    </listitem>
+	  </varlistentry>
+
 	</variablelist>
     </sect1>
 
@@ -159,7 +173,7 @@ Examples are also set off from the rest of the text.  They look like this:
           <listitem>
             <para>
               To create a backup of your Evolution data, copy the
-              <guilabel>~/evolution/local/</guilabel> directory to
+              <command>~/.evolution/</command> directory to
               your backup disk.  To access data you
               have backed up, use the <guilabel>Import</guilabel> tool to 
               restore individual files as needed.
@@ -173,7 +187,7 @@ Examples are also set off from the rest of the text.  They look like this:
             <para>
               To set the browser that opens when you click a link in
               an email, open the GNOME preferences tool
-              (<menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
+              (<menuchoice><guimenu>System</guimenu><guimenuitem>Personal Settings</guimenuitem></menuchoice>
             or <command>gnome-control-center</command>) and start the
             <guilabel>File Associations</guilabel> tool. There, look under
             <guilabel>Internet Services</guilabel>, select
@@ -192,7 +206,7 @@ Examples are also set off from the rest of the text.  They look like this:
           <listitem>
             <para>
               For GNOME desktops, you can set
-              <application>Evolution</application> to be the default
+              Evolution to be the default
               mail client, so that it opens when you click a mailto:
               link in web pages and help tools. To do that, open the
               GNOME preferences tool and start the <guilabel>File
@@ -200,7 +214,7 @@ Examples are also set off from the rest of the text.  They look like this:
               <guilabel>Internet Services</guilabel>, select
               <guilabel>Electronic mail transmission
               (mailto)</guilabel>, and select
-              <application>Evolution</application> from the drop-down
+              <guilabel>Evolution</guilabel> from the drop-down
               list.
             </para>
             <para>
diff --git a/help/C/topic.dat b/help/C/topic.dat
index cf9f0ec017..1cb3879b88 100644
--- a/help/C/topic.dat
+++ b/help/C/topic.dat
@@ -1,7 +1,6 @@
 index.html   Table of Contents
 introduction.html Introduction
 usage-mainwindow.html Getting Started
-usage-summary.html The Evolution Summary
 usage-mail.html Getting and Sending Email
 usage-contact.html Using the Contact Manager
 usage-calendar.html Managing Your Schedule
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index 88c2f05571..2f152a2320 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -49,17 +49,17 @@
       days that you wish to view in your calendar.
     </para>
     <para>
-       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
+       The <guilabel>Prev</guilabel> and <guilabel>Next</guilabel>
        buttons will move you forward and back in your calendar pages.
        If you're looking at only one day, you'll see tomorrow's page,
        or yesterday's.  If you're looking at your calendar by week or
        month, you'll move around by just that much.
        To come back to today's listing, click the
-        <guibutton>Today</guibutton> button in the toolbar.
+        <guilabel>Today</guilabel> button in the toolbar.
     </para>
     <para>
        To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
+       <guilabel>Go To</guilabel> and select the date in the dialog
        box that appears.
     </para>
 
@@ -86,7 +86,7 @@
 	  <guisubmenu>New</guisubmenu> 
 	  <guimenuitem>Appointment</guimenuitem>
 	</menuchoice>
-	or click the <guibutton>New Appointment</guibutton> button on the left end
+	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.
@@ -115,7 +115,7 @@
         multiple columns in the day view of the calendar.
       </para>
       <para>
-	<application>Evolution</application> supports the use of
+	Evolution supports the use of
 	timezones.  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:
@@ -132,14 +132,14 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click the <guibutton>Globe</guibutton> button in the
+	      Click the <guilabel>Globe</guilabel> button in the
 	      <guilabel>Time</guilabel> section, located in the
 	      <guilabel>General</guilabel> tab.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Each red dot represents a major city.  Click a dot and click <guibutton>OK</guibutton> to select your time zone.
+	      Each red dot represents a major city.  Click a dot and click <guilabel>OK</guilabel> to select your time zone.
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -158,9 +158,9 @@
        <title>Multiple Simultaneous Appointments</title>
          <para>
            If you create calendar appointments that overlap,
-           <application>Evolution</application> will display them side
+           Evolution will display them side
            by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
+           Evolution cannot help you do
            multiple things at once.
          </para>
       </note>
@@ -193,7 +193,7 @@
 	      <para>
 	        Select this if you would like to run a program as a
 	        reminder.  You can enter its name in the text field,
-	        or find it with the <guibutton>Browse</guibutton>
+	        or find it with the <guilabel>Browse</guilabel>
 	        button.
               </para>
 	    </listitem>
@@ -224,7 +224,7 @@
          higher level.
       </para>
       <para>
-	<application>Evolution</application> can handle free/busy
+	Evolution can handle free/busy
 	scheduling Using the Ximian Connector on a Microsoft Exchange
 	2000 server. For more information about Ximian Connector, see
 	<xref linkend="usage-exchange"/>.
@@ -235,7 +235,7 @@
 	<guilabel>Appointment Editor</guilabel>.
       </para>
       <para>
-        <application>Evolution</application> lets you categorize your
+        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.
@@ -245,7 +245,7 @@
       <title>Adding a New Appointment Category</title>
 	<para>
 	 You can add a new category to your category list by clicking on
-         <guibutton>Edit Master Category List</guibutton> and single-clicking
+         <guilabel>Edit Master Category List</guilabel> and single-clicking
 	 on <guilabel> Click here to add a category</guilabel>.
 	</para>
       </tip>
@@ -258,13 +258,13 @@
       </para>
 
       <para>
-	Clicking on the <guibutton>Categories</guibutton> button opens up the category
+	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 <guibutton>OK</guibutton> to
+	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 <guibutton>Categories...</guibutton>
+	listed in the text box to the right of the <guilabel>Categories...</guilabel>
 	button.
       </para>
 
@@ -292,7 +292,7 @@
     <sect2 id="usage-calendar-rsvp">
       <title>Sending an RSVP with the Calendar</title>
       <para>
-	<application>Evolution</application> can be used to schedule
+	Evolution can be used to schedule
 	group meetings and help you manage responses to meeting
 	requests.
       </para>
@@ -344,8 +344,8 @@
 	      Click the space labeled <guilabel>Click here to add an
 	      attendee</guilabel> to enter the names and email
 	      addresses of people you will invite, or click the
-	      <guibutton>Invite Others</guibutton> to select them from
-	      your addressbook.
+	      <guilabel>Invite Others</guilabel> to select them from
+	      your address book.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -382,7 +382,7 @@
 	    </para>
 	  </listitem>
 	</itemizedlist>
-	Click <guibutton>OK</guibutton> and an email will be sent to
+	Click <guilabel>OK</guilabel> and an email will be sent to
 	the organizer with your answer.  The event will also be added
 	to your calendar if you accept.
       </para>
@@ -420,7 +420,7 @@
 	Once you get a reply to your meeting invitation, you'll need
 	to view it inline in the email.  Click the attachment and
 	select <guimenuitem>View Inline</guimenuitem>.  At the bottom, you
-	can click <guibutton>OK</guibutton> to update your attendee
+	can click <guilabel>OK</guilabel> to update your attendee
 	list.
       </para>
     </sect2>
@@ -430,16 +430,16 @@
     <sect2 id="usage-calendar-apts-group">
       <title>Appointments for Groups</title>
       <para>
-	You can use <application>Evolution</application> to mark a
+	You can use Evolution to mark a
 	meeting request on another person's calendar.  To do it, click
-	<guibutton>New</guibutton> in the calendar toolbar, or select
+	<guilabel>New</guilabel> in the calendar toolbar, or select
 	<menuchoice> <guimenu>File</guimenu>
 	<guisubmenu>New</guisubmenu>
 	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
 	up the <interface>new appointment</interface> window.  Then
 	describe the appointment as you would any other. When you are
-	ready to send the invitation <guibutton>OK</guibutton>
-	<application>Evolution</application> will automatically send
+	ready to send the invitation <guilabel>OK</guilabel>
+	Evolution will automatically send
 	email to each person on the request list, notifying of the
 	time and date of the meeting you have requested with them.  In
 	addition, it will mark the appointment on your calendar and on
@@ -458,7 +458,7 @@
         When your meeting attendees get the email inviting them to the
         meeting, they'll be able to enter the information into their
         calendars and let you know if they'll be able to attend; if
-        they use <application>Ximian Evolution</application> or
+        they use Ximian Evolution or
         another iCal compliant mail client, they can do this with just
         one click. When you get a response from them, it will include
         an iCal attachment. Opening and accepting this attachment will
@@ -587,7 +587,7 @@
           Adjust the meeting time, either by dragging the meeting
           borders or by using the <guilabel>Autopick</guilabel>
           buttons to choose a time automatically, then click
-          <guibutton>Save and Close</guibutton>.  Attendees on an
+          <guilabel>Save and Close</guilabel>.  Attendees on an
           Exchange server will have the appointment updated
           automatically; others will receive email notification of any
           change in plans.
@@ -609,12 +609,12 @@
        The Task Pad, located in the lower right corner of the
        calendar, lets you keep a list of tasks separate from your
        calendar appointments.  You can use the list
-       in a larger window by choosing the <guibutton>Tasks</guibutton>
+       in a larger window by choosing the <guilabel>Tasks</guilabel>
        button in the shortcut bar or in the folder tree.
     </para>
     <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button in the toolbar.  <application>Evolution</application>
+       To record a new task, click the <guilabel>Add</guilabel>
+       button in the toolbar.  Evolution
        will pop up a small window with five items in it:
      
         <variablelist>
@@ -634,7 +634,7 @@
 	    <para>
 	      Decide when this item is
 	      due.  You can either type in a date and time, or select one from
-	      the <guibutton>Calendar</guibutton> and <guibutton>time</guibutton> drop-down menus.
+	      the <guilabel>Calendar</guilabel> and <guilabel>time</guilabel> drop-down menus.
           </para>
 	  </listitem>
 	</varlistentry>
@@ -673,13 +673,13 @@
        Once you've added a task to your to-do list, its summary
        appears in the <guilabel>Summary</guilabel> section of task
        list.  To view or edit a detailed description of an item,
-       double-click on it, or right click on it and select <guibutton>Open</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
+       double-click on it, or right click on it and select <guilabel>Open</guilabel>.  You can delete items by selecting
+       them and clicking on the <guilabel>Delete</guilabel> button.
     </para>
     <para>
       The list of tasks is sorted in a similar way to the list of
-      email messages in <application>Ximian Evolution
-      Mail</application>.  Click once on the message headers to change
+      email messages in Ximian Evolution
+      Mail.  Click once on the message headers to change
       the direction and type of sorting, or right-click to add or
       remove columns from the display.
     </para>
@@ -687,7 +687,7 @@
       <title>Folders for Your Tasks</title>
       <para>
 	Like any other component in
-	<application>Evolution</application>, you can create a folder
+	Evolution, you can create a folder
 	to help organize your tasks.  To do this:
 	<orderedlist numeration="arabic">
 	  <listitem>
@@ -697,12 +697,12 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Tasks</guibutton>.
+	      Click <guilabel>Tasks</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Right click on <guibutton>Tasks</guibutton>.
+	      Right click on <guilabel>Tasks</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -717,7 +717,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>OK</guibutton>
+	      Click <guilabel>OK</guilabel>
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -728,7 +728,7 @@
   <sect1 id="usage-calendar-multiple">
     <title>Multiple Calendars</title>
     <para>
-       <application>Evolution</application> permits you to have and
+       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.
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index 821b959c95..8f2464413c 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -6,10 +6,10 @@
   <title>Working with Your Contacts</title>
       <para>
         This chapter will show you how to use the
-        <application>Evolution</application> addressbook to organize
+        Evolution address book to organize
         any amount of contact information, share addresses over a
         network, and several ways to save time with everyday tasks. To
-        learn about configuring the addressbook, see <xref
+        learn about configuring the address book, see <xref
         linkend="config-prefs-contact"/>. You can import contacts from
         other contact management tools with the Import tool by
         selecting
@@ -18,15 +18,15 @@
       </para>
 
     <para>
-       The toolbar for the addressbook is quite simple.
+       The toolbar for the address book is quite simple.
        <itemizedlist>
 	<listitem><para>
-	  Click <guibutton>New Contact</guibutton> to create a new card, or double-click 
+	  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 <guibutton>New List</guibutton> to create a new card, or double-click 
+           Click <guilabel>New List</guilabel> to create a new card, or double-click 
            in a blank space in the contact list. 
 	</para></listitem>
 
@@ -60,7 +60,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    Press the <guibutton>Delete</guibutton> button.
+	    Press the <guilabel>Delete</guilabel> button.
 	  </para>
 	</listitem>
       </orderedlist>
@@ -69,7 +69,7 @@
        If you want to add or change cards, you'll use the contact
        editor.  To change a card that already exists, double click on
        it to open the contact editor window.  If you want to create a new
-       card, clicking the <guibutton>New</guibutton> button in the
+       card, clicking the <guilabel>New</guilabel> button in the
        toolbar will open the same window, with blank entry boxes for
        you to fill in.
     </para>
@@ -124,9 +124,9 @@
               <itemizedlist>
 		<listitem>
 		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
+                    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>
@@ -201,7 +201,7 @@
                 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, <application>Evolution</application> will store
+                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
@@ -254,7 +254,7 @@
   <sect1 id="contact-search">
     <title>Searching for Contacts</title>
     <para>
-      <application>Evolution</application> allows searching through contacts
+      Evolution allows searching through contacts
       quickly and easily.
     </para>
     <para>
@@ -301,30 +301,30 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    If you want to add more criteria, click the <guibutton>Add
-	    Criterion</guibutton> button.
+	    If you want to add more criteria, click the <guilabel>Add
+	    Criterion</guilabel> button.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Click <guibutton>Search</guibutton>.
+	    Click <guilabel>Search</guilabel>.
 	  </para>
 	</listitem>
       </orderedlist>
     </para>
     <para>
-      To show all your contacts, select <guibutton>Show All</guibutton> in the
+      To show all your contacts, select <guilabel>Show All</guilabel> in the
       <guilabel>Search Bar</guilabel> or search with an empty query.
     </para>
 
   </sect1>
 
   <sect1 id="usage-contact-organize">
-    <title>Organizing your Addressbook</title>
+    <title>Organizing your Address Book</title>
     <para>
-       Organizing your addressbook is a lot like organizing your
+       Organizing your address book is a lot like organizing your
        mail.  You can have folders and searches the same way you can
-       with mail, but the addressbook does not allow Virtual Folders.  It
+       with mail, but the address book does not allow Virtual Folders.  It
        does, however, allow each card to fall under several
        categories, and allow you to create your own categories.  To
        learn about categories, read <xref
@@ -333,11 +333,11 @@
 
 <!-- UNIMPLEMENTED FEATURE
     <para>
-      Another useful <application>Evolution</application> feature is
+      Another useful Evolution feature is
       its ability to recognize when people live or work together.  If
-      several people in your addressbook share an address, and you
+      several people in your address book share an address, and you
       change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
+      Evolution will ask you if you wish to
       change the address for all of them, or just for one.
     </para>
 -->
@@ -345,7 +345,7 @@
     <sect2 id="usage-contact-organize-group">
       <title>Groups of contacts</title>
       <para>
-         <application>Evolution</application> offers two ways for you
+         Evolution offers two ways for you
          to organize your cards.  The first way is to use folders;
          this works the same way mail folders do.  For more
          flexibility, you can also mark contacts as elements of
@@ -396,7 +396,7 @@
         </para>
 	<para>
            To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
+           <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>
@@ -406,7 +406,7 @@
 
            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 <guibutton>Categories</guibutton> and
+           text box, then click <guilabel>Categories</guilabel> and
            choose <guilabel>Add to Master List</guilabel> in the
            window that appears. 
          </para>
@@ -423,7 +423,7 @@
 	    <listitem>
 	      <para>
                 Open the list creation dialog box by clicking the
-                <guibutton>New List</guibutton> button or selecting
+                <guilabel>New List</guilabel> button or selecting
                  <menuchoice>
 		  <guimenu>
                      File
@@ -464,7 +464,7 @@
 	  </orderedlist>
         </para>
 	<para>
-           When you are done, click <guibutton>OK</guibutton>. The
+           When you are done, click <guilabel>OK</guilabel>. The
            list will appear as a contact card, which you can use as
            you would any other. That includes emailing the list to
            another person, and, of course, sending email to the list.
@@ -473,7 +473,7 @@
            To mail the list, open a new email and type the name you
            chose for the list. Ximian Evolution will address the
            message to the entire list when you send it. You can also
-           right-click on the list's address card in the Addressbook
+           right-click on the list's address card in the address book
            and select <guimenuitem>Send Message to List</guimenuitem>.
         </para>
         <para>
@@ -486,7 +486,7 @@
   </sect1>
   
   <sect1 id="usage-contact-sharing">
-    <title>LDAP: Shared Addressbooks on a Network</title>
+    <title>LDAP: Shared Address Books on a Network</title>
 
     <para>
       The <glossterm linkend="ldap">LDAP</glossterm> protocol was
@@ -520,7 +520,7 @@
           <listitem>
 	    <para>
               To prevent excess network traffic,
-              <application>Evolution</application> will not normally
+              Evolution will not normally
               load the contents of LDAP folders immediately upon
               opening.  You must click <guilabel>Display
               All</guilabel> before LDAP folder cards will be loaded
@@ -541,7 +541,7 @@
       <title>Configuring Evolution to use LDAP</title>
       <para>
 	For information about setting up
-	<application>Evolution</application> to use LDAP, please refer
+	Evolution to use LDAP, please refer
 	to <xref linkend="config-prefs-contact" />
       </para>
     </sect2>
@@ -554,7 +554,7 @@
       the mail or in a calendar entry, you can add it to an address
       card.  To do so, right click on any email address or email
       message, and select <guimenuitem>Add Sender to Address Book</guimenuitem> from the menu that appears.
-      <application> Evolution</application> can also add cards from a
+       Evolution can also add cards from a
       hand-held device during HotSync operation.  For more
       information about that, see <xref linkend="usage-sync"/>.
     </para>
@@ -562,16 +562,16 @@
   
 <!-- Unimplemented features:
       <para>
-         You can also use the addressbook to print postal addresses
+         You can also use the address book to print postal addresses
 	 on mailing labels.  Future versions of
-	 <application>Evolution</application> will allow you to you
+	 Evolution will allow you to you
 	 export a group of cards to a spreadsheet, database, or word
 	 processor so you can print address labels or prepare large
 	 mailings.
       </para>
   <para>
-    Need a map or directions? Click <guibutton>MapIt</guibutton> from
-  within the addressbook, and <application>Evolution</application>
+    Need a map or directions? Click <guilabel>MapIt</guilabel> from
+  within the address book, and Evolution
   will map the address for you online.
   </para>
   -->
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index 6c29418a2b..f21b34df06 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -31,7 +31,7 @@
 
   <para>
     Previous versions of Ximian Connector for Microsoft Exchange added
-    support for the <guibutton>Flag for Followup</guibutton> feature,
+    support for the <guilabel>Flag for Followup</guilabel> feature,
     public folders, delegation, direct booking, and more. For
     information on setting up delegation, see <xref
   linkend="exchange-delegate" />.
@@ -42,8 +42,8 @@
   <sect1 id="features">
     <title>Connector Features</title>
     <para>
-      In addition to the features listed above, <application>Ximian
-      Connector</application> supports the following basic 
+      In addition to the features listed above, Ximian
+      Connector supports the following basic 
       <application>Microsoft Exchange</application> features:
       <itemizedlist>
 	<listitem>
@@ -52,7 +52,7 @@
 	  </para>
 	  <variablelist>
 	    <varlistentry>
-	      <term>Remote <application>Exchange</application> Information Store</term>
+	      <term>Remote Exchange Information Store</term>
 	      <listitem>
 		<para>
 		  Allows you to access mail, address book (including
@@ -147,7 +147,7 @@
 	      <listitem>
 		<para>
 		  If you receive a VCard attachment and click
-		  <guibutton>Save in Address Book</guibutton>, it will
+		  <guilabel>Save in Address Book</guilabel>, it will
 		  be saved to your Exchange address book.
 		</para>
 	      </listitem>
@@ -191,7 +191,7 @@ There are, however, some features which are not available:
        Connector for Microsoft Exchange channel, select the Ximian
        Connector for Microsoft
        Exchange2000, and click the
-       <guibutton>Install</guibutton> button.  You can also install
+       <guilabel>Install</guilabel> button.  You can also install
        the Connector by downloading the individual packages from
        ftp.ximian.com if you wish.
    </para>
@@ -273,8 +273,8 @@ There are, however, some features which are not available:
             <para>
               If you receive your license key in Ximian Evolution, the
               simple assistant will start when you click the
-              license file attachment and choose <guibutton>Open in
-            Ximian Connector</guibutton>.
+              license file attachment and choose <guilabel>Open in
+            Ximian Connector</guilabel>.
           </para>
         </listitem>
 
@@ -307,7 +307,7 @@ There are, however, some features which are not available:
 	  <guimenu>Tools</guimenu>
 	  <guimenuitem>Mail Settings</guimenuitem>
 	  </menuchoice>
-          from any mail view. Then click the <guibutton>Add</guibutton>
+          from any mail view. Then click the <guilabel>Add</guilabel>
           button in the accounts list. The account creation assistant
           will guide you through the process, which is also described in
           <xref linkend="usage-mainwindow-starting"/>. If you're not
@@ -385,8 +385,8 @@ There are, however, some features which are not available:
 		  <listitem>
 		    <para>
                       Select the kind of authentication your network
-                      uses. You can click the <guibutton>Check for Supported
-                      Types</guibutton> button to see which kinds will work.
+                      uses. You can click the <guilabel>Check for Supported
+                      Types</guilabel> button to see which kinds will work.
                     </para>
 		  </listitem>
 
@@ -505,8 +505,8 @@ There are, however, some features which are not available:
 	  </varlistentry>
 	</variablelist>
 	<para>
-          You're done.  Click <guibutton>Finish</guibutton> and
-          <guibutton>OK</guibutton>, then quit
+          You're done.  Click <guilabel>Finish</guilabel> and
+          <guilabel>OK</guilabel>, then quit
           Evolution and start it again. Now
           you're ready to get to work on the Exchange server.
         </para>
@@ -520,7 +520,7 @@ There are, however, some features which are not available:
 	  <para>
 	    If you have an existing email account, and want to convert it
 	    to use for Exchange, select the account you want to convert
-	    and click the <guibutton>Edit</guibutton> button. You'll want
+	    and click the <guilabel>Edit</guilabel> button. You'll want
 	    to change settings in the following tabs of the account
 	    dialog:
 	  </para>
@@ -600,7 +600,7 @@ There are, however, some features which are not available:
 		       <listitem>
 			 <para>
 			   The Global Address List (GAL) is an
-			   addressbook for everyone represented in
+			   address book for everyone represented in
 			   your organization's Exchange deployment. To
 			   use the GAL, click the tab labeled
 			   <guilabel>Receiving Options</guilabel> and
@@ -669,7 +669,7 @@ There are, however, some features which are not available:
 	<para>
 
         Once you have made those changes, click the
-        <guibutton>OK</guibutton> button.
+        <guilabel>OK</guilabel> button.
       </para>
 	<para>
           Then, quit Evolution and start it
@@ -698,7 +698,7 @@ There are, however, some features which are not available:
       Click on any of the folder tree items to visit them; you may
       have to enter your server password.  You can now create contact
       cards, send and receive email as you would normally. If there
-      are items in your local calendar or addressbook that you'd like
+      are items in your local calendar or address book that you'd like
       to add to your Exchange stores, you
       can copy and paste them over, or just drag items from one folder
       to another as you would with two local stores.
@@ -757,7 +757,7 @@ There are, however, some features which are not available:
           <title>Delegating Access to Others</title>
         <para>
           To add someone to your list of delegates, click the
-          <guibutton>Add</guibutton> button and select them from the
+          <guilabel>Add</guilabel> button and select them from the
           Global Address List. When delegating you can grant different
           levels of access to different types of data. You may also
           decide whether the access you grant applies to items marked
@@ -851,8 +851,8 @@ There are, however, some features which are not available:
               <para>
                 Enter the email address of the user who
                 has delegated to you or click the
-                <guibutton>User</guibutton> button to select them from your
-                addressbook. 
+                <guilabel>User</guilabel> button to select them from your
+                address book. 
               </para>
             </listitem>
           
@@ -864,7 +864,7 @@ There are, however, some features which are not available:
 
             <listitem>
               <para>
-                Click <guibutton>OK</guibutton>.
+                Click <guilabel>OK</guilabel>.
               </para>
             </listitem>
           </orderedlist>
@@ -905,8 +905,8 @@ There are, however, some features which are not available:
           To create an <guilabel>Out of Office</guilabel> message,
         select <menuchoice> <guimenu>Tools</guimenu>
         <guimenuitem>Settings</guimenuitem>
-          </menuchoice> and then click the <guibutton>Out of
-          Office</guibutton> button. 
+          </menuchoice> and then click the <guilabel>Out of
+          Office</guilabel> button. 
         </para>
 
         <para>
@@ -968,7 +968,7 @@ There are, however, some features which are not available:
 	<listitem>
 	  <para> Add attendees, either by entering their email
             addresses into the list, or by clicking the
-            <guibutton>Invite Others</guibutton> button. If you choose
+            <guilabel>Invite Others</guilabel> button. If you choose
             to so, it's best to use the Global Address List (GAL).
             Choose the GAL from the drop-down list of address sources
             at the top of the dialog box.
diff --git a/help/C/usage-exec-summary.xml b/help/C/usage-exec-summary.xml
deleted file mode 100644
index 69eab4f91c..0000000000
--- a/help/C/usage-exec-summary.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-
-<chapter id="usage-summary">
-  <title>Getting Oriented with the Ximian Evolution Summary</title>
-  
-  <sect1 id="summary-intro">
-    <title>Using the Summary</title>
-    <para>
-      The Ximian Evolution Summary can show you what you need to know
-      quickly.  It will show you your tasks for that day, how many
-      emails are waiting for you, and much more.
-    </para>
-    <para>
-      To begin using your Summary, click on the <guilabel>Shortcut
-      Bar</guilabel> or <guilabel>Summary</guilabel> at the top of the
-      <guilabel>Folder Bar</guilabel>.  By default, you will see:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    Weather Reports
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    News feeds from the Internet
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Mail summary
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Appointments
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Tasks
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-  </sect1>
-  <sect1 id="customizing-summary">
-    <title>Customizing the Summary's Modules</title>
-    <para>
-      <application>Evolution's</application> modules can be customized
-      to suit your needs.  For example, you can choose which mail
-      boxes are summarized, and which news services appear.
-    </para>
-
-
-  <note id="summary-http-proxy">
-    <title>Using the Summary through an HTTP Proxy</title>
-    <para>
-      If you use an HTTP proxy, <application>Ximian
-    Evolution</application> must be able to find it through the
-    <systemitem>gnome-vfs</systemitem> subsystem before it can
-    access news and weather from the Internet.  This is also
-    the case if you wish to load remote images into HTML mail
-    message.  
-  </para>
-  <para>
-    You can find the proxy settings tool in the Control Center.
-  </para>
-</note>
-
-
-    <sect2 id="customizing-summary-weather">
-      <title>Customizing the Weather Summary</title>
-      <para>
-	To add a city to be displayed in the weather:
-	<orderedlist numeration="arabic">
-	  
-	  <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guilabel>Weather</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the city on the left hand column.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-        Below the list of cities, you can select the time, in seconds,
-        between updates, and whether you wish to see temperatures in Celsius
-        or Farenheit.
-      </para>
-
-    </sect2>
-    <sect2 id="customizing-feeds">
-      <title>Customizing Your News Feeds</title>
-      <para>
-	To customize your news feeds:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool. Then, choose the
-		<guilabel>News Feeds</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the left hand column, select the news feed to add to
-	      your display.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-        You can also add your own news feeds. Evolution will display
-        RDF formatted XML news feeds from the website of your
-        choice. For most sites, it's a file called "index.rdf."
-      </para>
-
-    </sect2>
-    <sect2 id="customizing-mail">
-      <title>Customizing Your Mail Summary</title>
-      <para>
-	To customize your mail summary:
-	<orderedlist numeration="arabic">
-        <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool.
-	    </para>
-	  </listitem>	
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Mail</guibutton> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              Expand the folder tree to the folders you wish to
-              display in the Summary.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the checkbox to the left of that folder.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="customizing-cal">
-      <title>Customizing Your Schedule Summary</title>
-      <para>
-	To customize your calendar summary:
-	<orderedlist numeration="arabic">
-	 <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Schedule</guibutton> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Choose whether you'd like appointments displayed for one
-	      day, five days, a week, or a month.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-            Choose whether you'd like to display all tasks, or just
-            the tasks due today.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
\ No newline at end of file
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index cf4860e649..0667ad08c3 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -5,28 +5,28 @@
       want to sort and organize them.  When you get a hundred a day
       and you want to refer to a message you received six weeks ago,
       you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Ximian Evolution</application> has the tools
+      Fortunately, Ximian Evolution has the tools
       to help you do it.
     </para>
 
   <sect1 id="importing-mail-and-settings">
     <title>Importing Your Old Email and Settings</title>
     <para>
-      <application>Evolution</application> allows you to import old
+      Evolution allows you to import old
       email and data so that you don't need to worry about losing your
       old information.
     </para>
     <sect2 id="importing-mail">
       <title>Importing Email and Other Data</title>
       <para>
-        <application>Ximian Evolution</application> can import the
+        Ximian Evolution can import the
         following types of files:
         <variablelist>
           <varlistentry>
             <term>VCard (.vcf, gcrd):</term>
             <listitem>
               <para>
-                The addressbook format used by the GNOME, KDE, and
+                The address book 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 application.
@@ -40,8 +40,8 @@
 	      <para>
 		A format for storing calendar files.  iCalendar is used by 
 		PalmOS based handhelds, Ximian
-                <application>Evolution</application>, and Microsoft
-		<application>Outlook</application>.
+                Evolution, and 
+		<application>Microsoft Outlook</application>.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -87,22 +87,22 @@
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Next</guibutton> after reading the Welcome screen.
+              Click <guilabel>Next</guilabel> after reading the Welcome screen.
             </para>
           </listitem>
           <listitem>
             <para>
-              Select <guibutton>Import a single file</guibutton>.
+              Select <guilabel>Import a single file</guilabel>.
             </para>
           </listitem>
           <listitem>
             <para>
-              Find the file that you wish to import into <application>Evolution</application>.
+              Find the file that you wish to import into Evolution.
             </para>
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Import</guibutton>
+              Click <guilabel>Import</guilabel>
             </para>
           </listitem>
         </orderedlist>
@@ -111,9 +111,9 @@
     <sect2 id="importing-preferences">
       <title>Importing Preferences</title>
       <para>
-        <application>Evolution</application> can import all your old
+        Evolution can import all your old
         mail, contacts, and other information from other applications,
-        making your transition to <application>Evolution</application>
+        making your transition to Evolution
         easy.
       </para>
       <para>
@@ -126,12 +126,12 @@
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Next</guibutton> after reading the Welcome screen.
+              Click <guilabel>Next</guilabel> after reading the Welcome screen.
             </para>
           </listitem>
           <listitem>
             <para>
-              Select <guibutton>Import data and settings from older programs</guibutton>.
+              Select <guilabel>Import data and settings from older programs</guilabel>.
             </para>
           </listitem>
           <listitem>
@@ -144,12 +144,12 @@
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Next</guibutton>
+              Click <guilabel>Next</guilabel>
             </para>
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Import</guibutton>
+              Click <guilabel>Import</guilabel>
             </para>
           </listitem>
         </orderedlist>
@@ -160,8 +160,8 @@
 	  <title>Microsoft Outlook and Outlook Express Users</title>
 	  <para>
 	    Microsoft Outlook, and versions of Outlook Express after
-	    version 4, use proprietary formats that <application>Ximian
-	      Evolution</application> cannot read or import.  For contacts,
+	    version 4, use proprietary formats that Ximian
+	      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:
 	    <orderedlist numeration="arabic">
@@ -177,13 +177,13 @@
 	      <listitem>
 		<para>
 		  Copy the files to the system or partition you use for
-		  <application>Ximian Evolution</application>.  
+		  Ximian Evolution.  
 		</para>
 	      </listitem>
 	      
 	      <listitem>
 		<para>
-		  Use the <application>Ximian Evolution</application> import
+		  Use the Ximian Evolution import
 		  tool to import the files.  There's more information about
 		  why this works, and how, at the Ximian support website.
 		</para>
@@ -198,7 +198,7 @@
 	    Before importing mail from Netscape, make sure you select
 	    <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
 		Folders</guimenuitem></menuchoice>. If you don't,
-	    <application>Ximian Evolution</application> will import and undelete
+	    Ximian Evolution will import and undelete
 	    the messages in your Trash folders.
 	  </para>
 	</note>     
@@ -318,6 +318,12 @@
         upcoming deadlines.
       </para>
 
+      <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>
+      </para>
+
       </sect2>
 
     </sect1>
@@ -325,7 +331,7 @@
     <sect1 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
       <para>
-	<application>Ximian Evolution</application> keeps mail, as well as
+	Ximian Evolution keeps mail, as well as
 	address cards and calendars, in folders.  You start out with a
 	few mail folders, such as <guilabel>Inbox</guilabel>,
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
@@ -333,15 +339,15 @@
 	selecting <guisubmenu>New</guisubmenu> and then
 	<guimenuitem>Folder</guimenuitem> from the
 	<guimenu>File</guimenu> menu.
-	<application>Ximian Evolution</application> will ask you for the name
+	Ximian Evolution will ask you for the name
 	and the type of the folder, and will provide you with a folder
 	tree so you can pick where it goes.
       </para>
       <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
+        When you click <guilabel>OK</guilabel>, your new folder will
 	appear in the <interface>folder view</interface>.  You can
 	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the
+	using the <guilabel>Move</guilabel> button in the
 	toolbar. If you want to move several messages at once, click
 	on the ones you want to move while holding down the
 	<keycap>Ctrl</keycap> key, or use <keycap>Shift</keycap> to
@@ -369,7 +375,7 @@
     <title>Searching for Messages</title>
     <para>
       Most mail clients can search through your messages for you,
-      but <application>Ximian Evolution</application> does it faster. You
+      but Ximian Evolution does it faster. You
       can search through just the message subjects, just the message
       body, or both body and subject.
     </para>
@@ -429,7 +435,7 @@
       </variablelist>
       
       When you've entered your search phrase, press
-      <keycap>Enter</keycap>.  <application>Ximian Evolution</application>
+      <keycap>Enter</keycap>.  Ximian Evolution
       will show your search results in the message list.
     </para>
     
@@ -458,7 +464,7 @@
         search criteria (each with the same options you saw in the
         regular search bar), and decide whether you want to find
         messages that match all of them, or messages that match even
-        one. Then, click <guibutton>Search</guibutton> to go and find
+        one. Then, click <guilabel>Search</guilabel> to go and find
         those messages.
      </para>
 
@@ -469,6 +475,36 @@
 
     </sect1>
 
+    <sect1 id="usage-mail-organize-spam">
+      <title>Stopping Junk Mail (Spam)</title>
+      <para>
+        Evolution can check for junk mail for you. When the software
+        detects mail that appears to be junk mail, it will flag it and
+        hide it from your view. Messages that are flagged as junk mail
+        are displayed only in the <guilabel>Junk</guilabel> folder.
+      </para>
+      <para>
+        The junk mail filter can "learn" which kinds of mail are
+        legitimate and which are not if you train it. When you first start using
+        junk mail blocking, check the <guilabel>Junk</guilabel> folder
+        to be sure that legitimate mail doesn't get flagged as junk
+        mail. If good mail, also known as "ham," is mis-flagged, remove
+        it from the <guilabel>Junk</guilabel> folder by right-clicking
+        on it and selecting <guilabel>Mark as Not Junk</guilabel>. If
+        Evolution misses junk mail, right-click it and select
+        <guilabel>Mark as Junk</guilabel>. When you correct it, the
+        filter will be able to recognize similar messages in the future,
+        and will become more accurate as time goes on.
+      </para>
+      <para>
+        To change your junk mail filtering preferences, select <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Settings</guimenuitem>
+    </menuchoice> and click the <guilabel>Mail Preferences</guilabel>
+    button. In the mail preferences tool, select the
+    <guilabel>Junk</guilabel> tab. <!-- FIXME: expand when available -->
+      </para>
+    </sect1>
+
+
     <sect1 id="usage-mail-organize-filters">
       <title>Create Rules to Automatically Organize Mail</title>
       <para>
@@ -511,7 +547,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press the <guibutton>Add</guibutton> button.
+	      Press the <guilabel>Add</guilabel> button.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -567,7 +603,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define filters in <application>Ximian Evolution</application>.
+		    define filters in Ximian Evolution.
 		  </para>
 
 <para>
@@ -590,8 +626,8 @@
          <para>
             If you have several filters that match a single message,
             they will all be applied to the message, in order, unless
-            one of the filters has the action <guibutton>Stop
-            Processing</guibutton>. If you use that action in a
+            one of the filters has the action <guilabel>Stop
+            Processing</guilabel>. If you use that action in a
             filter, the messages that it affects will not be touched
             by other filters.
          </para>
@@ -599,8 +635,8 @@
            When you first open the filters dialog, you are shown the
            list of filters sorted in the order in which they will be
            applied. You can move them up and down in the priority list
-           by clicking the <guibutton>Up</guibutton> and
-           <guibutton>Down</guibutton> buttons.
+           by clicking the <guilabel>Up</guilabel> and
+           <guilabel>Down</guilabel> buttons.
          </para>
       </note>
 </para>
@@ -700,8 +736,8 @@
 	  <listitem>
 	    <para>
 	      Select the criterion for the condition.   If you want multiple
-	      criteria for this filter, press <guibutton>Add
-		criterion</guibutton> and repeat the previous step.
+	      criteria for this filter, press <guilabel>Add
+		criterion</guilabel> and repeat the previous step.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -710,16 +746,16 @@
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
-		    Move to Folder - If you select this item, <application>Ximian Evolution</application>
+		    Move to Folder - If you select this item, Ximian Evolution
 		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
+		    <guilabel>&lt;click here to select a folder&gt;</guilabel> button
 		    to select a folder. 
 		  </para></listitem>
 
 		<listitem><para>
-		    Copy to Folder - If you select this item, <application>Ximian Evolution</application>
+		    Copy to Folder - If you select this item, Ximian Evolution
 		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
+		    <guilabel>&lt;click here to select a folder&gt;</guilabel> button
 		    to select a folder. 
 		  </para></listitem>
 		
@@ -741,7 +777,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Assign Color - Select this item, and <application>Ximian Evolution</application>
+		    Assign Color - Select this item, and Ximian Evolution
 		    will mark the message with whatever color you please.
 		  </para></listitem>
 		
@@ -757,12 +793,12 @@
 	  <listitem>
 	    <para>
 	      Set Status - If you want to add multiple actions for this filter, press
-	      <guibutton>Add action</guibutton> and repeat the previous step.
+	      <guilabel>Add action</guilabel> and repeat the previous step.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton>.
+	      Press <guilabel>OK</guilabel>.
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -780,171 +816,6 @@
          </para>
       </note>
 
-      <example id="filter-example">
-         <title>Using a Filter to Avoid Spam</title>
-         <para>
-           Spam, also known as unsolicited commercial email (UCE), is
-           the bane of many people's Inboxes, but it doesn't have to
-           be. Using Ximian Evolution filters and an external Spam
-           detection tool like <application>SpamAssassin</application> (<ulink
-           url="http://spamassassin.org/">http://spamassassin.org/</ulink>),
-           you can catch the vast majority of junk mail and drop it
-           directly into the trash.
-         </para>
-         <para>
-           The easiest way to do this is to get your system
-           administrator to install SpamAssassin (or its equivalent)
-           on your mail server. There, it will flag messages it
-           suspects of being Spam with the "X-Spam-Status" header to
-           your mail, which you can then search for in a
-           filter. Because SpamAssassin scores mails based on the
-           likelihood that messages are junk, you can even choose how
-           strict you want it to be. If you don't have a friendly
-           network administrator, never fear: you can install
-           SpamAssassin on your own system, then pipe messages through
-           it before reading them.
-         </para>
-
-         <para>
-           If your system administrator or ISP has SpamAssassin, here's how to siphon off the junk mail:
-            <orderedlist>
-
-             <listitem><para>
-                 Select <menuchoice><guimenu>Tools</guimenu><guimenuitem>Filters</guimenuitem></menuchoice>.
-             </para></listitem>
-
-             <listitem><para>
-                 Click <guibutton>Add</guibutton>.
-             </para></listitem>
-
-             <listitem><para>
-               Set the first part of your search criterion to look in a <guilabel>Specific header</guilabel>.
-             </para></listitem>
-
-             <listitem><para>
-               Enter <userinput>X-Spam-Flag</userinput> as the name of the header.
-             </para></listitem>
-
-             <listitem><para>
-               Choose <guilabel>contains</guilabel> at the second drop-down box.
-             </para></listitem>
-
-             <listitem><para>
-               Enter <userinput>YES</userinput> as the content to search for. 
-               You're now working with all email that has the word "YES" in the 
-               "X-Spam-Status" header.
-             </para></listitem>
-
-             <listitem><para>
-               For actions, choose what you'd like to do with the
-             messages. You can delete the messages automatically, but
-             it's more prudent to place them in a "Possible Junk Mail"
-             folder, and check them over just to make sure a genuine
-             message didn't get flagged by accident.
-             </para></listitem>
-
-             <listitem><para>
-                Click <guibutton>OK</guibutton>. You're done.
-             </para></listitem>
-	   </orderedlist>
-         </para>
-         <para>
-           If you don't have SpamAssassin or other junk mail filtering
-           on your mail server, there's still hope, although it's not
-           quite as simple. First, download
-           and install SpamAssassin from <ulink
-           url="http://spamassassin.org">http://spamassassin.org</ulink>
-         You'll need to download the "spamassassin"
-         and "perl-Mail-SpamAssassin"
-         packages, and you can install them with Red Carpet by
-         selecting <guimenuitem>Install Local Packages</guimenuitem>
-         from the
-         <guimenu>File</guimenu> menu. Further instructions are at the
-         SpamAssassin web site. Once you have the software
-         installed, do the following: 
-
-         <orderedlist>
-           <listitem>
-           <para>
-             Create a text file with any text editor (
-             <menuchoice>
-               <guimenu>
-                 Programs
-               </guimenu>
-               <guisubmenu>
-                 Accessories
-               </guisubmenu>
-               <guimenuitem>
-                 Text Editor
-               </guimenuitem>
-             </menuchoice> is the most convenient) and write the next command:
-             <command>spamassassin -e</command>.
-             This will run the SpamAssassin command and report back 0
-             if the message is not junk.
-           </para>
-         </listitem>
-         <listitem>
-           <para>
-             Save the file as <filename>spam-filter.sh</filename>
-           </para>
-         </listitem>
-         <listitem>
-           <para>
-              Mark the file as an executable program: 
-             Open your home directory in <application>Nautilus</application>, right-click on
-             spam-filter.sh there, and select
-             <guimenuitem>Properties</guimenuitem>. Then, click the
-             <guilabel>Permissions</guilabel> tab and check the box in the
-             <guilabel>Execute</guilabel> column and the
-             <guilabel>Owner</guilabel> row. Alternately, open a terminal
-             (<menuchoice>
-             <guimenu>
-               Programs
-             </guimenu>
-             <guisubmenu>
-               Accessories
-             </guisubmenu>
-             <guimenuitem>
-               Terminal
-             </guimenuitem>
-           </menuchoice>) and enter the command: <command>chmod +x spam-filter.sh</command>.
-       </para>
-     </listitem>
-     <listitem>
-       <para>
-          Back in Evolution, create a new filter: Select
-         <menuchoice><guimenu>Tools</guimenu><guimenuitem>Filters</guimenuitem></menuchoice>,
-         then click <guibutton>Add</guibutton>.
-     </para>
-   </listitem>
-
-             <listitem><para> 
-             Select <guilabel>Pipe Message to Shell Command</guilabel> as the first portion of the criterion.
-               </para></listitem>
-
-             <listitem><para> 
-             Enter <userinput>/home/username/spam-filter.sh</userinput> as the shell command, then select
-             <guilabel>Does Not Return</guilabel>  and <guilabel>0</guilabel> as the remaining two
-             items. Substitute your username for "username" so that
-             Evolution can find the script.
-           </para></listitem>
-
-             <listitem><para>
-               For actions, choose what you'd like to do with the
-             messages. You can delete the messages automatically, but
-             it's more prudent to place them in a "Possible Junk Mail"
-             folder, and check them over just to make sure a genuine
-             message didn't get flagged by accident.
-             </para></listitem>
-           <listitem>
-             <para>
-               You're done. Click <guibutton>OK</guibutton> to close the filter and <guibutton>OK</guibutton> to
-               close the filter editor.
-             </para>
-           </listitem>
-         </orderedlist>
-       </para>
-     </example>
    </sect2>
    
    <sect2 id="filters-edit">
@@ -964,7 +835,7 @@
 	  <listitem>
 	    <para>
 	      Select the filter in the <guilabel>Filter Rules</guilabel> section
-	      and press <guibutton>Edit</guibutton>.
+	      and press <guilabel>Edit</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -974,12 +845,12 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton> in the filter editor window.
+	      Press <guilabel>OK</guilabel> in the filter editor window.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton> in the filter manager window.
+	      Press <guilabel>OK</guilabel> in the filter manager window.
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -1002,7 +873,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the filter and press <guibutton>Delete</guibutton>.
+	      Select the filter and press <guilabel>Delete</guilabel>.
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -1034,7 +905,7 @@
 	yourself performing the same search again and again, consider
 	a vFolder. vFolders, or virtual folders, are an advanced way
 	of viewing your email messages within
-	<application>Ximian Evolution</application>.  If you get a lot of
+	Ximian Evolution.  If you get a lot of
 	mail or often forget where you put messages, vFolders
 	can help you stay on top of things.
       </para>
@@ -1050,7 +921,7 @@
 
       <para>
 	As messages that meet the vFolder criteria arrive or are
-	deleted, <application>Ximian Evolution</application> will
+	deleted, Ximian Evolution will
 	automatically place them in and remove them from the
 	vFolder contents list.  When you delete a message, it gets
 	erased from the folder in which it actually exists, as well as
@@ -1093,12 +964,12 @@
       <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 <application>Ximian Evolution</application> in the subject line, so he
+	have ximian.com in the address and Ximian Evolution in the subject line, so he
 	can keep a record of what people from work send him about
-	<application>evolution</application>.  If Anna sends him a message about
-	anything other than <application>Ximian Evolution</application>, it only shows up in the "Anna" folder.
+	Evolution.  If Anna sends him a message about
+	anything other than Ximian Evolution, it only shows up in the "Anna" folder.
 	When Anna sends him mail about the user interface for
-	<application>evolution</application>, he can see that message both in
+	Evolution, he can see that message both in
 	the "Anna" vFolder and in the "Internal Evolution Discussion"
 	vFolder.
        </para>
@@ -1121,7 +992,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Add</guibutton>
+	      Click <guilabel>Add</guilabel>
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -1181,7 +1052,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define vFolders in <application>Ximian Evolution</application>.
+		    define vFolders in Ximian Evolution.
 		  </para>
 		</listitem>
 		
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 65a7a30715..c90bffba79 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -21,11 +21,10 @@
   <sect1 id="usage-mail-getnsend-read">
     <title>Reading Mail</title>    
     <para>
-      Start the mail client by clicking on the
-      <guibutton>Inbox</guibutton> icon in the shortcut bar, or by
-      selecting a mail folder in the folder bar.  To read a message,
+      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,
       select it in the message list; if you'd like to see it in its
-      own window, double-click on it or press
+      own window, double-click on it, or press <keycap>Return</keycap> or 
       <keycombo action="simul">
 	<keycap>Ctrl</keycap>
 	<keycap>O</keycap>
@@ -37,25 +36,27 @@
 	<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.  This
-	  may help to make reading your email faster.
+	  an email, and press backspace to page up in an email. 
 	</para>
     
         <para>
-          You can navigate the message list by pressing the arrow keys up
-          and down. To jump to the next unread message, press the
-          <keycap>.</keycap> (period)
-          or <keycap>]</keycap> (close bracket) key. You can go to the
-          previous unread message with
-          <keycap>,</keycap> (comma) or <keycap>[</keycap> (open
-          bracket).
+          Navigate the message list by pressing the arrow keys up
+          and down. To go to the next and previous
+          <emphasis>unread</emphasis> messages, press the
+          <keycap>.</keycap> (period) or <keycap>,</keycap> (comma)
+          keys. On most keyboards, these  keys are also marked
+          with the &gt; and &lt; symbols, which makes a convenient way
+          to remember that they move you forward and backward in your
+          message list. You can also use <keycap>]</keycap> (close
+          bracket) for the next unread message, and <keycap>[</keycap>
+          (open bracket) for the previous unread message.
         </para>
       </tip>
 
     <sect2 id="usage-mail-listorder">
       <title>Sorting the message list</title>
       <para>
-	<application>Evolution</application> helps you work by letting you sort
+	Evolution helps you work by letting you sort
 	your email.  To sort by sender, subject, or date, click
 	on the bars with those labels at the top of the message
 	list. The direction of the arrow next to the label indicates
@@ -63,7 +64,7 @@
 	sort them in reverse order. For example, click once on
 	<guilabel>Date</guilabel> to sort messages by date from
 	oldest to newest.  Click again, and
-	<application>Evolution</application> sorts the list from
+	Evolution sorts the list from
 	newest to oldest. You can also right-click on the message
 	header bars to get a set of sorting options, and add or
 	remove columns from the message list.  You can find detailed
@@ -92,7 +93,7 @@
           <guimenuitem>Threaded</guimenuitem> 
 	</menuchoice> 
 	to turn the threaded view on or off.  When you select this option,
-	<application>Evolution</application> groups the replies to a
+	Evolution groups the replies to a
 	message with the original, so you can follow the thread of a
 	conversation from one message to the next.
       </para>
@@ -128,7 +129,7 @@
 	    <note>
 	      <title>Why do I still see deleted mail?</title>
 	      <para>
-		When you press <guibutton>Delete</guibutton> or click
+		When you press <guilabel>Delete</guilabel> or click
 		the trash button, your mail isn't actually deleted,
 		but is marked for deletion.  Your email is not gone
 		until you have expunged it. When you "Expunge" a
@@ -223,7 +224,7 @@
     <para>
       Now that you've had a look around the
       <interface>Inbox</interface>, it's time to check for new mail.
-      Click <guibutton>Send/Receive</guibutton> in the toolbar to check
+      Click <guilabel>Send/Receive</guilabel> in the toolbar to check
       your mail.  If you haven't entered any mail settings yet, the
       <interface>setup assistant</interface> will ask you for the
       information it needs to check your email.
@@ -265,9 +266,9 @@
 
 
     <para>
-      To check your email, press the <guibutton>Check Mail</guibutton>
+      To check your email, press the <guilabel>Check Mail</guilabel>
       button.  If this is your first time checking mail, or you
-      haven't asked <application>Evolution</application> to store your
+      haven't asked Evolution to store your
       password, you'll be prompted for the password.  Enter your
       password and your email will be downloaded.
     </para>
@@ -286,9 +287,9 @@
           <tip>
             <title>Sharing Mailboxes with Other Mail Programs</title>
             <para>
-              If you want to use <application>Evolution</application>
+              If you want to use Evolution
               and another email client, such as
-              <application>Mutt</application>, at the same time,
+              Mutt, at the same time,
               here's how:
               <orderedlist numeration="arabic">
                 <listitem>
@@ -299,7 +300,7 @@
                   </listitem>
                 <listitem>
                    <para>
-                      In <application>Evolution</application>, select
+                      In Evolution, select
                       <menuchoice><guimenu>Tools</guimenu><guimenuitem>
                       Settings</guimenuitem></menuchoice>, go to the
                       Mail Accounts configuration tool, and pick the account
@@ -319,7 +320,7 @@
                   </listitem>
                 <listitem>
                    <para>
-                      Click the <guibutton>OK</guibutton> button.
+                      Click the <guilabel>OK</guilabel> button.
                    </para>
                   </listitem>
                 </orderedlist>
@@ -336,8 +337,8 @@
 	  news source to your configuration (see <xref
 	  linkend="config-prefs-network-news"/>). The news server will
 	  appear as a remote server, and will look quite similar to an
-        IMAP folder.  When you click <guibutton>Send/Receive</guibutton>,
-	  <application>Evolution</application> will also check for news
+        IMAP folder.  When you click <guilabel>Send/Receive</guilabel>,
+	  Evolution will also check for news
 	  messages.
 	</para>
 	</sect2>
@@ -348,7 +349,7 @@
 	 <para>
 	   If someone sends you an <glossterm linkend="attachment">attachment</glossterm>,
 	   a file attached to an email,
-	   <application>Evolution</application> will display the file
+	   Evolution will display the file
 	   at the bottom of the message to which it's attached.  Text,
 	   including HTML formatting and embedded images, will appear
 	   as part of the message, rather than at the end of the
@@ -359,7 +360,7 @@
      <title>Saving or Opening Attachments</title>
      <para>
         If you get an attachment with an email message,
-        <application>Ximian Evolution</application> can help you save
+        Ximian Evolution can help you save
         it or open it with the appropriate applications.
      </para>
      <para>
@@ -378,7 +379,7 @@
 	 </listitem>
 	 <listitem>
 	   <para>
-	     Click <guibutton>OK</guibutton>.
+	     Click <guilabel>OK</guilabel>.
 	   </para>
 	 </listitem>
        </orderedlist>
@@ -414,8 +415,7 @@
       <para>
          When someone sends you HTML mail that includes an image in
          the body of the message (for example, the welcome message in your
-         Inbox when you first start <application>Ximian
-         Evolution</application>) <application>Evolution</application>
+         Inbox) Evolution
          will display the image inside the message.  You can create
          messages like this by using the
          <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>
@@ -424,9 +424,9 @@
 
       <para>
          If the image isn't included in the message, but is, instead,
-         a link to an image, <application>Evolution</application> can 
+         a link to an image, Evolution can 
          download the image from the Internet for you.  However,
-         <application>Evolution</application> will not display the
+         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
@@ -440,19 +440,22 @@
 	   <guimenuitem>Load Images</guimenuitem>
          </menuchoice>.  
 
-         If you want <application>Ximian Evolution</application> to
+         If you want Ximian Evolution to
          load remotely hosted images more often, select
          <menuchoice>
 	   <guimenu>Tools</guimenu>
 	   <guimenuitem>Settings</guimenuitem> </menuchoice> and go to
 	   the mail settings tool. There, click the <guilabel>HTML
-           Mail</guilabel> tab and select one of the items there: <guilabel>Never load images off the net</guilabel>, <guilabel>Load images if sender is in addressbook</guilabel>, or <guilabel>Always load images off the net.</guilabel>
+           Mail</guilabel> tab and select one of the items there:
+<guilabel>Never load images off the net</guilabel>, <guilabel>Load
+images if sender is in address book</guilabel>, or <guilabel>Always
+load images off the net.</guilabel>
       </para>
       <note id="http-proxy">
 	<title>Loading Images from the Net through an HTTP Proxy</title>
         <para>
            If you use an HTTP proxy (as in many large organizations),
-          <application>Evolution</application> must be able to find
+          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
@@ -465,7 +468,7 @@
          GNOME Control Center. Select
          <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
          from your menu panel or from the GNOME menu, and then click
-         the <guibutton>Network Proxies</guibutton> button in the
+         the <guilabel>Network Proxies</guilabel> button in the
          <guilabel>System Settings</guilabel> category. Select the
          <guilabel>Use an HTTP network proxy</guilabel> check box and
          then enter information about your proxy. If you are not sure,
@@ -483,7 +486,7 @@
          <menuchoice> <guimenu>File</guimenu>
          <guisubmenu>New</guisubmenu> <guimenuitem>
          Mail Message</guimenuitem></menuchoice>, or by pressing the
-         <guibutton>New</guibutton> button in the Inbox toolbar.
+         <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"/>.
@@ -505,14 +508,14 @@
       wish, enter a subject in the <guilabel>Subject:</guilabel>, and
       a message in the box at the bottom of the window.
       Once you have written your message, press
-      <guibutton>Send</guibutton>.
+      <guilabel>Send</guilabel>.
     </para>
 
      <sect2 id="usage-mail-getnsend-send-delay">
         <title>Sending Composed Messages Later</title>
         <para>
-           <application>Evolution</application> will normally send
-           mail as soon as you click the <guibutton>Send</guibutton>
+           Evolution will normally send
+           mail as soon as you click the <guilabel>Send</guilabel>
            button. However, there are a few ways you can save a
            message to be sent later:
 
@@ -520,7 +523,7 @@
           <listitem>
              <para>
                 If you are offline,
-                <application>Evolution</application> will add your
+                Evolution will add your
                 messages to the <guilabel>Outbox</guilabel> queue. The
                 next time you connect to the Internet and send or
                 receive mail, that message will be sent.
@@ -551,8 +554,9 @@
       <title>Working Offline</title>
     
       <para>
-        Offline mode is a tool designed for use with IMAP or Exchange
-        mail accounts in situations where you will not be connected to
+        Offline mode is a tool designed for use with remote mail
+        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
         in your Outbox to be sent the next time you connect.
@@ -560,11 +564,10 @@
      
       <para>
         While POP mail downloads all messages to your local system,
-        IMAP and Exchange connections usually download just the
-        headers, and fetch the rest only when you want to read the
-        message.  Before you go offline, Evolution will download
-        the unread messages from the folders you have chosen to
-        store.
+        other connections usually download just the headers, and fetch
+        the rest only when you want to read the message.  Before you
+        go offline, Evolution will download the unread messages from
+        the folders you have chosen to store.
       </para>
 
       <para>
@@ -581,7 +584,7 @@
         Your connection status is shown by the small icon in the lower
         left border of the Evolution main window. When you are online,
         it will display two connected cables. When you go offline, the
-        cables will separate.
+        cables will separate. 
       </para>
 
       <para>
@@ -600,7 +603,7 @@
       <title>More About Mail Composition</title>
       <para>
         In the next few sections, you'll see how
-	<application>Evolution</application> handles advanced email
+	Evolution handles advanced email
 	features, including large recipient lists, attachments, and
 	forwarding.
       </para>
@@ -621,14 +624,18 @@
 	    </listitem>
 	    <listitem>
 	      <para>
-		Press <guibutton>OK</guibutton>
+		Press <guilabel>OK</guilabel>
 	      </para>
 	    </listitem>
 	  </orderedlist>
 	</para>
 	<para>
-	  You can drag a file from your desktop into the composer window to
-	  attach it as well.
+          You can drag a file into the address area or, if it is
+          already displayed, the attachment display area, of the composer
+          window. If you are attaching an image and wish to send it
+          inline rather than attached, drag the image into the text
+          composition area of the composer window. Non-image files
+          cannot be dragged into the text composition area.
         </para>
         <para>
             To hide the display of files you've attached to the
@@ -647,7 +654,7 @@
       <sect3 id="usage-mail-getnsend-send-to-types">
 	<title>Specifying Recipients for Email</title>
         <para>
-	  <application>Evolution</application>, like most email
+	  Evolution, like most email
 	   programs, recognizes three types of addressee: primary
 	   recipients, secondary recipients, and hidden ("blind")
 	   recipients.
@@ -690,7 +697,7 @@
 	<tip id="reply-to-per-mail">
 	  <title>Setting Reply-to On a Per-Mail Basis</title>
 	  <para>
-	    <application>Evolution</application> has the ability to
+	    Evolution has the ability to
 	    let you specify the Reply-To in an email. Using this, you
 	    can setup a special Reply-To for an email.  To do this:
 	    <orderedlist numeration="arabic">
@@ -724,14 +731,14 @@
 	      <para>
 		If you have created address cards in the contact manager,
           you can also enter nicknames or other portions of address
-          data, and <application>Evolution</application> will offer a
+          data, and Evolution will offer a
           drop down list of possible address completions from your
           address book.  If you enter a name or nickname that can go
           with more than one card, Evolution will open a dialog box to
           ask you which person you meant. 
 
 <!-- 
-     Also, <application>Evolution</application> will add a
+     Also, Evolution will add a
           domain to any unqualified addresses.  By default, this is
           your domain, but you can choose which one mail preferences
           dialog. NOTE: ex-feature, may be reinstated, but probably not. 
@@ -740,8 +747,8 @@
 
           <para>
             Alternately, you can click on the
-            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
+            <guilabel>To:</guilabel>, <guilabel>Cc:</guilabel>, or
+            <guilabel>Bcc:</guilabel> buttons to get a list &mdash;
             potentially a very long one &mdash; of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
@@ -760,7 +767,7 @@
         <title>Replying to Email Messages</title>
         <para>
            To reply to a message, press the
-           <guibutton>Reply</guibutton> button while it is selected,
+           <guilabel>Reply</guilabel> button while it is selected,
            or choose <guimenuitem>Reply to Sender</guimenuitem> from
            the message's right-click menu.  That will open the
            <interface>message composer</interface>.  The
@@ -787,8 +794,8 @@
         </para>
         <para>
           If you're reading a message with several recipients, you may
-           wish to use <guibutton>Reply to All</guibutton> instead of
-           <guibutton>Reply</guibutton>.  If there are large numbers
+           wish to use <guilabel>Reply to All</guilabel> instead of
+           <guilabel>Reply</guilabel>.  If there are large numbers
            of people in the <guilabel>Cc:</guilabel> or
            <guilabel>To:</guilabel> fields, this can save substantial
            amounts of time.
@@ -798,9 +805,9 @@
               Susan sends an email to a client and sends copies to Tim
               and to an internal company mailing list of co-workers.
               If Tim wants to make a comment for all of them to read,
-              he uses <guibutton>Reply to All</guibutton>, but if he
+              he uses <guilabel>Reply to All</guilabel>, but if he
               just wants to tell Susan that he agrees with her, he
-              uses <guibutton>Reply</guibutton>.  Note that his reply
+              uses <guilabel>Reply</guilabel>.  Note that his reply
               will not reach anyone that Susan put on her
               <guilabel>Bcc</guilabel> list, since that list is not
               shared with anyone.
@@ -810,9 +817,9 @@
         <para>
           If you're subscribed to a mailing list, and want your reply
           to go just to the list, rather than to the sender, choose
-          <guibutton>Reply to List</guibutton> instead of
-          <guibutton>Reply</guibutton> or <guibutton>Reply to
-          All</guibutton>.
+          <guilabel>Reply to List</guilabel> instead of
+          <guilabel>Reply</guilabel> or <guilabel>Reply to
+          All</guilabel>.
           <note>
             <title>What is a Mailing List?</title>
             <para>
@@ -858,7 +865,7 @@
             <varlistentry>
               <term><guimenuitem>Find</guimenuitem></term>
               <listitem><para> Enter a word or phrase, and
-              <application>Evolution</application> will find it
+              Evolution will find it
               in your message.
               </para></listitem>
             </varlistentry>
@@ -922,7 +929,7 @@
             prefer not to receive HTML-enhanced mail because it is
             slower to download and display. Because some people may
             prefer not to get HTML mail,
-            <application>Evolution</application> sends plain text
+            Evolution sends plain text
             unless you explicitly ask for HTML.  
            </para>
 	 </note>
@@ -970,7 +977,7 @@
 		<para>
 		  Instead of using asterisks to mark a bulleted list,
 		  try the Bulleted List style from the style dropdown
-		  list.  <application>Evolution</application> uses
+		  list.  Evolution uses
 		  more attractive bullets and handles word wrap and
 		  multiple levels of indentation.
 		</para>
@@ -990,7 +997,7 @@
 		  <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>
-		  <listitem><para>Push <guiicon>striked A</guiicon> for a strikethrough.</para></listitem>
+		  <listitem><para>Push <guiicon>strikethrough A</guiicon> for a strikethrough.</para></listitem>
 		</itemizedlist>
 	      </para>
 	    </listitem>
@@ -1050,7 +1057,7 @@
 	      <para>
 		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 <application>Evolution</application>
+                  directly, and Evolution
                   will recognize it as a link.  To add a link:
 		<orderedlist numeration="arabic">
 		  <listitem>
@@ -1060,7 +1067,7 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Right click on the text and click on <guibutton>Link</guibutton>.
+		      Right click on the text and click on <guilabel>Link</guilabel>.
 		    </para>
 		  </listitem>
 		  <listitem>
@@ -1070,7 +1077,7 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Click <guibutton>OK</guibutton>.
+		      Click <guilabel>OK</guilabel>.
 		    </para>
 		  </listitem>
 		</orderedlist>
@@ -1103,7 +1110,7 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Click the <guibutton>Insert Image</guibutton> button in the toolbar, or select		   
+		      Click the <guilabel>Insert Image</guilabel> button in the toolbar, or select		   
 		         <menuchoice>
 			<guimenu>Insert</guimenu>
 			<guimenuitem>Image</guimenuitem>
@@ -1112,12 +1119,12 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Choose your image by clicking the <guibutton>Browse</guibutton> button.
+		      Choose your image by clicking the <guilabel>Browse</guilabel> button.
 		    </para>
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Press <guibutton>Insert</guibutton> to insert the image.
+		      Press <guilabel>Insert</guilabel> to insert the image.
 		    </para>
 		  </listitem>
 		</orderedlist>
@@ -1146,7 +1153,7 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Click the <guibutton>Rule</guibutton> button in the <guilabel>Toolbar</guilabel>.
+		      Click the <guilabel>Rule</guilabel> button in the <guilabel>Toolbar</guilabel>.
 		    </para>
 		  </listitem>
 		  <listitem>
@@ -1172,7 +1179,7 @@
 
 		  <listitem>
 		    <para>
-		      Click <guibutton>Insert</guibutton> to insert the rule.
+		      Click <guilabel>Insert</guilabel> to insert the rule.
 		    </para>
 		  </listitem>
 		</orderedlist>
@@ -1201,12 +1208,12 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Click the <guibutton>Table</guibutton> button in the <guilabel>Toolbar</guilabel>.
+		      Click the <guilabel>Table</guilabel> button in the <guilabel>Toolbar</guilabel>.
 		    </para>
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Select the table <guibutton>Template</guibutton>
+		      Select the table <guilabel>Template</guilabel>
                     you wish to use.  Each has a slightly different feel and
                     layout.
 		    </para>
@@ -1219,7 +1226,7 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Click the <guibutton>Insert</guibutton> button.
+		      Click the <guilabel>Insert</guilabel> button.
 		    </para>
 		  </listitem>
 		</orderedlist>
@@ -1237,7 +1244,7 @@
             <term>Templates</term>
             <listitem>
               <para>
-          <application>Evolution</application> not only allows you to
+          Evolution not only allows you to
 	  decorate your email with HTML text and graphics, but
 	  provides you with prebuilt templates for you to use when
 	  making these improvements.  You can use these to emphasize a
@@ -1262,7 +1269,7 @@
 	    </listitem>
 	    <listitem>
 	      <para>
-		Click the <guibutton>HTML Template</guibutton> button in the 
+		Click the <guilabel>HTML Template</guilabel> button in the 
 		<guilabel>Toolbar</guilabel> or select 		
 		<menuchoice>
 		  <guimenu>
@@ -1290,7 +1297,7 @@
 
 	    <listitem>
 	      <para>
-		Click <guibutton>Insert</guibutton> to insert it where the 
+		Click <guilabel>Insert</guilabel> to insert it where the 
 		cursor is.
 	      </para>
 	    </listitem>
@@ -1336,7 +1343,7 @@
         </para>
         <para>
           To forward a message you are reading, press
-          <guibutton>Forward</guibutton> on the toolbar, select
+          <guilabel>Forward</guilabel> on the toolbar, select
           <menuchoice> <guimenu>Actions</guimenu>
           <guimenuitem>Forward</guimenuitem> </menuchoice>, or press
           <keycombo
@@ -1350,7 +1357,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
           subject will already be entered, although you can alter it
           if you wish.  Enter your comments on the message in the
           <interface>composition frame</interface>, and press
-          <guibutton>Send</guibutton>.
+          <guilabel>Send</guilabel>.
         </para>
       </sect2>
 
@@ -1359,7 +1366,6 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
         <para>
 
           <itemizedlist>
-
             <listitem>
               <para>
                  Don't send spam or forward chain mail.  If you must,
@@ -1389,7 +1395,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
             <listitem>
               <para>
                Check your spelling and use complete sentences. By
-               default, <application>Evolution</application> will put
+               default, Evolution will put
                a red line beneath words it doesn't recognize, as you
                type them.
               </para>
@@ -1424,16 +1430,16 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
     <para>
       If you create an event in the calendar component, you can then
       send invitations to the attendee list through the
-      <application>Ximian Evolution</application> email tool.  The
+      Ximian 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>, <application>Ximian
-      Evolution</application> will show you information about 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
-      <guibutton>OK</guibutton> button.
+      <guilabel>OK</guilabel> button.
    </para>
    <para>
   Your options are:
@@ -1443,7 +1449,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	  <listitem>
 	    <para>
 	  Select this entry if you will attend the meeting.  When you
-	  click the <guibutton>OK</guibutton> button, the meeting will
+	  click the <guilabel>OK</guilabel> button, the meeting will
 	  be entered into your calendar.
 	    </para>
 	  </listitem>
@@ -1454,7 +1460,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	  <listitem>
 	    <para>
 	  Select this entry if you will probably attend the meeting.
-	  When you click the <guibutton>OK</guibutton> button, the
+	  When you click the <guilabel>OK</guilabel> button, the
 	  meeting will be entered into your calendar, but marked as
 	  tentative.
 	    </para>
@@ -1467,7 +1473,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	    <para>
 	  Select this item if you will be unable to attend the
 	  meeting. The meeting will not be entered into your calendar
-	  when you click the <guibutton>OK</guibutton>, although your
+	  when you click the <guilabel>OK</guilabel>, although your
 	  response will be sent to the meeting host if you have
 	  checked the <guilabel>RSVP</guilabel> box.
 	    </para>
@@ -1493,7 +1499,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
       Since IMAP folders exist on the server, and opening them or
       checking them takes time, you need fine-grained control over the
       way that you use IMAP folders.  That's why
-      <application>Evolution</application> has an IMAP subscriptions
+      Evolution has an IMAP subscriptions
       manager.  If you prefer to have every mail folder displayed, you
       can select that option as well. However, if you'd like to choose
       specific items in your mailbox, and exclude others, you can use
@@ -1515,7 +1521,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	  <para>
 	    If you have accounts on multiple IMAP servers, select the
 	    server where you'd like to manage your
-	    subscriptions. <application>Evolution</application> will
+	    subscriptions. Evolution will
 	    display a list of available files and folders.
 	  </para>
 	</listitem>
@@ -1532,7 +1538,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 
 	<listitem>
 	  <para>
-	    Click the <guibutton>Subscribe</guibutton> to add it to
+	    Click the <guilabel>Subscribe</guilabel> to add it to
 	    the subscribed list.
 	  </para>
 	</listitem>
@@ -1552,9 +1558,9 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
       <title>What is Encryption?</title>
       <para>
 	Encryption is an ancient method of keeping information safe
-	from prying eyes. <application>Evolution</application> helps
+	from prying eyes. Evolution helps
 	you you protect your privacy by using
-	<application>gpg</application>, an implementation of strong
+	gpg, an implementation of strong
 	<glossterm linkend="public-key-encryption">Public Key
 	Encryption.</glossterm>
       </para>
@@ -1605,7 +1611,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	    Kevin wants to send an encrypted message to his friend
 	    Rachel.  He looks up her public key on a general key
 	    server, and then tells
-	    <application>Evolution</application> to encrypt the
+	    Evolution to encrypt the
 	    message.  The message now reads "@#$23ui7yr87#@!48970fsd."
 	    When the information gets to Rachel, she decrypts it using
 	    her private key, and it appears as plain text for her to
@@ -1615,7 +1621,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
       <tip id="always-sign">
 	<title>Always Sign</title>
 	<para>
-	  You can set <application>Evolution</application> to always sign your email messages:
+	  You can set Evolution to always sign your email messages:
 	  <orderedlist numeration="arabic">
 	    <listitem>
 	      <para>
@@ -1634,7 +1640,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	    </listitem>
 	    <listitem>
 	      <para>
-		Click the <guibutton>Always sign outgoing messages when using this account</guibutton> button.
+		Click the <guilabel>Always sign outgoing messages when using this account</guilabel> button.
 	      </para>
 	    </listitem>
 	  </orderedlist>
@@ -1682,11 +1688,11 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 
 	  <listitem>
       	   <para>
-             Decide if you want your key to expire automatically, and if so, when.
+             Decide if you want your key to expire automatically, and
+             if so, when.
 	  </para>
          </listitem>
 
-
 	  <listitem>
       	   <para>
             Enter your name, email address, and any additional
@@ -1782,7 +1788,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
       <para>
 	To encrypt a message to your someone else you'll need to use
 	their public key in combination with your private key.
-	<application>Evolution</application> does that for you, but
+	Evolution does that for you, but
 	you still need to get their key and add it to your keyring.
      </para>
      <para>
@@ -1793,7 +1799,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	</command>, substituting "keyid" for your recipient's ID.  You
 	will need to type in your password, and then their ID will
 	automatically be added to your keyring. When you send mail to
-	them, <application>Evolution</application> will allow you to
+	them, Evolution will allow you to
 	encrypt your messages.
       </para>
       <para>
@@ -1813,18 +1819,18 @@ 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
-	<guibutton>Edit</guibutton> button. Then, select the
+	<guilabel>Edit</guilabel> button. Then, select the
 	<guilabel>Security</guilabel> tab in the account dialog.   In the
 	<guilabel>Security</guilabel> tab is a section labeled
 	<guilabel>Pretty Good Privacy</guilabel>.  Enter your key ID
-	and click <guibutton>OK</guibutton>.  Your key is now
+	and click <guilabel>OK</guilabel>.  Your key is now
 	integrated into your identity in
-	<application>Evolution</application>.
+	Evolution.
       </para>
       <note>
 	<title>What is my Key ID again?</title>
 	<para>
-	  <application>Evolution</application> 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>
@@ -1847,9 +1853,9 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	<menuchoice>
 	  <guimenu>Security</guimenu>
 	  <guimenuitem>PGP Sign</guimenuitem>
-	</menuchoice>
-	.  You will be prompted for your encryption password.  Once
-	you enter it, click <guibutton>OK</guibutton> and your message
+	</menuchoice>.
+        You will be prompted for your encryption password.  Once
+	you enter it, click <guilabel>OK</guilabel> and your message
 	will be signed.
       </para>
     </sect2>
@@ -1862,7 +1868,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	  <menuchoice>
 	    <guimenu>Security</guimenu>
 	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
+	  </menuchoice>.
 	</para>
       </sect2>
       <sect2 id="unencrypting">
@@ -1874,7 +1880,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	</para>
 	<para>
 	  When you view the message,
-	  <application>Evolution</application> will ask you for your
+	  Evolution will ask you for your
 	  PGP password.  Enter it, and the message will be displayed
 	  properly.  
        </para>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index b78ba13dfc..f614ac2c0b 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -8,7 +8,7 @@
         Information is useless unless it's organized and accessible;
         it's hardly even worth the name if you can't look at it and be
         <emphasis>informed</emphasis>.  The goal of
-        <application>Ximian Evolution</application> is to make the
+        Ximian Evolution is to make the
         tasks of storing, organizing, and retrieving your personal
         information easier, so you can work and communicate with
         others.  That is, it's a highly evolved <glossterm
@@ -16,7 +16,7 @@
         part of the Internet-connected desktop.
       </para>
       <para>
-        In other words, <application>Ximian Evolution</application> is
+        In other words, Ximian Evolution is
         a tool to help you get your work done. It can help you work in
         a group by handling email, address and other contact
         information, and one or more calendars.  It can do that on one
@@ -25,11 +25,11 @@
       </para>
 
       <para>
-        With <application>Ximian Evolution</application>, you can
+        With Ximian Evolution, you can
         accomplish your most common daily tasks faster.  For example, it
         takes only one or two clicks to enter an appointment or an
         address card sent to you by email, or to send email to a contact
-        or appointment.  <application>Ximian Evolution</application>
+        or appointment.  Ximian Evolution
         makes displays faster and more efficient, so searches are faster
         and memory usage is lower.  People who get lots of mail will
         appreciate advanced features like <link
@@ -42,7 +42,7 @@
    <sect1 id="usage-mainwindow-starting">
      <title>The First Time you Start Ximian Evolution</title>
      <para>
-       To start <application>Ximian Evolution</application>, do either
+       To start Ximian Evolution, do either
       of the following: 
       <itemizedlist>
       <listitem>
@@ -85,7 +85,9 @@
 
            <listitem>
              <para>
-               To make your web browser use Evolution as the default email client, enter <userinput>evolution "%s"</userinput> as the email handler in your web browser or in the GNOME Control Center.
+               To make your web browser use Evolution as the default
+               email client, enter <userinput>evolution "%s"</userinput> as the email
+               handler in your web browser or in the GNOME Control Center.
             </para>
           </listitem>
         </itemizedlist>
@@ -94,7 +96,7 @@
   </para>
  <para>
      The first time you run the program, it will create a directory
-      called <filename>evolution</filename> in your home directory,
+      called <filename>.evolution</filename> in your home directory,
       where it will store all of its local data.  Then, it will open a
       first-run assistant to help you set up mail accounts and import
       data from other applications.
@@ -102,7 +104,17 @@
     <para>
       Using the first-run assistant will take approximately two to
       five minutes.
-    </para>
+    </para> 
+    <para>
+      Later on, if you want to change the account you are creating, or
+      if you want to create a new one,select
+        <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Configure
+        </guimenuitem></menuchoice>, and click the <guilabel>Mail
+        Accounts</guilabel> button. Then, select the account you want
+        to change and click <guilabel>Edit</guilabel>, or click
+        <guilabel>Add</guilabel> to add a new account. See <xref
+        linkend="config-prefs-mail"/> for details.
+      </para>
 
     <sect2 id="first-step">
       <title>Defining Your Identity</title>
@@ -112,7 +124,7 @@
 	define multiple identities later on with the
 	<menuchoice><guimenu>Tools</guimenu>
 	<guimenuitem>Settings</guimenuitem></menuchoice> tool and
-	clicking the <guibutton>Mail Accounts</guibutton> button.
+	clicking the <guilabel>Mail Accounts</guilabel> button.
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -150,7 +162,7 @@
 	  <listitem>
 	    <para>
 	      Server Type: There are numerous types of servers
-	      from which <application>Ximian Evolution</application>
+	      from which Ximian Evolution
 	      can fetch your mail.  Ask your system administrator if
 	      you're not sure which of the following are available to
 	      you:
@@ -158,22 +170,23 @@
 
 		<listitem>
 		  <para>
-		    POP: Downloads your email to your hard disk for
-		    permanent storage.
+		    GroupWise: Select this option if you use a
+                    GroupWise server. GroupWise keeps mail, calendar,
+                    and contact information on the server.
 		  </para>
 		</listitem>
+
 		<listitem>
 		  <para>
 		    Microsoft Exchange: Available only if you have
 		    purchased the Ximian Connector for Microsoft
 		    Exchange, this will allow you to connect to a
-		    Microsoft Exchange 2000 server, which stores
-		    email, calendar, and contact information on the
-		    server. 
+		    Microsoft Exchange 2000 or 2003 server, which
+                    stores email, calendar, and contact information on
+                    the server.
 		  </para>
 		</listitem>
 
-
 		<listitem>
 		  <para>
 		    IMAP: Keeps the email on your server so you can
@@ -183,23 +196,24 @@
 
 		<listitem>
 		  <para>
-		    Standard Unix mbox spool or directory: If you want
-		    to read and store mail in the mail spool on your
-		    local system, choose this option. You'll need to
-		    provide the path to the mail spool
-		    you want to use.
+		    POP: Downloads your email to your hard disk for
+		    permanent storage.
 		  </para>
 		</listitem>
 
 		<listitem>
 		  <para>
-		    Maildir format mail directories: If you download
-		    your mail using qmail or another maildir-style
-		    program, you'll want to use this option.  You'll need
-		    to provide the path to the mail directory you want to
+		    Local Delivery: Choose this option if you want to
+		    move mail from the spool and store it in your home
+		    directory. If you would rather leave mail in your
+		    system's spool files, choose the
+		    <guimenuitem>Standard Unix mbox
+		    spools</guimenuitem> option instead. You'll need
+		    to provide the path to the mail spool you want to
 		    use.
 		  </para>
 		</listitem>
+
 		<listitem>
 		  <para>
 		    MH format mail directories: If you download your
@@ -211,17 +225,25 @@
 
 		<listitem>
 		  <para>
-		    Local Delivery: Choose this option if you want to
-		    move mail from the spool and store it in your home
-		    directory. If you would rather leave mail in your
-		    system's spool files, choose the
-		    <guimenuitem>Standard Unix mbox
-		    spools</guimenuitem> option instead. You'll need
-		    to provide the path to the mail spool you want to
+		    Maildir format mail directories: If you download
+		    your mail using qmail or another maildir-style
+		    program, you'll want to use this option.  You'll need
+		    to provide the path to the mail directory you want to
 		    use.
 		  </para>
 		</listitem>
 
+
+		<listitem>
+		  <para>
+		    Standard Unix mbox spool or directory: If you want
+		    to read and store mail in the mail spool on your
+		    local system, choose this option. You'll need to
+		    provide the path to the mail spool
+		    you want to use.
+		  </para>
+		</listitem>
+
 		<listitem>
 		  <para>
 		    None: Select this if you do not plan to
@@ -271,8 +293,9 @@
 			</para>
 		      </listitem>
 		    </itemizedlist>
+
       <tip id="exchange-info">
-	<title>Ximian Evolution Talk to Microsoft Exchange?</title>
+	<title>Use Ximian Evolution with Microsoft Exchange</title>
          <para>
 	   If you have purchased Ximian Connector for Microsoft
 	   Exchange, you can access Microsoft Exchange 2000 servers
@@ -284,18 +307,13 @@
       </tip> 
 
     </sect2>
+
+
     <sect2 id="more-mail-options">
       <title>More Mail Configuration Options</title>
       <para>
-        There are more extensive options for mail preferences,
-        especially if you've chosen POP, Microsoft Exchange, or IMAP
-        as incoming mail server type.  If you want to set these
-        options after you've created the account, you can select
-        <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Configure
-        </guimenuitem></menuchoice>, click the <guibutton>Mail
-        Accounts</guibutton> button. Then, select the account you want
-        to change and click <guibutton>Edit</guibutton>. See <xref
-        linkend="config-prefs-mail"/> for details.
+        Once you have selected a mail delivery mechanism, you may
+        set some preferences for its behavior:
       </para>
         <variablelist>
 	 <varlistentry>
@@ -304,7 +322,7 @@
          <itemizedlist>
 	  <listitem>
 	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
+	    Evolution to check for new mail
 	    automatically, check the box and select a frequency in
 	    minutes.
             </para>
@@ -325,7 +343,7 @@
 	  <listitem><para>
         <itemizedlist> <listitem>
 	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
+	    Evolution to check for new mail
 	    automatically, check the box and select a frequency in
 	    minutes.
             </para>
@@ -368,23 +386,23 @@
 	  </listitem>
         </itemizedlist>
       </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
 	  <term>If you chose IMAP:</term>
 	  <listitem>
 	    <para>
          <itemizedlist>
 	  <listitem>
 	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
+	    Evolution to check for new mail
 	    automatically, check the box and select a frequency in
 	    minutes.  
             </para>
 	  </listitem>
 
 	  <listitem>
-	    <para>If you want <application>Evolution</application>
+	    <para>If you want Evolution
 	    to check for new messages in <emphasis>all</emphasis> your
 	    IMAP folders, make sure the <guilabel>Check for new
 	    messages in all folders</guilabel> box is selected.</para>
@@ -444,12 +462,14 @@
 	  <listitem>
 	    <para>
 	      Server Type: There are numerous server types that
-	      <application>Ximian Evolution</application> supports for sending your
+	      Ximian Evolution supports for sending your
 	      mail.
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    SMTP: Sends mail directly from your system.
+		    SMTP: Sends mail using an outbound mail
+                    server. This is the most common choice for sending
+                    mail.
 		  </para>
 		</listitem>
 
@@ -466,6 +486,12 @@
 
 		<listitem>
 		  <para>
+		    Groupwise: Sends mail through your GroupWise server. 
+		  </para>
+		</listitem>
+
+		<listitem>
+		  <para>
 		    Sendmail: Uses the Sendmail program to send mail
 		    from your system. Sendmail is more flexible, but
 		    is not as easy to configure, so you should only
@@ -500,9 +526,9 @@
 	      your best bet is to leave this set at
 	      <guilabel>Password</guilabel>.  If you're not sure, ask
 	      your system administrator or ISP, or have
-	      <application>Ximian Evolution</application> check for
-	      you by clicking <guibutton>Check for supported
-	      types</guibutton>.
+	      Ximian Evolution check for
+	      you by clicking <guilabel>Check for supported
+	      types</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -542,7 +568,8 @@
         If you check the box next to the label <guilabel>Make this my
       default account</guilabel>, Evolution will assume that you will
       send messages from this most often, and will set the
-      "From" selector to this account whenever you open a new message. Only one account can be the default.
+      "From" selector to this account whenever you open a new
+      message. Only one account can be the default.
     </para>
     <para>
       If you have not done so already, you may also be asked to choose
@@ -553,7 +580,7 @@
   <sect2 id="fourth-step">
       <title>Importing Mail (Optional)</title>
       <para>
-	If <application>Ximian Evolution</application> finds mail or
+	If Ximian Evolution finds mail or
 	address files from another application, it will offer to
 	import them.  If you're not sure which file format your mail
 	program uses, ask your system administrator.  If you want, you
@@ -562,17 +589,19 @@
 	<menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
       </para>
       <para>
-	<application>Ximian Evolution</application> can import the following types of
+	Ximian Evolution can import the following types of
 	files:
           <variablelist>
            <varlistentry>
 	    <term>VCard (.vcf, gcrd):</term>
 	    <listitem>
 	      <para>
-	         The addressbook format used by the GNOME, KDE, and
+	         The address book 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 application.
+                address book application. Failing that, export to CSV
+                format and use the <command>csv2vcard</command>
+              utility before importing.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -581,9 +610,11 @@
 	    <term>Microsoft Outlook Express 4 (.mbx):</term>
 	    <listitem>
 	      <para>
-                 Email file format used by Microsoft Outlook Express
-4. For other versions of Microsoft Outlook and Outlook Express, see
-the workaround described in the note below.
+                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>
@@ -603,39 +634,15 @@ the workaround described in the note below.
     <note>
       <title>Microsoft Outlook and Outlook Express Users</title>
       <para>
-	Microsoft Outlook, and versions of Outlook Express after
-	version 4, use proprietary formats that <application>Ximian
-	Evolution</application> cannot read or import.  For contacts,
+        <application>Microsoft Outlook</application>, and versions of
+        <application>Outlook Express</application> after
+	version 4, use proprietary formats that Ximian
+	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:
-	<orderedlist numeration="arabic">
-
-	<listitem>
-	<para>
-	  While using Windows, import the files into Mozilla Mail (or
-	  another mailer, such as Netscape or Eudora, that uses the
-	  standard mbox format).
-        </para>
-        </listitem>
-	
-	<listitem>
-	<para>
-          Copy the files to the system or partition you use for
-          <application>Ximian Evolution</application>.  
-         </para>
-        </listitem>
-
-	<listitem>
-	<para>
-	  Use the <application>Ximian Evolution</application> import
-          tool to import the files.  There's more information about
-          why this works, and how, at the Ximian <ulink
-          url="http://support.ximian.com">support website.</ulink>
-      </para>
-        </listitem>
-     </orderedlist>
+	way.  For email, see the instructions in <xref
+	      linkend="outlook-migration-mail" />
     </para>
-    </note>     
+  </note>
 
     <note>
       <title>Netscape Users</title>
@@ -643,18 +650,15 @@ the workaround described in the note below.
 	Before importing mail from Netscape, make sure you select
 	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
 	Folders</guimenuitem></menuchoice>. If you don't,
-	<application>Ximian Evolution</application> will import and undelete
+	Ximian Evolution will import and undelete
 	the messages in your Trash folders.
       </para>
     </note>     
-
-    </para>
-
-      <tip>
-	<title>Exporting Files From Ximian Evolution</title>
-	<para>
-          Ximian Evolution uses standard file types for all its information,
-          so you should have no trouble taking your information
+    <tip>
+      <title>Exporting Files From Ximian Evolution</title>
+      <para>
+        Ximian Evolution uses standard file types for all its information,
+        so you should have no trouble taking your information
           elsewhere if you want.
         </para>
 	<para>
@@ -663,8 +667,9 @@ the workaround described in the note below.
           in a <filename>.db3</filename> database.
         </para>
       </tip>
-    </sect2>
-  </sect1>
+    </para>
+  </sect2>
+</sect1>
 
   <sect1 id="importing-mail-from-clients">
     <title>Importing Mail from Other Mail Clients</title>
@@ -680,12 +685,12 @@ the workaround described in the note below.
 	which is shipped with many Linux and Unix distributions.
 	<application>mutt</application> uses the standard mbox,
 	maildir, and MH file formats, which makes importing your mail
-	into <application>Evolution</application> easy.  By default,
+	into Evolution relatively simple.  By default,
 	<application>mutt</application> uses the mbox file format.
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Open <application>Ximian Evolution</application>
+	      Open Ximian Evolution
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -704,17 +709,17 @@ the workaround described in the note below.
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Next</guibutton>.
+	      Click <guilabel>Next</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select <guibutton>Import a Single File</guibutton>
+	      Select <guilabel>Import a Single File</guilabel>
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Browse</guibutton> and select the file
+	      Click <guilabel>Browse</guilabel> and select the file
 	      you would like to import from.  By default, your email
 	      is stored in <filename>~/mbox</filename> for the mbox
 	      format and <filename
@@ -724,7 +729,7 @@ the workaround described in the note below.
 	  <listitem>
 	    <para>
 	      When prompted for what folder in
-	      <application>Evolution</application> to import to,
+	      Evolution to import to,
 	      select a folder.  You can also create a new folder and
 	      drop it in there.
 	    </para>
@@ -735,14 +740,16 @@ the workaround described in the note below.
     <sect2 id="kmail">
       <title>Importing Mail from KMail</title>
       <para>
-	KMail is the mail client which is shipped with the KDE desktop
-	environment.  KMail uses the standard mbox file format, which
+        <application>KMail</application>
+ is the mail client which is shipped with the KDE desktop
+        environment.  <application>KMail</application> uses the
+standard mbox file format, which
 	means that importing your mail into
-	<application>Evolution</application> is easy.
+	Evolution is easy.
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Open <application>Ximian Evolution</application>
+	      Open Ximian Evolution
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -761,17 +768,17 @@ the workaround described in the note below.
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Next</guibutton>.
+	      Click <guilabel>Next</guilabel>.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select <guibutton>Import a Single File</guibutton>
+	      Select <guilabel>Import a Single File</guilabel>
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Browse</guibutton> and select the file
+	      Click <guilabel>Browse</guilabel> and select the file
 	      you would like to import from.  By default, KMail stores
 	      its information in the Mail directory of your home
 	      directory.
@@ -780,7 +787,7 @@ the workaround described in the note below.
 	  <listitem>
 	    <para>
 	      When prompted for what folder in
-	      <application>Evolution</application> to import to,
+	      Evolution to import to,
 	      select a folder.  You can also create a new folder and
 	      drop it in there.
 	    </para>
@@ -796,7 +803,7 @@ the workaround described in the note below.
         Now that you've gotten the first-run configuration out of the
         way, you're ready to get down to work.  Here's a quick
         explanation of what's going on in your main
-        <application>Ximian Evolution</application> window.
+        Ximian Evolution window.
     </para>
 
     <figure id="preface-basic-interface">
@@ -820,8 +827,8 @@ the workaround described in the note below.
     
     <para>
       The <guilabel>menu bar</guilabel> gives you access to nearly all
-      the features that can be found in <application>Ximian
-      Evolution</application>.
+      the features that can be found in Ximian
+      Evolution.
     </para>
 
     <para>
@@ -840,8 +847,10 @@ the workaround described in the note below.
     </para>
     
     <para>
-      The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
-      components with the click of a click of a button.  
+      The <guilabel>Shortcut Bar</guilabel> lets you switch between
+    folders and between Evolution tools.  At the bottom of the
+    shortcut bar there are buttons that let you switch tools, and 
+    above that, all the available folders for the current tool.
     </para>
     
     <para>
@@ -850,10 +859,11 @@ the workaround described in the note below.
     </para>
     
     <para>
-      Periodically, <application>Ximian Evolution</application> will need to quietly
+      Periodically, Ximian Evolution will need to quietly
       display a message, or tell you the progress of a task.  This most
       often happens when you're checking or sending email.  These progress
-      queues are shown here, in the <guilabel>Status Bar</guilabel>.  
+    queues are shown here, in the <guilabel>Status Bar</guilabel>.
+    The Online/Offline indicator is here, too, in the lower left of the window.
     </para>
     
     <para>
@@ -866,122 +876,31 @@ the workaround described in the note below.
       with precision so you can easily find what you're looking for.
     </para>
 
-    
-
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
     <para>
-        <application>Ximian Evolution</application>'s most important job is
+        Ximian Evolution's most important job is
         to give you access to your information and help you use it
         quickly.  One way it does that is through the
         <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
+        hand side of the main window.  The  buttons with names
+        like <guilabel>Mail</guilabel> and
+        <guilabel>Contacts</guilabel> are the shortcuts. Above them
+        is a list of folders for the current Evolution tool.
     </para>
     <para>
-       Take a look at the <guilabel>Shortcut Bar</guilabel>.
-       The shortcut buttons in that category are:
-
-	    <variablelist>
-	      <varlistentry>
-		<term> <guibutton>Summary</guibutton>:</term>
-		<listitem>
-	    <para>
-		    Start your day here.  The Ximian Evolution
-		    <guilabel>Summary</guilabel> gives you a quick
-		    summary of new or important messages, daily
-		    appointments and urgent tasks.  You can customize
-		    its appearance and content, and use it to access
-		    Ximian Evolution services.
-		  </para>
-		</listitem>
-	      </varlistentry>
-
-	<varlistentry>
-	  <term> <guibutton>Inbox</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Inbox</guibutton> button to start
-	      reading your mail.  Your Inbox is also where you can
-	      access Ximian Evolution's tools to filter, sort, organize, and
-	      search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and task lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-       <varlistentry>
-         <term><guibutton>Tasks</guibutton>:</term>
-	<listitem>
-	  <para>
-	     A full-size view of your calendar's task pad.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      The Addressbook holds contacts, with address, phone, and
-	      other personal information. Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>	  
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="usage-mainwindow-folderbar">
-    <title>Folders and The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Ximian Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>&mdash; it starts small at the top, and branches
-      downward. On most computers, there will be three or four
-      folders at the base.  First, of course, is the
-      <guilabel>Summary</guilabel>, a customizable summary of your
-      information. Below that are your <guilabel>Local
-      Folders</guilabel>, which hold all the
-      <application>Ximian Evolution</application> data that's stored on your
-      computer.  After that are your network servers: <glossterm
-      linkend="ldap">LDAP</glossterm> servers that host shared contact
-      directories, and <glossterm linkend="imap">IMAP</glossterm> mail
-      folders to which you subscribe.  Lastly, there are
-      <guilabel>vFolders</guilabel>, or virtual folders, discussed in
-      <xref linkend="usage-mail-organize-vfolders"/>,
+      The folder list organizes your mail, calendars, address books,
+      and task lists in a tree, similar to a <glossterm linkend="filetree">file
+      tree</glossterm>.  Most people will find one to four 
+      folders at the base of the tree, depending on the tool and their
+    system configuration. Each Evolution tool will have at least one,
+    called <guilabel>On This Computer</guilabel>, for local
+    information. For example, the folder list for the email tool will show any
+    remote mail storage you have set up, plus local folders and 
+    <guilabel>vFolders</guilabel>, or virtual folders, discussed in <xref
+    linkend="usage-mail-organize-vfolders"/>. 
     </para>
 
-
-    <figure id="mainwin-folderbar">
-      <title>Using the Folder Bar</title>
-      <screenshot>
-	<screeninfo>Inbox with Folder Bar</screeninfo>
-	  <mediaobject>
-             <imageobject>
-                 <imagedata fileref="figures/folder-bar" format="PNG" srccredit="Aaron Weber"/> 
-             </imageobject>
-          </mediaobject>
-      </screenshot>
-    </figure>
-    
     <para>
        
       A typical <guilabel>Local</guilabel> folder contains the following folders:
@@ -1012,7 +931,7 @@ the workaround described in the note below.
 	   <para>
 	    <guilabel>Outbox</guilabel>, for messages you have written
 	    but not yet sent.  This will be empty unless you use
-	    <application>Ximian Evolution</application> while offline.
+	    Ximian Evolution while offline.
 	   </para>
 	 </listitem>
 
@@ -1041,14 +960,11 @@ the workaround described in the note below.
 
     </para>
     <tip id="foldertips">
-    <title>Navigating without the Folder Bar or the Shortcut Bar</title>
+    <title>Navigating without the Shortcut Bar</title>
        <para>
          You don't need the folder bar or the shortcut bar to move
          around the main window. You can use the <keycap>Tab</keycap>
-         key to switch from one part of the window to another. When
-         you hide the folder bar, there is a menu on the left side of
-         the window just below the toolbar to move about the folder
-         tree, even with the folder and shortcut bars hidden.
+         key to switch from one part of the window to another.
        </para>
      </tip>
 
@@ -1115,7 +1031,7 @@ the workaround described in the note below.
     <sect3 id="subfolders">
     <title>Subfolders</title>
       <para>
-        <application>Ximian Evolution</application> lets you nest folders
+        Ximian Evolution lets you nest folders
 	inside of each other, so that you can have a detailed
 	organizational system.
       </para>
@@ -1130,7 +1046,7 @@ the workaround described in the note below.
 
     <para>
       Right-clicking will bring up a menu for just about anything in
-      <application>Ximian Evolution</application>.  If you right-click on a
+      Ximian Evolution.  If you right-click on a
       folder, you'll have a menu with the following options:
       <itemizedlist>
 	<listitem><para><guimenuitem>View</guimenuitem>, to view the folder. </para></listitem>
@@ -1164,7 +1080,7 @@ the workaround described in the note below.
       provide all the possible actions for any given view of your
       data.  If you're looking at your Inbox, most of the menu items
       will relate to mail; some will relate to other components of
-      <application>Ximian Evolution</application> and some, especially those
+      Ximian Evolution and some, especially those
       in the <guimenu>File Menu</guimenu> will relate to the
       application as a whole. 
    </para> 
@@ -1190,9 +1106,9 @@ the workaround described in the note below.
        <varlistentry>
           <term> <guimenu>View</guimenu>:</term>
           <listitem><para>
-            This menu lets you decide how <application>Ximian Evolution</application> 
+            This menu lets you decide how Ximian Evolution 
             should look. Some of the features control the appearance of 
-            <application>Ximian Evolution</application> as a whole, and others 
+            Ximian Evolution as a whole, and others 
             the way a particular kind of information appears.
           </para></listitem>
         </varlistentry>
@@ -1237,8 +1153,8 @@ the workaround described in the note below.
           <term> <guimenu>Help</guimenu>:</term>
           <listitem><para>
              Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Ximian Evolution</application> manual.
+             Help Browser 
+             and read the Ximian Evolution manual.
           </para></listitem>
         </varlistentry>
       </variablelist>
@@ -1248,75 +1164,15 @@ the workaround described in the note below.
       Once you've familiarized yourself with the <interface>main
       window</interface> you can start doing things with it.  We'll
       start with the <guilabel>Summary</guilabel>, which provides a
-      quick overview of your <application>Ximian
-      Evolution</application> information.
+      quick overview of your Ximian
+      Evolution information.
     </para>
     </sect2>
-    <sect2 id="basics-summary">
-      <title>Introducing the Summary</title>
-      <para>
-         The Ximian Evolution Summary provides you with a quick
-         run-down of important information: your appointments for a
-         given day, how much new mail you have, headlines from
-         selected news services, and so forth. To see the Summary,
-         click on the <guibutton>Summary</guibutton> button in the
-         shortcut bar, or select the <guilabel>Summary</guilabel>
-         folder in the folder bar.
-      </para>
-
-      <figure>
-	<title>The Evolution Summary</title>
-        <screenshot>
-          <screeninfo>The Evolution Summary gives you a quick view of your day</screeninfo>
-          <mediaobject>
-            <imageobject>
-              <imagedata  format="PNG" fileref="figures/summary" srccredit="Kevin Breit"/>
-            </imageobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
-
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-1" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Weather Summary</guilabel>
-</para>
-<para>
-Shows you the latest weather updates from hundreds of cities around the world.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-2" format="PNG"/></imageobject></inlinemediaobject> <guilabel>News Feeds</guilabel>
-</para>
-<para>
-Displays up to the minute news from your favorite websites.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-3" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Mail Summary</guilabel>
-</para>
-<para>
-Shows you how many email messages you have in your selected folders, waiting to be read.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-4" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Calendar Summary</guilabel>
-</para>
-<para>
-Shows you your calendar. Tasks are displayed below calendar appointments.
-</para>
-
-
-      <para>
-        To add additional services to your Summary, or to edit the
-        existing services, select
-        <menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Configure</guimenuitem> </menuchoice> and click
-	  the <guibutton>Summary Settings</guibutton> button.
-      </para>
-
-    </sect2>
-
+    
     <sect2 id="basics-mail">
       <title>Introducing Email</title>
       <para>
-         <application>Ximian Evolution</application> email is like other
+         Ximian Evolution email is like other
          email programs in several ways:
      <itemizedlist>
 	  <listitem>
@@ -1349,18 +1205,19 @@ Shows you your calendar. Tasks are displayed below calendar appointments.
 	</itemizedlist>
       </para>
       <para>
-        However, <application>Ximian Evolution</application> has some
+        However, Ximian Evolution has some
         important differences.  First, it's built to handle very large
-        amounts of mail.  Both the <link
+      amounts of mail.  The <link
+      linkend="usage-mail-organize-spam">junk mail</link>, message <link
         linkend="usage-mail-organize-filters">filtering</link> and
         <link linkend="usage-mail-organize-search">searching</link>
         functions were built for speed and efficiency on large volumes
-        of mail. There's also the <application>Ximian Evolution</application>
-        <link linkend="usage-mail-organize-vfolders">vFolder</link>,
-        an advanced organizational feature not found in mainstream
-        mail clients.  If you get a lot of mail, or if you keep every
-        message you get in case you need to refer to it later, you'll
-        find this feature especially useful.
+        of mail. There's also the <link
+linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
+        organizational feature not found in mainstream mail clients.
+        If you get a lot of mail, or if you keep every message you get
+        in case you need to refer to it later, you'll find this
+        feature especially useful.
      </para>
      <para>
         Here's what the mailer looks like:
@@ -1406,8 +1263,8 @@ Shows you your calendar. Tasks are displayed below calendar appointments.
         and hold on the divider between the two panes.  Then you can drag
         up and down to select the size of the panes.
 
-</para>
-<para> Just like with folders, you can right-click on messages in the
+    </para>
+    <para> Just like with folders, you can right-click on messages in the
         message list and get a menu of possible actions: you can move,
         delete, or undelete them, and create filters or vFolders based
         on them.
@@ -1434,8 +1291,8 @@ Shows you your calendar. Tasks are displayed below calendar appointments.
     <sect2 id="basics-calendar">
       <title>Introducing the Calendar</title>
       <para>
-       To begin using the calendar, select
-       <guibutton>Calendar</guibutton> from the <interface>shortcut
+       To begin using the calendar, click the 
+       <guilabel>Calendar</guilabel> button in the <interface>shortcut
        bar</interface>.  By default, the calendar starts showing
        today's schedule on a ruled background.  At the upper right,
        there's a monthly calendar you can use to switch days.  Below
@@ -1480,7 +1337,8 @@ Shows you your calendar. Tasks are displayed below calendar appointments.
         have complex notes associated with them, and you can also note
         their completeness on a percentage scale. To display more
         information about your notes, drag the column border to the
-        left.
+        left. For a very detailed view of your tasks, click the
+        <guilabel>Tasks</guilabel> button in the shortcut bar.
       </para>
 
       <para>
@@ -1505,25 +1363,24 @@ Shows you your calendar. Tasks are displayed below calendar appointments.
     <sect2 id="basics-contacts">
       <title>Introducing the Address Book</title>
       <para>
-        The <application>Ximian Evolution</application> address book
+        The Ximian Evolution address book
         can handle all of the functions of an address book, phone
         book, or Rolodex.  Of course, it's a lot easier to update
-        <application>Ximian Evolution</application> than it is to
-        change an actual paper book. <application>Ximian
-        Evolution</application> also allows easy synchronization with
+        Ximian Evolution than it is to
+        change an actual paper book. Ximian
+        Evolution also allows easy synchronization with
         hand-held devices and functions with <glossterm
         linkend="ldap">LDAP</glossterm> directories on a network.
       </para>
       <para>
-        Another advantage of the <application>Ximian Evolution</application>
+        Another advantage of the Ximian Evolution
         address book is its integration with the rest of the
         application.  For example, you can create an address card from
         an email just by right-clicking on the sender's email address.
       </para>
       <para>
         To open your address book, click on
-        <guibutton>Contacts</guibutton> in the shortcut bar, or select
-        one of your contacts folders from the folder bar.  <xref
+        <guilabel>Contacts</guilabel> in the shortcut bar.  <xref
         linkend="usage-contact-fig"/> shows the address book in all its
         organizational glory.  By default, the address book shows all
         your cards in alphabetical order, in a <glossterm
@@ -1551,17 +1408,18 @@ Shows you your calendar. Tasks are displayed below calendar appointments.
       </para>
 
       <para>
-        The <guilabel>Contact List</guilabel> lists your contact cards.
-        You can also search through the cards in the same way 
-        that you search email folders, with the search bar just
-        above the contact list.
+        The largest section of the address book lists your
+        contacts. You can also search through the cards in the same way
+        that you search email folders, with the search tool on the
+        right side of the toolbar.
       </para>
 
       <para>
 	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="PNG"/></imageobject></inlinemediaobject>
 	<guilabel>Alphanumeric Shortcuts</guilabel>
       </para>
-      <para> Click one of the buttons along the right side of the
+      <para>
+        Click one of the buttons along the right side of the
         window to view contacts that begin with the letter or number
         you click.
       </para>
diff --git a/help/C/usage-print.xml b/help/C/usage-print.xml
index 1e7f5c5b18..143e32feec 100644
--- a/help/C/usage-print.xml
+++ b/help/C/usage-print.xml
@@ -2,8 +2,8 @@
   <title>Printing with Evolution</title>
   <para>
     If you've printed from most any other
-    <application>Gnome</application> application, you should be able
-    to print from <application>Evolution</application> without much
+    Gnome application, you should be able
+    to print from Evolution without much
     trouble.
   </para>
   <para>
@@ -17,7 +17,7 @@
   <sect1 id="printpreview">
     <title>Print Preview</title>
     <para>
-      <guibutton>Print Preview</guibutton> appears both as a button in
+      <guilabel>Print Preview</guilabel> appears both as a button in
       the printing dialog and as an item in the
       <guimenu>File</guimenu> menu.  In both places, it does the same
       thing: it opens a new window that shows you what would happen if
@@ -27,15 +27,15 @@
     <para>
       That window allows you to select which pages you want to see,
       and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (the <guibutton>Fit</guibutton> button)
+      the page to the window (the <guilabel>Fit</guilabel> button)
       or match the width of the page and the window (the
-      <guibutton>Fit Width</guibutton> button).  None of these buttons
+      <guilabel>Fit Width</guilabel> button).  None of these buttons
       changes the way the page will be printed, but they do let you
       get a better look.  If you're satisfied with the way the your paper
-      looks, click <guibutton>Print</guibutton> to send your document
+      looks, click <guilabel>Print</guilabel> to send your document
       on its way.  If you'd like to change it, just close the
       <guilabel>Print Preview</guilabel> window and make the changes
-      you want from your mail, calendar, or addressbook.
+      you want from your mail, calendar, or address book.
     </para>
 
 
@@ -99,9 +99,9 @@
      whether to print only the selected cards, or all of them.
    </para>
     <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
+      When you're ready, click <guilabel>Print</guilabel> to print,
+      <guilabel>Preview</guilabel> to have a look (or another look)
+      at the preview, or <guilabel>Cancel</guilabel> to cancel the
       whole deal.
     </para>
   </sect1>
diff --git a/help/C/usage-sync.xml b/help/C/usage-sync.xml
index 45e18e5e82..98ab6be928 100644
--- a/help/C/usage-sync.xml
+++ b/help/C/usage-sync.xml
@@ -3,7 +3,7 @@
       <para>
         This chapter is very short.  It describes how to synchronize
         the data on your Palm-OS device with the data you store in
-        <application>Ximian Evolution</application>.  If you need
+        Ximian Evolution.  If you need
         information on how to set up handheld synchronization, consult
         <xref linkend="config-sync"/>.
       </para>
@@ -27,8 +27,8 @@ protection on your handheld.
 </tip>
         <para>
 	 If you have followed the set up instructions properly, your
-	 Palm-OS device will synchronize data with <application>Ximian
-	 Evolution</application>.
+	 Palm-OS device will synchronize data with Ximian
+	 Evolution.
         </para>
 
          <para>