typos, redescribe 1.1 bugs.

2001-10-29  Aaron Weber  <aaron@ximian.com>

	* C/apx-bugs.sgml: typos, redescribe 1.1 bugs.

	* C/apx-authors.sgml: Added last few authors, a few more credits,
	etc. Also changed contact info and URL for evolution.

	* C/menuref.sgml: did we have only 1 item in the calendar?
	yes. Also, s/Contact Manager/Addressbook/

	* C/usage-calendar.sgml: phrasing. UI. Spelling. Validation.

	* C/Makefile.am: removed config-encryption and
	usage-encryption. Stray files. Do not use, ship, etc. All
	encryption info is in the mail docs.

	* C/config-sync.sgml: call it the addressbook. added : for <terms>

	* C/config-prefs.sgml: commented out empty section.

	* C/figures/print-preview.png: ch. screenshot

	* C/usage-contact.sgml: address book--> addressbook

	* C/usage-mail-org.sgml: added "the note below" (duplicate of data
	in mainwindow.sgml, but so is all the import information. The
	import process is available in two places, we should document it
	in two places. Also typos.  removed a commented-out section on
	subscription management-- now in usage-mail and mainwindow.

	* C/usage-mail.sgml: mdash correction.

	* C/usage-mainwindow.sgml: replaced &mdash; with :

	* C/apx-gloss.sgml: typo.

	* C/preface.sgml: gnome-help-browser doesn't understand &mdash;

svn path=/trunk/; revision=14421

18 files changed, 429 insertions, 635 deletions

diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 96b00881c8..3c2a8c7d84 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -29,7 +29,6 @@ sgml_ents =	\
 	apx-authors.sgml	\
 	apx-bugs.sgml		\
 	apx-gloss.sgml		\
-	config-encryption.sgml	\
 	config-prefs.sgml	\
 	config-sync.sgml	\
 	evolution-faq.sgml	\
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index fadd2dd3f3..acf43b6cfc 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -7,19 +7,26 @@
      <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
      <member>Damon Chaplin: <email>damon@ximian.com</email></member>
      <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
+     <member>Anna Dirks: <email>anna@ximian.com</email></member>
      <member>Miguel De Icaza: <email>miguel@ximian.com</email></member>
      <member>Radek Doulik: <email>rodo@ximian.com</email></member>
      <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
      <member>Larry Ewing: <email>lewing@ximian.com</email></member>
+     <member>Nat Friedman: <email>nat@ximian.com</email></member>
      <member>Bertrand Guiheneuf: <email>bertrand@ximian.com</email></member>
+     <member>Iain Holmes: <email>iain@ximian.com</email></member>
      <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
      <member>Christopher J. Lahey: <email>clahey@ximian.com</email></member>
+     <member>Jason Leach: <email>jleach@usa.net</email></member>
      <member>Matthew Loper: <email>matt@loper.org</email></member>
      <member>Federico Mena: <email>federico@ximian.com</email></member>
+     <member>Rodrigo Moya: <email>rodrigo@ximian.com</email></member>
      <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Nat Friedman: <email>nat@ximian.com</email></member>
+     <member>Federico Mena: <email>federico@ximian.com</email></member>
+     <member>Jesse Pavel: <email>jpavel@ximian.com</email></member>
      <member>Ettore Perazzoli: <email>ettore@ximian.com</email></member>
      <member>Jeffrey Stedfast: <email>jeff@ximian.com</email></member>
+     <member>Jakyb Steiner: <email>rodo@ximian.com</email></member> 
      <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
      <member>Peter Teichman: <email>peter@ximian.com</email></member>     
      <member>Chris Toshok: <email>toshok@ximian.com</email></member>
@@ -27,7 +34,7 @@
      <member>Dan Winship: <email>danw@ximian.com</email></member>
      <member>Michael Zucchi: <email>notzed@ximian.com</email></member>
 </simplelist>
-and other dedicated GNOME programmers. 
+and numerous other dedicated GNOME programmers. 
 </para>
     <para>
       The <application>Evolution</application> code owes a great debt
@@ -38,18 +45,23 @@ and other dedicated GNOME programmers.
        and contributions of all who worked on those projects.
     </para>
 
+    <para>
+     Ximian would like to thank Miles Lane for his contributions in
+     quality assurance, and the staff of the El Pelon Taqueria, on
+     Peterborough St. in Boston, for sustenance.
+    </para>
+
    <para>
       For more information please visit the
       <application>Evolution</application> <ulink
-      url="http://www.ximian.com/apps/evolution.php3"
+      url="http://www.ximian.com/products/ximian_evolution/"
       type="http">Web page</ulink>.  Please send all comments,
       suggestions, and bug reports to the <ulink
-      url="http://bugs.gnome.org" type="http">GNOME bug tracking
+      url="http://bugzilla.ximian.com" type="http">Ximian bug tracking
       database</ulink>. Instructions for submitting bug reports can be
-      found on-line at <ulink
-      url="http://bugs.gnome.org/Reporting.html" type="http">
-      http://bugs.gnome.org/Reporting.html</ulink>. You can also use
-      command <command>bug-buddy</command> for submitting bug reports.
+      found on-line at the same location. You can also use the GNOME
+      bug report tool, <command>bug-buddy,</command> to submit your
+      defect reports.
     </para>
     <para>
       This manual was written by Aaron Weber
@@ -58,15 +70,13 @@ and other dedicated GNOME programmers.
       (<email>duncan@ximian.com</email>) and Ettore Perazzoli
       (<email>ettore@ximian.com</email>) with the help of the
       application programmers and the GNOME Documentation Project.
-      Please send all comments and suggestions regarding the manual to
-      the GNOME Documentation Project at
-      <email>docs@gnome.org</email>. You can also add your comments
-      online by using <ulink type="http"
-      url="http://www.gnome.org/gdp/doctable/">GNOME Documentation
-      Status Table</ulink>.
+      Please file comments and suggestions for this manual as bugs in
+      the Ximian bug tracking system. If you contributed to this
+      project but do not see your name here, please contact Aaron
+      Weber (<email>aaron@ximian.com</email>) and he'll list you.
     </para>
       <para>
-       Translations: 
+       Partial list of Translators: 
          <itemizedlist>
             <listitem><para>
               Daniel Persson for .se
@@ -79,7 +89,6 @@ and other dedicated GNOME programmers.
             <listitem><para>
 	    Kjartan Maraas for .no
             </para></listitem>
-
            </itemizedlist>
 
          </para>          
diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
index db1aa4d080..43643a32b1 100644
--- a/help/C/apx-bugs.sgml
+++ b/help/C/apx-bugs.sgml
@@ -3,28 +3,31 @@
     <title>Known bugs and limitations</title>
     <abstract>
     <para>
-     This appendix describes known bugs and limitations of
-    <application>Evolution</application>. Ximian Evolution bug
-    tracking is done at the <ulink
+     Ximian Evolution bug tracking is done at the <ulink
     url="http://bugzilla.ximian.com">Ximian bug tracking
     System</ulink>.  You may use that, or the GNOME <application>Bug
     Report Tool</application> (known as <command>bug-buddy</command>
-    at the command line) if you find bugs, or would like to request
-    new features
+    at the command line) if you find bugs or would like to request new
+    features.
     </para>
+    <para>
+      If you need additional help with Ximian Evolution, please visit
+      the Ximian support site at <ulink
+      url="http://support.ximian.com">ximian.com/support</ulink>.
+    <para>
     </abstract>
 
     <para>
-      A number of popular features will not make it into Ximian
-      Evolution 1.0, but we plan to include them for version 1.1.
-      Some of them are:
+      A number of often-requested features will not make it into
+      Ximian Evolution 1.0, but we plan to include them for version
+      1.1.  Some of them are:
     <simplelist>
     <member>Direct import of Microsoft Outlook contact cards</member>
     <member>Synchronization of email with handheld devices</member>
     <member>S/MIME support</member>
     <member>Read foreign mail folders without importing them</member>
     <member>Import of WINMAIL.DAT attachments</member>
-    <member>A "You have new mail" popup or other indicator</member>
+    <member>Playing a sound to indicate new mail arriving</member>
 </simplelist>
     </para>
     <para>
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 84f6b3cfb4..7660d400c8 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -3,7 +3,7 @@
  <title>Glossary</title>
 
  <glossentry id="attachment">
-  <glossterm>Attachment</glossterm>
+  <glossterm>Attachment:</glossterm>
   <glossdef>
    <para>
     Any file sent along with an email.  Attachments may be embedded in
@@ -13,7 +13,7 @@
  </glossentry>
 
 <glossentry id="automatic-indexing">
-  <glossterm>Automatic Indexing</glossterm>
+  <glossterm>Automatic Indexing:</glossterm>
   <glossdef>
    <para>
      Pre-sorting procedure that allows
@@ -25,7 +25,7 @@
  </glossentry>
 
  <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
+  <glossterm>Bcc (Blind Carbon Copy):</glossterm>
   <glossdef>
    <para>
     A way of addressing a message.  Bcc is used to send a group of
@@ -36,7 +36,7 @@
  </glossentry>
 
  <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy)</glossterm>
+  <glossterm>Cc (Carbon Copy):</glossterm>
   <glossdef>
    <para>
     Carbon-copies are used to send a 3rd party a copy of the e-mail,
@@ -47,7 +47,7 @@
  </glossentry>
 
  <glossentry id="conduit">
-  <glossterm>Conduit</glossterm>
+  <glossterm>Conduit:</glossterm>
   <glossdef>
    <para>
      A synchronization conduit is a small application which controls
@@ -59,7 +59,7 @@
 
 
  <glossentry id="druid">
