updated, fixed.

svn path=/trunk/; revision=17064

2 files changed, 149 insertions, 58 deletions

diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index f8d4b4d1fa..aa9502cfdb 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -76,16 +76,15 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	  </warning>
         </para>
     </sect1>
+
+
     <sect1 id="whats-new-in-one-two">
       <title>What's New in Evolution 1.2</title>
       <para>
-        If you're already familiar with Ximian Evolution 1.0, you may
-        want to know what has changed in this release. Aside from
-        performance benefits like faster POP server interaction, there
-        are new features and options, including some that may surprise
-        or confuse you. Here is a list of new and changed features:
-      <variablelist>
-
+        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:
+        <variablelist>
 	  <varlistentry>
 	    <term>Configuration Interface</term>
 	    <listitem>
@@ -107,65 +106,21 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	    </listitem>
 	  </varlistentry>
 
-	  <varlistentry>
-	    <term>Folder Preferences for Autocompletion and Offline Mode</term>
-	    <listitem>
-              <para>
-               You may now select which network folders which will be
-               cached locally when you go into Offline mode. Offline
-               mode now works better in general.
-             </para>
-	      <para>
-                You may also select which contact folders will be used
-                to autocomplete addresses in the mail composer.
-             </para>
-	    </listitem>
-	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Redirect (Bounce) Feature Added</term>
+	    <term>Performance Improvements</term>
 	    <listitem>
 	      <para>
-               To redirect 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 have been forwarded to you as
-                attachments are now displayed in "Digest Mode" rather
-                than inline.
-             </para>
+                Startup time has decreased, POP server interactions
+                are more efficient, and indexing of locally cached
+                mail is now faster.
+              </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>
 
 	  <varlistentry>
-	    <term>Letter Keyboard Shortcuts</term>
+	    <term>Keyboard Navigation Overhaul</term>
 	    <listitem>
 	      <para>
                 Pressing an unmodified letter key in the Folder Bar
@@ -216,6 +171,142 @@ Lastly, we'll have warnings, in cases where you should be careful:
                </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 Limits Removed</term>
+	    <listitem>
+	      <para>
+                You can now have IMAP folders with names including the
+                ampersand (&amp;) and dash (-) characters, and even
+                UTF-8 (unicode) characters.
+              </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>Additional Message Status Options</term>
+	    <listitem>
+	      <para>
+                You can now mark messages by color (Right click on a
+                menu and select "Labels), or flag them for a follow-up
+                action. Filters can now be based on these criteria.
+              </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, and update themselves
+                accordingly.
+              </para>
+	    </listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term>Signature Editor</term>
+	    <listitem>
+	      <para>
+                 There is now a signature editor, and it supports the
+                 full range of Gtkhtml functionality.
+              </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>New Filter Criteria and Actions</term>
+	    <listitem>
+	      <para>
+                 You can now filter based on score, flag-for-followup
+                 or message coloration status, or the existence of
+                 attachments. New actions include beeping, playing
+                 sounds, running shell commands, and piping messages
+                 to external processes.
+              </para>
+	    </listitem>
+	  </varlistentry>
+
+         <varlistentry>
+	    <term>Folder Preferences for Autocompletion and Offline Mode</term>
+	    <listitem>
+              <para>
+               You may now select which network folders which will be
+               cached locally when you go into Offline mode. Offline
+               mode now works better in general.
+             </para>
+	      <para>
+                You may also select which contact folders will be used
+                to autocomplete addresses in the mail composer.
+             </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Redirect (Bounce) Feature Added</term>
+	    <listitem>
+	      <para>
+               To redirect 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 have been forwarded to you as
+                attachments are now displayed in "Digest Mode" rather
+                than inline.
+             </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>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index ffd00a45ef..b467297804 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1744,7 +1744,7 @@
 	  option of designing your signatures in HTML or in plain

 	  text.

 	</para>

-	<sect4 id=html-signature-howto">

+	<sect4 id="html-signature-howto">

 	  <title>Setting Up Your HTML Signature</title>

 	  <para>

 	    To set up an HTML signature: