Remove glossterms in favor of links; add a lot more edits, special

thanks to Angela Boyle.

svn path=/trunk/; revision=26642

11 files changed, 344 insertions, 336 deletions

diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 390699661a..feb931fc5f 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -191,10 +191,10 @@
            <listitem>
 	    <para>
              Here, select the way you will be getting mail: you may
-             download mail from a server (<glossterm
-             linkend="pop">POP</glossterm>), read and keep it on the
-             server (Microsoft Exchange or <glossterm
-             linkend="imap">IMAP</glossterm>), or read it from files
+             download mail from a server (<link
+             linkend="pop">POP</link>), read and keep it on the
+             server (Microsoft Exchange or <link
+             linkend="imap">IMAP</link>), or read it from files
              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
@@ -381,11 +381,11 @@ smtp.omniport.com:143
            <listitem>
 	    <para>
               In this section, you will choose and configure a method
-              for sending mail.  You may choose <glossterm
-              linkend="smtp">SMTP</glossterm>, Microsoft Exchange (if
+              for sending mail.  You may choose <link
+              linkend="smtp">SMTP</link>, Microsoft Exchange (if
               you have installed the Evolution Connector for Microsoft
-              Exchange) or <glossterm
-              linkend="sendmail">sendmail</glossterm>.
+              Exchange) or <link
+              linkend="sendmail">sendmail</link>.
              </para>
              <para>
                If you choose Exchange or Sendmail, you're done with
@@ -943,8 +943,8 @@ smtp.omniport.com:143
 	  <listitem>
 
 	    <para>
-              If you are creating an <glossterm
-              linkend="ldap">LDAP</glossterm> server, enter the server information
+              If you are creating an <link
+              linkend="ldap">LDAP</link> server, enter the server information
             as requested by the assistant:
 	    <variablelist>
 		<varlistentry>
@@ -998,8 +998,8 @@ smtp.omniport.com:143
                   <term><guilabel>Search base</guilabel></term>
 		  <listitem>
 		    <para>
-		      The <glossterm linkend="search-base">search
-                    base</glossterm> is the starting point for a directory search. 
+		      The <link linkend="search-base">search
+                    base</link> is the starting point for a directory search. 
 		      Contact your network administrator for information about
 		      the correct settings.
 		    </para>
@@ -1009,8 +1009,8 @@ smtp.omniport.com:143
                   <term><guilabel>Search scope</guilabel></term>
 		  <listitem>
 		    <para>
-                      The <glossterm linkend="search-scope">search
-                    scope</glossterm> is the breadth of a given search. 
+                      The <link linkend="search-scope">search
+                    scope</link> is the breadth of a given search. 
 		    The  following options are available:
 		      <variablelist>
 			<varlistentry>
diff --git a/help/C/config-sync.xml b/help/C/config-sync.xml
index 35ed29b440..57cfddf047 100644
--- a/help/C/config-sync.xml
+++ b/help/C/config-sync.xml
@@ -1,5 +1,5 @@
   <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
+     <title>Synchronization Settings</title>
      <para>
         Synchronization presents you with two issues you'll need to
         address. First, your computer needs to recognize and access
@@ -24,8 +24,8 @@
     </para>
     <para>
         Once your computer and your PalmOS device are talking happily
-        to each other, select the <glossterm
-        linkend="conduit">conduits</glossterm> you want under the
+        to each other, select the <link
+        linkend="conduit">conduits</link> you want under the
         <guilabel>Pilot Conduits</guilabel> section of the Control
         Center.  You may use conduits to synchronize data with several
         applications; the Novell Evolution
diff --git a/help/C/evolution-1.5.xml b/help/C/evolution-1.5.xml
index b7b663ec55..6064605b3e 100644
--- a/help/C/evolution-1.5.xml
+++ b/help/C/evolution-1.5.xml
@@ -42,7 +42,7 @@ entity names correspond.  APX is for appendix.  -->
 
 <book id="index">
   <bookinfo>
-    <title>A User's Guide to  Evolution 1.5</title>
+    <title>Evolution 1.5 Manual</title>
     <authorgroup>
       <author><firstname>Aaron</firstname><surname>Weber</surname></author>
       <author><firstname>Kevin</firstname><surname>Breit</surname></author>
@@ -76,7 +76,7 @@ entity names correspond.  APX is for appendix.  -->
   </preface>
 
   <part id="usage">
-    <title>Getting Started with Novell  Evolution</title>
+    <title>Using Evolution</title>
      <partintro>
       <para>
         Part one of the Novell Evolution manual
@@ -97,7 +97,7 @@ entity names correspond.  APX is for appendix.  -->
     &USAGE-SYNC; 
   </part>
   <part id="config">
-  <title>Configuring and Managing Novell Evolution</title>
+  <title>Setting Preferences</title>
     <partintro>
       <para>
         Novell Evolution is highly
@@ -119,8 +119,8 @@ entity names correspond.  APX is for appendix.  -->
     &CONFIG-SYNC;
   </part>
 
-  &MENUREF;
   &APX-GLOSS;