-  <glossterm>Druid</glossterm>
+  <glossterm>Druid:</glossterm>
   <glossdef>
    <para>
     A tool which guides a user through a series of steps, usually to
@@ -70,7 +70,7 @@
  </glossentry>
 
  <glossentry id="evolution">
-  <glossterm>Evolution</glossterm>
+  <glossterm>Evolution:</glossterm>
   <glossdef>
    <para>
     <application>Evolution</application> is the <acronym> GNOME
@@ -80,7 +80,7 @@
  </glossentry>
 
  <glossentry id="execute">
-  <glossterm>Execute</glossterm>
+  <glossterm>Execute:</glossterm>
   <glossdef>
    <para>
     To run a program.  Any file that can be run is called an
@@ -95,7 +95,7 @@
  </glossentry>
 
  <glossentry id="expunge">
-  <glossterm>Expunge</glossterm>
+  <glossterm>Expunge:</glossterm>
   <glossdef>
    <para>
      When messages are marked for deletion, they remain till they are expunged.
@@ -106,7 +106,7 @@
  </glossentry>
 
  <glossentry id="filetree">
-  <glossterm>File Tree</glossterm>
+  <glossterm>File Tree:</glossterm>
   <glossdef>
    <para>
      A way of describing a group of files on a computer.  With the
@@ -122,7 +122,7 @@
  </glossentry>
 
  <glossentry id="filter">
-  <glossterm>Filter</glossterm>
+  <glossterm>Filter:</glossterm>
   <glossdef>
    <para>
     Within <application>Evolution</application>, a filter is a method
@@ -134,7 +134,7 @@
  </glossentry>
 
  <glossentry id="forward">
-  <glossterm>Forward</glossterm>
+  <glossterm>Forward:</glossterm>
   <glossdef>
    <para>
     If you get a message intended for someone else, you can use
@@ -144,7 +144,7 @@
  </glossentry>
 
  <glossentry id="groupware">
- <glossterm>Groupware</glossterm>
+ <glossterm>Groupware:</glossterm>
   <glossdef>
    <para>
     Groupware is a term describing an application which helps groups
@@ -156,10 +156,10 @@
  </glossentry>
 
  <glossentry id="html">
-  <glossterm>HTML</glossterm>
+  <glossterm>HTML:</glossterm>
   <glossdef>
    <para>
-    Hyper-text Markup Language(<acronym>HTML</acronym>) is a language
+    Hyper-text Markup Language (<acronym>HTML</acronym>) is a language
     for describing page layout in electronic documents like web pages,
     help files, and email messages.  HTML can be used in email and
     news posts to insert images and apply text treatments.
@@ -168,7 +168,7 @@
  </glossentry>
 
  <glossentry id="hot-key">
-  <glossterm>Hot Key</glossterm>
+  <glossterm>Hot Key:</glossterm>
   <glossdef>
    <para>
     Hot-keys are keyboard combinations used to do actions on a
@@ -179,7 +179,7 @@
  </glossentry>
 
  <glossentry id="ical">
-  <glossterm>iCal</glossterm>
+  <glossterm>iCal:</glossterm>
   <glossdef>
    <para>
     <application>iCal</application> is the program which
@@ -190,14 +190,14 @@
  </glossentry> 
 
  <glossentry id="imap">
-  <glossterm>IMAP</glossterm>
+  <glossterm>IMAP:</glossterm>
   <glossdef>
    <para>
     Depending upon whom you ask, IMAP stands for the Internet Mail
     Access Protocol, or the Interim Mail Access Protocol.  Whatever it
     stands for, it allows access to email which is typically (although
     not always) stored remotely on a server rather than on a local
-    hard disk.  Often contrasted with <glossterm>POP</glossterm>.
+    hard disk.  Often contrasted with <glossterm>POP:</glossterm>.
     This will not be on the test.
    </para>
   </glossdef>
@@ -205,18 +205,18 @@
 
 
  <glossentry id="inline">
-  <glossterm>Inline</glossterm>
+  <glossterm>Inline:</glossterm>
   <glossdef>
    <para>
      Displayed as part of a message or other document, rather than
      attached as a separate file. Contrast with <glossterm
-     linkend="attachment">Attachment</glossterm>.
+     linkend="attachment">Attachment:</glossterm>.
    </para>
   </glossdef>
  </glossentry>
  
   <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
+   <glossterm>LDAP:</glossterm>
    <glossdef>
     <para>
      LDAP, the Lightweight Directory Access Protocol, allows a client
@@ -227,7 +227,7 @@
   </glossentry>
 
  <glossentry id="mail-client">
-  <glossterm>Mail Client</glossterm>
+  <glossterm>Mail Client:</glossterm>
   <glossdef>
    <para>
     A mail client is the application with which a person reads and
@@ -240,7 +240,7 @@
 
 
  <glossentry id="minicard">
-  <glossterm>Minicard</glossterm>
+  <glossterm>Minicard:</glossterm>
   <glossdef>
    <para>
       A format for the display of contact data.  Similar in appearance
@@ -250,7 +250,7 @@
  </glossentry> 
 
  <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
+  <glossterm>Nautilus:</glossterm>
   <glossdef>
    <para>
     <application>Nautilus</application> is the next generation file
@@ -260,7 +260,7 @@
  </glossentry>
 
  <glossentry id="pop">
-  <glossterm>POP</glossterm>
+  <glossterm>POP:</glossterm>
   <glossdef>
    <para>
      POP, the Post Office Protocol, is a mechanism for email
@@ -271,7 +271,7 @@
  </glossentry>
 
  <glossentry id="protocol">
-  <glossterm>Protocol</glossterm>
+  <glossterm>Protocol:</glossterm>
   <glossdef>
    <para>
      An agreed-upon method of communication, especially one for
@@ -283,7 +283,7 @@
  </glossentry>
 
  <glossentry id="public-key-encryption">
-  <glossterm>Public Key Encryption</glossterm>
+  <glossterm>Public Key Encryption:</glossterm>
   <glossdef>
    <para>
      A strong encryption method that uses a set of two "keys," one of
@@ -298,7 +298,7 @@
 
 
  <glossentry id="regular-expression">
-  <glossterm>Regular Expression</glossterm>
+  <glossterm>Regular Expression:</glossterm>
   <glossdef>
    <para>
       A regular expression, or "regex", is a way of describing a
@@ -314,7 +314,7 @@
  </glossentry>
 
  <glossentry id="script">
-  <glossterm>Script</glossterm>
+  <glossterm>Script:</glossterm>
   <glossdef>
    <para>
     A program written in an interpreted (rather than compiled)
@@ -325,12 +325,12 @@
  </glossentry>
 
  <glossentry id="sendmail">
-  <glossterm>Sendmail</glossterm>
+  <glossterm>Sendmail:</glossterm>
   <glossdef>
    <para>
       As its name implies, <application>sendmail</application> is a
       program which sends mail.  <application>Evolution</application>
-      can use it instead of <glossterm>SMTP</glossterm>; some people
+      can use it instead of <glossterm>SMTP:</glossterm>; some people
       prefer it because it offers more flexibility, but is more
       difficult to set up.
    </para>
@@ -339,7 +339,7 @@
 
 
  <glossentry id="shortcut-bar">
-  <glossterm>Shortcut Bar</glossterm>
+  <glossterm>Shortcut Bar:</glossterm>
   <glossdef>
    <para>
      A portion of <application>Evolution</application> which offers
@@ -350,7 +350,7 @@
  </glossentry>
 
   <glossentry id="signature">
-   <glossterm>Signature</glossterm>
+   <glossterm>Signature:</glossterm>
    <glossdef>
     <para>
      In email terms, a signature is a piece of text placed at the end
@@ -363,7 +363,7 @@
   </glossentry> 
 
   <glossentry id="SMTP">
-   <glossterm>SMTP</glossterm>
+   <glossterm>SMTP:</glossterm>
    <glossdef>
     <para>
       This is the most common way of transporting mail messages from
@@ -374,7 +374,7 @@
   </glossentry> 
 
  <glossentry id="tooltip">
-  <glossterm>Tool-Tip</glossterm>
+  <glossterm>Tool-Tip:</glossterm>
   <glossdef>
    <para>
       A small box of explanatory text which appears when the mouse
@@ -385,7 +385,7 @@
  </glossentry>
 
  <glossentry id="virus">
-  <glossterm>Virus</glossterm>
+  <glossterm>Virus:</glossterm>
   <glossdef>
    <para>
     A program which inserts itself into other files or programs and
@@ -398,23 +398,23 @@
  </glossentry>
 
  <glossentry id="vcard">
-  <glossterm>vCard</glossterm>
+  <glossterm>vCard:</glossterm>
   <glossdef>
    <para>
     A file format for the exchange of contact information. When you
     get an address card attached to an email, it's probably in vCard
     format.  Not to be confused with <glossterm
-    linkend="vfolder">vFolder</glossterm>.
+    linkend="vfolder">vFolder:</glossterm>.
    </para>
   </glossdef>
  </glossentry>
 
  <glossentry id="vfolder">
-  <glossterm>vFolder</glossterm>
+  <glossterm>vFolder:</glossterm>
   <glossdef>
    <para>
     An email organization tool. vFolders allows you to create a folder
-    that contains the results of a complex search. Folder contents are
+    that contains the results of a complex search. vFolder contents are
     are updated dynamically.
    </para>
   </glossdef>
