A long list of updates for all these files.

2003-04-14  Aaron Weber  <aaron@ximian.com>
	A long list of updates for all these files.

	* C/config-prefs.xml: Many changes, expansion.
	* C/usage-mail-org.xml: can't vfolder on arbitrary folders.
	* C/legal.xml: update trademark/copyright hoo-ha.
	* C/usage-mail-org.xml: add flag-for-followup instructions.
	* C/usage-exchange.xml : add more features, description, better links to and from config-prefs sections.
	* C/evolution-1.4.xml: validation, interstitial text phrasing.
	* C/usage-mainwindow.xml: phrasing, changes in links to config prefs.

svn path=/trunk/; revision=20838

10 files changed, 622 insertions, 671 deletions

diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 1ef309a783..c783cd8ede 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -1,6 +1,3 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
 <chapter id="config-prefs">
 
       <title>Advanced Configuration</title>
@@ -71,8 +68,10 @@
 	  <para>
              These are overall mail reading preferences: display
              settings, notification options, security, and so
-             forth. These are covered in <xref
-             linkend="config-prefs-mail-display"/>.
+            forth. Settings that vary per-account are in the Mail
+            Accounts tool, described in <xref
+            linkend="config-prefs-mail-identity"/>, but most of the
+            mail settings are here.
           </para>
 	</listitem>
       </varlistentry>
@@ -102,21 +101,23 @@
       </varlistentry>
 
       <varlistentry>
-	<term>Directory Servers</term>
+	<term>Exchange Delegation</term>
 	<listitem>
 	  <para>
-             If you want to use a shared directory server (LDAP
-             server), this is the place to set it up.
+            This item will only appear if you have Ximian Connector
+            for Microsoft Exchange installed. It will allow you to
+            choose who has access to your Exchange account. This
+            feature is covered in <xref linkend="exchange-delegate" />.
           </para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term>Font Preferences</term>
+	<term>Directory Servers</term>
 	<listitem>
 	  <para>
-            Choose the fonts that Evolution will use to edit and display email
-            here.
+             This item allows you to enter account information for
+            connecting to remote directory (LDAP) servers.
           </para>
 	</listitem>
       </varlistentry>
@@ -127,23 +128,30 @@
 	  <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.
+             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>Out of Office</term>
+	<listitem>
+	  <para>
+            This item will only appear if you have Ximian Connector
+            for Microsoft Exchange installed. It allows you to create
+            and remove automatic "vacation" messages.  For
+            information about how to use this feature, read <xref
+            linkend="exchange-out-of-office" />.
+          </para>
+	</listitem>
+      </varlistentry>
     </variablelist>
-
   </para>
 
-  <sect1 id="config-prefs-mail">
-    <title>Mail Settings</title>
-    <para>
-       The first few tools, with the exception of the folder tool,
-       cover mail tasks:
-    </para>
-
-   <sect2 id="config-prefs-mail-identity">
+   <sect1 id="config-prefs-mail-identity">
       <title>Working with Mail Accounts</title> 
       <para>
          <application>Ximian Evolution</application> allows you to
@@ -186,7 +194,8 @@
 	    <para>
               Here, enter the name,
               email address, and other identifying information for the
-              account.
+              account. You may also choose a default signature to
+              insert into messages sent from this account.
             </para>
 	  </listitem>
 	  </varlistentry>
@@ -276,39 +285,51 @@ smtp.omniport.com:143
 
 	    <itemizedlist> <listitem>
 		<para>Checking for new mail: If you would like
-		<application>Evolution</application> to check for new mail
-		automatically, check the box and select a frequency in
-		minutes.
+                Evolution to check for new mail automatically, check
+                the box and select a frequency in minutes.
 		</para>
 	      </listitem>
 
 	      <listitem>
-		<para>Exchange Server: If your active directory user name
-		is different from your Exchange mail user name, check this
-		box and enter your mail username here.
+		<para>
+                  Global Catalog server name: enter the name of your
+                  Global Catalog server to create a folder for your
+                  organization's Global Address List.
 		</para>
 	      </listitem>
 
 	      <listitem>
-		<para>Create a Global Address List folder: If you would
-		like to have a separate folder for the Active Directory's
-		Global Address List, leave this box checked. </para>
+		<para>Limit number of Responses: Select a maximum number
+		of results for an address search. Lowering the maximum
+		number the load on your system and on your
+                network. Most servers will not send more than 1000
+                results, regardless of the value you select here.
+		  </para>
+	      </listitem>
+
+	      <listitem>
+		<para>Mailbox Name: Enter your mailbox name.
+		</para>
 	      </listitem>
 
 	      <listitem>
 		<para>
-		  Active Directory Server Name: In most organizations,
-    		  the Active Directory server will be different from
-    		  the Exchange mail server.  If so, check the box and
-    		  enter the Active Directory server name here.
+                OWA Path: Enter the path used with Outlook Web Access on your server.
 		</para>
 	      </listitem>
 
 	      <listitem>
-		<para>Limit number of Responses: Select a maximum number
-		of results for an address search. A maximum number of
-		results limits the load on your system and on your network.
-		  </para>
+		<para>
+                  Public Folder Server: Enter the name of your public
+                  folder server, if it differs from your Exchange server.
+		</para>
+	      </listitem>
+	      <listitem>
+		<para>
+                  Apply Filters to new messages in Inbox on this
+                  server: check this box if you wish to apply filters
+                  to this account.
+		</para>
 	      </listitem>
 	    </itemizedlist>                       
                      </para>
@@ -353,8 +374,9 @@ smtp.omniport.com:143
 
 	  <listitem>
 	    <para>Apply filters to new messages in INBOX on this
-	    server: If you'd like your filters to work on this account
-	    as well as on locally downloaded mail, check this box.</para>
+	    server: If you'd like your filters to work on this
+            account, check this box.
+          </para>
 	  </listitem>
 
 	   <listitem>
@@ -387,6 +409,14 @@ smtp.omniport.com:143
               Exchange) or <glossterm
               linkend="sendmail">sendmail</glossterm>.
              </para>
+             <para>
+               If you choose Exchange or Sendmail, you're done with
+               this tab. SMTP offers you a choice of hostname,
+               connection security level, and authentication type,
+               which you will recognize as similar to those for
+               IMAP and POP servers in the <guilabel>Receiving
+               Mail</guilabel> tab.
+             </para>
 	  </listitem>
 	  </varlistentry>
 	  <varlistentry> 