+  &MENUREF;
   &APX-BUGS;
   &APX-AUTHORS; 
   &GPL;
diff --git a/help/C/preface.xml b/help/C/preface.xml
index ef803c9049..e6c055b0e8 100644
--- a/help/C/preface.xml
+++ b/help/C/preface.xml
@@ -25,7 +25,7 @@
     </sect1>
 
     <sect1 id="whats-new-in-one-two">
-      <title>What's New in Evolution &appversion;</title>
+      <title>New in Evolution &appversion;</title>
       <para>
         Even if you're already familiar with earlier versions,
         Evolution &appversion; has a lot of new features to offer. 
@@ -103,7 +103,7 @@
     </sect1>
 
     <sect1 id="preface-for-experts">
-      <title>Introductory Tips for Experienced Users</title>
+      <title>Tips for Experienced Linux Users</title>
       <para>
         This section has a few tips for experienced users of Linux or
         UNIX systems:
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index e5ef66dbae..ecec742c17 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -3,7 +3,7 @@
 -->
 
 <chapter id="usage-calendar">
-  <title>Managing your Schedule</title>
+  <title>Evolution Calendar</title>
 
      <para>
       This chapter will show you how to use the Novell Evolution
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index 0986b0c766..743e3bc77c 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -3,7 +3,7 @@
 -->
 
 <chapter id="usage-contact">
-  <title>Working with Your Contacts</title>
+  <title>Evolution Contacts: the Address Book</title>
       <para>
         This chapter will show you how to use the
         Evolution contacts tool to organize
@@ -474,7 +474,7 @@
     <title>LDAP: Shared Contact Groups on a Network</title>
 
     <para>
-      The <glossterm linkend="ldap">LDAP</glossterm> protocol was
+      The <link linkend="ldap">LDAP</link> protocol was
       created to let users share contact information over a network by
       sharing access to a central directory.  LDAP allows a company
     to maintain a shared set of contact information.  Many companies
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index 9fb63bf03c..b2bf8b0c6b 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -1,5 +1,5 @@
  <chapter id="usage-exchange">
-    <title>The Evolution Connector for Microsoft Exchange</title>
+    <title>Connecting to Exchange Servers</title>
     <para>The Evolution Connector for Microsoft Exchange allows Novell
     Evolution clients to access accounts on Microsoft Exchange 2000
     servers. It is available through Novell Red Carpet in its own
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 5390171a36..4e9e3cec1b 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -1,5 +1,5 @@
 <chapter id="usage-mail-organize">
-    <title>Organizing and Managing your Email</title>
+    <title>Organizing your Email</title>
     <para>
       Even if you only get a few email messages a day, you probably
       want to sort and organize them.  When you get a hundred a day
@@ -779,8 +779,8 @@
 		<listitem>
 		  <para>
 		    Regex Match  - If you know your way around a
-		    <glossterm
-		    linkend="regular-expression">regex</glossterm>, or
+		    <link
+		    linkend="regular-expression">regex</link>, or
 		    regular expression, put your knowledge to use
 		    here. This allows you to search for complex
 		    patterns of letters, so that you can find, for
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 5d8cdd98b4..e5d07cf8bb 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -1,5 +1,5 @@
 <chapter id="usage-mail">
-  <title>Using Evolution for Email</title>
+  <title>Getting and Sending Email</title>
   <para>
     This chapter, and <xref linkend="usage-mail-organize"/>, will
       provide you with an in-depth guide to the capabilities of
@@ -355,7 +355,7 @@
      <sect2 id="usage-mail-getnsend-get-attach">
 	 <title>Working with Attachments and HTML Mail</title>
 	 <para>
-	   If someone sends you an <glossterm linkend="attachment">attachment</glossterm>,
+	   If someone sends you an <link linkend="attachment">attachment</link>,
 	   a file attached to an email,
 	   Evolution will display the file
 	   at the bottom of the message to which it's attached.  Text,
@@ -953,8 +953,8 @@
               <listitem>
                 <para>
                   Find a regex, also called a
-                  <glossterm linkend="regular-expression">regular
-                  expression</glossterm>, in your composer window.
+                  <link linkend="regular-expression">regular
+                  expression</link>, in your composer window.
                </para>
              </listitem>
             </varlistentry>
@@ -997,8 +997,8 @@
             using far too many exclamation points to convey their
             feelings.  However, most newer email programs can display
             images and text styles as well as basic alignment and
-            paragraph formatting. They do this with <glossterm
-            linkend="html">HTML</glossterm>, just like web pages do.
+            paragraph formatting. They do this with <link
+            linkend="html">HTML</link>, just like web pages do.
         </para>
         <note>
           <title>HTML Mail is not a Default Setting</title>
@@ -1030,8 +1030,8 @@
 	<guimenu>Format</guimenu> menus.
       </para>
       <para>
-	The icons in the toolbar are explained in <glossterm
-            linkend="tooltip">tool-tips</glossterm>, which appear when
+	The icons in the toolbar are explained in <link
+            linkend="tooltip">tool-tips</link>, which appear when
             you hold your mouse over the buttons.  The buttons fall
             into four categories:
             <variablelist>
@@ -1411,7 +1411,7 @@
           have received a message and you think someone else would
           like to see it.  You can forward a message as an attachment
           to a new message (this is the default) or
-          you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
+          you can send it <link linkend="inline">inline</link> as a quoted
           portion of the message you are sending.  Attachment
           forwarding is best if you want to send the full, unaltered
           message on to someone else.  Inline forwarding is best if
@@ -1428,8 +1428,8 @@
           <guimenuitem>Forward</guimenuitem> </menuchoice>, or press
           <keycombo
 action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
-          you prefer to forward the message <glossterm
-          linkend="inline">inline</glossterm>
+          you prefer to forward the message <link
+          linkend="inline">inline</link>
           instead of attached, select <menuchoice>
           <guimenu>Actions</guimenu><guisubmenu>Forward</guisubmenu><guimenuitem>
           Inline</guimenuitem> </menuchoice> from the menu.  Choose an
@@ -1641,8 +1641,8 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
 	from prying eyes. Evolution helps
 	you you protect your privacy by using
 	gpg, an implementation of strong
-	<glossterm linkend="public-key-encryption">Public Key
-	Encryption.</glossterm>
+	<link linkend="public-key-encryption">Public Key
+	Encryption.</link>
       </para>
 
 	<note id="pub-priv">
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 4383101966..79549dd3a2 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -1,6 +1,6 @@
 <chapter id="usage-mainwindow">
 
-  <title>Getting Started with Novell Evolution</title>
+  <title>Getting Started</title>
 
     <sect1 id="what"> 
       <title>What is Novell Evolution, and What Can It Do for Me?</title>
@@ -11,17 +11,16 @@
         Novell 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
-        linkend="groupware">groupware</glossterm> program, an integral
+        others.  That is, it's a highly evolved <link
+        linkend="groupware">groupware</link> program, an integral
         part of the Internet-connected desktop.
       </para>
       <para>
-        In other words, Novell 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
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
+        Novell Evolution 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 or several computers,
+        connected directly or over a network, for one person or for
+        large groups.
       </para>
 
       <para>
@@ -33,7 +32,7 @@
         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
-        linkend="usage-mail-organize-vfolders"><trademark>VFolders</trademark></link>,
+        linkend="usage-mail-organize-vfolders">VFolders</link>,
         which let you save searches as though they were ordinary mail
         folders.
      </para>
@@ -83,12 +82,29 @@
              </para>
            </listitem>
 
+	    <listitem>
+	      <para>
+		To start Evolution in mail mode, type <userinput>evolution -c
+		  mail</userinput>.  To open the calendar first, use
+		<userinput>-c calendar</userinput>.  To open the contact list
+		first, use <userinput>-c contacts</userinput>.
+		</para>
+	      </listitem>
+
+	    <listitem>
+	      <para>
+		If Evolution stops responding, freezes, or hangs, open a
+		terminal and type <userinput>evolution
+		  --force-shutdown</userinput> to force every piece of the
+              application to quit.
+            </para>
+          </listitem>
+
            <listitem>
-             <para>
-               To make your web browser use Evolution as the default
+             <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.
-            </para>
+             </para>
           </listitem>
         </itemizedlist>
       </para>
@@ -106,13 +122,14 @@
       five minutes.
     </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
+      Later on, if you want to change this account, or
+      if you want to create a new one, select
+        <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Settings
+        </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
+        to change and click <guilabel>Edit</guilabel>. Alternately,
+        add a new account by clicking
+       <guilabel>Add</guilabel>. See <xref
         linkend="config-prefs-mail"/> for details.
       </para>
 
@@ -126,35 +143,55 @@
 	<guimenuitem>Settings</guimenuitem></menuchoice> tool and
 	clicking the <guilabel>Mail Accounts</guilabel> button.
 	<itemizedlist>
+          <listitem>
+            <para>
+              <guilabel>Account Information:</guilabel> Choose a name
+              for Evolution to refer to this account.  This is used
+              only for display within Evolution. Good choices are
+              "Work Email" or "IMAP Server."
+            </para>
+          </listitem>
+
+	  <listitem>
+	    <para>
+              <guilabel>Full Name</guilabel>: Your full name.
+	    </para>
+	  </listitem>
 	  <listitem>
 	    <para>
-	      Full Name: Your full name (Example: John Doe).
+              <guilabel> Email Address </guilabel>: Your email address.
 	    </para>
 	  </listitem>
+
 	  <listitem>
 	    <para>
-	      Email Address: Your email address (Example: john@doe.com)
+              <guilabel>Make this my default account</guilabel>:
+              Select this as the primary account. 
 	    </para>
 	  </listitem>
+
 	  <listitem>
 	    <para>
-	      Reply-To: If you want to have replies sent to another
-	      email address, enter it here (optional).
+              <guilabel> Reply-To </guilabel>: If you want to have
+              replies sent to another email address, enter it in this
+              space (optional).
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Organization: The company where you work, or the
+              <guilabel>Organization </guilabel>: The company where you work, or the
 	      organization you represent when you send email
 	      (optional).
 	    </para>
 	  </listitem>
