8 files changed, 60 insertions, 22 deletions
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index 971301475c..0b0944b97d 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -48,7 +48,7 @@
       Weber (<email>aaron@ximian.com</email>) and he'll list you.
     </para>
       <para>
-       Partial list of Translators: 
+       Partial list of Translators:
          <itemizedlist>
             <listitem><para>
               Daniel Persson for .se
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index 340a408847..bb1eccf994 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -186,8 +186,8 @@
 	    <term>Navigating the Message List with the Keyboard:</term>
 	    <listitem>
 	      <para>
-                Press <keycap>N</keycap> to jump to the next unread
-                message. <keycap>P</keycap> goes to the previous
+                Press <keycap>]</keycap> or <keycap>.</keycap> to jump to the next unread
+                message. <keycap>[</keycap> or <keycap>,</keycap> goes to the previous
                 unread message.  Use the arrow keys to move up
                 and down along the list of all messages.
                 </para>
@@ -249,7 +249,7 @@
 	    <listitem>
 	      <para>
                 Double-click the message you want to view, or select
-                it and press
+                it and press <keycap>Return</keycap>
                 <keycombo action="simul">
 		  <keycap>Ctrl</keycap>
 		  <keycap>O</keycap>
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index ea339dbae9..c69e058917 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -1,5 +1,5 @@
   <preface id="introduction">
-    <title>About this Book</title> 
+    <title>Introduction</title> 
       <sect1 id="organization">
         <title>Organization</title>
       <para>
diff --git a/help/C/topic.dat b/help/C/topic.dat
index 57369e0e39..cf9f0ec017 100644
--- a/help/C/topic.dat
+++ b/help/C/topic.dat
@@ -1,5 +1,5 @@
 index.html   Table of Contents
-introduction.html What is Evolution?
+introduction.html Introduction
 usage-mainwindow.html Getting Started
 usage-summary.html The Evolution Summary
 usage-mail.html Getting and Sending Email
diff --git a/help/C/usage-exchange.sgml b/help/C/usage-exchange.sgml
index f5e483672d..2a7ef31ba7 100644
--- a/help/C/usage-exchange.sgml
+++ b/help/C/usage-exchange.sgml
@@ -16,7 +16,7 @@
     <title>Requirements</title>
     <para>
       Ximian Connector works only with Exchange 2000, and requires
-      that Outlook Web Access must be enabled. Each user will need a
+      that Outlook Web Access be enabled. Each user will need a
       valid Microsoft Exchange 2000 server account, including license.
   </para>
   </warning>
@@ -79,7 +79,7 @@
 	<term>Notes</term>
 	<listitem>
 	  <para>
-            The Notes component now works.
+            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>
@@ -100,9 +100,9 @@
   <sect1 id="features">
     <title>Connector Features</title>
     <para>
-      <application>Ximian Connector</application> supports the most
-      often used features of <application>Microsoft
-      Exchange</application>:
+      In addition to the features listed above, <application>Ximian
+      Connector</application> supports the following basic 
+      <application>Microsoft Exchange</application> features:
       <itemizedlist>
 	<listitem>
 	  <para>
@@ -229,12 +229,6 @@
 <para>
 There are, however, some features which are not available:
 <itemizedlist>
-
-	    <listitem>
-	      <para>
-                Journal component.
-	      </para>
-	    </listitem>
 	    <listitem>
 	      <para>
 		Work Offline (disconnected mode).
@@ -245,7 +239,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
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index e7d8a587f7..d03edf6267 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -498,6 +498,23 @@
 		    want, even obscure or custom ones. Enter the header name
 		    in the first text box, and put your search text in the
 		    second one.
+        
+
+      <note id="multiple-repeated-headers">
+        <title>Repeated Headers</title>
+         <para>
+            If a message uses a header more than once, Evolution will
+	    pay attention only to the first instance, even if the
+	    message defines the header differently the second
+	    time. For example, if a message declares the Resent-From:
+	    header as "engineering@rupertcorp.com" and then restates
+	    it as "marketing@rupertcorp.com," Evolution will filter as
+	    though the second declaration had not occurred.  To filter
+	    on messages that use headers multiple times, use a regular
+	    expression.
+         </para>
+      </note>
+
 		  </para></listitem>
 		
 		<listitem><para>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 52abc0c249..a6f10d8d28 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -2141,10 +2141,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	and select the <guilabel>Mail Accounts</guilabel> button, then
 	select the account you want to use securely, and click the
 	<guibutton>Edit</guibutton> button. Then, select the
-	<guilabel>Security</guilabel> tab in the account dialog. Once
-	there, select the account with which you'd like to send and
-	receive encrypted mail, and click the
-	<guibutton>Edit</guibutton> button.  In the
+	<guilabel>Security</guilabel> tab in the account dialog.   In the
 	<guilabel>Security</guilabel> tab is a section labeled
 	<guilabel>Pretty Good Privacy</guilabel>.  Enter your key ID
 	and click <guibutton>OK</guibutton>.  Your key is now
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index bb4e9af493..41942e798e 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -77,6 +77,37 @@
      </itemizedlist>
      </para>
  
+     <para>
+       <note>
+         <title>Command Line Options</title>
+         <para>
+           Evolution has a number of command-line options that you may
+           wish to make use of. You can find the full list by running
+           the commands <userinput>man evolution</userinput> or
+           <userinput>evolution --help</userinput>.  The most
+           important ones are:
+           <itemizedlist>
+             <listitem>
+               <para>
+                 To start Evolution in offline mode: <userinput>evolution --offline</userinput> 
+               </para>
+             </listitem>
+
+             <listitem>
+               <para>
+                 To start Evolution and begin composing a message to the email address you name: <userinput>evolution mailto:joe@somewhere.net</userinput>
+             </para>
+           </listitem>
+
+           <listitem>
+             <para>
+               To make your web browser use Evolution as the default email client, enter <userinput>evolution "%s"</userinput> as the email handler in your web browser or in the GNOME Control Center.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </note>
+  </para>
  <para>
      The first time you run the program, it will create a directory
       called <filename>evolution</filename> in your home directory,