@@ -395,7 +425,16 @@ smtp.omniport.com:143
 	    <para>
               Here, you can decide where this account will store the
               messages that it has sent, and the messages that you
-              save as drafts.
+              save as drafts. If you wish to revert to the "factory"
+              settings, click the <guibutton>Restore
+            Defaults</guibutton> button.
+            </para>
+            <para>
+              If you wish to send someone a copy of every message from
+              this account, check the box labeled <guilabel>Always
+              carbon-copy (Cc) to:</guilabel> or <guilabel>Always
+              blind carbon-copy (Bcc) to:</guilabel>, and enter one or
+              more addresses.
             </para>
 	  </listitem>
 	  </varlistentry>
@@ -404,63 +443,208 @@ smtp.omniport.com:143
            <listitem>
 	    <para>
               In this section, you will set the security options for
-              this account. Enter your PGP Key ID and decide how
-              frequently to encrypt and sign your messages. You can
-              learn more about PGP and encryption in <xref
-              linkend="encryption"/>.
+              this account. If you use encryption, enter your PGP
+              key id (see <xref linkend="encryption"/> for more
+              information) and select among the four options below to
+            determine key and signature handling.
             </para>
 	  </listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
-    </sect2>
+    </sect1>
   
+    <sect1 id="config-prefs-folders">
+      <title>Folder Settings</title>
+      <para>
+        There are three sets of folder options. In the first,
+        <guilabel>Defaults</guilabel>, select which folders will be
+        your usual mail, contact, calendar, and task folders. These
+        are the folders opened when you click items in the shortcut
+        bar, and when you want to save a calendar attachment or
+        address card.
+      </para>
+      <para>
+        The <guilabel>Offline Folders</guilabel> are the ones which
+        will be cached when you activate the <guibutton>Go
+        Offline</guibutton> feature. 
+      </para>
+      <para>
+        Select one or more folders of contacts for your
+        <guilabel>Autocompletion Folders</guilabel>. When you type a
+        few letters into the message composer address fields,
+        Evolution will look for matches in the folders you choose here.
+      </para>
+    </sect1>
 
-    <sect2 id="config-prefs-mail-display">
-      <title>Mail Display Options</title>
+    <sect1 id="config-prefs-mail">
+      <title>Mail Options</title>
       <para>
-        In this tab you can decide how you would like
-        <application>Ximian Evolution</application> to display your
-        mail: how to display citations, how long to wait before
-        marking a message as read, and so forth.
+        The <guilabel>Mail Options</guilabel> tool lets you choose how
+        to display citations, how long to wait before marking a
+        message as read, and other mail display settings. There are
+        three categories of settings: General, HTML Mail, and
+        Colors.
+      </para>
+      <para>
+        For information on individual email account settings, see <xref
+        linkend="config-prefs-mail-identity" />.
       </para>
-     <para>
-        This is also where you can decide how you would like
-        <application>Ximian Evolution</application> to handle inline
-        images in HTML mail that you get. There is a detailed
-        discussion of the issues surrounding these options in <xref
-        linkend="usage-mail-getnsend-get-attach-html"/>.
-     </para>
-     <para>
-       To change the font which <application>Ximian
-        Evolution</application> uses to display mail, do the
-        following:
-       <orderedlist numeration="arabic">
-	  <listitem>
-            <para>
-              Open the Evolution preferences dialog by selecting
-		<menuchoice> <guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice>.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-                  Select the <guilabel>Font Settings</guilabel> portion of the 
-               settings dialog.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>Choose the font and font size you would like to use.
-            </para>
-	  </listitem>
-	</orderedlist>
-     </para>
-     </sect2>
 
-    <sect2 id="config-prefs-mail-composer">
+      <para>
+        In the <guilabel>General</guilabel> tab, your options are:
+     <variablelist>
+       <varlistentry>
+         <term>Message Fonts</term>
+         <listitem>
+           <para>
+             Normally, Evolution will use the same fonts as other
+             GNOME applications. To choose different fonts, uncheck
+             the box <guilabel>Use the same fonts as other
+           applications</guilabel> and select one font for standard typefaces and 
+           a second for monospace, or terminal, display.
+           </para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term>Message Display</term>
+         <listitem>
+           <para>
+             These three settings handle the way messages appear to
+             you. 
+             <variablelist>
+               <varlistentry>
+                 <term>Mark Messages as Read</term>
+                 <listitem>
+                   <para> 
+                   Normally, Evolution will mark a message as read as soon
+                   as it is displayed. If you prefer, you may set this to
+                   happen only after a delay, or disable it entirely and
+                   mark messages as read only when you choose to do so.
+                 </para>
+                 </listitem>
+               </varlistentry>
+           
+               <varlistentry>
+                 <term>Default Character Encoding</term>
+                 <listitem>
+                   <para>
+                     This setting allows you to select character
+                     interpretation sets so that Evolution can display
+                     different alphabets.  If you are not sure, pick
+                     Unicode (UTF-8), which will work for a large
+                     number of languages and character sets.
+                   </para>
+                 </listitem>
+               </varlistentry>
+           
+               <varlistentry>
+                 <term>Quotation Highlight Color</term>
+                 <listitem>
+                   <para>
+                     Choose a color to highlight quotations from other
+                     messages.
+                   </para>
+                 </listitem>
+               </varlistentry>
+             </variablelist>
+           </para>
+         </listitem>
+       </varlistentry>
+       
+       <varlistentry>
+         <term>Deleting Mail</term>
+         <listitem>
+           <para>
+             Here, choose whether to delete messages automatically
+             when quitting Evolution, and whether you wish to
+             explicitly confirm the final deletion of messages.
+           </para>
+         </listitem>
+       </varlistentry>
+           
+       <varlistentry>
+         <term>New Mail Notification</term>
+         <listitem>
+           <para>
+              Evolution can alert you to the arrival of new mail with
+             a beep or by playing a sound file. Choose your alert
+             noise, or select none, as you wish.
+           </para>
+         </listitem>
+       </varlistentry>
+     </variablelist>
+   </para>
+   <para>
+     The options in the <guilabel>HTML Mail</guilabel> section are:
+   <variablelist>
+    
+       <varlistentry>
+         <term>Loading Images</term>
+         <listitem>
+           <para>
+             You can embed a message in an email and have it load only
+             when the message arrives. However, spammers can use image loading
+             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.
+           </para>
+           <para>
+             If you have chosen not to load images automatically, you
+             can choose to see the images in one message at a time by selecting <menuchoice>
+             <guimenu>View</guimenu><guisubmenu>Message Display</guisubmenu>
+             <guimenuitem>Load Images</guimenuitem></menuchoice>.
+           </para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term>Show animated images</term>
+         <listitem>
+           <para>
+             Turn animation on or off here.
+           </para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term>Automatically detect links</term>
+         <listitem>
+           <para>
+             Check this box to have Evolution look for web addresses in your mail
+             and make them clickable automatically.
+           </para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term>Prompt when sending HTML messages to contacts that don't want them</term>
+         <listitem>
+           <para>
+             Some people do not like HTML mail, and you can set
+             Evolution to warn you. This warning will appear only
+             when you send HTML mail to people in your address book
+             who are listed as disliking HTML.
+           </para>
+         </listitem>
+       </varlistentry>
+     </variablelist>
+   </para>
+   <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>
+   button.
+ </para>
+</sect1>
+
+
+    <sect1 id="config-prefs-mail-composer">
       <title>Message Composer Preferences</title>
       <para>
-        There are three whole tabs of settings you can change for the
+        There are three  tabs of settings you can change for the
         message composer. The General tab covers shortcuts and
         assorted behavior, and the other two control signatures and
         spell checking.  In the General tab, you can set:
@@ -528,12 +712,11 @@ smtp.omniport.com:143
     </para>
 
      <para>
-         The signature editor is new for Evolution 1.2. It allows you
-         to create several different signatures in plain text or in
-         HTML, and to specify which of them will be added to emails
-         you create in the message composer.  If you prefer to use an
-         alternate signature or none at all, you can select it from
-         the mail composer itself.
+         The signature editor allows you to create several different
+         signatures in plain text or in HTML, and to specify which of
+         them will be added to emails you create in the message
+         composer.  If you prefer to use an alternate signature or
+         none at all, you can select it from the mail composer itself.
     </para>
     <para>
        In the spell-checking tool, you can set spelling options,
@@ -544,8 +727,14 @@ smtp.omniport.com:143
        Red Carpet and are detected automatically if you have installed
        them.
     </para>
-    </sect2>
-
+    <para>
+      You can check the spelling of messages by selecting
+      <menuchoice><guimenu>Edit</guimenu><guimenuitem>Spell Check
+      Document</guimenuitem></menuchoice>.
+      Alternately, check the <guibutton>Check spelling while i
+      type</guibutton> box, and choose a color for your misspelled words.
+  </para>
+</sect1>
 
 <!-- NOT FOR 1.0, see usage-mail.sgml
       <sect1 id="config-prefs-news">          
@@ -568,8 +757,9 @@ smtp.omniport.com:143
             <interface>folder bar</interface>.
           </para>
      </sect2>
--->
   </sect1>
+-->
+
 
     <sect1 id="config-prefs-cal">
        <title>Calendar and Task List Settings</title>
@@ -738,21 +928,20 @@ smtp.omniport.com:143
       </para>
   </sect1>
   <sect1 id="config-prefs-contact">
-    <title>Managing the Addressbook</title>
+    <title>Directory Server Settings</title>
     <para>
         Addressbook settings are limited to the usage and
         configuration of directory servers (LDAP and
-        Exchange). Contact folders for the mailer's autocompletion
-        feature are set in the Folders tool above, and all other
-        addressbook controls are available in the addressbook window
-        itself.
+      Exchange). To learn how to set autocompletion options, see <xref
+      linkend="config-prefs-folders" />.
+      Other addressbook controls are available in the addressbook
+      window itself.
     </para>
       
-    <sect2 id="config-prefs-contact-ldap-add">
-      <title>Adding Directory Servers</title>
       <para>
 	To add a new <glossterm linkend="ldap">LDAP</glossterm> server
 	to your available contact folders:
+    </para>
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
@@ -912,26 +1101,11 @@ smtp.omniport.com:143
 	    </para>
 	  </listitem>
 	</orderedlist>
+        <para>
+          Editing a directory server account means changing that same
+          information, although it is displayed in a slightly different order.
+        </para>
+    </sect1>
 
 
-<!-- Finish this example:
-
-	<example id="ldap-config-example">
-	  <title>LDAP Configuration</title>
-	  <para>
-	    Rich works at omniport.net and needs to access the
-	    company's LDAP server so that he can look up the email
-	    addresses of his co-workers. 
-	  </para>
-	  <para>
-	    He uses his email address, rich@omniport.net, 
-	  </para>
-	  <para>
-	    His Server Name is: ldap.wemakechips.com
-	  </para>
-	</example>
--->
-      </para>
-    </sect2>
-  </sect1>
 </chapter>
\ No newline at end of file
diff --git a/help/C/evolution-1.4-C.omf b/help/C/evolution-1.4-C.omf
index d0eb3cccf5..a407073619 100644
--- a/help/C/evolution-1.4-C.omf
+++ b/help/C/evolution-1.4-C.omf
@@ -5,9 +5,9 @@
       Ximian, Inc.
     </creator>
     <title>
-      Evolution Manual
+      User's Guide to Ximian Evolution 1.4
     </title>
-    <date>2002</date>
+    <date>2002-2003</date>
     <subject category="GNOME|Applications"/>
     <description>
 	A user's guide to Ximian Evolution which explains how to use
diff --git a/help/C/evolution-1.4.xml b/help/C/evolution-1.4.xml
index 56e5c3bc0f..654a177da1 100644
--- a/help/C/evolution-1.4.xml
+++ b/help/C/evolution-1.4.xml
@@ -1,9 +1,10 @@
-<?xml version='1.0'?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  
-<!ENTITY LEGAL SYSTEM "legal.xml">
+<?xml version='1.0' ?>
+
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+
 <!ENTITY GFDL SYSTEM "apx-fdl.xml">