+
+
 	</itemizedlist>
       </para>
     </sect2>
 
     <sect2 id="second-step">
-      <title>Receiving Email</title>
+      <title>Receiving Mail</title>
       <para>
         The <guilabel>Receiving Email</guilabel> lets you determine
 	which you will get your email.
@@ -170,7 +207,7 @@
 
 		<listitem>
 		  <para>
-		    GroupWise: Select this option if you use a
+                    <guimenuitem>GroupWise</guimenuitem>: Select this option if you use a
                     GroupWise server. GroupWise keeps mail, calendar,
                     and contact information on the server.
 		  </para>
@@ -178,7 +215,7 @@
 
 		<listitem>
 		  <para>
-		    Microsoft Exchange: Available only if you have
+                    <guimenuitem>Microsoft Exchange</guimenuitem>: Available only if you have
 		    installed the Novell Connector for Microsoft
 		    Exchange, this will allow you to connect to a
 		    Microsoft Exchange 2000 or 2003 server, which
@@ -189,21 +226,21 @@
 
 		<listitem>
 		  <para>
-		    IMAP: Keeps the email on your server so you can
+                    <guimenuitem>IMAP</guimenuitem>: Keeps the email on your server so you can
 		    access your email from multiple systems.
 		  </para>
 		</listitem>
 
 		<listitem>
 		  <para>
-		    POP: Downloads your email to your hard disk for
+		    <guimenuitem>POP</guimenuitem>: Downloads your email to your hard disk for
 		    permanent storage.
 		  </para>
 		</listitem>
 
 		<listitem>
 		  <para>
-		    Local Delivery: Choose this option if you want to
+		    <guimenuitem>Local Delivery</guimenuitem>: 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
@@ -216,7 +253,7 @@
 
 		<listitem>
 		  <para>
-		    MH format mail directories: If you download your
+		    <guimenuitem>MH format mail directories</guimenuitem>: If you download your
 		    mail using mh or another MH-style program, you'll
 		    want to use this option.  You'll need to provide
 		    the path to the mail directory you want to use.
@@ -225,7 +262,7 @@
 
 		<listitem>
 		  <para>
-		    Maildir format mail directories: If you download
+		    <guimenuitem>Maildir format mail directories</guimenuitem>: 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
@@ -236,7 +273,7 @@
 
 		<listitem>
 		  <para>
-		    Standard Unix mbox spool or directory: If you want
+		    <guimenuitem>Standard Unix mbox spool or directory</guimenuitem>: 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
@@ -246,7 +283,7 @@
 
 		<listitem>
 		  <para>
-		    None: Select this if you do not plan to
+		    <guimenuitem>None</guimenuitem>: Select this if you do not plan to
 		    check mail with this account.
 		  </para>
 		</listitem>
@@ -281,21 +318,34 @@
 
 		      <listitem>
 			<para>The authentication options supported by
-			your server. If you're not sure, click the
+			your server. If you're not sure, ask your system 
+                        administrator. You can also click the
 			<guilabel>Check for supported types</guilabel>
-			button or ask your system administrator.
+                        button; when you have done so, the menu will
+                        limit itself to options your server has not 
+                        refused to support. Note that some servers do
+                        not announce the authentication mechanisms
+                        they support, so clicking this button is not
+                        an absolute guarantee that available
+                        mechanisms will actually work.
 			</para>
 		      </listitem>
 
 		      <listitem>
-			<para>Whether you'd like Evolution to remember
-			your password.
+			<para>Choose whether you'd like Evolution to remember
+                        your password. If you have selected this item,
+                        you can force Evolution to ask for a
+                        password again by selecting
+                        <menuchoice><guimenu>Actions</guimenu><guimenuitem>Forget
+                        Passwords</guimenuitem></menuchoice>, or by returning to this section of the 
+                        accounts tool, which you can find by selecting
+                        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
 			</para>
 		      </listitem>
 		    </itemizedlist>
 
       <tip id="exchange-info">
-	<title>Use Novell Evolution with Microsoft Exchange</title>
+	<title>Connecting to an Exchange Server</title>
          <para>
 	   If you have installed Novell Connector for Microsoft
 	   Exchange, you can access Microsoft Exchange 2000 servers
@@ -310,7 +360,7 @@
 
 
     <sect2 id="more-mail-options">
-      <title>More Mail Configuration Options</title>
+      <title>Receiving Mail Options</title>
       <para>
         Once you have selected a mail delivery mechanism, you may
         set some preferences for its behavior:
@@ -352,7 +402,7 @@
 	  <listitem>
 	    <para>
               Global Address List/Active Directory: Enter the name of
-              your global catalog server here. You may also choose to
+              your global catalog server. You may also choose to
               limit the server's responses and select a maximum number
               of results for an address search. A maximum number of
               results limits the load on your system and on your
@@ -369,13 +419,12 @@
 	  <listitem>
 	    <para>
 	      Outlook Web Access (OWA) Path: In most cases, the URL