diff --git a/help/C/config-encryption.sgml b/help/C/config-encryption.sgml
deleted file mode 100644
index e36f17c652..0000000000
--- a/help/C/config-encryption.sgml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]>
-
-<article>
-  
-  <sect1 id="encryption-intro">
-    <title>What is Encryption?</title>
-    <para>
-      Encryption is an ancient method of changing readable text to unreadable
-      text that dates back to Egyptian times.  Encryption takes the statement
-      "Evolution" and turns it into something which cannot be read without help
-      through decryption.
-      <example>
-	<title>Encryption Example</title>
-	<para>
-	  Kevin orders an <application>Evolution</application> t-shirt from
-	  Ximian, Inc. over the internet.  He puts in his credit card number
-	  which is 1234-567-8901.  For security, his computer encrypts the
-	  credit card number so it can be safely transmitted over the internet.
-	  The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	  resemblance to the inital number.  When the information gets to
-	  Ximian, Inc. it'll be decrypted into the inital number.
-	</para>
-      </example>
-      Encryption can be used in email in two ways: to verify that the sender is
-      the real sender, and to hide the message while in transmission.
-      <application>Evolution</application> has the capability to do both.  
-    </para>
-  </sect1>
-  <sect1 id="generating-key">
-    <title>Generating your PGP key</title>
-    <para>
-      First, you need to create a PGP key.  To do this, you'll need GPG
-      installed.
-    </para>
-    <tip>
-      <title>GPG Versions</title>
-      <para>
-	This manual covers version 1.0.6 of GPG.  If your version is different,
-	this may not be entirely accurate.  You may find out your version number
-	by typing in: <command>gpg --version</command>.
-	</para>
-      </tip>
-    <para>
-      You can start by typing in: <command>gpg --gen-key</command>.  At the
-      first question, select 1.  The next question asks you about key length.
-      The longer the key, more stronger it is.  However, the longer the key, the
-      longer it takes to generate.  This is your choice.  However, 1024 bits
-      (default) should be adequate.  The next question asks you if you want your
-      key to expire.  Expiring keys make your key invalid after a certain amount
-      of time, so old keys don't float around active.  This is the same concept
-      as a coupon at a supermarket.  Next, you'll type in your Real name, your
-      email address, and a comment.  You should not forge this information, as
-      it is used later to verify who you are.  Assuming that all your
-      information is correct, press "O" to continue.  GPG now asks you for a
-      passphrase.  This is a password which you will need to decrypt and encrypt
-      messages.  This can be any length, with any characters in it.  It is case
-      sensitive, which means that it does know the difference between capital
-      letters and lower-case.  Now your key is generated.  It is recommend you
-      surf the internet, read your email, or write a letter in a word
-      processor.  This help creates randomness in the key.
-    </para>
-    <para>
-      Once this is completed, you'll be dropped back to the command line.
-      Now you can view your key information by typing <command>gpg
-      --list-keys</command>.  You should see something similar to this:
-      <example id="gpg-list-keys">
-	<title>GPG Listing Keys</title>
-	<para>
-	  /home/bob/.gnupg/pubring.gpg
-	  ----------------------------
-	  pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
-	  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	</para>
-      </example>
-      You'll now need to upload your public key to a keyserver, so that your
-      friends can use your key.  You'll need to know the ID of your key, which
-      is after the 1024D on the line beginning with pub.  For this example, it
-      is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
-      wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
-      You will be prompted to type in your password <!-- verify that you need to
-      enter your password here --> and your key will be uploaded for your
-      friends to download.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-evo-integ">
-    <title>Setting up Evolution's Encryption</title>
-    <para>
-      You'll need to open
-      <menuchoice>
-	<guimenu>Tools</guimenu>
-	<guimenuitem>Mail Settings</guimenuitem>
-      </menuchoice>
-     Once there, select the account you'd like to associate the key to and click
-     the <guibutton>Edit</guibutton> button.  In the
-     <guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-     Goog Privacy</guilabel>.  Enter your key ID and click
-     <guibutton>OK</guibutton>.  Your key is now integrated into your identity
-     in <application>Evolution</application>.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-sending">
-    <title>Sending Encrypted Messages</title>
-    <para>
-      You can either sign or encrypt a message.  When you sign a message, verify
-      that you were the one who sent it, and that no one is forging your
-      identity.  Encrypting a message makes it impossible for someone with
-      prying eyes to view it while it's in tranmission.
-    </para>
-    <para>
-      <sect2 id="sign-msg">
-	<title>Signing a Message</title>
-	<para>
-	  To sign a message, you simply click
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Sign</guimenuitem>
-	  </menuchoice>
-	  .  You will be prompted for your PGP password.  Once you enter it,
-	  click <guibutton>OK</guibutton> and your message will be signed.
-	</para>
-      </sect2>
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.  You simply
-	  click the menu item 
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-    </para>
-  </sect1>
-  <sect1 id="unencrypting">
-    <title>Unencrypting a Recieved Message</title>
-    <para>
-      Sometimes, a friend will send you a message which is encrypted.  In order
-      for you to read it, you need to unencrypt it.
-    </para>
-    <para>
-      When you view the encrypted message, <application>Evolution</application>
-      will prompt you for your PGP password.  You type in your PGP password and
-      the message is then decrypted.
-    </para>
-  </sect1>
-  </article>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index de0717d199..77ebe4e807 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -628,15 +628,11 @@ smtp.omniport.com:143
    </sect1>
 
    <sect1 id="config-prefs-contact">
-      <title>Managing the Contact Manager</title>
+      <title>Managing the Addressbook</title>
 	<para>
-          To set the behavior of your Contact Manager, click on the
-          <guibutton>Contact Manager</guibutton> tab in the
-          <interface>Preferences</interface> window.
-        </para>
-	<para>
-          You can set the following options: <!--insert variable list
-          here-->
+          The addressbook does not have a large list of configuration
+          settings, but those that are there can be found in the
+          <guimenu>Tools</guimenu> menu.
         </para>
       
         <sect2 id="config-prefs-contact-ldap-add">
@@ -730,7 +726,7 @@ How broad the search is in the directory.
   </sect1>
     
 
-
+<!--
   <sect1 id="config-prefs-general">
     <title>General Preferences</title> 
     <para>
@@ -738,6 +734,7 @@ How broad the search is in the directory.
       they become available.
     </para>
   </sect1>
+-->
 </chapter>
     
 
diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
index 8490f9a84b..5ce42c3467 100644
--- a/help/C/config-sync.sgml
+++ b/help/C/config-sync.sgml
@@ -6,7 +6,7 @@
         <simplelist>
           <member>
             Your computer needs to recognize and access your handheld.
-            At this time, <application>Evolution</application> only
+            At this time, <application>Ximian Evolution</application> only
             supports Palm-OS devices like the PalmPilot and the
             Handspring Visor.
           </member>
@@ -33,9 +33,9 @@
         Center.  You may use conduits to synchronize data with several
         applications; the <application>Ximian Evolution</application>
         conduits are labelled <guilabel>EAddress</guilabel>, for the
-        address cards in your Contact Manager,
-        <guilabel>ECalendar</guilabel>, for your Calendar, and
-        <guilabel>ETodo</guilabel>, for your Task List.
+        contacts in your addressbook, <guilabel>ECalendar</guilabel>,
+        for your calendar, and <guilabel>ETodo</guilabel>, for your
+        task list.
     </para>
    <para>
       To enable a conduit, click the
@@ -46,7 +46,7 @@
 
         <variablelist>
          <varlistentry>
-            <term>Disabled</term>
+            <term>Disabled:</term>
             <listitem> 
                <para>
                   Do nothing.
@@ -55,7 +55,7 @@
           </varlistentry>
 
          <varlistentry>
-            <term>Synchronize</term>
+            <term>Synchronize:</term>
             <listitem> 
                <para>
                   Copy new data from the computer to the handheld, and
@@ -67,7 +67,7 @@
           </varlistentry>
 
          <varlistentry>
-            <term>Copy From Pilot</term>
+            <term>Copy From Pilot:</term>
             <listitem> 
                <para>
                   If there is any new data on the the handheld device,
@@ -77,7 +77,7 @@
           </varlistentry>
 
          <varlistentry>
-            <term>Copy To Pilot</term>
+            <term>Copy To Pilot:</term>
             <listitem> 
                <para>
                  Copy new data from the computer to the handheld. 
@@ -86,7 +86,7 @@
           </varlistentry>
 
          <varlistentry>
-            <term>Merge From Pilot</term>
+            <term>Merge From Pilot:</term>
             <listitem> 
                <para>
                   Copy new data from the handheld to the computer, and
@@ -97,7 +97,7 @@
           </varlistentry>
 
          <varlistentry>
-            <term>Merge To Pilot</term>
+            <term>Merge To Pilot:</term>
             <listitem> 
                <para>
                   Copy new data from the computer to the handheld, and
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index 3cfb3a6830..aff75abe03 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -11,8 +11,6 @@
 <!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY CONFIG-ENCRYPTION SYSTEM "config-encryption.sgml">
-<!-- <!ENTITY FAQ SYSTEM "evolution-faq.sgml"> Just link to the web page-->
 <!ENTITY MENUREF SYSTEM "menuref.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml">
diff --git a/help/C/figures/print-preview.png b/help/C/figures/print-preview.png
index 51ab5e795e..7f044afa3c 100644
--- a/help/C/figures/print-preview.png
+++ b/help/C/figures/print-preview.png
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index bc5008f68d..340a408847 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -41,8 +41,27 @@
       <para>
           <variablelist>
 
+
 	  <varlistentry>
-	    <term>Create a new folder</term>
+	    <term>New Item:</term>
+	    <listitem>
+	      <para>
+                Press <keycombo action="simul"> <keycap>Ctrl</keycap>
+		  <keycap>N</keycap> </keycombo> to open a new item
+		  for whatever part of <application>Ximian
+		  Evolution</application> you're working on. In mail,
+		  that means you'll create a new message. If you're
+		  looking at your addressbook, <keycombo
+		  action="simul"> <keycap>Ctrl</keycap>
+		  <keycap>N</keycap> </keycombo> creates a new contact
+		  card, and in the calendar, a new appointment.
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term>Create a new folder:</term>
 	    <listitem>
 	      <para>
                 <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
@@ -57,7 +76,7 @@
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
+	    <term>Create a new Shortcut in the Evolution Bar:</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
@@ -89,7 +108,7 @@
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Create a new Appointment</term>
+	    <term>Create a new Appointment:</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
@@ -106,7 +125,7 @@
 
 
 	  <varlistentry>
-	    <term>Enter a new Contact</term>
+	    <term>Enter a new Contact:</term>
 	    <listitem>
 	      <para>       
                   Double-click in any blank space in the contact
@@ -125,7 +144,7 @@
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Create a new Task</term>
+	    <term>Create a new Task:</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
@@ -152,7 +171,7 @@
 
   
         <varlistentry>
-	    <term>Send and Receive Mail</term>
+	    <term>Send and Receive Mail:</term>
 	    <listitem>
 	      <para>
                 Press <keycap>F9</keycap>, click the
@@ -164,19 +183,19 @@
 	    </listitem>
 	  </varlistentry>
         <varlistentry>
-	    <term>Navigating the Message List with the Keyboard</term>
+	    <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
                 unread message.  Use the arrow keys to move up
-                and down along the list of all message.
+                and down along the list of all messages.
                 </para>
 	    </listitem>
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Move the display up and down in the preview pane</term>
+	    <term>Move the display up and down in the preview pane:</term>
 	    <listitem>
 	      <para>
                 Press the space bar to go a page down.  Press
@@ -186,7 +205,7 @@
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Reply to a Message</term>
+	    <term>Reply to a Message:</term>
 	    <listitem>
 	      <para>
                 To reply to the sender of the message only:
@@ -211,7 +230,7 @@
 	  </varlistentry>
 	  
           <varlistentry>
-	    <term>Forward a Message</term>
+	    <term>Forward a Message:</term>
 	    <listitem>
 	      <para>
                 Select the message or messages you want to forward,
@@ -226,7 +245,7 @@
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Open a Message in a New Window</term>
+	    <term>Open a Message in a New Window:</term>
 	    <listitem>
 	      <para>
                 Double-click the message you want to view, or select
@@ -240,7 +259,7 @@
 	  </varlistentry>
 	  
           <varlistentry>
-	    <term>Create Filters and Virtual Folders</term>
+	    <term>Create Filters and Virtual Folders:</term>
 	    <listitem>
 	      <para>
                 Right-click on a message and select
@@ -253,7 +272,7 @@
 
 
           <varlistentry>
-	    <term>Add Sender to Address Book</term>
+	    <term>Add Sender to Address Book:</term>
 	    <listitem>
 	      <para>
                 Right-click on a message and select <guimenuitem>Add
@@ -273,6 +292,39 @@
       <title>Calendar</title>
       <para>
         <variablelist>
+
+	  <varlistentry>
+	    <term>Create a new Appointment:</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>A</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new Task:</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>T</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term></term>
 	    <listitem>
@@ -292,15 +344,12 @@
         </para>
   </sect1>
     <sect1 id="quickref-contact">
-        <title>Contact Manager</title>
+        <title>Addressbook</title>
         <para>
-	Here are the most frequent tasks that are done in the Contact Manager,
-	with the shortcuts so that you can use these tasks without having to use
-	your mouse:
-
+	Here are shortcuts for the most frequent addressbook actions:
         <variablelist>
 	  <varlistentry>
-	    <term>Edit a Contact</term>
+	    <term>Edit a Contact:</term>
 	    <listitem>
 	      <para>
 		You can edit a contact two ways:
@@ -324,7 +373,7 @@
 	
 	<variablelist>
 	  <varlistentry>
-	    <term>Deleting a Contact</term>
+	    <term>Deleting a Contact:</term>
 	    <listitem>
 	      <para>
 		Right click on a contact and click <guilabel>Delete</guilabel>
@@ -338,7 +387,7 @@
 	
         <variablelist>
 	  <varlistentry>
-	    <term>Email a Contact</term>
+	    <term>Email a Contact:</term>
 	    <listitem>
 	      <para>
 		Right click on a contact and select 
@@ -350,7 +399,7 @@
 	
         <variablelist>
 	  <varlistentry>
-	    <term>Creating a New Contact</term>
+	    <term>Creating a New Contact:</term>
 	    <listitem>
 	      <para>
                   Double-click in any blank space in the contact
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 722f40a7f4..9637beaf4c 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -8,7 +8,7 @@
       <para>
         This book is divided into two parts, with several
         appendices. The first part is a <link linkend="usage">guided
-        tour</link>&mdash; it will explain how to use
+        tour</link>, which will explain how to use
         <application>Evolution</application>.  If you are new to
         <application>Evolution</application> or to groupware in
         general, this section is for you. The second section, covering
@@ -42,6 +42,10 @@
 	  <member><glossterm linkend="apx-gloss">Words</glossterm>
             that are defined in the <xref linkend="apx-gloss">.</member>
 	  </simplelist>
+</para>
+<para>
+We'll provide assorted bits of additional information in tips set off from the rest of the book, as well. 
+
 	  <tip id="example-tip">
 	      <title>Tip</title>
 	      <para>
@@ -49,6 +53,10 @@
 		this.
 	      </para>
 	    </tip>
+</para>
+
+<para>
+Examples are also set off from the rest of the text.  They look like this:
 
 	  <example>
 	    <title>Example Example</title>
@@ -58,6 +66,9 @@
 	      might be performing.
 	    </para>
 	  </example>
+</para>
+<para>
+Lastly, we'll have warnings, in cases where you should be careful:
 
 	    <warning id="example-warning">
 	      <title>Example Warning</title>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 3e9f119715..4a1745e55a 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -150,7 +150,7 @@
          you've scheduled.  You can have one alarm of each of the following types:
           <variablelist>
            <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
+	    <term><guilabel>Display:</guilabel></term>
 	    <listitem>
 	      <para>
 	        A window will pop up on your screen to remind you of
@@ -159,7 +159,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry> 
-	    <term><guilabel>Audio</guilabel></term>
+	    <term><guilabel>Audio:</guilabel></term>
 	    <listitem>
 	      <para>
 	        Choose this to have your computer deliver a sound
@@ -168,7 +168,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Program</guilabel></term>
+	    <term><guilabel>Program:</guilabel></term>
 	    <listitem>
 	      <para>
 	        Select this if you would like to run a program as a
@@ -253,50 +253,44 @@
     <sect2 id="usage-calendar-rsvp">
       <title>Sending an RSVP with the Calendar</title>
       <para>
-	<application>Evolution</application> can be used to setup group appointments
-	and help you manage RSVPs.
+	<application>Evolution</application> can be used to schedule
+	group meetings and help you manage responses to meeting
+	requests.
       </para>
       <para>
-	When you setup a gathering, you can specify people to come in numerous
-	positions, such as chair.  They are sent an email which lets them
-	easily reply to you with their response.  If they aren't sure if they
-	can attend, they can always reply to the mail later.
+	When you create a meeting or group appointment, you can
+	specify the attendees in several categories, such as "chair"
+	or "required."  When you save the appointment listing, each
+	attendee will be sent an email with the appointment
+	information and gives them the option to respond.
       </para>
       <para>
-	To select recipients to be invited to an event:
+	To schedule a meeting:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Click
+	      Select
 	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Schedule Meeting</guimenuitem>
-	      </menuchoice>.  The <guilabel>Scheduling</guilabel> and <guilabel>Meeting</guilabel> tab open.
+		<guimenu>Actions</guimenu> <guimenuitem>Schedule
+		Meeting</guimenuitem> </menuchoice>.  The
+		<guilabel>Scheduling</guilabel> and
+		<guilabel>Meeting</guilabel> tabs open.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      If you have multiple identities setup, select the identity to use in the <guilabel>Sent By</guilabel> field.
+	      If you have multiple Evolution identities, choose the
+	      one you'll use by selecting an item in the
+	      <guilabel>Sent By</guilabel> field.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click in the white box.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Invite Others</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	    Select a person in the <guilabel>Contacts</guilabel> field and click one of the four choices to move them to be an RSVP receiver.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
+	      Click the space labelled <guilabel>Click here to add an
+	      attendee</guilabel> to enter the names and email
+	      addresses of people you will invite, or click the
+	      <guibutton>Invite Others</guibutton> to select them from
+	      your addressbook.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -309,9 +303,13 @@
       </para>
     </sect2>
     <sect2 id="replying-to-rsvp">
-      <title>Replying to an RSVP</title>
+      <title>Replying to a Meeting Request</title>
       <para>
-	If you recieve an RSVP, the RSVP will be attached as an ical file.  Click on the attachment and view it inline.   All the details are shown about the event including time and dates.  Then you can choose how to reply to the RSVP.  Your choices are:
+	Meeting requests are sent as iCal attachments.  To view or
+	respond to one, click on the attachment icon and view it
+	inline in the mail window.  All the details are shown about
+	the event including time and dates.  Then you can choose how
+	to reply to the RSVP.  Your choices are:
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -320,7 +318,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Tentativly Accept
+	      Tentatively Accept
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -329,14 +327,20 @@
 	    </para>
 	  </listitem>
 	</itemizedlist>
-	Click <guibutton>OK</guibutton> and an email will be sent to the organizer with your answer.  The event will also be added to your calendar if you accept.
+	Click <guibutton>OK</guibutton> and an email will be sent to
+	the organizer with your answer.  The event will also be added
+	to your calendar if you accept.
       </para>
     </sect2>
 
     <sect2 id="recieving-rsvp-response">