+<!ENTITY LEGAL SYSTEM "legal.xml">
 <!ENTITY GPL SYSTEM "apx-gpl.xml">
 <!ENTITY PREFACE SYSTEM "preface.xml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.xml">
@@ -23,15 +24,18 @@
 <!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">
 
+]>
 
 <!-- Almost every chapter is an entity.  Files, Chapter id's, and
 entity names correspond.  APX is for appendix.  -->
 
 <book id="index">
   <bookinfo>
-    <title>A User's Guide to Ximian Evolution</title>
+    <title>A User's Guide to Ximian Evolution 1.4</title>
     <authorgroup>
       <author><firstname>Aaron</firstname><surname>Weber</surname></author>
       <author><firstname>Kevin</firstname><surname>Breit</surname></author>
@@ -39,14 +43,16 @@ entity names correspond.  APX is for appendix.  -->
       <author><firstname>Duncan</firstname><surname>Mak</surname></author>
     </authorgroup>
     <copyright>
-      <year>2000-2002</year>
+      <year>2000-2003</year>
       <holder>Ximian, Inc.</holder>
     </copyright>
     
    <releaseinfo>
-      This is version 1.2.1 of the Ximian Evolution manual. It describes
-      version 1.2 of the Ximian Evolution groupware suite.
+      This is version &docversion; of the Ximian Evolution manual. It describes
+      version &appversion; of the Ximian Evolution groupware suite.
    </releaseinfo>
+
+
     <legalnotice id="legalnotice">
       <para>
          Please note that legal and licensing information is in <xref
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 9257521a85..e3591f6fb5 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,3 +1,4 @@
+
   <sect1 id="legal-info-note">
    <title>Legal Information and Licensing</title>
 
@@ -5,25 +6,23 @@
      but for formatting reasons putting it in a sect1, inside the
      Preface, and adding a paragraph to the beginning of it -->
 
-
-<para>
-
-  <note id="evo-is-free-software">
-    <title>Ximian Evolution is Free Software</title>
+    <note id="evo-is-free-software">
+      <title>Ximian Evolution is Free Software</title>
+      <para>
+        Ximian Evolution is licensed under the terms of the GNU General
+        Public License (GPL), and its documentation is licensed
+        separately
+        under the GNU Free Documentation License (GFDL).  You can find a the
+        complete text of the GPL in <xref linkend="apx-gpl" />, and of the
+        GFDL in <xref linkend="apx-fdl"/>. The licenses are also available
+        in the files COPYING and COPYING-DOCS distributed with this
+        software. The Ximian Connector for Microsoft Exchange 2000 is
+        proprietary software and is subject to a different license. Copyright
+        for all three pieces of software and their documentation belongs to
+        Ximian, Inc.
+      </para>
+    </note>
     <para>
-      Ximian Evolution is licensed under the terms of the GNU General
-      Public License (GPL), and its documentation is licensed
-      separately
-      under the GNU Free Documentation License (GFDL).  You can find a the
-      complete text of the GPL in <xref linkend="apx-gpl" />, and of the
-      GFDL in <xref linkend="apx-fdl"/>. The licenses are also available
-    in the files COPYING and COPYING-DOCS distributed with this
-    software. The Ximian Connector for Microsoft Exchange 2000 is
-    proprietary software and is not subject to these licenses. Copyright
-    for all three pieces of software and their documentation belongs to
-    Ximian, Inc.
-  </para>
-</note>
 
 	  Permission is granted to copy, distribute and/or modify this
 	  document under the terms of the GNU Free Documentation
@@ -41,19 +40,21 @@
 	</para>
 
 	<para>
-	  Many of the names used by companies to distinguish their
-	  products and services are claimed as trademarks. Where those
-	  names appear in any GNOME documentation, and the members of
-	  the GNOME Documentation Project are made aware of those
-	  trademarks, then the names are in capital letters or initial
-	  capital letters.
+          Ximian is a registered trademark and Ximian Evolution, the
+	  dancing monkey logo and the Ximian capsule logo are
+	  trademarks of Ximian, Inc. Other names may be trademarks or
+	  registered trademarks of other companies or
+	  organizations. Where those names appear in any GNOME
+	  documentation, and the members of the GNOME Documentation
+	  Project are made aware of those trademarks, then the names
+	  are in capital letters or initial capital letters.
 	</para>
 
 	<para>
 	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
 	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
 	  WITH THE FURTHER UNDERSTANDING THAT:
-
+        </para>
 	  <orderedlist>
 		<listitem>
 		  <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
@@ -95,6 +96,4 @@
 		  </para>
 		</listitem>
 	  </orderedlist>
-	</para>
-  </sect1>
-
+        </sect1>
\ No newline at end of file
diff --git a/help/C/preface.xml b/help/C/preface.xml
index 02e17f610c..2d49b50e26 100644
--- a/help/C/preface.xml
+++ b/help/C/preface.xml
@@ -65,7 +65,7 @@ Examples are also set off from the rest of the text.  They look like this:
 	  </example>
 </para>
 <para>
-Lastly, we'll have warnings, in cases where you should be careful:
+  Lastly, we'll have warnings, in cases where you should be careful:
 
 	    <warning id="example-warning">
 	      <title>Example Warning</title>
@@ -91,57 +91,37 @@ Lastly, we'll have warnings, in cases where you should be careful:
     </sect1>
 
     <sect1 id="whats-new-in-one-two">
-      <title>What's New in Evolution 1.2</title>
+      <title>What's New in Evolution &appversion;</title>
       <para>
-        If you're already familiar with Ximian Evolution 1.0, our new
-        version has a lot to add.  Here are some of the new and
-        changed features. Ximian Connector for Microsoft Exchange also
-        has new features, which are covered in "new-in-connector-one-two">.
+        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" />.
+        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
+      Website</ulink>. Some of the features include:
+    </para>
         <variablelist>
 	  <varlistentry>
-	    <term>Evolution Settings Interface</term>
+	    <term>Better Fonts</term>
 	    <listitem>
 	      <para>
-                The preferences dialogs have been completely
-                overhauled. There is now a single configuration dialog
-                window for all components of the program, and you can
-                access it from anywhere. To change your preferences,
-                select 
-                 <menuchoice>
-		  <guimenu>
-                      Tools
-                  </guimenu>
-		  <guimenuitem>
-                     Preferences
-                  </guimenuitem>
-		</menuchoice>. Detailed help for the preferences
-		dialogs has been added to <xref
-		linkend="config-prefs"/>.
+                Ximian Evolution &appversion; uses the same font
+                smoothing technology as the rest of your GNOME 2
+                desktop.
               </para>
 	    </listitem>
 	  </varlistentry>
 
-
 	  <varlistentry>
-	    <term>Mail Composer Autocomplete</term>
+	    <term>Cleaner Shutdowns</term>
 	    <listitem>
 	      <para>
-                Email addresses in the message composer can now work
-                with LDAP address books. Add your LDAP address book to
-                the list of folders searched for address completion in
-                the <guilabel>Folder Settings</guilabel> section of
-                the Settings dialog.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Performance Improvements</term>
-	    <listitem>
-	      <para>
-                Startup time has decreased, POP server interactions
-                are more efficient, and indexing of locally cached
-                mail is now faster.
+                We have fixed several bugs that caused Evolution to
+                continue to occupy system resources when it was not
+                running.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -151,212 +131,20 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	    <term>Mail Composer HTML Improvements</term>
 	    <listitem>
 	      <para>