-	      for web access is "http://server.company.com/exchange."
-	      If your system has a path that is not "exchange," enter
-	      the appropriate value here.
+	      for web access is "http://server.company.com/exchange,"
+              but some systems use a different path.
 	     </para>
 	  </listitem>
 	  <listitem>
-	    <para>Public Folder Server: Enter the name of your organization's public folder server, if any, here.</para>
+	    <para>Public Folder Server: Enter the name of your organization's public folder server, if any.</para>
 	  </listitem>
 
 	  <listitem>
@@ -394,40 +443,78 @@
 	    <para>
          <itemizedlist>
 	  <listitem>
-	    <para>Checking for new mail: If you would like
-	    Evolution to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.  
+	    <para>
+
+              <guilabel>Automatically check for new mail
+              every... minutes:</guilabel> If you would like Evolution to check
+              for new mail automatically, check the box and select a
+              frequency in minutes.
             </para>
 	  </listitem>
 
 	  <listitem>
-	    <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>
+            <para><guilabel>Check for new messages in all
+            folders:</guilabel> If you want Evolution to check for new
+            messages in <emphasis>all</emphasis> your
+	    IMAP folders, make sure this box is selected. This option
+            is normally selected in combination with server-side
+            filtering tools like procmail. </para>
+	  </listitem>
+
+
+	  <listitem>
+            <para> <guilabel>Use custom command to connect to
+            server:</guilabel> Some IMAP servers require a specific,
+            custom connection sequence. Custom commands are rare; if
+            your server requires one, your system administrator
+            should be able to tell you.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Show only subscribed folders: Check this box if you
-	    have more folders in your IMAP view than you want to
-	    read.</para>
+            <para> <guilabel>Show only subscribed folders</guilabel>:
+            Check this box if you have more folders in your IMAP view
+            than you want to read. For more information about IMAP
+            mail and folder subscriptions, see <xref
+            linkend="usage-mail-subscriptions"/>.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para>
-              Override server-supplied namespace: If you like, enter a
-              specific directory where your server stores mail for
-              you.  Typical values are "mail" and "Mail."  For more
-              information about how to use IMAP mail, see <xref
-              linkend="usage-mail-subscriptions"/>.</para>
+              <guilabel>Override server-supplied namespace</guilabel>:
+              If you like, enter a specific directory where your
+              server stores mail for you.  The most common values are
+              "mail" and "Mail."  </para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Apply filters to new messages in INBOX on this
-	    server: If you'd like your filters to work on this account
+            <para><guilabel>Apply filters to new messages in INBOX on this
+            server</guilabel>: If you'd like your filters to work on this account
 	    as well as on locally downloaded mail, check this box.</para>
 	  </listitem>
+
+	  <listitem>
+            <para><guilabel>Check new messages for Junk
+            contents:</guilabel> Check this box if you want your IMAP
+            email filtered for junk mail.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>
+              <guilabel>Only check for Junk messages in the INBOX
+              folder:</guilabel> If you have new messages arriving in
+              multiple folders, as you would with server-side filters,
+              Evolution may filter them for junk mail as well. This
+              can take extra time, so if you know that those messages
+              are not likely to be junk mail, select this option.
+            </para>
+	  </listitem>
+
+	  <listitem>
+            <para><guilabel>Automatically synchronize remote mail
+            locally:</guilabel> Select this option to have Evolution 
+            cache mail locally for offline use.</para>
+	  </listitem>
+
 	</itemizedlist>
      </para>
     </listitem>
@@ -437,11 +524,12 @@
          <note id="imap-namespace">
             <title>What's an IMAP Namespace?</title>
                 <para>
-                    For IMAP mail servers, your sysadmin may provide
-		    you with a specific namespace, the directory on
-		    where your server stores mail for you. If you
-		    check your IMAP mail and your folder list includes
-		    files that don't look like mail folders, you
+                  For IMAP mail servers, your system administrator
+                  may provide you with a specific namespace, the
+                  directory where your server stores mail for
+                  you. If you check your IMAP mail and your folder
+                  list includes files that don't look like mail
+folders, you
 		    probably need to change your mail
 		    namespace. Typical values are "mail" and "Mail."
 		    If you prefer, you can choose to subscribe to
@@ -454,10 +542,11 @@
     </sect2>
 
     <sect2 id="third-step">
-      <title>Sending Email</title>
+      <title>Sending Mail</title>
       <para>
-	The <guilabel>Sending Email</guilabel> step lets you configure sending 
-	email.
+	Now that you have entered information about how you plan to
+        get mail, Evolution needs to know about how you want to send
+        it:
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -508,7 +597,7 @@
 	  <listitem>
 	    <para>
 	      Host: enter your mail sending server's name or IP
-              address here.
+              address.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -550,45 +639,107 @@
     </sect2>
 
     <sect2 id="step-three-b">
-      <title>Account Management</title>
-      <para>
-        This is a very short section. You can pick two things: the
-        name for the account, and whether it is the default account.
-      </para>
+      <title>Defaults</title>
+	  
       <para>