-      <title>Recieving an RSVP Response</title>
+      <title>Getting Responses to Meeting Requests</title>
       <para>
-	Once you recieve an RSVP, you'll need to view it inline in the email.  Click the attachment and select <guibutton>View Inline</guibutton>.  At the bottom, you can choose an action.  Click <guibutton>OK</guibutton> to update your attendee list.
+	Once you get a reply to your meeting invitation, you'll need
+	to view it inline in the email.  Click the attachment and
+	select <guibutton>View Inline</guibutton>.  At the bottom, you
+	can click <guibutton>OK</guibutton> to update your attendee
+	list.
       </para>
     </sect2>
 
@@ -435,7 +439,7 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><guilabel>Start Date</guilabel></term>
+	  <term><guilabel>Start Date:</guilabel></term>
 	  <listitem>
 	    <para>
 	      The date you intend to start working.
@@ -453,7 +457,7 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><guilabel>Classification</guilabel></term>
+	  <term><guilabel>Classification:</guilabel></term>
 	  <listitem>
 	    <para>
 	      Sets who will see it if your calendar is shared.
@@ -482,7 +486,9 @@
     <sect2 id="task-folders">
       <title>Folders for Your Tasks</title>
       <para>
-	Like any other component in <application>Evolution</application>, you can create a folder to help organize your tasks.  To do this:
+	Like any other component in
+	<application>Evolution</application>, you can create a folder
+	to help organize your tasks.  To do this:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
@@ -531,10 +537,9 @@
     <example>
       <title>Keeping Multiple Calendars</title>
       <para>
-        Lucy, the office manager for a small company, has one
-        calendar for her own schedule.  On the local network, she
-        maintains one for the conference room, so people know when
-        they can schedule meetings.  Next to that, she maintains a
+        Lucy, the office manager for a small company, has one calendar
+        for her own schedule. She maintains one for the conference
+        room, to schedule meetings.  Next to that, she maintains a
         calendar that reflects when consultants are going to be on
         site, and another that keeps track of when the Cubs are
         playing.
@@ -549,6 +554,8 @@
        You'll need to tell the <guilabel>New Folder</guilabel> dialog that the new folder should be of the calendar type.  You can place the calendar in any calendar folder and access it
        from the folder view.
     </para>
-    
+    <para>
+       Each calendar folder can hold only one calendar.
+    </para>
   </sect1>
 </chapter>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 574d7cedd5..dc11b4bd0a 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -5,10 +5,10 @@
   <title>Working with Your Contacts</title>
       <para>
         This chapter will show you how to use the
-        <application>Evolution</application> address book to organize
+        <application>Evolution</application> addressbook to organize
         any amount of contact information, share addresses over a
         network, and several ways to save time with everyday tasks. To
-        learn about configuring the address book, see <xref
+        learn about configuring the addressbook, see <xref
         linkend="config-prefs-contact">. You can import contacts from
         other contact management tools with the Import tool by
         selecting
@@ -17,7 +17,7 @@
       </para>
 
     <para>
-       The toolbar for the address book is quite simple.
+       The toolbar for the addressbook is quite simple.
        <itemizedlist>
 	<listitem><para>
            Click <guibutton>New Contact</guibutton> to create a new card, or double-click 
@@ -159,15 +159,15 @@
 		</para>
 	    <para>
 		  To see how it works, type a name in the
-		  <guilabel>Full Name</guilabel> field:
-		  <userinput>Rupert T. Monkey</userinput>.  You'll
-		  notice that the <guilabel>File As</guilabel> field
-		  also fills in, but in reverse:
-		  <computeroutput>Monkey, Rupert</computeroutput>.
-		  You can pick <computeroutput>Rupert Monkey
-		  </computeroutput> from the drop-down, or type in
-		  your own, such as <userinput> T. Rupert Monkey
-		  </userinput>.
+		  <guilabel>Full Name</guilabel> field. As an example,
+		  we'll use the Ximian mascot, <userinput>Rupert
+		  T. Monkey</userinput>.  You'll notice that the
+		  <guilabel>File As</guilabel> field also fills in,
+		  but in reverse: <computeroutput>Monkey,
+		  Rupert</computeroutput>.  You can pick
+		  <computeroutput>Rupert Monkey </computeroutput> from
+		  the drop-down, or type in your own, such as
+		  <userinput> T. Rupert Monkey </userinput>.
 		</para>
 	    <tip>
 	      <title>Filing Suggestion</title>
@@ -181,7 +181,7 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term>Multiple Values for Fields</term>
+	  <term>Multiple Values for Fields:</term>
             <listitem>
 	      <para>
                 If you click on the downward pointing triangle buttons
@@ -337,22 +337,22 @@
   </sect1>
 
   <sect1 id="usage-contact-organize">
-    <title>Organizing your Address Book</title>
+    <title>Organizing your Addressbook</title>
     <para>
-       Organizing your address book is a lot like organizing your
+       Organizing your addressbook is a lot like organizing your
        mail.  You can have folders and searches the same way you can
-       with mail, but the address book does not allow Virtual Folders.  It
+       with mail, but the addressbook does not allow Virtual Folders.  It
        does, however, allow each card to fall under several
        categories, and allow you to create your own categories.  To
        learn about categories, read <xref
        linkend="usage-contact-organize-group-category">.
     </para>
 
-<!--
+<!-- UNIMPLEMENTED FEATURE
     <para>
       Another useful <application>Evolution</application> feature is
       its ability to recognize when people live or work together.  If
-      several people in your address book share an address, and you
+      several people in your addressbook share an address, and you
       change the address for one of them,
       <application>Evolution</application> will ask you if you wish to
       change the address for all of them, or just for one.
@@ -490,9 +490,8 @@
            To mail the list, open a new email and type the name you
            chose for the list. Ximian Evolution will address the
            message to the entire list when you send it. You can also
-           right-click on the list's address card in the Contact
-           Manager and select <guimenuitem>Send Message to
-           List</guimenuitem>.
+           right-click on the list's address card in the Addressbook
+           and select <guimenuitem>Send Message to List</guimenuitem>.
         </para>
       </sect3>
 
@@ -506,11 +505,11 @@
     <para>
        If you keep your cards on a network using an <glossterm
        linkend="ldap">LDAP</glossterm> server, you can share access to
-       them, browse other peoples address books, or maintain a shared set of
+       them, browse other peoples addressbooks, or maintain a shared set of
        contact information for your company or your department.  This
        is the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
-       you share calendars as well as address books, people can avoid
+       you share calendars as well as addressbooks, people can avoid
        duplicating work and keep up to date on developments within
        their workgroup or across the entire company.
     </para>
@@ -589,42 +588,21 @@
       </para>
     </sect1>
 
-    <sect1 id="contact-automation-lists">
-      <title>Sending Mail to Categories of Contacts</title>
-      <para>
-	 You already know that when you are writing an email, you can
-	 address it to one or more people, and that
-	 <application>Evolution</application> will fill in addresses
-	 from your address book's address cards if you let it.  In
-	 addition to that, you can send email to everyone in a
-	 particular group if you choose.
-      </para>
-
-<!-- this feature not yet implemented 
-
+<!-- Unimplemented features:
       <para>
-         You can also use the address book to print postal addresses
+         You can also use the addressbook to print postal addresses
 	 on mailing labels.  Future versions of
 	 <application>Evolution</application> will allow you to you
 	 export a group of cards to a spreadsheet, database, or word
 	 processor so you can print address labels or prepare large
 	 mailings.
       </para>
- -->
-
-    </sect1>
-
-    <!--- this feature not yet implemented 
-  <sect1 id="usage-contact-automation-extra">
-  <title>Map It!</title>
   <para>
-    Need a map or directions? Click
-  <guibutton>MapIt</guibutton> from within the contact
-    manager, and <application>Evolution</application> will
-    map the address for you online.
+    Need a map or directions? Click <guibutton>MapIt</guibutton> from
+  within the addressbook, and <application>Evolution</application>
+  will map the address for you online.
   </para>
-  </sect2>
-    -->
+  -->
     
     
 