-                 Pasting into the mail composer from another message
-                or from a web page preserves the HTML formatting of
-                the source document. Multiple levels of reply
-                quotation in messages are clearer and use a vertical
-                blue line on the left side to indicate quotation. Text
-                "smileys" are now automatically converted to small
-                images displaying the appropriate emotion. You can
-                turn this option off in the
-                <guilabel>Composer</guilabel> section of the Settings
-                dialog.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Signature Editor</term>
-	    <listitem>
-	      <para>
-                 There is now a signature editor, which can be used to
-                 create plain text or HTML signatures. 
-                 click the the <guilabel>Signatures</guilabel> tab in
-                 the Composer Settings section of the Evolution
-                 Settings window.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Keyboard Navigation Overhaul</term>
-	    <listitem>
-              <para>
-                All unmodified letter keys have changed function-- the
-                <keycap>N</keycap> and <keycap>P</keycap> keys, for
-                example, no longer take you to the next you to the
-                next or previous message.  Pressing a letter will now
-                take you to the nearest message whose data in the sort
-                column begins with that letter. That is, if you press
-                N and you are sorting your list by sender, you will
-                move to a message from Nadine. If you are sorting by
-                subject, you'll move to the message about
-                nectarines. This should also work in the folder list
-                for folder navigation.
-              </para>
-	      <para>
-               This means that the old single letter shortcuts have
-               changed as well.  The new shortcuts:
-                <simplelist>
-		  <member>
-                    <keycap>,</keycap> (comma) and <keycap>.</keycap>
-                    (period) are now the keyboard shortcuts for Next
-                    and Previous unread messages. You can also use the
-                    square brackets <keycap>]</keycap> and
-                    <keycap>[</keycap>.
-                 </member>
-		 <member>
-                   <keycap>`</keycap> (backtick) toggles
-                   the message preview pane.
-                 </member>
-		</simplelist>
-                Shortcuts that use the <keycap>Control</keycap> key
-                have not changed.
-             </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Added Functionality for the "New" Button</term>
-	    <listitem>
-	      <para>
-                The <guibutton>New</guibutton> now has a menu next to
-                it. As in Evolution 1.0, you can click the button once
-                to get a new item for the Evolution tool you're
-                using. However, if you click the small arrow menu to
-                the right of the button, you will find a menu that
-                allows you to create new items for the rest of
-                Evolution: All day appointments, regular appointments,
-                tasks and meetings for the calendar; mail messages for
-                the mail tool; and contacts and contact lists for the
-                address book.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Import Tool Now Imports Netscape Filters</term>
-	    <listitem>
-	      <para>
-                You can now import your filters, as well as your email
-                messages, from the Netscape mail client.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Folder Naming Internationalization</term>
-	    <listitem>
-	      <para>
-                You can now use Unicode (UTF-8) characters in the
-                names for IMAP folders.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Executive Summary now Reads IMAP</term>
-	    <listitem>
-	      <para>
-                The Executive Summary tool in Evolution now displays
-                email messages in IMAP as well as local mail folders. 
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Filters and vFolders Notice Moved or Missing Folders</term>
-	    <listitem>
-	      <para>
-                vFolders and filters now notice if you move or delete
-                a folder that they use.
+                 The message composer has continued to improve.
               </para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>vFolder "Original Location" Feature</term>
+	    <term>New Graphics and Icons</term>
 	    <listitem>
 	      <para>
-                vFolders can now display the actual folder location
-                for each message they contain.  To do so, right click
-                on the column headers in the message list of any
-                vFolder, select <guimenuitem>Add a
-                Column</guimenuitem>, and drag the <guibutton>Original
-                Location</guibutton> item into position.
+                We've added new graphics and icons.
               </para>
 	    </listitem>
 	  </varlistentry>
-
-	  <varlistentry>
-	    <term>New Criteria and Actions</term>
-	    <listitem>
-	      <para>
-                 There are many new filter criteria and actions,
-                 including additional message flags such as Flag for
-                 Followup.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-         <varlistentry>
-	    <term>Folder Selection for Offline Mode</term>
-	    <listitem>
-              <para>
-               You may now select which network folders which will be
-               cached locally when you go into Offline mode. This
-               setting may be changed from the Folders section of the
-               Evolution Settings window.
-             </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Redirect (Bounce) Feature Added</term>
-	    <listitem>
-	      <para>
-               This feature is often called "Bounce" or "Resend." To
-               resend a message with all its headers instead of merely
-               forwarding it, select the message and choose
-                 <menuchoice>
-		  <guimenu>
-                      Actions
-                  </guimenu>
-		  <guisubmenu>
-                     Forward
-                  </guisubmenu>
-		  <guimenuitem>
-                      Redirect
-                  </guimenuitem>
-		</menuchoice>.
-             </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Digest-mode Display of Forwarded Messages</term>
-	    <listitem>
-	      <para>
-                Messages that contain multiple forwarded messages are
-                now displayed as a digest rather than inline or as a
-                series of attachments.
-             </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>New Mail Notification</term>
-	    <listitem>
-	      <para>
-                When new mail arrives, you may opt to have Evolution
-                beep or play a sound file that you specify.
-             </para>
-	    </listitem>
-	  </varlistentry>
-
 	</variablelist>
-      </para>
     </sect1>
 
     <sect1 id="preface-for-experts">
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index a3835addd8..821b959c95 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -542,7 +542,7 @@
       <para>
 	For information about setting up
 	<application>Evolution</application> to use LDAP, please refer
-	to <xref linkend="config-prefs-contact-ldap-add" />
+	to <xref linkend="config-prefs-contact" />
       </para>
     </sect2>
   </sect1>
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index d42e5d7dd7..783f8a59cb 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -21,80 +21,22 @@
   </para>
   </warning>
 
-<sect1 id="new-in-connector-one-two">
-<title>What's New in Connector 1.2</title>
+  <sect1 id="new-in-connector">
+<title>What's New in Connector &appversion;</title>
   <para>
-    Ximian Connector 1.2 has added some of the most frequently
-    requested features of Microsoft Exchange clients, including Public
-    Folder access and calendar delegation.
+    Ximian Connector &appversion; has added the <guilabel>Out of
+    Office</guilabel> feature and an automatic configuration tool for
+    large Exchange deployments.
   </para>
 
-   <variablelist>     
-   <varlistentry>
-	<term>Preferences Dialogs</term>
-	<listitem>
-	  <para>
-           The preferences dialogs have been completely overhauled for
-           Evolution and Connector 1.2. Select
-           <menuchoice><guimenu>Tools</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-           from the main Evolution window to change your settings.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Public Folders, Posting, and Delegation</term>
-	<listitem>
-	  <para>
-            Public folders, posting to folders, and delegation
-            functions have been added. You may now set permissions on
-            folders to which you have appropriate access, and view the
-            folders of other users who have granted you permission to
-            view them.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Flag for Followup</term>
-	<listitem>
-	  <para>
-            Flag for Followup now works properly in both Outlook and
-            Evolution, even when set in one and read in the other.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Improved vFolder Support</term>
-	<listitem>
-	  <para>
-            vFolders now function better with Exchange accounts.
-          </para>
-	</listitem>
-      </varlistentry>
-
-
-      <varlistentry>
-	<term>Notes</term>
-	<listitem>
-	  <para>
-            The "Notes" and "Journal" folders in Exchange accounts are now readable, and you can drag items into them from other folders. Creating new Notes or Journal entries is not yet supported.
-          </para>
-	</listitem>
-      </varlistentry>
+  <para>
+    Previous versions of Ximian Connector for Microsoft Exchange added
+    support for the <guibutton>Flag for Followup</guibutton> feature,
+    public folders, delegation, direct booking, and more. For
+    information on setting up delegation, see <xref
+  linkend="exchange-delegate" />.
+  </para>
 
-      <varlistentry>
-	<term>Direct Booking</term>
-	<listitem>
-	  <para>
-            When creating a meeting request, resources such as rooms
-            and equipment can be checked and reserved without waiting
-            for a reply.	    
-          </para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
 </sect1>
 
   <sect1 id="features">
@@ -239,12 +181,6 @@ There are, however, some features which are not available:
                "Recall Message" function.
 	      </para>
 	    </listitem>
-	    <listitem>
-	      <para>
-               Creation of an automatic "out-of-office" reply
-               messages.
-	      </para>
-	    </listitem>
       </itemizedlist>
     </para>
   </sect1>
@@ -278,7 +214,7 @@ There are, however, some features which are not available:
  </sect1>
 
   <sect1 id="exchange-configure">
-    <title>Configuration</title>
+    <title>Adding your Exchange Account in Ximian Evolution</title>
     <para>
       Once you have installed the Connector, you need to set up access
       for your <application>Exchange</application>account on both the
@@ -286,7 +222,7 @@ There are, however, some features which are not available:
     </para>
 
        <sect2 id="config-server">
-       <title>Exchange Server Configuration</title>
+       <title>Exchange Server Settings</title>
         <para>
 	  Check with your system administrator to ensure that:
 	<itemizedlist>
@@ -305,6 +241,7 @@ There are, however, some features which are not available:
 	  </listitem>
 	</itemizedlist>
       </para>
+      
       <para>
 	The Ximian website knowledge base, at <ulink type="http"
 	url="http://support.ximian.com">support.ximian.com</ulink>,
@@ -314,31 +251,96 @@ There are, however, some features which are not available:
       </para>
     </sect2>
     
+
     <sect2 id="config-client">
-      <title>Evolution Settings for Connecting to an <application>Exchange</application>Server</title>
+      <title>Standard Configuration Tool for Ximian Connector</title>
       <para>
-	
-	Once you know that your server is ready for you to connect, start
-	Ximian Evolution and select
-	<menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Mail Settings</guimenuitem>
-	</menuchoice>
-	from any mail view. 
+	Once you know that your server is ready for you to connect,
+        you are ready to add your Exchange account to Ximian Connector.
      </para>
+
+
+    <sect3 id="config-easy">
+      <title>Simple Configuration Tool for Ximian Connector</title>
+      <para>
+        Ximian Connector 1.4 comes with a simple account creation tool
+        for some installations. Other installations will require
+        the standard account tool described in <xref
+        linkend="config-client" /> below.
+      </para>
+      <para>
+        The simple assistant works in the following cases:
+        <itemizedlist>
+          <listitem>
+            <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>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            If you have no accounts configured, and your system
+            administrator has preinstalled a license key file,            
+            the simple assistant will start when you start <application>Ximian
+            Evolution.</application> It asks only for the name of your Outlook
+            Web Access server, and your username and password. Ximian
+            Connector will determine the remaining information on its own.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
+      <para>
+        If the simple account tool does not run automatically, create
+        an account as described below.
+      </para>
+    </sect3>
+  
+
       <sect3 id="config-exchange-new-account">
 	<title>Creating a New Exchange Account</title>
-	
 
+	
 	<para>
 	  If you would like to create a new account for your Exchange
-	  server, click the <guibutton>Add</guibutton> 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 sure
-	  about any of the information you need, just ask your system
-	  administrator.
+          server, select <menuchoice>
+	  <guimenu>Tools</guimenu>
+	  <guimenuitem>Mail Settings</guimenuitem>
+	  </menuchoice>
+          from any mail view. Then click the <guibutton>Add</guibutton>
+          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
+          sure about any of the information you need, just ask your
+          system administrator.
         </para>
+
+     <note id="license-file-issues">
+       <title>Installing the License File</title>
+       <para>
+         Your purchase email will contain instructions for installing
+         the license file: it may be opened with Ximian Evolution and
+         installed automatically that way, or placed in the
+         <systemitem>evolution</systemitem> directory in your home
+         directory.
+       </para>
+       <para>
+         Be aware that the <systemitem>evolution</systemitem> directory in
+         your home directory won't exist if you haven't already run 
+         <application>Ximian Evolution</application>. If you have not
+         done so already, start <application>Ximian
+         Evolution</application> and configure an account as described
+         below.  Then, quit the application and pllace the
+         <systemitem>connector-key.data</systemitem> file in your
+         <systemitem>evolution</systemitem> directory. When you start
+         <application>Evolution</application> again, the license will
+         be verified and Ximian Connector will work properly.
+       </para>
+     </note>
+
+
 	<variablelist>
 	  <varlistentry>
 	    <term>Identity</term>
@@ -686,7 +688,7 @@ There are, however, some features which are not available:
       </note>
 
    <tip id="gal-empty">
-	<title>The Global Address List Is Empty At First</title>
+	<title>The Global Address List Appears Empty At First</title>
 	<para>
           To avoid unnecessary strain on the server, the GAL will
           appear empty until you have searched for something in it.
@@ -696,9 +698,80 @@ There are, however, some features which are not available:
           it, every card will appear.
         </para>
       </tip>
+
+    </sect1>
+
+    <sect1 id="exchange-settings">
+      <title>Special Connector Only Settings</title>
+      <para>
+        There are two items in the Evolution preferences window that
+        are available only with Ximian Connector. The first is
+        delegation and permissions handling, and the second is the
+        creation of "Out of Office" messages.
+      </para>
+
+      <sect2 id="exchange-delegate">
+        <title>Delegating and Acting as a Delegate</title>
+        <para>
+          You can allow other people in your organization's Global
+          Address List  to access your calendar, address
+          book, and messages, and they can let you manage theirs.
+          Delegation allows people to do anything from check on each
+          other's schedules to completely manage their personal
+          information.
+        </para>
+        <para>
+          To add someone to your list of delegates, click the
+          <guibutton>Add</guibutton> button and select them from the
+          Global Address List. You may choose which folders they can
+          handle, grant read-only, or read and write privileges.
+        </para>
+        <para>
+          To see the list of people who have granted you access to
+          their folders, click the <guilabel>Acting as a
+          Delegate</guilabel> tab. Their folders will appear in your
+        normal folder tree under their account names.
+        </para>
+
+      </sect2>
+
+      
+      <sect2 id="exchange-out-of-office">
+        <title>Setting an Out of Office Message</title>
+        <para>
+          An <guilabel>Out of Office</guilabel> message is
+          an automatic reply that you can send to emails, explaining why
+          you aren't going to respond to their message. For example, if
+          you go on vacation for a week and will be away from email, you
+          can set an automatic reply so that people who write to you know
+          that you aren't ignoring them.
+        </para>
+        <para>
+          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. 
+        </para>
+
+        <para>
+          Then, click  <guilabel>I am currently
+          out of the office.</guilabel>. Then, enter a short message in
+          the text entry box. Click <guilabel>OK</guilabel>.
+        </para>
+        <para>
+          Your message will be sent automatically to
+          anyone who sends you mail until you return and click
+          <guilabel>I am currently in the office</guilabel>.
+        </para>
+      </sect2>
+
+
     </sect1>
+
+
     <sect1 id="full-advantage">
-      <title>Taking Full Advantage of the Exchange Server When Scheduling Appointments</title>
+      <title>Scheduling Appointments with Free/Busy</title>
       <para>
         When you schedule a meeting with your calendar on the
         <application>Exchange</application>server, you can check when
diff --git a/help/C/usage-exec-summary.xml b/help/C/usage-exec-summary.xml
index 67c0cc5b69..8725487f30 100644
--- a/help/C/usage-exec-summary.xml
+++ b/help/C/usage-exec-summary.xml
@@ -1,6 +1,4 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
+
 <chapter id="usage-summary">
   <title>Getting Oriented with the Ximian Evolution Summary</title>
   
@@ -54,120 +52,19 @@
 
 
   <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.  You can tell the GNOME Virtual File System about
-           your HTTP proxy in one of three ways, from easiest to most
-           complicated:
-            <variablelist>
-             <varlistentry>
-              <term>Use the VFS Proxy Tool</term>
-	      <listitem>
-		<para>
-                 <orderedlist numeration="arabic">
-		    <listitem>
-		      <para>
-			Run the command "gnome-vfs-proxy-capplet" or
-			select the GNOME VFS Proxy Configuration tool
-			from your Desktop Preferences menu in the menu
-			panel.
-	               </para>
-		    </listitem>
-                    <listitem>
-		      <para>
-			Enter the address or hostname of your proxy
-			server and click the <guibutton>OK</guibutton>
-			button.
-	               </para>
-		    </listitem>
-                </orderedlist>
-               </para>
-      	      </listitem>
-            </varlistentry>
-	    <varlistentry>
-	      <term>Configure it with Nautilus</term>
-	      <listitem>
-		<para>
-                 <orderedlist numeration="arabic">
-		    <listitem>
-		      <para>
-			Open a Nautilus window
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-	                 Select <menuchoice>
-			  <guimenu>Preferences</guimenu>
-			  <guimenuitem>Edit Preferences</guimenuitem>
-			</menuchoice>.
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-			Go to the <guilabel>Navigation</guilabel> tab.
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-			Click the <guilabel>Use HTTP Proxy</guilabel>
-			checkbox and enter the location of your HTTP
-			proxy in the <guilabel>Location</guilabel> field.
-	               </para>
-		    </listitem>
-		  </orderedlist>
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Configure it with the gconftool command</term>
-	      <listitem>
-	      <para>
-                 <orderedlist numeration="arabic">
-		    <listitem>
-		      <para>
-                        Open a terminal.
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-                        gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"
-                        </command>
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-      gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"
-                        </command>
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-                        gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"
-                        </command>                  
-                      </para>
-		    </listitem>
-		  </orderedlist>
-                </para>
-		<para>
-                  For more information about the gconftool command,
-                  read the gconftool man page.
-                </para>
-	      </listitem>
-             </varlistentry>
-	  </variablelist>
-         </para>
-      </note>
+    <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">
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 7841239c1d..23a7f0d921 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -278,6 +278,48 @@
 	</varlistentry>
 	</variablelist>
       </para>
+
+      <sect2 id="usage-mail-organize-columns-followup">
+        <title>Column Sorting with the Follow Up Feature</title>
+        <para>
+          One way to make sure you don't forget about a message is
+          with the <guilabel>Follow Up</guilabel> feature. To use it,
+        select one or more messages, and then right-click on one and select
+        <guimenuitem>Follow Up</guimenuitem>.  A dialog box will open
+        and allow you to set the type of flag and the due date.
+      </para>
+      <para>
+        The <guilabel>Flag</guilabel> itself is the action you
+        want to remind yourself about. Several are provided for you, such as
+        <guilabel>Call</guilabel>, <guilabel>Forward</guilabel>, and
+        <guilabel>Reply</guilabel>, but you can enter your own note or
+        action if you wish. You may set a deadline date for the flag
+        as well, if you wish.
+      </para>
+      <para>
+        Once you have added a flag, you can mark it as complete or
+        remove it entirely by right-clicking on the message and
+        selecting <guilabel>Flag Completed</guilabel> or <guilabel>Clear
+        Flag</guilabel>.
+      </para>
+
+      <para>
+         When you read a flagged message, its flag status will be
+         displayed right at the top, before the message headers. An
+        overdue message might tell you <guilabel>Overdue: Call by April 07, 2003, 5:00 PM</guilabel>
+      </para>
+
+      <para>
+        Flags can help you organize your work in a number of ways. For
+        example, you might add a Flag Status column to your message
+        list and sort that way. Alternately, you could create a vFolder
+        that displays all your flagged messages, and clear the flags
+        when you're done, so the vFolder contains only messages with
+        upcoming deadlines.
+      </para>
+
+      </sect2>
+
     </sect1>
 
     <sect1 id="usage-mail-organize-folders">
@@ -1088,14 +1130,16 @@
 		<listitem><para>
 		    Subject - The subject line of the message.
 		  </para></listitem>
-		
+
+<!--		No, can't vfolder on arbitrary headers
 		<listitem><para>
 		    Specific Header - The vFolder can look at any header you
 		    want, even obscure or custom ones. Enter the header name
 		    in the first text box, and put your search text in the
 		    second one.
 		  </para></listitem>
-		
+-->	
+
 		<listitem><para>
 		    Message Body - Search in the actual text of the message.
 		  </para></listitem>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 8b83ff91c9..c4ed98d78c 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -17,47 +17,32 @@
       </para>
       <para>
         In other words, <application>Ximian Evolution</application> is
-        a tool to help you get your work done.
-      </para>
-      <para>
-        <application>Ximian Evolution</application> is Free Software.
-        The program and its source code are released under the terms
-        of the <citetitle>GNU General Public License</citetitle> (GPL,
-        see <xref linkend="apx-gpl" />), and the documentation falls
-        under the <citetitle>Free Documentation License</citetitle>
-        (FDL, see <xref linkend="apx-fdl" />). For more information
-        about the GPL and the FDL, visit the Free Software
-        Foundation's website at <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-
-      <para>
-        <application>Ximian Evolution</application> can help you work in a
-        group by handling email, address and other contact
+        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.
       </para>
 
-    <para>
-      With <application>Ximian Evolution</application>, 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>
-      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>,
-      which let you save searches as though they were ordinary mail
-      folders.
-    </para>
-  </sect1>
+      <para>
+        With <application>Ximian Evolution</application>, 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>
+        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>,
+        which let you save searches as though they were ordinary mail
+        folders.
+     </para>
+   </sect1>
 
-  <sect1 id="usage-mainwindow-starting">
-    <title>The First Time you Start Ximian Evolution</title>
-    <para>
-      To start <application>Ximian Evolution</application>, do either
+   <sect1 id="usage-mainwindow-starting">
+     <title>The First Time you Start Ximian Evolution</title>
+     <para>
+       To start <application>Ximian Evolution</application>, do either
       of the following: 
       <itemizedlist>
       <listitem>
@@ -159,7 +144,7 @@
     <sect2 id="second-step">
       <title>Receiving Email</title>
       <para>
-	The <guilabel>Receiving Email</guilabel> lets you determine
+        The <guilabel>Receiving Email</guilabel> lets you determine
 	which you will get your email.
 	<itemizedlist>
 	  <listitem>
@@ -237,19 +222,6 @@
 		  </para>
 		</listitem>
 
-<!-- not using this anymore
-		<listitem>
-		  <para>
-		    Directory Tree of mbox files: If you wish to use a
-		    directory tree full of mbox files, select this
-		    option and enter the directory you wish to
-		    use. This option is useful if you wish to use pine
-		    or other email clients at the same time as
-		    Evolution, while storing mail on your local system
-		    in mbox format.
-		  </para>
-                </listitem>
--->
 		<listitem>
 		  <para>
 		    None: Select this if you do not plan to
@@ -261,11 +233,11 @@
 	    </para>
 	  </listitem>
 	</itemizedlist>
-</para>
-    <para>
-      If you selected POP, Microsoft Exchange, or IMAP as your mail
-      server, you'll need to enter some more information:
-
+      </para>
+      <para>
+        If you selected POP, Microsoft Exchange, or IMAP as your mail
+        server, you'll need to enter some more information:
+      </para>
                      <itemizedlist>
 		      <listitem>
 			<para>The host name of your mail server. Ask
@@ -299,8 +271,6 @@
 			</para>
 		      </listitem>
 		    </itemizedlist>
-              </para>
-      <para>
       <tip id="exchange-info">
 	<title>Ximian Evolution Talk to Microsoft Exchange?</title>
          <para>
@@ -312,7 +282,7 @@
 	   like POP and IMAP.
 	</para>
       </tip> 
-</para>
+
     </sect2>
     <sect2 id="more-mail-options">
       <title>More Mail Configuration Options</title>