-        The name you choose for the account is used for display within
-        Evolution, and is not sent with any emails.  The suggested
-        name is your email address, but you can use other words or
-        phrases, like "Work," "Personal" or "First Account" if you
-        like.
+       In this step, you will set a few miscellaneous options:
       </para>
+
+        <itemizedlist>
+          <listitem>
+	    <para>
+              <guilabel>Drafts Folder</guilabel>: When you save a message as a draft, it will be saved to this folder. 
+	    </para>
+	  </listitem>
+          <listitem>
+	    <para>
+              <guilabel>Sent Messages Folder</guilabel>: A copy of every message you send will be saved in this folder.
+	    </para>
+	  </listitem>
+          <listitem>
+	    <para>
+              <guilabel>Always carbon-copy (cc) to</guilabel>: Send a carbon copy of every message to this address.
+	    </para>
+	  </listitem>
+          <listitem>
+	    <para>
+              <guilabel>Always blind carbon-copy (bcc) to</guilabel>: Send a blind carbon copy of every message to this address.
+	    </para>
+	  </listitem>
+	</itemizedlist>
+
+        <para>
+          If you have not done so already, you may also be asked to choose
+          a time zone.
+        </para>
+      </sect2>
+
+      <sect2 id="fourth-step">
+        <title>Importing Mail (Optional)</title>
+        <para>
+          If Novell Evolution finds mail or
+          address files from another application, it will offer to
+          import them. You should be aware of a few caveats before you
+          begin:
+        </para>
+
+        <para>
+          <application>Microsoft Outlook</application>, and versions of
+          <application>Outlook Express</application> after
+          version 4, use proprietary formats that Novell
+          Evolution cannot read or import.  To import information, you
+          may wish to use the <application>Outport</application> under
+          Windows. See the instructions in <xref
+          linkend="outlook-migration-mail" />.
+        </para>
+        
+        <para>
+          Before importing mail from Netscape, make sure you have selected
+          <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
+          Folders</guimenuitem></menuchoice>. If you don't,
+          Novell Evolution will import and undelete
+          the messages in your Trash folders.
+        </para>
+        
+        <tip>
+          <title>Exporting Files From Novell Evolution</title>
+          <para>
+            Evolution uses standard file types for mail and calendar
+            information, so you can copy those files from your
+            <filename>~/.evolution</filename> directory. 
+            The file formats used are <filename>mbox</filename> for
+            mail and <filename>iCal</filename> for calendar
+            information.
+          </para>
+          <para>
+            Contacts files are stored in a database, but can be saved as
+            a standard <filename>VCard</filename>.  To export contact
+          data, open your contacts tool and select the contacts you wish
+          to export (press <keycombo><keycap>Ctrl</keycap>
+          <keycap>A</keycap></keycombo> to select them all). Then,
+          select <menuchoice><guimenu>File</guimenu><guimenuitem>Save as
+          VCard</guimenuitem></menuchoice>.        
+          </para>
+        </tip>
+
+    </sect2>
+
+
+    <sect2 id="importing-mail-from-clients">
+      <title>Importing Data from Other Mail Clients</title>
       <para>
-        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.
+        If you have mail in another mail client that was not detected by
+        the automatic import tool, you can still keep your old
+        mail by using the <guilabel>Import</guilabel> tool after you
+      have finished setting up your account. Mail import is only
+      relevant for POP mail accounts and for some local contact and
+      calendar information; if you used IMAP, Exchange, or GroupWise
+      before you switched to Evolution, you can skip this step entirely.
     </para>
     <para>
-      If you have not done so already, you may also be asked to choose
-      a time zone.
-    </para>
-  </sect2>
-
-  <sect2 id="fourth-step">
-      <title>Importing Mail (Optional)</title>
-      <para>
-	If Novell 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
-	can skip this step and return to it at a later time by
-	selecting
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
-      </para>
-      <para>
-	Novell Evolution can import the following types of
-	files:
+      You will need to know what kind of file your old mail client uses,
+      and you will need to have access to those files. Evolution can
+      import the following types of files:
           <variablelist>
            <varlistentry>
 	    <term>VCard (.vcf, .gcrd):</term>
@@ -625,82 +776,22 @@
 	    </listitem>
 	  </varlistentry>
        </variablelist>
-</para>
-<para>
-    <note>
-      <title>Microsoft Outlook and Outlook Express Users</title>
-      <para>
-        <application>Microsoft Outlook</application>, and versions of
-        <application>Outlook Express</application> after
-	version 4, use proprietary formats that Novell
-	Evolution cannot read or import.  For contacts,
-	you may have to email them to yourself and import them that
-	way.  For email, see the instructions in <xref
-	      linkend="outlook-migration-mail" />
-    </para>
-  </note>
-
-    <note>
-      <title>Netscape Users</title>
-      <para>
-	Before importing mail from Netscape, make sure you select
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-	Folders</guimenuitem></menuchoice>. If you don't,
-	Novell Evolution will import and undelete
-	the messages in your Trash folders.
-      </para>
-    </note>     
-    <tip>
-      <title>Exporting Files From Novell Evolution</title>
-      <para>
-        Novell Evolution uses standard file types for all its information,
-        so you should have no trouble taking your information
-          elsewhere if you want.
-        </para>
-	<para>
-          For mail, that's <filename>mbox</filename>, for the calendar,
-          <filename>iCal</filename>, and for the contacts, a database that
-	    exports to vCards.
-        </para>
-      </tip>
-    </para>
-  </sect2>
-</sect1>
-
-  <sect1 id="importing-mail-from-clients">
-    <title>Importing Mail from Other Mail Clients</title>
-    <para>
-      Chances are, you already have your email in another mail program
-      and don't want to lose the information.  The following section
-      describes how to import mail from specific mail clients.
-    </para>
-    <sect2 id="mutt">
-      <title>Importing Mail from mutt</title>
-      <para>
-	<application>mutt</application> is a text-based mail client
-	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 Evolution relatively simple.  By default,
-	<application>mutt</application> uses the mbox file format.
+     </para>
+     <para>
+     To import data from another application:
 	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open Novell Evolution
-	    </para>
-	  </listitem>
-	  <listitem>
+          <listitem>
 	    <para>
-	      Click
+              Open the mail importer tool by selecting
 	      <menuchoice>
 		<guimenu>File</guimenu>
 		<guimenuitem>Import</guimenuitem>
 	      </menuchoice>
-	      or press
+	      or pressing
 	      <keycombo action="simul">
 		<keycap>Ctrl</keycap>
 		<keycap>I</keycap>
-	      </keycombo>.
+	      </keycombo>. 
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -716,79 +807,25 @@
 	  <listitem>
 	    <para>
 	      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
-	      class="directory">~/Maildir</filename> for the Maildir format.
+              you would like to import. Many mail clients store mail
+            in
+            <filename>~/mbox</filename> or <filename
+            class="directory">~/Maildir</filename>. <application>KMail</application>
+            uses the <filename>~/Mail</filename> directory.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      When prompted for what folder in
-	      Evolution to import to,
-	      select a folder.  You can also create a new folder and
-	      drop it in there.
+	      When prompted for an import destination, choose
+	      a folder.  You can also create a new folder and
+              import to that.
 	    </para>
 	  </listitem>
 	</orderedlist>
       </para>
-    </sect2>
-    <sect2 id="kmail">
-      <title>Importing Mail from KMail</title>
       <para>
-        <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
-	Evolution is easy.
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open Novell Evolution
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>File</guimenu>
-		<guimenuitem>Import</guimenuitem>
-	      </menuchoice>
-	      or press
-	      <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>I</keycap>
-	      </keycombo>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>Next</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select <guilabel>Import a Single File</guilabel>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>Browse</guilabel> and select the file
-	      you would like to import from.  By default, KMail stores
-	      its information in the Mail directory of your home
-	      directory.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When prompted for what folder in
-	      Evolution to import to,
-	      select a folder.  You can also create a new folder and
-	      drop it in there.
-	    </para>
-	  </listitem>
-	</orderedlist>
+      You will need to repeat this process for each mail folder
+      you wish to import, so it can be slightly tedious.
       </para>
     </sect2>
   </sect1>
@@ -888,8 +925,8 @@ standard mbox file format, which
     </para>
     <para>
       The folder list organizes your mail, calendars, contact lists,
-      and task lists in a tree, similar to a <glossterm linkend="filetree">file
-      tree</glossterm>.  Most people will find one to four 
+      and task lists in a tree, similar to a <link linkend="filetree">file
+      tree</link>.  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
@@ -911,12 +948,7 @@ standard mbox file format, which
 	    <para>
               Right click on the list of folders, and select 
               <guilabel>New Folder</guilabel>.
-                <!--  FIXME: this was taken out: or press the keyboard shortcut  
-                <keycombo action="simul">
-		<keycap>Shift</keycap>
-		<keycap>Ctrl</keycap>
-		<keycap>F</keycap>
-	      </keycombo>.  -->
+
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -935,25 +967,20 @@ standard mbox file format, which
       </para>
 
     <sect3 id="subfolders">
-    <title>Subfolders</title>
-      <para>
-        Novell Evolution lets you nest folders
-	inside of each other, so that you can have a detailed
-	organizational system.
-      </para>
+    <title>Folder Arrangement and Subfolders</title>
 
     <para>
       Right-clicking will bring up a menu for just about anything in
       Novell Evolution.  If you right-click on a
-      folder, you'll have a menu with the following options:
+      folder or subfolder, you'll have a menu with the following options:
       <itemizedlist>
 	<listitem><para><guimenuitem>Copy</guimenuitem>, to copy the folder to another place. When you select this item, Evolution offers a choice of locations to copy to. </para></listitem>
 	<listitem><para><guimenuitem>Move</guimenuitem>, to move the folder to another location. </para></listitem>
 	<listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder and all its contents. </para></listitem>
 	<listitem><para><guimenuitem>New Folder</guimenuitem>, to create another folder in the same location. </para></listitem>
-	<listitem><para><guimenuitem>Rename</guimenuitem>, to change its name. </para></listitem>
+	<listitem><para><guimenuitem>Rename</guimenuitem>, to change the name of the folder. </para></listitem>
         <listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder.</para></listitem>
-        <listitem><para><guimenuitem>Properties</guimenuitem>, which lets you check the number of total and unread messages in a folder, and, for remote folders, lets you decide whether to copy the folder to your local system for offline operation.</para></listitem>
+        <listitem><para><guimenuitem>Properties</guimenuitem>, to check the number of total and unread messages in a folder, and, for remote folders, decide whether to copy the folder to your local system for offline operation.</para></listitem>
       </itemizedlist>
     </para>
     <para>
@@ -1049,13 +1076,6 @@ standard mbox file format, which
       </variablelist>
    </para>
 
-   <para>
-      Once you've familiarized yourself with the main
-      window you can start doing things with it.  We'll
-      start with the <guilabel>Summary</guilabel>, which provides a
-      quick overview of your Novell
-      Evolution information.
-    </para>
     </sect2>
     
     <sect2 id="basics-mail">
@@ -1079,9 +1099,9 @@ standard mbox file format, which
 	  </listitem>
 	  <listitem>
 	    <para>
-              It supports multiple mail sources, including <glossterm
-              linkend="imap">IMAP</glossterm>, <glossterm
-              linkend="pop">POP3</glossterm>, and local
+              It supports multiple mail sources, including <link
+              linkend="imap">IMAP</link>, <link
+              linkend="pop">POP3</link>, and local
               <filename>mbox</filename> or <filename>mh</filename>
               spools and files created by other mail programs.
             </para>
@@ -1109,7 +1129,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
         feature especially useful.
      </para>
      <para>
-        Here's what the mailer looks like:
+
 
  <!-- ==============Figure=================================== -->
 
@@ -1136,8 +1156,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
 
       <para>
         <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2"
-        format="PNG"/></imageobject></inlinemediaobject> <guilabel>Email
-        Viewer</guilabel>
+        format="PNG"/></imageobject></inlinemediaobject> <guilabel>Email</guilabel>
       </para>
     
       <para>
@@ -1150,15 +1169,16 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
         message in the message list to have it
         open in a new window.  To change the sizes of a pane, just click
         and hold on the divider between the two panes.  Then you can drag
-        up and down to select the size of the panes.
+        it to select the size of the panes.
 
     </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.
-      </para>
-      <para>
+    
+    <para>
+      Just like with folders, you can right-click on messages in the
+      message list and get a menu of possible actions, including moving or deleting them, 
+      creating filters or vFolders based on them, and marking them as junk mail.
+    </para>
+    <para>
         Most of the mail-related actions you'll want to perform are
         listed in the <guimenu>Actions</guimenu> menu in the menu bar.
         The most frequently used ones, like
@@ -1187,7 +1207,6 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
        there's a monthly calendar you can use to switch days.  Below
        that, there's a <guilabel>Task</guilabel> pad, where you can
        keep a list of tasks separate from your calendar appointments.
-       The day view in the calendar looks like this:
 
    <!-- ============== Figure ============================= -->
     <figure id="usage-calendar-fig">
@@ -1249,10 +1268,10 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
         The Novell Evolution contacts tool
         can handle all of the functions of an address book, phone
         book, or Rolodex.  Of course, it's a lot easier to update
-        Evolution than it is to change an actual paper book. Novell
-        Evolution also allows easy synchronization with
-        hand-held devices and functions with <glossterm
-        linkend="ldap">LDAP</glossterm> directories on a network.
+        Evolution than it is to change an actual paper book, in part
+        because Evolution can synchronize with
+        PalmOS devices and use <link
+        linkend="ldap">LDAP</link> directories on a network.
       </para>
       <para>
         Another advantage of the Novell Evolution
@@ -1265,8 +1284,8 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
         <guilabel>Contacts</guilabel> button in the shortcut bar.  <xref
         linkend="usage-contact-fig"/> shows the address book in all its
         organizational glory.  By default, the display shows all
-        your contacts in alphabetical order, in a <glossterm
-        linkend="minicard">minicard</glossterm> view.  You can select
+        your contacts in alphabetical order, in a <link
+        linkend="minicard">minicard</link> view.  You can select
         other views from the <guimenu>View</guimenu> menu, and adjust
         the width of the columns by clicking and dragging the gray
         column dividers.
@@ -1297,17 +1316,6 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </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
-        window to view contacts that begin with the letter or number
-        you click.
-      </para>
-
-
-      <para>
           For detailed instructions on how to use the address book,
           read <xref linkend="usage-contact"/>.
       </para>
diff --git a/help/C/usage-sync.xml b/help/C/usage-sync.xml
index 74108ffd0d..96bcfa4d15 100644
--- a/help/C/usage-sync.xml
+++ b/help/C/usage-sync.xml
@@ -1,5 +1,5 @@
     <chapter id="usage-sync">
-      <title>Synchronizing Evolution with Hand-Held Devices</title>
+      <title>Synchronizing with Hand-Held Devices</title>
       <para>
         This chapter is very short.  It describes how to synchronize
         the data on your Palm-OS device with the data you store in