diff --git a/help/C/usage-encryption.sgml b/help/C/usage-encryption.sgml
deleted file mode 100644
index e36f17c652..0000000000
--- a/help/C/usage-encryption.sgml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]>
-
-<article>
-  
-  <sect1 id="encryption-intro">
-    <title>What is Encryption?</title>
-    <para>
-      Encryption is an ancient method of changing readable text to unreadable
-      text that dates back to Egyptian times.  Encryption takes the statement
-      "Evolution" and turns it into something which cannot be read without help
-      through decryption.
-      <example>
-	<title>Encryption Example</title>
-	<para>
-	  Kevin orders an <application>Evolution</application> t-shirt from
-	  Ximian, Inc. over the internet.  He puts in his credit card number
-	  which is 1234-567-8901.  For security, his computer encrypts the
-	  credit card number so it can be safely transmitted over the internet.
-	  The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	  resemblance to the inital number.  When the information gets to
-	  Ximian, Inc. it'll be decrypted into the inital number.
-	</para>
-      </example>
-      Encryption can be used in email in two ways: to verify that the sender is
-      the real sender, and to hide the message while in transmission.
-      <application>Evolution</application> has the capability to do both.  
-    </para>
-  </sect1>
-  <sect1 id="generating-key">
-    <title>Generating your PGP key</title>
-    <para>
-      First, you need to create a PGP key.  To do this, you'll need GPG
-      installed.
-    </para>
-    <tip>
-      <title>GPG Versions</title>
-      <para>
-	This manual covers version 1.0.6 of GPG.  If your version is different,
-	this may not be entirely accurate.  You may find out your version number
-	by typing in: <command>gpg --version</command>.
-	</para>
-      </tip>
-    <para>
-      You can start by typing in: <command>gpg --gen-key</command>.  At the
-      first question, select 1.  The next question asks you about key length.
-      The longer the key, more stronger it is.  However, the longer the key, the
-      longer it takes to generate.  This is your choice.  However, 1024 bits
-      (default) should be adequate.  The next question asks you if you want your
-      key to expire.  Expiring keys make your key invalid after a certain amount
-      of time, so old keys don't float around active.  This is the same concept
-      as a coupon at a supermarket.  Next, you'll type in your Real name, your
-      email address, and a comment.  You should not forge this information, as
-      it is used later to verify who you are.  Assuming that all your
-      information is correct, press "O" to continue.  GPG now asks you for a
-      passphrase.  This is a password which you will need to decrypt and encrypt
-      messages.  This can be any length, with any characters in it.  It is case
-      sensitive, which means that it does know the difference between capital
-      letters and lower-case.  Now your key is generated.  It is recommend you
-      surf the internet, read your email, or write a letter in a word
-      processor.  This help creates randomness in the key.
-    </para>
-    <para>
-      Once this is completed, you'll be dropped back to the command line.
-      Now you can view your key information by typing <command>gpg
-      --list-keys</command>.  You should see something similar to this:
-      <example id="gpg-list-keys">
-	<title>GPG Listing Keys</title>
-	<para>
-	  /home/bob/.gnupg/pubring.gpg
-	  ----------------------------
-	  pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
-	  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	</para>
-      </example>
-      You'll now need to upload your public key to a keyserver, so that your
-      friends can use your key.  You'll need to know the ID of your key, which
-      is after the 1024D on the line beginning with pub.  For this example, it
-      is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
-      wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
-      You will be prompted to type in your password <!-- verify that you need to
-      enter your password here --> and your key will be uploaded for your
-      friends to download.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-evo-integ">
-    <title>Setting up Evolution's Encryption</title>
-    <para>
-      You'll need to open
-      <menuchoice>
-	<guimenu>Tools</guimenu>
-	<guimenuitem>Mail Settings</guimenuitem>
-      </menuchoice>
-     Once there, select the account you'd like to associate the key to and click
-     the <guibutton>Edit</guibutton> button.  In the
-     <guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-     Goog Privacy</guilabel>.  Enter your key ID and click
-     <guibutton>OK</guibutton>.  Your key is now integrated into your identity
-     in <application>Evolution</application>.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-sending">
-    <title>Sending Encrypted Messages</title>
-    <para>
-      You can either sign or encrypt a message.  When you sign a message, verify
-      that you were the one who sent it, and that no one is forging your
-      identity.  Encrypting a message makes it impossible for someone with
-      prying eyes to view it while it's in tranmission.
-    </para>
-    <para>
-      <sect2 id="sign-msg">
-	<title>Signing a Message</title>
-	<para>
-	  To sign a message, you simply click
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Sign</guimenuitem>
-	  </menuchoice>
-	  .  You will be prompted for your PGP password.  Once you enter it,
-	  click <guibutton>OK</guibutton> and your message will be signed.
-	</para>
-      </sect2>
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.  You simply
-	  click the menu item 
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-    </para>
-  </sect1>
-  <sect1 id="unencrypting">
-    <title>Unencrypting a Recieved Message</title>
-    <para>
-      Sometimes, a friend will send you a message which is encrypted.  In order
-      for you to read it, you need to unencrypt it.
-    </para>
-    <para>
-      When you view the encrypted message, <application>Evolution</application>
-      will prompt you for your PGP password.  You type in your PGP password and
-      the message is then decrypted.
-    </para>
-  </sect1>
-  </article>
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 88dec18187..ce6f75e69c 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -21,7 +21,7 @@
         files:
         <variablelist>
           <varlistentry>
-            <term>VCard (.vcf, gcrd)</term>
+            <term>VCard (.vcf, gcrd):</term>
             <listitem>
               <para>
                 The addressbook format used by the GNOME, KDE, and
@@ -33,7 +33,7 @@
           </varlistentry>
 
 	  <varlistentry>
-	    <term>iCalendar (.ics)</term>
+	    <term>iCalendar (.ics):</term>
 	    <listitem>
 	      <para>
 		A format for storing calendar files.  iCalendar is used by 
@@ -43,7 +43,7 @@
 	  </varlistentry>
 
           <varlistentry>
-            <term>Microsoft Outlook Express 4 (.mbx)</term>
+            <term>Microsoft Outlook Express 4 (.mbx):</term>
             <listitem>
               <para>
                 Email file format used by Microsoft Outlook Express
@@ -54,7 +54,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term>MBox (mbox)</term>
+            <term>MBox (mbox):</term>
             <listitem>
               <para>
                 The email box format used by Mozilla, Netscape,
@@ -135,6 +135,57 @@
           </listitem>
         </orderedlist>
       </para>
+
+<para>
+    <note>
+      <title>Microsoft Outlook and Outlook Express Users</title>
+      <para>
+	Microsoft Outlook, and versions of Outlook Express after
+	version 4, use proprietary formats that <application>Ximian
+	Evolution</application> cannot read or import.  For contacts,
+	you may have to email them to yourself and import them that
+	way.  For email, there is a simpler workaround:
+	<orderedlist numeration="arabic">
+
+	<listitem>
+	<para>
+	  While using Windows, import the files into Mozilla Mail (or
+	  another mailer, such as Netscape or Eudora, that uses the
+	  standard mbox format).
+        </para>
+        </listitem>
+	
+	<listitem>
+	<para>
+          Copy the files to the system or partition you use for
+          <application>Ximian Evolution</application>.  
+         </para>
+        </listitem>
+
+	<listitem>
+	<para>
+	  Use the <application>Ximian Evolution</application> import
+          tool to import the files.  There's more information about
+          why this works, and how, at the Ximian support website.
+      </para>
+        </listitem>
+     </orderedlist>
+    </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,
+	<application>Ximian Evolution</application> will import and undelete
+	the messages in your Trash folders.
+      </para>
+    </note>     
+
+    </para>
+
     </sect2>
   </sect1>
   <sect1 id="usage-mail-organize-columns">
@@ -173,21 +224,21 @@
 	options:
 	<variablelist>	  
 	<varlistentry>
-	  <term><guimenuitem>Sort Ascending</guimenuitem></term>
+	  <term><guimenuitem>Sort Ascending</guimenuitem>:</term>
 	  <listitem><para>
 	      Sorts the messages top to bottom.
 	    </para></listitem>
 	</varlistentry>
 	  
 	  <varlistentry>
-	    <term><guimenuitem>Sort Descending</guimenuitem></term>
+	    <term><guimenuitem>Sort Descending</guimenuitem>:</term>
 	    <listitem><para>
 		Sorts the messages bottom to top.
 	      </para></listitem>
 	  </varlistentry>
 	  
 	  <varlistentry>
-	    <term><guimenuitem>Group By this Field</guimenuitem></term>
+	    <term><guimenuitem>Group By this Field</guimenuitem>:</term>
 	    <listitem><para>
 	      Groups messages instead of sorting them. This makes each contact
 	      with identical properties in the specified field to be placed in
@@ -197,7 +248,7 @@
 	  
 	  <varlistentry>
 	    <term><guimenuitem>Remove this
-		Column</guimenuitem></term> <listitem><para> Remove
+		Column</guimenuitem>:</term> <listitem><para> Remove
 		this column from the display. You can also remove
 		columns by dragging the header off the list and
 		letting it drop.  </para></listitem>
@@ -205,7 +256,7 @@
 	  
 	  <varlistentry>
 	    <term><guimenuitem>Field
-		Chooser</guimenuitem></term> <listitem><para> 
+		Chooser</guimenuitem>:</term> <listitem><para> 
 	      When you choose this item, a list
 	      of column headers will appear; just drag and drop them into
 	      place between two existing headers. A red arrow will
@@ -259,7 +310,7 @@
 	right below the toolbar, and choose a search type:
 	<variablelist>
 	  <varlistentry>
-	    <term><guilabel>Body or subject contains</guilabel></term>
+	    <term><guilabel>Body or subject contains</guilabel>:</term>
 	  <listitem>
 	      <para>
 	        This will search message subjects and the messages
@@ -269,7 +320,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term> <guilabel>Body contains</guilabel> </term>
+	    <term> <guilabel>Body contains</guilabel>:</term>
 	    <listitem>
 	      <para>
 	        This will search only in message text, not the subject
@@ -278,7 +329,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Subject contains</guilabel></term>
+	    <term><guilabel>Subject contains:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This will show you messages where the search text is
@@ -288,7 +339,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Body does not contain</guilabel></term>
+	    <term><guilabel>Body does not contain:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This finds every email message that does not have the
@@ -299,7 +350,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Subject does not contain</guilabel></term>
+	    <term><guilabel>Subject does not contain:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This finds every mail whose subject does not contain
@@ -471,18 +522,24 @@
 		    Mailing List - Filter based on the mailing list it came from.
 		  </para>
 		  <note>
-		    <title>How Does Filterint on Mailing Lists Work?</title>
+		    <title>How Does Filtering on Mailing Lists Work?</title>
 		    <para>
-		      Filtering on mailing lists uses the domain part (@ximian.com) of the address and the user part (the part before the @).  However, if you wish to exclude the domain section from being filtered, simply don't put anything after the user.
+		      Filtering on mailing list actually looks for a
+		      specific mailing-list header called the
+		      <computeroutput>X-BeenThere</computeroutput>
+		      header, used to identify mailing lists or other
+		      redistributors of mail.
 		    </para>
 		  </note>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Regex Match - If you know your way around a <glossterm
-									   linkend="regular-expression">regex</glossterm>, or
-		    regular expression, put your knowledge to use here.
+		    Regex Match - If you know your way around a
+		    <glossterm
+		    linkend="regular-expression">regex</glossterm>, or
+		    regular expression, put your knowledge to use
+		    here.
 		  </para>
 		</listitem>
 		
@@ -638,7 +695,7 @@
 	      Select
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
+		<guimenuitem>Filters</guimenuitem>
 	      </menuchoice>
 	    </para>
 	  </listitem>
@@ -751,12 +808,14 @@
 
 
     <note id="unmatched-vfolder">
-      <title>The Unmatched vFolder</title>
+      <title>The "Unmatched" vFolder</title>
       <para>
 	Obviously, not all messages will fit into all your Virtual
-	Folders.  That's why <application>Ximian Evolution</application>
-	includes an UNMATCHED vFolder.  The UNMATCHED 
-	vFolder displays messages that are not matched by other rules.
+	Folders.  That's why <application>Ximian
+	Evolution</application> includes an Unmatched vFolder.  The
+	Unmatched vFolder displays messages that are not matched by
+	other rules. If you have no vFolders, the Unmatched folder
+	will contain all of your mail.
       </para>
     </note>
 
@@ -959,29 +1018,4 @@ include any messages from that source.
       </para>
     </sect2>
   </sect1>
-  <!--
-    <sect1 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Ximian Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-         If you have configured any IMAP (mail) or NNTP (news)
-         servers, you will see them listed in the left half of the
-         subscription management window.  Click on a server to select
-         it, and you will see the folders or newsgroups available to
-         you.  You can then select individual folders and subscribe to
-         them, or remove yourself from the subscription list.
-      </para>
-      <para>
-        Once you have subscribed to a folder or newsgroup, your system
-        will check for new messages whenever you press the
-        <guibutton>Get Mail</guibutton> button.
-    </para>
-  </sect1>
--->
 </chapter>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 9108115758..2a1958805e 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -308,7 +308,7 @@
      <sect2 id="usage-mail-getnsend-get-attach">
 	 <title>Working with Attachments and HTML Mail</title>
 	 <para>
-	   If someone sends you an <glossterm>attachment</glossterm>,
+	   If someone sends you an <glossterm linkend="attachment">attachment</glossterm>,
 	   a file attached to an email,
 	   <application>Evolution</application> will display the file
 	   at the bottom of the message to which it's attached.  Text,
@@ -375,12 +375,11 @@
       <title>Inline Images in HTML Mail</title>
       <para>
          When someone sends you HTML mail that includes an image in
-         the body of the message&mdash; like the welcome message in
-         your Inbox when you first started <application>Ximian
-         Evolution</application>&mdash;
-         <application>Evolution</application> will display the image
-         inside the message.  You can create messages like this by
-         using the
+         the body of the message (for example, the welcome message in your
+         Inbox when you first start <application>Ximian
+         Evolution</application>) <application>Evolution</application>
+         will display the image inside the message.  You can create
+         messages like this by using the
          <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>
          tool in the message composer.
       </para>
@@ -717,8 +716,8 @@
           <para>
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
+            <guibutton>Bcc:</guibutton> buttons to get a list --
+            potentially a very long one -- of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
@@ -832,7 +831,7 @@
         <para>
            <variablelist>
             <varlistentry>
-              <term><guimenuitem>Find</guimenuitem></term>
+              <term><guimenuitem>Find:</guimenuitem></term>
               <listitem><para> Enter a word or phrase, and
               <application>Evolution</application> will find it
               in your message.
@@ -840,7 +839,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><guimenuitem>Find Regex</guimenuitem></term>
+              <term><guimenuitem>Find Regex:</guimenuitem></term>
               <listitem>
                 <para>
                   Find a regex, also called a
@@ -851,14 +850,14 @@
             </varlistentry>
 
             <varlistentry>
-              <term><guimenuitem>Find Again</guimenuitem></term>
+              <term><guimenuitem>Find Again:</guimenuitem></term>
               <listitem><para>
                    Select this item to repeat the last search you performed.
               </para></listitem>
             </varlistentry>
 
             <varlistentry>
-               <term><guimenuitem>Replace</guimenuitem></term>
+               <term><guimenuitem>Replace:</guimenuitem></term>
                <listitem><para>
                  Find a word or phrase, and replace it with
                  something else.
@@ -927,7 +926,7 @@
             into four categories:
             <variablelist>
              <varlistentry>
-             <term>Headers and lists</term>
+             <term>Headers and lists:</term>
               <listitem>
                 <para>
                   At the left edge of the toolbar, you can choose
@@ -943,7 +942,7 @@
               </listitem>
            </varlistentry>
 	  <varlistentry>
-	    <term>Text style</term>
+	    <term>Text style:</term>
 	    <listitem>
 	      <para>
 		Use these buttons to determine the way your letters
@@ -961,7 +960,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-              <term>Alignment</term>
+              <term>Alignment:</term>
 	    <listitem>
 	      <para>
 		Located next to the text style buttons, these three
@@ -975,7 +974,7 @@
 	  </varlistentry>
 
             <varlistentry>
-              <term>Indentation rules</term>
+              <term>Indentation rules:</term>
               <listitem>
                 <para>
                   The button with the arrow pointing left will reduce
@@ -986,7 +985,7 @@
           </varlistentry>
 
             <varlistentry>
-              <term>Color Selection</term>
+              <term>Color Selection:</term>
               <listitem>
                 <para>
                   At the far right is the color section tool.  The
@@ -1008,7 +1007,7 @@
            spruce up your email to make it more interesting:
 	<variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
+	    <term><guimenuitem>Link:</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
@@ -1046,7 +1045,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
+	    <term><guimenuitem>Image:</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Lets you put an image alongside text.
@@ -1093,7 +1092,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
+	    <term><guimenuitem>Rule:</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Inserts a horizontal line into the text to help divide two
@@ -1153,7 +1152,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term>Table</term>
+	    <term>Table:</term>
 	    <listitem>
 	      <para>
 		Inserts a table into the text to help divide two
@@ -1582,7 +1581,7 @@
   Your options are:
       <variablelist>
 	<varlistentry>
-	  <term>Accept</term>
+	  <term>Accept:</term>
 	  <listitem>
 	    <para>
 	  Select this entry if you will attend the meeting.  When you
@@ -1593,7 +1592,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>Tentatively Accept</term>
+	  <term>Tentatively Accept:</term>
 	  <listitem>
 	    <para>
 	  Select this entry if you will probably attend the meeting.
@@ -1605,7 +1604,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>Decline</term>
+	  <term>Decline:</term>
 	  <listitem>
 	    <para>
 	  Select this item if you will be unable to attend the
@@ -1618,7 +1617,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>RSVP</term>
+	  <term>RSVP:</term>
 	  <listitem>
 	    <para>
 	     Check this box if you would like your response sent to
@@ -1634,13 +1633,16 @@
     <title>Subscription Management</title>
     <para>
       Since IMAP folders exist on the server, and opening them or
-      checking them takes time, you need fine-grained control over
-      the way that you use IMAP folders.  That's why
-      <application>Evolution</application> has an IMAP
-      subscriptions manager.
+      checking them takes time, you need fine-grained control over the
+      way that you use IMAP folders.  That's why
+      <application>Evolution</application> has an IMAP subscriptions
+      manager.  If you prefer to have every mail folder displayed, you
+      can select that option as well. However, if you'd like to choose
+      specific items in your mailbox, and exclude others, you can use
+      the subscription management tool to do that.
     </para>
     <para>
-      To use it:
+    Here's how:
       <orderedlist numeration="arabic">
 	
 	<listitem>
@@ -1710,7 +1712,7 @@
 	    ever</emphasis>.  Your private key lets you decrypt any
 	    message encrypted with your public key.
 	  </para>
-	</note>
+ 	</note>
 
       <para>
         Using encryption takes a bit of forethought.  When you send a
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index f042bc4aa0..b7ff02ecf7 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -103,22 +103,22 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Full Name &mdash; Your full name (Example: John Doe).
+	      Full Name: Your full name (Example: John Doe).
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Email Address &mdash; Your email address (Example: john@doe.com)
+	      Email Address: Your email address (Example: john@doe.com)
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Organization &mdash; The company where you work (optional).
+	      Organization: The company where you work (optional).
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Signature file &mdash; If you'd like to use an email
+	      Signature file: If you'd like to use an email
 	      <glossterm linkend="signature">signature</glossterm>,
 	      select your signature file here.  Normally, the
 	      signature will be the contents of the
@@ -138,7 +138,7 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Server Type &mdash; There are numerous types of servers
+	      Server Type: There are numerous types of servers
 	      from which <application>Ximian Evolution</application>
 	      can fetch your mail.  Ask your system administrator if
 	      you're not sure which of the following are available to
@@ -146,26 +146,26 @@
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    POP &mdash; Downloads your email to your hard disk for
+		    POP: Downloads your email to your hard disk for
 		    permanent storage.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    IMAP &mdash; Keeps the email on your server so you
+		    IMAP: Keeps the email on your server so you
 		    can access your email from multiple systems. 
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Unix mail spool file &mdash; If you run a mail
+		    Unix mail spool file: If you run a mail
 		    server on your desktop computer, choose this
 		    option.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Standard Unix .mbox file &mdash; If you want
+		    Standard Unix .mbox file: If you want
 		    <application>Ximian Evolution</application> to
 		    read mail from a specific file, or if you download
 		    mail with another application, choose this option.
@@ -173,13 +173,13 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    Qmail maildir format files &mdash; If you download your
+		    Qmail maildir format files: If you download your
 		    mail using qmail, you'll want to use this.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    None &mdash; Select this if you do not plan to
+		    None: Select this if you do not plan to
 		    check mail with this account.
 		  </para>
 		</listitem>
@@ -196,8 +196,8 @@
 		    probably need to change your mail
 		    namespace. Typical values are "mail" and "Mail."
 		    If you prefer, you can choose to subscribe to
-		    individual mail folders. For more information
-		    about how to use IMAP mail, see <xref
+		    individual mail folders one at a time. For more
+		    information about how to use IMAP mail, see <xref
 		    linkend="usage-mail-subscriptions">.
                </para>
              </note>
@@ -205,23 +205,25 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Email Server &mdash; This is the address of the server you're
+	      Email Server: This is the address of the server you're
 	      downloading from.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Username &mdash; The username that you login to your email.  That
+	      Username: The username that you login to your email.  That
 	      is often the part before the @ in your email.
 	    </para>
 	    <para>
-	      Authentication Type &mdash; Chances are you are using
-	      <guilabel>Password</guilabel>.  Ask your administrator for more
-	      details.  You can have <application>Ximian Evolution</application> check
-	      by clicking <guibutton>Check for supported types</guibutton>.
+	      Authentication Type: Chances are you are using
+	      <guilabel>Password</guilabel>.  Ask your administrator
+	      for more details.  You can have <application>Ximian
+	      Evolution</application> make sure you've chosen
+	      correctly by clicking <guibutton>Check for supported
+	      types</guibutton>.
 	    </para>
 	    <para>
-	      Remember Password &mdash; If you prefer to not enter your
+	      Remember Password: If you prefer to not enter your
 	      password every time you check email, press this button.
 	    </para>
 	  </listitem>
@@ -246,18 +248,18 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Server Type &mdash; There are numerous server types that
+	      Server Type: There are numerous server types that
 	      <application>Ximian Evolution</application> supports for sending your
 	      mail.
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    SMTP &mdash; Downloads mail into your mailbox file.
+		    SMTP: Downloads mail into your mailbox file.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Sendmail &mdash; Uses another program to download your mail
+		    Sendmail: Uses another program to download your mail
 		    to your mailbox files.
 		  </para>
 		</listitem>
@@ -266,20 +268,20 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Host &mdash; If you chose SMTP, enter the server's name
+	      Host: If you chose SMTP, enter the server's name
 	      or IP address here.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Server requires authentication &mdash; If your server
+	      Server requires authentication: If your server
 	      requires you to enter a password to send mail, check
 	      this box.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Authentication Type &mdash; Chances are you are using
+	      Authentication Type: Chances are you are using
 	      <guilabel>Password</guilabel>.  If you're not sure, ask
 	      your system administrator or ISP, or have
 	      <application>Ximian Evolution</application> check for you by
@@ -289,14 +291,14 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Username &mdash; The account name you use when you login
+	      Username: The account name you use when you login
 	      to check your email.  Normally, this is the part of your
 	      email address before the '@' character.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Remember Password &mdash; If you prefer to not enter
+	      Remember Password: If you prefer to not enter
 	      your password every time you check email, press this
 	      button.
 	    </para>
@@ -321,7 +323,7 @@
 	files:
           <variablelist>
            <varlistentry>
-	    <term>VCard (.vcf, gcrd)</term>
+	    <term>VCard (.vcf, gcrd):</term>
 	    <listitem>
 	      <para>
 	         The addressbook format used by the GNOME, KDE, and
@@ -333,7 +335,7 @@
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Microsoft Outlook Express 4 (.mbx)</term>
+	    <term>Microsoft Outlook Express 4 (.mbx):</term>
 	    <listitem>
 	      <para>
                  Email file format used by Microsoft Outlook Express
@@ -344,7 +346,7 @@ the workaround described in the note below.
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>MBox (mbox)</term>
+	    <term>MBox (mbox):</term>
 	    <listitem>
 	      <para>
 	       The email box format used by Mozilla, Netscape,
@@ -483,7 +485,7 @@ the workaround described in the note below.
     
     <para>
       <inlinemediaobject><imageobject><imagedata  fileref="figures/full-5" format="png"></imageobject></inlinemediaobject>
-      <guilabel>Search Tools</guilabel>
+      <guilabel>Search Tool</guilabel>
     </para>
     
     <para>
@@ -511,7 +513,7 @@ the workaround described in the note below.
 
 	    <variablelist>
 	      <varlistentry>
-		<term> <guibutton>Summary</guibutton></term>
+		<term> <guibutton>Summary</guibutton>:</term>
 		<listitem>
 	    <para>
 		    Start your day here.  The Ximian Evolution
@@ -525,7 +527,7 @@ the workaround described in the note below.
 	      </varlistentry>
 
 	<varlistentry>
-	  <term> <guibutton>Inbox</guibutton></term>
+	  <term> <guibutton>Inbox</guibutton>:</term>
 	  <listitem>
 	    <para>
 	      Click the <guibutton>Inbox</guibutton> button to start
@@ -537,7 +539,7 @@ the workaround described in the note below.
 	</varlistentry>
 
 	<varlistentry>
-	  <term><guibutton>Calendar</guibutton></term>
+	  <term><guibutton>Calendar</guibutton>:</term>
 	  <listitem>
 	    <para>
 	      The Calendar can store your appointments and task lists
@@ -548,7 +550,7 @@ the workaround described in the note below.
 	</varlistentry>
 
        <varlistentry>
-         <term><guibutton>Tasks</guibutton></term>
+         <term><guibutton>Tasks</guibutton>:</term>
 	<listitem>
 	  <para>
 	     A full-size view of your calendar's task pad.
@@ -557,7 +559,7 @@ the workaround described in the note below.
       </varlistentry>
 
 	<varlistentry>
-	  <term><guibutton>Contacts</guibutton></term>
+	  <term><guibutton>Contacts</guibutton>:</term>
 	  <listitem>
 	    <para>
 	      The Addressbook holds contacts, with address, phone, and
@@ -596,7 +598,7 @@ the workaround described in the note below.
       <application>Ximian Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
       like a <glossterm linkend="filetree">file
-      tree</glossterm>&mdash; it starts small at the top, and branches
+      tree</glossterm>-- it starts small at the top, and branches
       downwards. On most computers, there will be three or four
       folders at the base.  First, of course, is the
       <guilabel>Summary</guilabel>, a customizable summary of your
@@ -664,12 +666,11 @@ the workaround described in the note below.
     <title>Navigating without the Folder Bar or the Shortcut Bar</title>
        <para>
          You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another. When you hide the folder
-         bar, 
-         there is a menu on the left side of the window just below the toolbar
-         to move about the folder tree, even with the folder and
-         shortcut bars hidden.
+         around the main window. You can use the <keycap>Tab</keycap>
+         key to switch from one part of the window to another. When
+         you hide the folder bar, there is a menu on the left side of
+         the window just below the toolbar to move about the folder
+         tree, even with the folder and shortcut bars hidden.
        </para>
      </tip>
 
@@ -791,7 +792,7 @@ the workaround described in the note below.
    <para>
       <variablelist>
         <varlistentry>
-          <term> <guimenu>File</guimenu></term>
+          <term> <guimenu>File</guimenu>:</term>
 
           <listitem><para> Anything related to a file or to the
             operations of the application generally falls under this
@@ -800,7 +801,7 @@ the workaround described in the note below.
         </varlistentry>
 
        <varlistentry>
-          <term> <guimenu>Edit</guimenu></term>
+          <term> <guimenu>Edit</guimenu>:</term>
           <listitem><para>
               The <guimenu>Edit</guimenu> menu holds
               useful tools that help you edit text and move it around.
@@ -808,7 +809,7 @@ the workaround described in the note below.
         </varlistentry>
 
        <varlistentry>
-          <term> <guimenu>View</guimenu></term>
+          <term> <guimenu>View</guimenu>:</term>
           <listitem><para>
             This menu lets you decide how <application>Ximian Evolution</application> 
             should look. Some of the features control the appearance of 
@@ -818,17 +819,17 @@ the workaround described in the note below.
         </varlistentry>
 
         <varlistentry>
-          <term> <guimenu>Actions</guimenu></term>
+          <term> <guimenu>Actions</guimenu>:</term>
           <listitem><para>
 	    Holds actions which maybe applied to a message.  Normally,
-	    if there is only one target for the action &mdash; for
-	    example, replying to a message &mdash; you can find it in
+	    if there is only one target for the action -- for
+	    example, replying to a message -- you can find it in
 	    the <guimenu>Actions</guimenu> menu.
           </para></listitem>
         </varlistentry>
 
        <varlistentry>
-          <term> <guimenu>Tools</guimenu></term>
+          <term> <guimenu>Tools</guimenu>:</term>
           <listitem><para>
              Tools for configuring, changing, and
           setting up preferences go here.  For mail, that means things like
@@ -841,7 +842,7 @@ the workaround described in the note below.
         </varlistentry>
 
        <varlistentry>
-          <term> <guimenu>Help</guimenu></term>
+          <term> <guimenu>Help</guimenu>:</term>
           <listitem><para>
              Select among these items to open the 
              <application>Help Browser</application> 
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
index ebce544b9a..e611b97b00 100644
--- a/help/C/usage-print.sgml
+++ b/help/C/usage-print.sgml
@@ -35,7 +35,7 @@
       look, click <guibutton>Print</guibutton> to send your document
       on its way.  If you'd like to change it, just close the
       <guilabel>Print Preview</guilabel> window and make the changes
-      you want from the Mail, Calendar, or Contact Manager.
+      you want from your mail, calendar, or addressbook.
     </para>