I have deleted all of these files as they are being moved to the help directory.

svn path=/trunk/; revision=12097

46 files changed, 0 insertions, 8967 deletions

diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
deleted file mode 100644
index 349f0f640f..0000000000
--- a/doc/C/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-figs = \
-	figures/calendar.png			\
-	figures/config-cal.png			\
-	figures/config-mail.png			\
-	figures/contact-editor.png		\
-	figures/contact.png			\
-	figures/filter-assist-fig.png		\
-	figures/filter-new-fig.png		\
-	figures/full-1.png			\
-	figures/full-2.png			\
-	figures/full-3.png			\
-	figures/full-4.png			\
-	figures/full-5.png			\
-	figures/full-6.png			\
-	figures/full-7.png			\
-	figures/mail-composer.png		\
-	figures/mail-druid-pic.png		\
-	figures/mail-inbox.png			\
-	figures/mainwindow-pic.png		\
-	figures/newmsg.png			\
-	figures/print-dest.png			\
-	figures/print-preview.png		\
-	figures/replymsg.png			\
-	figures/vfolder-createrule-fig.png
-docname = evolution
-lang = C
-omffile = evolution-C.omf
-sgml_ents =	\
-	apx-authors.sgml	\
-	apx-bugs.sgml		\
-	apx-gloss.sgml		\
-	config-encryption.sgml	\
-	config-prefs.sgml	\
-	config-sync.sgml	\
-	evolution-faq.sgml	\
-	menuref.sgml		\
-	preface.sgml		\
-	usage-calendar.sgml	\
-	usage-contact.sgml	\
-	usage-encryption.sgml	\
-	usage-exec-summary.sgml	\
-	usage-mail-org.sgml	\
-	usage-mail.sgml		\
-	usage-mainwindow.sgml	\
-	usage-print.sgml	\
-	usage-sync.sgml
-	
-include $(top_srcdir)/doc/sgmldocs.make
-dist-hook: app-dist-hook
diff --git a/doc/C/POTFILES.in b/doc/C/POTFILES.in
deleted file mode 100644
index d9393e82cc..0000000000
--- a/doc/C/POTFILES.in
+++ /dev/null
@@ -1,16 +0,0 @@
-apx-authors.sgml
-apx-bugs.sgml
-apx-gloss.sgml
-config-prefs.sgml
-config-setupassist.sgml
-config-sync.sgml
-evolution.sgml
-menuref.sgml
-preface.sgml
-usage-calendar.sgml
-usage-contact.sgml
-usage-mail.sgml
-usage-mainwindow.sgml
-usage-notes.sgml
-usage-print.sgml
-usage-sync.sgml
diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
deleted file mode 100644
index c0c06d355b..0000000000
--- a/doc/C/apx-authors.sgml
+++ /dev/null
@@ -1,85 +0,0 @@
-  <appendix id="authors">
-    <title>Authors</title>
-     <para>
-      <application>Evolution</application> was written by:
-<simplelist>
-     <member>Seth Alves: <email>alves@ximian.com</email></member>
-     <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>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>Bertrand Guiheneuf: <email>bertrand@ximian.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@ximian.com</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@ximian.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Nat Friedman: <email>nat@ximian.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@ximian.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@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>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@ximian.com</email></member>
-     <member>Michael Zucchi: <email>notzed@ximian.com</email></member>
-</simplelist>
-and other dedicated GNOME programmers. 
-</para>
-    <para>
-      The <application>Evolution</application> code owes a great debt
-       to the <application>GNOME-pim</application> and
-       <application>GNOME-Calendar</application> applications, and to
-       <application>KHTMLW</application>.  The developers of
-       <application>Evolution</application> acknowledge the efforts
-       and contributions of all who worked on those projects.
-    </para>
-
-   <para>
-      For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.ximian.com/apps/evolution.php3"
-      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
-      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.
-    </para>
-    <para>
-      This manual was written by Aaron Weber
-      (<email>aaron@ximian.com</email>), Kevin Breit
-      (<email>battery841@mypad.com</email>) Duncan Mak
-      (<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>.
-    </para>
-      <para>
-       Translations: 
-         <itemizedlist>
-            <listitem><para>
-              Daniel Persson for .se
-            </para></listitem>
-          
-            <listitem><para>
-              Hector Garcia Alvarez for .es
-            </para></listitem>
-           </itemizedlist>
-         </para>          
-    </appendix>
-
-
-
-
-
diff --git a/doc/C/apx-bugs.sgml b/doc/C/apx-bugs.sgml
deleted file mode 100644
index e4a96a8155..0000000000
--- a/doc/C/apx-bugs.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
- <appendix id="bugs">
-   
-    <title>Known bugs and limitations</title>
-    <abstract>
-    <para>
-     This appendix describes known bugs and limitations of
-    <application>Evolution</application>.  Please use the GNOME
-    <application>Bug Report Tool</application> (known as
-    <command>bug-buddy</command> at the command line) if you find one
-    we have not listed.
-    </para>
-    </abstract>
-
-    <para>
-      Evolution is still beta software, so the bug tracking is best
-      left to the bugzilla system and to the programmers.  However,
-      there are a number of limitations that will not be addressed
-      before version 1.0. The most notable are: Import of Microsoft
-      Outlook .pst files, and compatibility with the Microsoft
-      Exchange protocol.
-    </para>
-  </appendix>
-
diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
deleted file mode 100644
index 76102417c4..0000000000
--- a/doc/C/apx-gloss.sgml
+++ /dev/null
@@ -1,470 +0,0 @@
-<glossary id="apx-gloss">
-
- <title>Glossary</title>
-
- <glossentry id="attachment">
-  <glossterm>Attachment</glossterm>
-  <glossdef>
-   <para>
-    Any file sent along with an email.  Attachments may be embedded in
-    a message or appended to it.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Automatic Indexing</glossterm>
-  <glossdef>
-   <para>
-     Pre-sorting procedure that allows
-     <application>Evolution</application> to refer to data quickly.
-     It enables faster searches and decreases memory usage for
-     data displays.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    A way of addressing a message.  Bcc is used to send a group of
-    people an e-mail, while hiding their names and addresses from each
-    other.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    Carbon-copies are used to send a 3rd party a copy of the e-mail,
-    so they an keep up to date on a conversation, without being in the
-    To: list.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="conduit">
-  <glossterm>Conduit</glossterm>
-  <glossdef>
-   <para>
-     A synchronization conduit is a small application which controls
-     the transfer of data between a handheld device and a desktop
-     computer.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="druid">
-  <glossterm>Druid</glossterm>
-  <glossdef>
-   <para>
-    A tool which guides a user through a series of steps, usually to
-    configure or set up a program.  Equivalent to "Assistant" and
-    "Wizard."
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="emoticon">
-  <glossterm>Emoticon</glossterm>
-  <glossdef>
-   <para>
-     Also called "smileys," emoticons are the little sideways faces made
-     of colons and parentheses which people use to convey emotion in email.
-     Examples: :-) or ;(  .
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> is the <acronym> GNOME
-    </acronym> groupware application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Execute</glossterm>
-  <glossdef>
-   <para>
-    To run a program.  Any file that can be run is called an
-    executable.  <application>Evolution</application> can download
-    executable attachments, but before they can be run, the files must
-    be marked as executable with a shell or file manager.  This
-    security precaution prevents the automatic or accidental execution
-    of malicious programs. For more information on executables and file
-    permissions, see the documentation for your file manager or shell.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="expunge">
-  <glossterm>Expunge</glossterm>
-  <glossdef>
-   <para>
-     When messages are marked for deletion, they remain till they are expunged.
-     When a message is expunged, it is permanently deleted, as long as it was
-     marked for deletion.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filetree">
-  <glossterm>File Tree</glossterm>
-  <glossdef>
-   <para>
-     A way of describing a group of files on a computer.  With the
-     perversity typical of computer (and especially Unix and Linux)
-     nomenclature, the top of the tree is called the root directory,
-     and denoted by <systemitem><filename>/</filename></systemitem>.
-     The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the <systemitem>root</systemitem>
-     account, or root's home directory,
-     <systemitem><filename>/home/root</filename></systemitem>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter</glossterm>
-  <glossdef>
-   <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically.  You can create filters to perform
-    one or more actions on a message that meets any (or all) of a wide
-    range of criteria.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Forward</glossterm>
-  <glossdef>
-   <para>
-    If you get a message intended for someone else, you can use
-    message forwarding to send it on to the right person. 
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Groupware</glossterm>
-  <glossdef>
-   <para>
-    Groupware is a term describing an application which helps groups
-    of people work together.  Typically, a groupware application will
-    have several productivity features built into one program,
-    including email, calendar, and addressbook tools.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="haiku">
-  <glossterm>Haiku</glossterm>
-  <glossdef>
-   <para>
-     A traditional Japanese form of poetry.  The poems are three lines
-     long, with first and last lines having five syllables, and the
-     second line seven syllables.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML</glossterm>
-  <glossdef>
-   <para>
-    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.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Hot Key</glossterm>
-  <glossdef>
-   <para>
-    Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse to do the same action.
-    Hot-keys can speed up computer usage.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
-    section.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <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>.
-    This will not be on the test.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <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>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
-   <glossdef>
-    <para>
-     LDAP, the Lightweight Directory Access Protocol, allows a client
-     to search through a large database of addresses, phone numbers,
-     and people stored on a server.
-    </para>
-   </glossdef>
-  </glossentry>
-
- <glossentry id="mail-client">
-  <glossterm>Mail Client</glossterm>
-  <glossdef>
-   <para>
-    A mail client is the application with which a person reads and
-    sends e-mail.  Its counterparts are the various types of mail
-    servers, which handle user authentication and direct messages from
-    sender to recipient.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minicard</glossterm>
-  <glossdef>
-   <para>
-      A format for the display of contact data.  Similar in appearance
-      to a small business card.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym> being written by Eazel.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="nickname">
-  <glossterm>Nickname</glossterm>
-  <glossdef>
-   <para>
-    An alias for an e-mail address.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP</glossterm>
-  <glossdef>
-   <para>
-     POP, the Post Office Protocol, is a mechanism for email
-     transport.  In contrast to IMAP, it is used only to get mail from
-     a server and store it locally on your hard disk.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protocol</glossterm>
-  <glossdef>
-   <para>
-     An agreed-upon method of communication, especially one for
-     sending particular types of information between computer systems.
-     Examples include POP (Post Office Protocol), for email, and HTTP
-     (HypterText Transfer Protocol), for web pages.
-
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="regular-expression">
-  <glossterm>Regular Expression</glossterm>
-  <glossdef>
-   <para>
-      A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly.*so[a|u]p</userinput> means
-      "any phrase beginning with 'fly' and ending in 'soup' or
-      'soap'".  If you searched for that expression, you'd find both
-      "fly in my soup" and "fly in my soap."  There's not room here to
-      go into depth, but if you want, have a look at the documentation
-      for the <command>grep</command> command.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Script</glossterm>
-  <glossdef>
-   <para>
-    A program written in an interpreted (rather than compiled)
-    language.  Often used as a synonym for "macro," to denote a series
-    of pre-recorded commands or actions within an application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="sendmail">
-  <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
-      prefer it because it offers more flexibility, but is more
-      difficult to set up.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="shortcut-bar">
-  <glossterm>Shortcut Bar</glossterm>
-  <glossdef>
-   <para>
-     A portion of <application>Evolution</application> which offers
-     users fast access to the most frequently used portions of the
-     application.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="signature">
-   <glossterm>Signature</glossterm>
-   <glossdef>
-    <para>
-     In email terms, a signature is a piece of text placed at the end
-     of every email sent, like a hand-written signature at the bottom
-     of a written letter.  A signature can be anything from a favorite
-     quotation to a link to a web page; courtesy dictates that it be
-     fewer than four lines long.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="SMTP">
-   <glossterm>SMTP</glossterm>
-   <glossdef>
-    <para>
-      This is the most common way of transporting mail messages from
-      the client's computer (you) to the server. SMTP stands for
-      Simple Mail Transfer Protocol.
-    </para>
-   </glossdef>
-  </glossentry> 
-
- <glossentry id="spam">
-  <glossterm>Spam</glossterm>
-  <glossdef>
-   <para>
-    Useless, unsolicited e-mail.  Spam normally comes in forms of
-    chain letters and advertisements for unscrupulous or clueless
-    companies.  Messages that are merely useless are called "opt-in
-    newsletters."
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="tooltip">
-  <glossterm>Tool-Tip</glossterm>
-  <glossdef>
-   <para>
-      A small box of explanatory text which appears when the mouse
-      pointer is held motionless over a button or other interface
-      element.
-   </para>
-  </glossdef>
- </glossentry>
-
-
-
-
- <glossentry id="virus">
-  <glossterm>Virus</glossterm>
-  <glossdef>
-   <para>
-    A malicious program which inserts itself into others so that it will be 
-    executed, allowing it to spread to still more programs and other computers.
-    A virus can cause substantial damage by clogging networks or disk drives, 
-    deleting files, or opening security holes.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vcard">
-  <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>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vfolder">
-  <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
-    are updated dynamically.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/config-encryption.sgml b/doc/C/config-encryption.sgml
deleted file mode 100644
index e36f17c652..0000000000
--- a/doc/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/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
deleted file mode 100644
index b3e27fce98..0000000000
--- a/doc/C/config-prefs.sgml
+++ /dev/null
@@ -1,669 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
-        will tell you how to do just that.
-      </para>
-
-       <sect1 id="config-prefs-mail">
-         <title>Mail Settings</title>
-        <para>
-        To change your mail settings, select <menuchoice>
-        <guimenu>Tools</guimenu> <guimenuitem>Mail
-        Settings</guimenuitem></menuchoice> in the Inbox.  This
-        will open the <interface>mail preferences window</interface>,
-        illustrated in <xref linkend="config-prefs-mail-fig">.  Mail
-        preferences are separated into several categories:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Accounts</guilabel></term>
-	    <listitem>
-	      <para>
-		This allows you to create and alter one or more identities for your
-		email.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
-	    <listitem>
-	      <para>
-		Allows you to edit how email is handled and displayed.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Composer</guilabel></term>
-	    <listitem>
-	      <para>
-		Customizes the composer's behavior.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Other</guilabel></term>
-	    <listitem>
-	      <para>
-		Configures miscellanious aspects of <application>Evolution</application>
-		such as character sets.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Mail Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-      <sect2 id="config-prefs-mail-identity">
-      <title>Identity Settings</title> 
-      <para>
-         If you have only one email account, or send email from only
-         one address, you will only need to configure one identity. If
-         you want, however, you can have multiple identities.  This
-         can be useful if you want to keep personal and professional
-         email separate, or if you wear several hats at work.
-         
-       </para>
-       <para>
-         To add a new identity, simply click
-         <guibutton>Add</guibutton>. To alter an existing identity,
-         click on it in the <guilabel>Identity</guilabel> tab of the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton>.
-      </para>
-
-      <para>
-         <application>Evolution</application> will then present you
-         with a dialog box containing four fields:
-          <itemizedlist>
-           <listitem>
-	    <para>
-              <guilabel>Full Name:</guilabel> by default, this is the
-              same name as the full name described in your user
-              account on your computer.  You can select another if you
-              wish.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Email address:</guilabel> Enter your email
-              address in this space.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Organization:</guilabel> If you send email as
-              a representative of a company or other organization,
-              enter its name here.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Signature file:</guilabel> You may choose a
-              small text file to be appended to every message that you
-              send.  Typically, signature files include address or
-              other contact information, or a favorite quotation.
-              It's good form to keep it to four lines at the maximum.
-            </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-network">
-      <title>Network Settings</title> 
-      <para>
-        In order to send mail with
-        <application>Evolution</application>, you need to connect to
-        your network.  To do that, you'll need to know your user name
-        and password, what sort of mail sending and receiving
-        protocols your network uses, and the names of the servers
-        you'll be using.  If you're switching from another groupware
-        or email program, you can almost certainly use the same
-        settings as you did with that program. Network-related
-        settings are in the <guilabel>Mail Sources</guilabel> and
-        <guilabel>Mail Transport</guilabel> tabs.
-      </para>
- 
-      <sect3 id="config-prefs-network-sources">
-	<title>Mail Sources</title>
-	<para>
-          The <interface>Mail Sources</interface> tab allows you to
-          add, edit, or delete methods of retrieving mail from
-          servers.  Clicking on <guibutton>Add</guibutton> or
-          <guibutton>Edit</guibutton> will bring up a dialog box to
-          offer you the following options:
-           <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Mail source type:</guilabel></term>
-	      <listitem>
-		<para>
-                  Select from <glossterm
-                  linkend="imap">IMAP</glossterm> or <glossterm
-                  linkend="pop">POP</glossterm> servers, or Unix-style
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term> <guilabel>Server:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the name of the mail source server in this
-                  field. Your POP server may or may not be the same as your
-                  <glossterm linkend="smtp">SMTP</glossterm> server.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Username:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the user name for the account you have on the
-                  server - this should the part of your email address
-                  before the @.  If you use
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files as your mail source, you do not need to enter
-                  a username.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Authentication:</guilabel></term>
-	      <listitem>
-		<para>
-                  Tell <application>Evolution</application> how to
-                  verify your identity with the server.  Your options
-                  vary depending upon the type of server you are
-                  using, and the ways it is configured.  Given the
-                  name of a server,
-                  <application>Evolution</application> can detect what
-                  sorts of authentication it offers.
-               </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Test Settings</guilabel></term>
-	      <listitem>
-		<para>
-                  Click this button to have
-                  <application>Evolution</application> check to see if
-                  mail sources are configured correctly.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-          </para>
-          <para>
-            If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP,
-            <systemitem><filename>mh</filename></systemitem>, or
-            <systemitem><filename>mbox</filename></systemitem>
-            listings and check and download mail from all POP servers.
-            In other words, <guibutton>Get Mail</guibutton> gets your
-            mail, no matter how many sources you have, or what types
-            they are.  You can disable checking mail on accounts in their
-            properties.
-          </para>
-          <tip>
-            <title>Sharing Mailboxes with Other Mail Programs</title>
-            <para>
-              If you want to use <application>Evolution</application>
-              and another email client, such as
-              <application>Mutt</application>, at the same time,
-              here's how:
-              <orderedlist numeration="arabic">
-                <listitem>
-                   <para>
-                      Download your mail in the other application as
-                      you would normally.
-                   </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      In <application>Evolution</application>
-                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Mail
-                      Settings</guimenuitem></menuchoice>, and pick the account
-                      you'd like to use to share mail. You may want to
-                      create a new account just for this source of
-                      mail.
-                   </para>
-               </listitem>                     
-               <listitem>
-                   <para>
-                      Under the <guilabel>Receiving Mail</guilabel>
-                      tab, select the type of mail file that your
-                      other mail application uses, and then enter the
-                      full path to that file.
-                   </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      Click the <guibutton>OK</guibutton> button.
-                   </para>
-                  </listitem>
-                </orderedlist>
-               </para>
-            </tip>
-        </sect3>
-
-      <sect3 id="config-prefs-mail-network-transports">
-	<title>Mail Transports</title>
-	<para>
-           The <interface>Mail Transports</interface> tab lets you choose
-           how you will send mail.  <application>Evolution</application> currently supports two
-           mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
-           uses a remote mail server, and
-           <glossterm linkend="sendmail">sendmail</glossterm>, which uses the
-           <application>sendmail</application> program on your local
-           system.  <application>Sendmail</application> is more
-           difficult to configure, but offers more flexibility than
-           <glossterm>SMTP</glossterm>.
-        </para>
-	<para>
-            To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server.  It may have the same name as
-            your mail source server.
-         </para>
-         <para>
-            <application>Evolution</application> can attempt to
-            determine if you have entered a valid server name.  To
-            have it do so, click the <guilabel>Test
-            Settings</guilabel> button.
-         </para>
-	</sect3>
-      </sect2>
-      <sect2 id="config-prefs-network-news">          
-          <title>News Servers</title>
-          <para>
-            Newsgroups are so much like mailing lists that there's no
-            reason not to keep them right next to your mail.  When you
-            first select the <guilabel>News Servers</guilabel> tab,
-            you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
-          </para>
-          <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
-            will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
-            as many news servers as you like, of course.  News servers
-            will appear next to your IMAP servers in the
-            <interface>folder bar</interface>.
-          </para>
-     </sect2>
-
-     <sect2 id="config-prefs-mail-other">
-	<title>Other Mail Preferences</title>
-	<para>
-          Not everything fits neatly into categories.  This tab
-          contains some miscellaneous configurations that don't have
-          too much to do with each other.
-          <variablelist>
-
-             <varlistentry>
-	    <term> 
-	      <guilabel>Send messages in HTML format</guilabel>
-	    </term>
-	    <listitem><para>
-		If you check this box, you will send
-		messages as HTML by default.  If you leave it unchecked, your
-		messages will be sent without HTML formatting unless you select 
-		<menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
-		</menuchoice> in the message composer.
-		See <xref linkend="usage-mail-getnsend-send-html">
-		  for more information about HTML mail.
-	      </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-                <term> 
-                   <guilabel>Mark Messages as Read After</guilabel>
-                </term>
-                <listitem><para> 
-                    When you click on a message,
-                    <application>Evolution</application> will wait a
-                    moment before marking it as read. You can set the
-                    delay, in milliseconds, here.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Folder Format</guilabel>
-                </term>
-                <listitem> <para> By default,
-                   <application>Evolution</application> saves its mail
-                   in the
-                   <systemitem><filename>mbox</filename></systemitem>
-                   format. You can switch to the
-                   <systemitem><filename>mh</filename></systemitem>
-                   format if you like.  Note that this is an advanced
-                   feature and may cause you to lose some messages, so
-                   you should probably make a backup of your
-                   <systemitem><filename>evolution</filename></systemitem>
-                   directory first. In addition, it will take quite
-                   some time if you have a large mailbox.
-               </para></listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuring the Calendar</title>
-       <para>
-          To set your calendar preferences, select
-          <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar
-          Configuration</guimenuitem></menuchoice> from the Calendar
-          view.  This will open up the
-          <interface>Preferences</interface> window.  It contains three
-          tabs: <guilabel>Calendar</guilabel>, <guilabel>TaskPad</guilabel>, <guilabel>Reminders</guilabel>.  The <interface>calendar
-          preferences window</interface> is illustrated in <xref
-          linkend="config-prefs-cal-fig">.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-time">
-      <title>Time Display Settings</title>
-      <para>
-        The <guilabel>Time display</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time format</term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Weeks start on</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Day range</term>
-	    <listitem>
-               <para>
-                 When does your work day start, and when does it end?
-                 In the day and week views,
-                 <application>Evolution</application> displays all the
-                 hours in the range you select here, even if there are
-                 no appointments for those times.  Of course, you can
-                 still schedule an appointment outside of these hours,
-                 and if you do, the display will be extended to show
-                 it.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-color">
-      <title>Calendar Colors</title>
-      <para>
-        The <interface>colors tab</interface> allows you to decide
-        what color your calendar will be.  The tab consists of a
-        sample calendar on the right and a list of ten items that can
-        be colored in different ways.  If you click on the color
-        button to the right of each item, you will bring up a
-        color-selector window where you can alter that
-        color.  By clicking <guibutton>OK</guibutton> in the color
-        selection dialog, you can see the results of the color on the
-        sample calendar.
-     </para>
-     <para>The display elements colors you can set are:
-
-          <itemizedlist>
-           <listitem>
-              <para>
-                <guilabel>Outline:</guilabel> The lines between days
-                and at the top of the display.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Headings:</guilabel> Text color for day
-                and month names and other headings.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Empty days:</guilabel> This is the
-                background color for any time slots in which you have no appointments.
-               </para>
-            </listitem>  
-
-         <listitem>
-              <para>         
-             <guilabel>Appointments:</guilabel> This is the
-                background color for any time slots in which you have appointments.
-               </para>
-            </listitem>
-     
-	  <listitem>
-	    <para> <guilabel>Highlighted day:</guilabel> The
-              background color for a selected time slot.
-             </para>
-	  </listitem>
-
-          
-	  <listitem>
-	    <para>         
-              <guilabel>Day numbers:</guilabel> Text color for date numbers.
-            </para>
-	  </listitem>
-
-              
-	  <listitem>
-	    <para>
-              <guilabel>Current day's number:</guilabel> Text color for today's date.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is not yet
-             due:</guilabel> Text color for To-Do list items that are
-             not yet due. 
-               </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is due today:</guilabel>
-             Text color for today's tasks.
-               </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is overdue:</guilabel>
-             Text color for overdue tasks.
-               </para>
-	  </listitem>
-
-          </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-todo">
-      <title>To Do List Settings</title>
-     <para>
-       You can choose what information the To Do list displays and the
-       way it is displayed.  The two areas of the <interface>To Do
-       List</interface> tab offer several options each:
-       <variablelist>
-	 <varlistentry>
-	   <term>Show on To Do List</term>
-	    <listitem>
-	      <para>
-                This box contains three items.  If you select the
-                check boxes next to them, that information will appear
-                in the To Do list for each task it contains:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Due Date</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Time Until Due</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Priority</guilabel></para>
-                   </listitem>
-               </itemizedlist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Style Options</term>
-	    <listitem>
-               <para>
-                 Select among the following checkboxes to determine
-                 how your To Do list will look:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Highlight overdue items</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight items due today</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight not yet due items</guilabel></para>
-                   </listitem>
-               </itemizedlist>                 
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms Settings</title>
-      <para>  
-        The <interface>alarms tab</interface> enables you to select from three boxes:
-        <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Beep on display alarms</guilabel>: select
-	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set. These beeps
-	    are distinct from full-fledged audio alarms. If you leave this box
-	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. 
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Audio alarms timeout after: </guilabel>
-	    Select this button to have your audio alarms stop
-	    automatically after a certain number of seconds.  </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Enable snoozing for:</guilabel> If you
-	    would like to have the option to tell
-	    <application>Evolution</application> to repeat an alarm in
-	    a few minutes, select this button and decide how long
-	    you'd like it to wait.
-           </para>
-	  </listitem>
-	</itemizedlist>   
-      </para>
-    </sect2>
-
-   </sect1>
-
-   <sect1 id="config-prefs-contact">
-      <title>Managing the Contact Manager</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-->
-        </para>
-      
-        <sect2 id="config-prefs-contact-ldap-add">
-           <title>Adding Directory Servers</title>
-           <para>
-              To add a new LDAP server to your available contact
-              folders, select <menuchoice> <guimenu>Actions</guimenu>
-              <guimenuitem>New Directory Server</guimenuitem>
-              </menuchoice>.  This brings up a small dialog box which
-              will let you enter the following options:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Name</guilabel> &mdash; any name you choose for the server.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Description</guilabel> &mdash; a longer description of the server.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
-    
-
-
-  <sect1 id="config-prefs-general">
-    <title>General Preferences</title> 
-    <para>
-          Additional configuration options will be covered here, as
-          they become available.
-        </para>
-  </sect1>
-</chapter>
-    
-
-
-
-
-
diff --git a/doc/C/config-sync.sgml b/doc/C/config-sync.sgml
deleted file mode 100644
index 8f3b30d1f0..0000000000
--- a/doc/C/config-sync.sgml
+++ /dev/null
@@ -1,128 +0,0 @@
-  <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
-     <para>
-        Synchronization presents you with two issues you'll need to
-        address. 
-        <simplelist>
-          <member>
-            Your computer needs to recognize and access your handheld.
-            At this time, <application>Evolution</application> only
-            supports Palm-OS devices like the PalmPilot and the
-            Handspring Visor.
-          </member>
-          <member>
-           You should decide what sort of synchronization behavior you
-           want.
-          </member>
-        </simplelist>
-
-    </para>
-
-    <para>
-       If you haven't used a handheld device with your computer
-       before, you'll need to run the GNOME <application>Control
-       Center</application> and make sure that <application>Pilot
-       Link</application> is properly configured. Then, select the
-       <application>Evolution</application> <glossterm
-       linkend="conduit">conduits</glossterm> under the
-       <guilabel>Pilot Conduits</guilabel> section of the Control
-       Center.
-  </para>
-  
-  <para>
-        Once your computer and your Palm-OS device are talking happily
-        to each other, you'll have to decide what exactly you want
-        them to do with the data they exchange.  To enable a conduit, click the
-        <guibutton>Enable</guibutton> to enable it and click
-        <guibutton>Settings</guibutton>.  Your options may vary
-        depending on the conduit, but typically they will be:
-
-        <variablelist>
-         <varlistentry>
-            <term>Disabled </term>
-            <listitem> 
-               <para>
-                  Do nothing.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Synchronize</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  from the handheld to the computer.  Remove items
-                  that were on both systems but have been deleted on
-                  one.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy From Pilot</term>
-            <listitem> 
-               <para>
-                  If there is any new data on the the handheld device,
-                  copy it to the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy To Pilot</term>
-            <listitem> 
-               <para>
-                 Copy new data from the computer to the handheld. 
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge From Pilot</term>
-            <listitem> 
-               <para>
-                  Copy new data from the handheld to the computer, and
-                  remove any information from the computer that has
-                  been deleted on the handheld.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge To Pilot</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  remove any information from the handheld that has
-                  been deleted on the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-       </variablelist>
-    </para>
-
-    <para>
-      Select a behavior for each conduit available.  For the most
-      part, you'll want to stick with
-      <guilabel>Synchronize</guilabel>.  Then, put your handheld on
-      its cradle and press the synchronization button.
-    </para>
-
-
-      <para> 
-         <tip> 
-	  <title>Data Loss Prevention</title> 
-	  <para>
-	    It's always a good idea to make a backup.  To do that,
-	    make a copy of your <systemitem>
-	    <filename>~/evolution</filename> </systemitem> directory.
-          </para>
-	</tip>
-       </para>
-
-    </chapter>
-
-
-
-
diff --git a/doc/C/evolution-C.omf b/doc/C/evolution-C.omf
deleted file mode 100644
index 70d30969eb..0000000000
--- a/doc/C/evolution-C.omf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-    <title>
-      The Evolution Manual
-    </title>
-    <subject>
-      <category>GNOME|PIM</category>
-    </subject>
-    <format mime="text/sgml"/>
-    <identifier url="evolution.sgml"/>
-    <language code="C"/>
-  </resource>
-</omf>
diff --git a/doc/C/evolution-faq.sgml b/doc/C/evolution-faq.sgml
deleted file mode 100644
index 8e658ff308..0000000000
--- a/doc/C/evolution-faq.sgml
+++ /dev/null
@@ -1,973 +0,0 @@
-<!--
-<!DOCTYPE appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<appendix id="evolution-faq">
-  <title>Frequently Asked Questions About Ximian Evolution</title>
-    	<para>
-	 Here are some frequently asked questions about the
-	 <application>Evolution</application> groupware suite from
-	 Ximian.  If you have a question that's not listed, you can
-	 contact us at evolve@ximian.com.
-	</para>
-
-  <sect1 id="faq-features">
-    <title>Features</title>
-
-    <qandaset>
-
-      <qandaentry>
-	<question>
-	  <para>
-	   How can I use Evolution with Microsoft Exchange or Lotus Notes?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-             If your server uses standard open protocols like IMAP,
-             LDAP, POP, and SMTP, you can use Evolution with it.  You
-             can share addresses with vCards and calendar items with
-             iCal appointments.
-	  </para>
-        </answer>
-       </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	     Can I use Evolution with KDE?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-             Evolution will work fine in KDE.  You will need to
-             install all of the GNOME libraries that it depends on.
-             Also, certain configuration options, such as default
-             fonts and the message editor keybinding behavior, must be
-             changed using the GNOME Control Center application (this
-             will also run from within KDE).
-	  </para>
-        </answer>
-       </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    How can I remove or rename a folder?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-            Right-click on the folder and select the
-            <guimenuitem>Delete</guimenuitem> or
-            <guimenuitem>Rename</guimenuitem> items.
-	  </para>
-	</answer> 
-      </qandaentry>
- 
-      <qandaentry>
-	<question>
-	  <para>
-	    Why doesn't drag and drop between folders seem to work?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    The implementation isn't finished, although it's nearly done.
-  	  </para>
-
-	  <para>
-	    In the meantime, right-click on the folders or messages
-	    you want to move, and select the
-	    <guimenuitem>Move</guimenuitem> or
-	    <guimenuitem>Copy</guimenuitem> options.
-	  </para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-      <question>
-	<para>
-	  Can I read mail from a mailbox file created by some other
-	  application (e.g. Mutt) without importing mail from it?
-	</para>
-	</question>
-	<answer>
-	  <para>
-	    No, but it's a planned feature.
-	  </para>
-	</answer> 
-      </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    Can Evolution sync with my Palm OS (tm) device?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    Yes.  However, it is not yet stable enough for general
-	    release and we do not yet ship Evolution with Palm
-	    synchronization enabled default. Until we do, you will
-	    need to compile this in yourself. Check the
-	    <filename>README</filename> file for additional
-	    information on the requirements.  Full compatibility and
-	    synchronization for calendar and addressbook applications
-	    on Palm devices will be implemented and shipped soon.
- 	  </para>
-	</answer> 
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-	    What is the difference between a virtual folder (vfolder)
-	    and a regular folder?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    A virtual folder is like a saved search: it is a view of
-	    your mail. Regular folders actually contain the mail
-	    messages.  You can have one message be in multiple virtual
-	    folders, but only in one regular folder.  See the section
-	    in the Evolution manual about virtual folders for more
-	    information.
-	  </para>
-	</answer> 
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-	    Can Evolution spell-check messages while I compose them?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    Yes. The Evolution composer is able to highlight
-	    mis-spelled word on the fly as you type them, and also
-	    give you suggestions for possible corrections.  In order
-	    for this to work you need the
-	    <filename>gnome-spell</filename> component, which is not
-	    shipped with Ximian GNOME yet.
- 	 </para>
-
-	  <para>
-	    If you are brave enough, you can check out module
-	    <filename>gnome-spell</filename> from the GNOME CVS and
-	    compile it yourself.  Check out its README file for a list
-	    of <filename>gnome-spell</filename>'s requirements for
-	    compilation.
-	  </para>
-
-	  <para>
-	    Note that you don't need to recompile Evolution after
-	    installing <filename>gnome-spell</filename>; it will be
-	    picked up automatically.
-	  </para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    Why can't I see the images that are contained in some HTML
-	    mail messages.
-	  </para>
-	</question>
-	<answer>
-	  <para>
-  	    Evolution currently doesn't support this, but it's a
-	    planned feature.  It will be an option: many people like
-	    to turn off the images because they use up bandwidth and can
-            be used to spy on your email reading habits.
-	  </para>
-	</answer> 
-      </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    Can I change the font that Evolution uses to compose and
-	    display mail messages?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    You have to change the GtkHTML settings for that: in the
-	    GNOME Control Center, go to the "HTML Viewer"
-	    configuration page, which is under the "Document Handlers"
-	    category.
-	</para>
-	</answer> 
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-            How do I import my Outlook <filename>.pst</filename> files into Evolution?
-         </para>
-	</question>
-	<answer>
-	  <para>
-            You cannot import these files directly into Evolution
-            because the <filename>.pst</filename> format is a
-            proprietary format. However, Mozilla Mail on Windows can
-            convert them into the <type>mbox</type> format, which can
-            then be imported by Evolution.
-          </para>
-      
-	  <para>
-            To start importing your Outlook mail to Evolution, run
-            Mozilla Mail on Windows and select the
-            <menuchoice><guimenu>File</guimenu><guimenuitem>Import...</guimenuitem></menuchoice>
-            to begin. Then select that you wish to import Mail from
-            Outlook. Once Mozilla has imported all your mail, reboot
-            your computer into Linux.
-          </para>
-      
-          <para>
-            Mount your Windows partition in Linux and run Evolution to
-            begin importing your mail. Select
-            <menuchoice><guimenu>File</guimenu><guimenuitem>Import
-            File...</guimenuitem></menuchoice> to start importing. Set
-            the file type to MBox (mbox) and click on
-            <guibutton>Browse</guibutton> to select the mail you want
-            to import.
-          </para>
-      
-          <para>
-            If you are the only user on Windows, the mail files will
-            be stored in <filename>/mnt/c/windows/Application
-            Data/Mozilla/Profiles/default/XXXX/Mail/imported.mail/</filename>
-            where <filename>/mnt/c/</filename> is your windows
-            partition mount point and XXXX is some collection of
-            numbers and digits ending in <filename>.slt</filename>.
-          </para>
-	  
-	  <para>
-            If there is more than one user, the file will be in
-            <filename>/mnt/c/windows/Profiles/USERNAME/XXXX/Mail/imported.mail/</filename>
-            where USERNAME is your Windows username.
-         </para>
-
-	  <para>
-            For each mail folder in Outlook, Mozilla will convert the
-            folder into one mbox file. To import all your mail, import
-            all the files without a <filename>.msf</filename>
-            extension.
-           </para>
-	</answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            If Mozilla can import <filename>.pst</filename> files, why can't Evolution?
-          </para> 
-        </question>
-        <answer>
-          <para>
-            Mozilla on Windows accesses the <filename>.pst</filename>
-            files through the <filename>MAPI.DLL</filename>, which is
-            only available on Windows.  <filename>MAPI.DLL</filename>
-            is the only way to access <filename>.pst</filename> files
-            and Evolution cannot use this DLL in Linux.
-          </para>
-        </answer> 
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-             Will there be an Evolution server? How about a text-based or web-based front end?
-           </para>
-        </question>
-        <answer>
-          <para>
-            Of course, we can't comment on unannounced future product
-            plans, but Evolution's architecture would permit the
-            existence of that kind of software. If there is enough
-            demand for such software we will consider moving in that
-            direction.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-           Will Evolution make a good mocha?
-           </para>
-        </question>
-        <answer>
-          <para>
-             Only espresso is planned, but you can easily plug in a chocolate component.
-          </para>
-        </answer>
-      </qandaentry>
-
-    </qandaset>
-  </sect1>
-
-
-  <!-- Section: Getting and compiling -->
-
-  <sect1 id="faq-get-and-compile">
-    <title>
-      Getting and Compiling Evolution
-    </title>
-     <qandaset>
-      <qandaentry>
-        <question>
-          <para>
-            Where can I get the latest Evolution release?
-          </para>
-        </question>
-        <answer>
-          <para>
-            There are two ways to install the latest Evolution
-            release:
-            <itemizedlist>
-              <listitem>
-                <para>
-                  If you have Ximian GNOME installed, you can start
-                  Red Carpet, Ximian's software updating system, and
-                  subscribe to the Evolution channel.  This will let
-                  you install a binary for the latest release, and
-                  will also warn you when a new version has been made
-                  available.
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  If you want to compile from source, you can
-                  download the latest official Evolution tarball
-                  from:
-                </para>
-
-                <para>
-                  <ulink url="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/evolution">
-                    ftp://ftp.gnome.org/pub/GNOME/unstable/sources/evolution</ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </para>  
-        </answer>      
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            Are binary snapshots available?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Yes, if you have Ximian GNOME installed.  Just run Red
-            Carpet and subscribe to the Evolution Snapshot channel.
-          </para>
-
-          <para>
-            You can check the status of snapshots at
-            <ulink url="http://primates.ximian.com/~snapshot">http://primates.ximian.com/~snapshot</ulink>.
-          </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            Why isn't a new snapshot available today?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Sometimes the build might fail because of problems with
-            the source on CVS.  In this case, just wait for next day's
-            snapshot.
-          </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            How do I get Evolution from CVS?
-          </para>
-        </question>
-        <answer>
-          <para>
-            If you already have
-            <ulink url="http://cvs.gnome.org">GNOME CVS</ulink> access,
-            simply check out the following modules: evolution,
-            gtkhtml, gal.
-          </para>
-          <para>
-            If you don't have a CVS account, you can use anoncvs
-            instead. Bear in mind that anoncvs is only synchronized once
-            a day, and code received from anoncvs may not be latest
-            version available.
-          </para>
-
-          <para>
-            Before using the anoncvs server, you have to log into it.
-            This only needs to be done once. Use this command:
-          </para>
-
-          <programlisting>
-            cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome login
-          </programlisting>
-
-          <para>
-            Then you can retrieve the modules needed to compile Evolution
-            using the following command:
-          </para>
-
-          <programlisting>
-            cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co evolution gtkhtml gal
-          </programlisting>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            How should I compile Evolution avoiding conflicts with my
-            existing GNOME installation?
-          </para>
-        </question>
-        <answer>
-          <para>
-            The best way is to install Evolution into a separate prefix.
-            In order to specify a non-default installation prefix, you
-            can pass the <parameter>--prefix</parameter> option to
-            <filename>configure</filename> or
-            <filename>autogen.sh</filename>.  For example:
-          </para>
-
-          <programlisting>
-            cd /cvs/evolution
-            ./autogen.sh --prefix=/opt/gnome
-          </programlisting>
-
-          <para>
-            If you install Evolution and the Evolution libraries in a
-            non-standard prefix, make sure you set the appropriate
-            environment variables in the startup script for Evolution:
-          </para>
-
-          <programlisting>
-            export PATH=/opt/gnome:$PATH
-            export GNOME_PATH=/opt/gnome:/usr
-          </programlisting>
-
-          <para>
-            You may also need to add <filename>$prefix/lib</filename>
-            (e.g. <filename>/opt/gnome/lib</filename>) to your
-            <filename>/etc/ld.so.conf</filename>.  Of course, this will
-            not work for systems which do not use ld.so.conf, such as
-            HP-UX.
-          </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            I get the error message: <computeroutput>make: *** No rule
-              to make target
-              `all-no-@BUILD_INCLUDED_LIBINTL@'</computeroutput>
-          </para>
-        </question>
-        <answer>
-          <para>
-            You probably have <filename>gettext</filename> 0.10.36 or
-            later installed.  Try downgrading to 0.10.35;
-            unfortunately, 0.10.36 introduced some incompatibilities
-            with the current <filename>xml-i18n-tools</filename>.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandaset>
-  </sect1>
-
-    <sect1 id="faq-trouble">
-      <title>Troubleshooting</title>
-    <qandaset>
-      <qandaentry>
-	<question>
-	  <para>
-	    I get <computeroutput>Cannot initialize the Evolution
-	    shell</computeroutput>.
-	   </para>
-	</question>
-	<answer>
-	  <para>
-	    There are a number of things that can cause this error.
-	    Check that:
-	  </para>
-
-	    <itemizedlist>
-	      <listitem>
-		<para>
-		  <filename>oafd</filename> is listed in your <envar>PATH</envar>
-		  environment variable.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-		  <filename>GNOME_Evolution_Shell.oaf</filename> and
-		  the other      
-		  <filename>GNOME_Evolution_*.oaf</filename> files are
-		  readable and installed in
-		  <filename>$prefix/share/oaf</filename>, where
-		  <filename>$prefix</filename> is one of the prefixes
-		  listed in <envar>GNOME_PATH</envar> or
-		  <envar>OAF_INFO_PATH</envar>.  (These variables are
-		  supposed to contain $PATH-like colon-separated lists of
-		  paths.  If the installation prefix for Evolution is
-		  different from that). Run `oaf-slay' once before running
-		  `evolution' again if you change $GNOME_PATH or
-		  $OAF_INFO_PATH.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-		  <filename>evolution</filename>,
-		  <filename>evolution-mail</filename> and the other
-		  <filename>evolution-*</filename> executables are in your
-		  $PATH.
-		</para>
-	      </listitem>
-	    </itemizedlist>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            I get <computeroutput>Cannot open composer window</computeroutput>.
-          </para>
-        </question>
-        <answer>
-          <para>
-            This actually means that Evolution cannot activate the HTML
-            editor component from GtkHTML.  The comments in the previous
-            answer still apply; also make sure that
-            <command>gnome-gtkhtml-editor</command> is in your
-            <envar>PATH</envar>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            The address suggestion list steals focus from the "To:"
-            entry box when I'm typing. How can I make it keep focus?
-          </para>
-        </question>
-        <answer>
-          <para>
-           This is a bug in GTK version 1.2.10. To avoid it, downgrade
-           to GTK version 1.2.9, or install the Ximian version of GTK
-           1.2.10.
-          </para>
-        </answer>
-      </qandaentry>
-      
-      <qandaentry>
-        <question>
-          <para>
-            I updated Evolution and now my addressbook information is gone!
-            What should I do?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Evolution uses the <filename>libdb</filename> library to
-            handle the addressbook database.  Two versions of
-            <filename>libdb</filename> can be used with Evolution: version
-            1.88 and version 2.
-          </para>
-
-          <para>
-            Unfortunately, an Evolution executable that is linked against
-            a certain version of <filename>libdb</filename> will only be
-            able to read addressbook files written by another Evolution
-            executable that is linked with the same version of the
-            library.  If your addressbook is not readable by Evolution
-            anymore, it probably means that you used to have Evolution
-            linked with a certain version of <filename>libdb</filename>,
-            but now it gets linked to a different version.
-          </para>
-
-          <para>
-            Because of the way <filename>libdb</filename> is designed, it
-            is not easy for Evolution to automatically do the conversion
-            between the two formats.  But, if your Evolution used to be
-            linked against version 1.85 and now is linked to version 2,
-            there is a very simple way to convert the database and recover
-            your data.
-          </para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                First of all, check the format of the database using the
-                <command>file</command> command:
-              </para>
-
-              <programlisting>
-                file ~/evolution/local/Contacts/addressbook.db
-              </programlisting>
-
-              <para>
-                You want version 1.85 there.  If your version is 2, then
-                your current Evolution is probably linked against
-                version 1.85 and you cannot convert the database to the
-                old format. To do that, follow these instructions:
-              </para>
-            </listitem>
-            
-            <listitem>
-              <para>
-                Quit Evolution.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Make a copy of the addressbook database for backup
-                purposes, then move the original out of the way.
-              </para>
-
-              <programlisting>
-                cd ~/evolution/local/Contacts
-                cp addressbook.db addressbook.db.backup
-                mv addressbook.db addressbook.db.tmp
-               </programlisting>
-            </listitem>
-
-            <listitem>
-              <para>
-                Convert the contacts to the new format using
-                <command>db_dump185</command> and
-                <command>db_load</command>:
-              </para>
-
-              <programlisting>
-                db_dump185 addressbook.db.tmp | db_load ~/evolution/local/Contacts/addressbook.db
-              </programlisting>
-            </listitem>
-
-            <listitem>
-              <para>
-                Restart Evolution.
-              </para>
-            </listitem>
-
-          </itemizedlist>
-        </answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            Evolution reported an error when trying to retrieve from my
-            local spool in <filename>/var/spool/mail/username</filename>.  Why?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Evolution doesn't have an external helper for moving mail,
-            so <filename>/var/spool/mail/</filename> must be writable
-            by you.  Try this:
-          </para>
-          
-          <programlisting>
-            chmod 1777 /var/spool/mail
-          </programlisting>
-
-          <para>
-            We're working on a solution to this problem now.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            Evolution crashes reporting that it couldn't allocate N
-            billion bytes; how do I fix this?
-          </para>
-        </question>
-        <answer>
-          <para>
-            This usually happens when a component tries talking a
-            certain version of a CORBA interface to another component
-            that supports a different version.  For example, this can
-            happen when you recompile and install a single component
-            without recompiling/installing the rest of Evolution.
-          </para>
-
-          <para>
-            If you run into this problem, make sure all the components
-            are compiled and installed at the same time.  This also
-            applies to GtkHTML upgrades; after upgrading and
-            installing a newer GtkHTML, always re-compile and
-            re-install Evolution against it.
-          </para>
-        </answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            What is <command>killev</command> and why do I need to use it?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Evolution is actually made up of several components that run
-            as separate processes.  Evolution's shell is not very good
-            at cleaning up stale processes, so it is possible that
-            sometimes already-running components cause unexpected and/or
-            broken behavior.
-          </para>
-
-          <para>
-            It's always a good idea to run <command>killev</command>
-            after a crash in Evolution, especially if the Evolution
-            shell itself crashed.  (If a component crashes instead, you
-            should try to exit the shell cleanly first, so you give a
-            chance to the other components to clean things up properly.)
-          </para>
-        </answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            What is <command>oaf-slay</command> and why do I need to use it?
-          </para>
-        </question>
-        <answer>
-          <para>
-            <command>oaf-slay</command> is an utility which comes with
-            OAF, the Object Activation Framework that is used in the
-            GNOME Desktop to activate components.  It will kill the
-            object activation daemon (<command>oafd</command>) as well
-            as all the active components on the system.
-          </para>
-
-          <para>
-            Using <command>oaf-slay</command>
-            <command>oaf-slay</command> is quite drastic and can cause
-            problems with other programs that use oaf, especially with
-            <application>Nautilus</application>. To avoid problems, do
-            not run <command>oaf-slay</command> while you are in GNOME.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandaset>
-  </sect1>
-
-  <sect1 id="faq-debugging">
-    <title>Questions about Bugs and Debugging</title>
-    <para>
-      Find a bug? Here's how to help us fix it!
-    </para>
-    
-    <qandaset>
-      <qandaentry>
-        <question>
-          <para>
-            Where should I report bugs for Evolution?
-          </para>
-        </question>
-        <answer>
-          <para>
-            You can use the GNOME Bug Report Tool
-            (<command>bug-buddy</command>), or report bugs to the
-            Ximian bug reporting system (Bugzilla), located at <ulink
-            url="http://bugzilla.ximian.com">http://bugzilla.ximian.com</ulink>.
-          </para>
-          
-          <para>
-            Please use the query function to check if a bug has been
-            submitted already, so that we avoid duplicate reports.
-          </para>
-        </answer> 
-      </qandaentry>
-      
-
-      <qandaentry>
-        <question>
-          <para>
-             What is a stack trace (backtrace) and how do I get one?
-           </para>
-        </question>
-        <answer>
-          <para>
-              A stack trace is a list of the chain of function calls
-              that lead to some point in the program. Typically, you
-              want to get a stack trace when Evolution crashes or
-              hangs and you want to try to figure out where in the
-              code that happened and why. For this reason, stack
-              traces are extremely useful for the Evolution
-              developers, so it's important that you learn how to get
-              them, and include them in crash reports. The
-              <application>bug-buddy</application> tool can get and
-              submit a stack trace for you.  If you want to do it by
-              yourself, here's how:
-          </para>
-          <para>
-             First of all, in order to get a stack trace, your
-             executable (and possibly the libraries) must be compiled
-             with debugging symbols. Debugging symbols are created by
-             default if you compile from CVS, and are included in the
-             snapshot builds. If you decide to compile by yourself
-             with some custom CFLAGS value, make sure -g is included
-             in them.
-          </para>
-          <para>
-            Finally, you must put the component that crashes through
-            <application>gdb</application>, the GNU debugging tool.
-            To do so, make sure all the components are dead (exit
-            Evolution and run <command>killev</command>), then run the
-            following command:
-               <programlisting>
-                   <command>gdb name-of-component</command>
-                </programlisting>
-           
-           Where "name-of-component" is the name of the component that
-           crashed.
-           </para>
-           <para>
-             Then, at the gdb prompt, type r (for "run") and wait a
-             few seconds to make sure the component has registered
-             with the name service. Then start
-             <application>Evolution</application> normally from a
-             different terminal.
-           </para>
-           <para>
-             When you have started
-             <application>Evolution</application>, reproduce the
-             crash, and go back to the terminal where you ran gdb. If
-             the component crashed, you should have a prompt there;
-             otherwise, just hit Control+C. At the prompt, type
-             <command>info threads</command>.  This will give you a
-             screen that looks like this:
-           </para>
-           <para>
-              <programlisting>
-(gdb) info threads
-  8 Thread 6151 (LWP 14908)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  7 Thread 5126 (LWP 14907)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  6 Thread 4101 (LWP 1007)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  5 Thread 3076 (LWP 1006)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  4 Thread 2051 (LWP 1005)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  3 Thread 1026 (LWP 1004)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  2 Thread 2049 (LWP 1003)  0x40a10d90 in poll () from /lib/libc.so.6
-  1 Thread 1024 (LWP 995)  0x40a10d90 in poll () from /lib/libc.so.6
-            </programlisting>
- 
-             For the most part, only
-             <application>evolution-mail</application> will have more
-             than one thread.
-         </para>
-         <para>
-           Now, for each of the threads listed, type the following commands:
-<programlisting>
-thread N
-bt
-</programlisting>
-           Where 'N' is the number of the thread (in this example, 1
-           through 8).
-          </para>
-          <para>
-            Cut and paste all the output gdb gives you into a text
-            file.  You can quit gdb by typing
-            <userinput>quit</userinput>
-          </para>
-          <para>
-            If you prefer, you can start gdb while a process is
-            running. You'll want to do this right after a crash dialog
-            appears, but before hitting "OK" or "Submit bug report".
-            Start <application>gdb</application> as above, but instead
-            of using <userinput>r</userinput>, type <userinput>attach
-            PID</userinput> where PID is the process ID of the
-            component you want to debug.
-          </para>
-          <para>
-             If that sounds too complicated, you can always use
-             <command>bug-buddy</command> to get and submit the stack
-             trace.
-           </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-             A component of evolution crashed, but since the rest of
-             evolution stayed up, I couldn't use bug-buddy to get a
-             stack trace. How can I use gdb to get a stack trace of
-             the component?
-           </para>
-	</question>
-	<answer>
-	  <para>
-             To trace a failing component (in this example, evolution-mail):
-             <orderedlist numeration="arabic">
-	      <listitem>
-		<para>
-                  Open two terminals.
-                </para>
-	      </listitem>
-	      <listitem>
-		<para>
-                   In one, type <command>gdb evolution-mail</command>
-                   .  Replace "evolution-mail" with the name of the
-                   component that is crashing: evolution-addressbook,
-                   evolution-calendar, etc.)
-                 </para>
-	      </listitem>
-	      <listitem>
-		<para>
-                  Once gdb starts, type <userinput>r</userinput> and
-                  hit enter. Give it a few seconds, to make sure it
-                  starts up completely.
-                </para>
-	      </listitem>
-	      <listitem>
-		<para>
-                   In the second terminal, type
-                   <command>evolution</command>. Do whatever you did
-                   to cause the crash in the component you used in
-                   step two.
-                </para>
-	      </listitem>  
-	      <listitem>
-		<para>
-                   When the crash occurs, type 'bt' in the first
-                   terminal. 
-                </para>
-	      </listitem>
-	      
-	      <listitem>
-		<para>
-                   Cut and paste the output into your bug report.
-                </para>
-	      </listitem>
-	    </orderedlist>
-           </para>
-	</answer>
-      </qandaentry>
-    </qandaset>
-  </sect1>
-  </appendix>
-
-<!-- Local Variables: --> <!-- indent-tabs-mode:nil --> <!-- End: -->
-
-
-
-
diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
deleted file mode 100644
index c3c5a5fbc2..0000000000
--- a/doc/C/evolution.sgml
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
-<!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
-<!ENTITY USAGE-MAIL-ORG SYSTEM "usage-mail-org.sgml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
-<!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 MENUREF SYSTEM "menuref.sgml"> REMOVED THIS FOR NOW -->
-<!ENTITY FAQ SYSTEM "evolution-faq.sgml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
-<!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-      <author><firstname>Ettore</firstname><surname>Perazzoli</surname></author>
-      <author><firstname>Duncan</firstname><surname>Mak</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2001</year>
-      <holder>Ximian, Inc.</holder>
-    </copyright>
-    
-    <legalnotice id="legalnotice">
- 
-     <para>
-         Permission is granted to copy, distribute and/or modify this
-         document under the terms of the <ulink type="help"
-         url="gnome-help:fdl"><citetitle>GNU Free Documentation
-         License</citetitle></ulink>, Version 1.1 or any later version
-         published by the Free Software Foundation with no Invariant
-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You
-         may obtain a copy of the <citetitle>GNU Free Documentation
-         License</citetitle> from the Free Software Foundation by
-         visiting <ulink type="http" url="http://www.fsf.org">their
-         Web site</ulink> or by writing to: Free Software Foundation,
-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-         USA.
-       </para>
-       <para>
-         Many of the names used by companies to distinguish their
-         products and services are claimed as trademarks. Where those
-         names appear in any GNOME documentation, and those trademarks
-         are made aware to the members of the GNOME Documentation
-         Project, the names have been printed in caps or initial caps.
-       </para>
-    </legalnotice>
-
-   <releaseinfo>
-      This is version 0.11 of the Evolution manual.
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Getting Started with Evolution 1.0</title>
-     <partintro>
-      <para>
-        Part one of the <application>Evolution</application> manual
-        describes how to use <application>Evolution</application> for
-        email, contact management, and appointment and task
-        scheduling.  You'll find as you go along that there's more
-        than one way to do things, and you can pick whichever method
-        you like best.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
-    &USAGE-MAIL;
-    &USAGE-MAIL-ORG;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Evolution</title>
-    <partintro>
-      <para>
-        <application>Evolution</application> is highly configurable.
-        Usually, when developers say that, they mean that they didn't
-        test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system. In the case of
-        <application>Evolution</application>, "configurable", it means that, while you can expect the
-        program to work perfectly well in its default settings, it's
-        also easy to alter its behavior in a wide variety of ways, so
-        that it fits your needs exactly.  This part of the book will
-        describe that process, from the quickest glimpse of the Setup
-        Assistant to an in-depth tour of the preferences dialogs.
-      </para>
-    </partintro>
-
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-<!-- COMMENTED OUT MENUREF SECTION 
-  <part>  
-    <title>Comprehensive Menu reference</title>
-    <partintro>
-      <para>
-        The following reference covers all, or nearly all, of the
-        menus and menu commands that
-        <application>Evolution</application> has to offer you.
-      </para>
-    </partintro>
- &MENUREF;
-  </part>
-COMMENTED OUT MENUREF -->
-
-  &FAQ;
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-
-</book>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/figures/calendar.png b/doc/C/figures/calendar.png
deleted file mode 100644
index 1266f7b21b..0000000000
--- a/doc/C/figures/calendar.png
+++ /dev/null
diff --git a/doc/C/figures/config-cal.png b/doc/C/figures/config-cal.png
deleted file mode 100644
index 5be44dc68d..0000000000
--- a/doc/C/figures/config-cal.png
+++ /dev/null
diff --git a/doc/C/figures/config-mail.png b/doc/C/figures/config-mail.png
deleted file mode 100644
index 5fb06c705c..0000000000
--- a/doc/C/figures/config-mail.png
+++ /dev/null
diff --git a/doc/C/figures/contact-editor.png b/doc/C/figures/contact-editor.png
deleted file mode 100644
index 988ad2f918..0000000000
--- a/doc/C/figures/contact-editor.png
+++ /dev/null
diff --git a/doc/C/figures/contact.png b/doc/C/figures/contact.png
deleted file mode 100644
index 0748b30d69..0000000000
--- a/doc/C/figures/contact.png
+++ /dev/null
diff --git a/doc/C/figures/filter-assist-fig.png b/doc/C/figures/filter-assist-fig.png
deleted file mode 100644
index 3240196307..0000000000
--- a/doc/C/figures/filter-assist-fig.png
+++ /dev/null
diff --git a/doc/C/figures/filter-new-fig.png b/doc/C/figures/filter-new-fig.png
deleted file mode 100644
index 51fc680df9..0000000000
--- a/doc/C/figures/filter-new-fig.png
+++ /dev/null
diff --git a/doc/C/figures/full-1.png b/doc/C/figures/full-1.png
deleted file mode 100644
index 84afc9d3e7..0000000000
--- a/doc/C/figures/full-1.png
+++ /dev/null
diff --git a/doc/C/figures/full-2.png b/doc/C/figures/full-2.png
deleted file mode 100644
index 929e356db5..0000000000
--- a/doc/C/figures/full-2.png
+++ /dev/null
diff --git a/doc/C/figures/full-3.png b/doc/C/figures/full-3.png
deleted file mode 100644
index 175fd1d970..0000000000
--- a/doc/C/figures/full-3.png
+++ /dev/null
diff --git a/doc/C/figures/full-4.png b/doc/C/figures/full-4.png
deleted file mode 100644
index 45d66bb193..0000000000
--- a/doc/C/figures/full-4.png
+++ /dev/null
diff --git a/doc/C/figures/full-5.png b/doc/C/figures/full-5.png
deleted file mode 100644
index 5fcfd20e45..0000000000
--- a/doc/C/figures/full-5.png
+++ /dev/null
diff --git a/doc/C/figures/full-6.png b/doc/C/figures/full-6.png
deleted file mode 100644
index 484eca4903..0000000000
--- a/doc/C/figures/full-6.png
+++ /dev/null
diff --git a/doc/C/figures/full-7.png b/doc/C/figures/full-7.png
deleted file mode 100644
index 8a19eaab42..0000000000
--- a/doc/C/figures/full-7.png
+++ /dev/null
diff --git a/doc/C/figures/mail-composer.png b/doc/C/figures/mail-composer.png
deleted file mode 100644
index d85f632b64..0000000000
--- a/doc/C/figures/mail-composer.png
+++ /dev/null
diff --git a/doc/C/figures/mail-druid-pic.png b/doc/C/figures/mail-druid-pic.png
deleted file mode 100644
index 18e29aa49d..0000000000
--- a/doc/C/figures/mail-druid-pic.png
+++ /dev/null
diff --git a/doc/C/figures/mail-inbox.png b/doc/C/figures/mail-inbox.png
deleted file mode 100644
index 7659cb003a..0000000000
--- a/doc/C/figures/mail-inbox.png
+++ /dev/null
diff --git a/doc/C/figures/mainwindow-pic.png b/doc/C/figures/mainwindow-pic.png
deleted file mode 100644
index 18b68c96a5..0000000000
--- a/doc/C/figures/mainwindow-pic.png
+++ /dev/null
diff --git a/doc/C/figures/newmsg.png b/doc/C/figures/newmsg.png
deleted file mode 100644
index 9f2c15d025..0000000000
--- a/doc/C/figures/newmsg.png
+++ /dev/null
diff --git a/doc/C/figures/print-dest.png b/doc/C/figures/print-dest.png
deleted file mode 100644
index fb1faf7d70..0000000000
--- a/doc/C/figures/print-dest.png
+++ /dev/null
diff --git a/doc/C/figures/print-preview.png b/doc/C/figures/print-preview.png
deleted file mode 100644
index 51ab5e795e..0000000000
--- a/doc/C/figures/print-preview.png
+++ /dev/null
diff --git a/doc/C/figures/replymsg.png b/doc/C/figures/replymsg.png
deleted file mode 100644
index 0952ba3805..0000000000
--- a/doc/C/figures/replymsg.png
+++ /dev/null
diff --git a/doc/C/figures/vfolder-createrule-fig.png b/doc/C/figures/vfolder-createrule-fig.png
deleted file mode 100644
index cc0a7abf66..0000000000
--- a/doc/C/figures/vfolder-createrule-fig.png
+++ /dev/null
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
deleted file mode 100644
index a2a4ea1b32..0000000000
--- a/doc/C/menuref.sgml
+++ /dev/null
@@ -1,1138 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="menuref">
-  <title>Menu Reference</title>
-  <para>
-    <application>Evolution</application>'s menus may not hold the
-    secret to happiness, they do hold every ability that
-    <application>Evolution</application> has. This section will serve
-    as a reference for all those menus, and the capabilites that they
-    offer you.
-  </para>
-  <para>
-    In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars of their own. From left to right, the
-    menus available to you when you are reading mail are:
-    <guimenu>File</guimenu>, <guimenu>Edit</guimenu>,
-    <guimenu>View</guimenu>, <guimenu>Settings</guimenu>,
-    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and
-    <guimenu>Help</guimenu>.
-
-  </para>
-  <para>
-    Menus in <application>Evolution</application> are
-    context-sensitive, which means that they vary depending on what
-    you're doing.  If you're reading your mail, you'll have
-    mail-related menus; for your calendar, you'll have
-    calendar-related menu items.  Some menus, of course, like
-    <guimenu>Help</guimenu> and <guimenu>File</guimenu> don't much, if
-    at all, because they have more universal functions.  But you'd
-    never mark an address card as "read," or set the recurrence for an
-    email message you've recieved. depending on whether you're looking
-    at mail, contacts, or calendar information. 
-  </para>
-
-   <sect1 id="menuref-mail">
-     <title>Mail Menus</title>
-     <para>
-           Note that the <guimenu>File</guimenu> menu and the
-	  <guimenu>Help</guimenu> are identical within the
-	  <application>Evolution</application> main window, regardless
-	  of what features you are using. 
-
-        <variablelist>
-          <varlistentry>
-	  <term>File Menu</term>
-          <listitem> <para>
-              <variablelist>
-		<varlistentry>
-		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-	           Message</guimenuitem></menuchoice></term>
-		  <listitem>
-		    <para>
-                   <keycombo action="simul"><keycap>Ctl</keycap>
-		      <keycap>N</keycap>
-		      </keycombo>
-                     </para></listitem>
-		</varlistentry>
-
-		<varlistentry>
-		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Evolution
-		   Window</guimenuitem></menuchoice></term>
-		   <listitem><para><keycombo action="simul">
-		   <keycap>Shft</keycap><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
-		</varlistentry>
-
-		<varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Shortcut</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>S</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-		 Message</guimenuitem></menuchoice></term>
-	 <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>M</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Appointment</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>A</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Contact</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>C</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Task</guimenuitem></menuchoice></term>
-	  <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Open Selected Items</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>O</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Save As</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Alt</keycap><keycap>S</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>Folder</guisubmenu>
-	<guimenuitem>New Folder</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>F</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Go to Folder</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>G</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Print</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>P</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Close</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
-     </varlistentry>
-	
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Exit</guimenuitem></menuchoice></term>
-  	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Q</keycap></keycombo></para></listitem>
-     </varlistentry>
-    </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-      <term>Edit Menu</term>
-      <listitem><para>
-       <variablelist>
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice></term>
-		  <listitem><para><keycombo action="simul"><keycap>
-	           Ctl</keycap><keycap>A</keycap></keycombo>
-		  </para></listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Invert Selection</guimenuitem></menuchoice></term>	
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>I</keycap></keycombo>
-		  </para></listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>D</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Undelete</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>U</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Read</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Unread</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-        </variablelist>
-      </para> </listitem>
-      </varlistentry>
-      
-    <varlistentry>
-      <term>View Menu</term>
-      <listitem>
-	<variablelist>
-	  <varlistentry>
-	    <term><menuchoice><guimenu>View</guimenu><guimenuitem>Threaded</guimenuitem></menuchoice></term>
-	    <listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
-	  </varlistentry>
-        </variablelist>
-      </listitem>
-    </varlistentry>
-    
-    <varlistentry>
-      <term>Actions Menu</term>
-      <listitem>
-	<variablelist>
-	  
-	   <varlistentry>
-	<term><menuchoice><guimenu>Actions</guimenu><guisubmenu>Forward
-			    As</guisubmenu><guimenuitem>Inline</guimenuitem>
-		    </menuchoice> </term>
-		  <listitem>
-		    <para>
-	              <keycombo action="simul">
-			<keycap>Shft</keycap><keycap>Ctl</keycap><keycap>J</keycap>
-		      </keycombo>
-	             </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term><menuchoice>
-		      <guimenu>Actions</guimenu><guisubmenu>Forward As</guisubmenu>
-		      <guimenuitem>Attachment</guimenuitem>
-		  </menuchoice></term>
-	  <listitem><para>
-	        <keycombo action="simul">
-			<keycap>Ctl</keycap><keycap>F</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-		
-		<varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply</guimenuitem>
-		    </menuchoice></term> <listitem><para>
-	        <keycombo action="simul">
-			<keycap>Ctl</keycap><keycap>R</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-
-	   <varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply to All</guimenuitem>
-		    </menuchoice></term>		
-		  <listitem><para>
-	        <keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>R</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-		
-	   <varlistentry>
-	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Move
-			  to Folder</guimenuitem> </menuchoice></term>
-		  <listitem><para> <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>M</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-	
-
-	   <varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Copy to Folder	</guimenuitem>
-		    </menuchoice></term>	
-		  <listitem><para>
-	        <keycombo action="simul"><keycap>>Ctl</keycap><keycap>C</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-
-	
-	   <varlistentry>
-	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Apply
-			  Filters </guimenuitem> </menuchoice></term>
-		  <listitem><para> <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>Y</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-
-	
-		<varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Expunge
-		  </guimenuitem> </menuchoice></term> <listitem><para>
-		  <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>X</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-	
-		<varlistentry>
-		  <term><menuchoice><guimenu>Help</guimenu><guimenuitem>Index
-		  </guimenuitem> </menuchoice></term>	  
-		  <listitem><para> <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>H</keycap></keycombo>
-		  </para></listitem>
-                 </varlistentry>
-      
-	    </variablelist>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-
-    </para>       
-
-   </sect1>
-  <sect1 id="menuref-mail-editor">
-    <title>The Message Composer Menus</title>
-    <para>
-      The message composition window has its own set of menus:
-      <guimenu>File</guimenu>, which controls operations on files and
-      data, <guimenu>Edit</guimenu>, for text editing,
-      <guimenu>Format</guimenu>, which controls the file format of
-      messages you send, <guimenu>View</guimenu>, to set how you view
-      the message, and <guimenu>Insert</guimenu>, which holds tools
-      for embedding files and other items in messages.  Here's what's in them:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>The Message Composer's File Menu</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Open</guimenu></term>
-	      <listitem><para>
-		 Open a text file or a draft mail message.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save</guimenu></term>
-	      <listitem><para>
-		 Save a mail message as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save As</guimenu></term>
-	      <listitem><para> 
-		Choose a file name and location for
-		a message you want to save as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save in Folder</guimenu></term>
-	      <listitem><para>
-		 Save a message as a draft, rather than 
-		 as a separate text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insert Text File</guimenu></term>
-	      <listitem><para>
-		   Open a text file and insert it into 
-		   the current message. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Send Now</guimenu></term>
-	      <listitem><para>
-		  Sends the message immediately.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Send Later</guimenu></term>
-	      <listitem><para>
-		  Queue 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Close</guimenu></term>
-	    <listitem><para>
-		 Closes the message composer.  If you have not done so, 
-		 <application>Evolution</application>
-		 will ask you if you want to save your message.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-
-<sect2 id="menuref-tasklist">
-      <title>Task List Shortcuts and Menus</title>
-      <para>
-      </para>
-</sect2>
-        
-    <sect2 id="menuref-mail-editor-edit">
-      <title>The Message Composer's Edit Menu</title>
-      <para>
-          The <guimenu>Edit</guimenu> menu in the message composer
-          contains the following items.  Keyboard shortcuts are listed
-          next to the items in the menus themselves.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Undo</guimenuitem></term>
-	    <listitem><para>
-                Undoes the last action you performed.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Redo</guimenuitem></term>
-	    <listitem><para>
-               If you change your mind about Undoing something, 
-               you can always use this item.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cut</guimenuitem></term>
-	    <listitem><para>
-                Removes the selected text from the text entry window and 
-                retains it in the system "clipboard" memory, ready for pasting.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy</guimenuitem></term>
-	    <listitem><para>
-              Copies selected text to the system clipboard without deleting it.
-              The text can then be inserted elsewhere with the 
-              <guimenuitem>Paste</guimenuitem> command.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Paste</guimenuitem></term>
-	    <listitem><para>
-                Inserts the contents of the system clipboard at the 
-                location of the cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find</guimenuitem></term>
-	    <listitem><para>
-               Enter a phrase and find your match in your message body.
-               As with <guimenuitem>Find Regex</guimenuitem>, 
-               <guimenuitem>Find Again</guimenuitem>, and
-               <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Regex</guimenuitem></term>
-	    <listitem><para>
-               If you are familiar with <glossterm>regular expressions</glossterm>,
-                often called "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Again</guimenuitem></term>
-	    <listitem><para>
-              Repeats your last search.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Replace</guimenuitem></term>
-	    <listitem><para>
-               Enter a word or phrase and the word or phrase with which you'd like
-               to replace it.  
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-               This item brings up the Message Composer Properties Capplet, 
-               a portion of the GNOME Control Center that determines the 
-               key bindings for the message composer.  Help for this capplet is 
-               available directly from the Control Center.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>The Message Composer's Format Menu</title>
-      <para> 
-        The <guimenu>Format</guimenu> menu has only one item:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Toggles HTML mode for the message composer.  When selected, 
-                 the message is displayed and sent in HTML.  If you have written a 
-                 message in HTML and turn HTML off, most formatting will be lost.
-                 <application>Evolution</application> will attempt to preserve spacing
-                 and to remove formatting gracefully, however.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>The Message Composer's View Menu</title>
-      <para>
-        The <guimenu>View</guimenu> menu controls the way messages are
-        displayed, and how much of the message, its headers, and
-        attachments appear.  It contains:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Attachments</guimenuitem></term>
-	    <listitem><para> 
-              Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a separate pane
-              of the composition window to show what attachments you are appending
-              to the message. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>The Message Composer's Insert Menu</title>
-      <para>
-        The <guimenu>Insert</guimenu> menu holds tools that allow you
-        to include images, horizontal rules, and other objects
-        in the body of your message. The tools are:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
-	    <listitem><para> 
-               This tool will prompt you to select an image file to 
-               insert into your HTML message.  For text messages, this
-               is the same as attaching an image file.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
-	    <listitem><para> 
-               Opens the <interface>link creation window</interface>, 
-               which lets you specify the URL and text description
-               for a link in your message.  This only works with HTML 
-               messages.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
-	    <listitem><para>    
-             Opens the<interface> horizontal rule creation dialog</interface>, which lets you
-	     create an HTML horizontal rule.  For more information,
-	     see <xref linkend="usage-mail-getnsend-send-html">.
-             This tool only works with HTML messages.
-	     </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Text File</guimenuitem></term>
-	    <listitem><para>
-	       Open a text file and insert it into the current message.
-               This tool works with both plain text and HTML messages.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="menuref-cal">
-    <title>The Calendar Menus</title>
-    <para>
-      The Main window of the calendar has the same menus as the main
-      window of the mail client.  However, their contents vary in a
-      number of ways.
-    </para>
-    <sect2 id="menuref-cal-edit">
-      <title>The Calendar Edit Menu</title>
-      <para>
-         The contents of the Edit menu are currently so borked that I
-         refuse to document them right now. (That means FIXME). They
-         should be:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	  <term><guimenuitem>Item</guimenuitem></term>
-	  <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>The Calendar View Menu</title>
-      <para>
-        The Calendar's <guimenu>View</guimenu> menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>View By Day</guimenuitem></term>
-	  <listitem><para>
-             Switch to the day view for your calendar.
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View Five Days</guimenuitem></term>
-	  <listitem><para>
-             View five calendar days at once. 
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View by Week</guimenuitem></term>
-	  <listitem><para>
-             Switch the calendar view to full week mode.
-           </para></listitem>
-	  </varlistentry>
-  
-	  <varlistentry>
-	  <term><guimenuitem>View By Month</guimenuitem></term>
-	  <listitem><para>
-             Look at a month at a time.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-settings">
-      <title>The Calendar Settings Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="menuref-cal-editor">
-    <title>The Appointment Editor Menus</title>
-    <para>
-    The appointment editor has its own menus, to help you use its
-    wide-ranging abilities.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu contains several items, including a
-         <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu></menuchoice>
-         submenu that is identical to that in the main window.  The
-         other contents are:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Send</guimenuitem></term>
-	    <listitem><para>
-             Opens a mail message with the appointment attached to it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save</guimenuitem></term>
-	    <listitem><para>
-              Save this appointment in the existing location and name. If you have not yet
-              chosen a location and name, this is the same as <guimenuitem>Save As</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save As</guimenuitem></term>
-	    <listitem><para>
-              Choose a location and name for this appointment, and save it.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete</guimenuitem></term>
-	    <listitem><para>
-              Deletes the appointment.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and move the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and put a copy of the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>
-	    <listitem><para>
-             This menu contains two items:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Memo Style</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
-		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para> Shows you what your appointment will look
-	    like if you print it. See <xref linkend="usage-print">
-	    for details on printing and the Print Preview function.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-              Prints the appointment without preview.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Close</guimenuitem></term>
-	    <listitem><para>
-             Close the appointment editor window.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>The Appointment Editor's Edit Menu</title>
-      <para>
-         FIXME: this menu is copied and pasted entirely from somewhere
-         else.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>The Appointment Editor's View Menu</title>
-      <para>
-         This menu allows you to look at different appointments, and
-         set the way you look at them, without having to move back to
-         the <interface>Main Window</interface>. It contains:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previous</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               prior to the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Next</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               scheduled to occur after the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendar</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Toolbars</guisubmenu></term>
-	    <listitem><para>
-             The <guisubmenu>Toolbars</guisubmenu> submenu 
-             allows you to choose which toolbars
-             are displayed in the 
-             <interface>Appointment Editor</interface>. They are:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Standard</guimenuitem> &mdash;
-                    Toggle the standard toolbar on and off.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formatting</guimenuitem> &mdash;
-                    Toggle the formatting toolbar on and off.
-                   </para></listitem>
-	
-		  <listitem><para>
-                    <guimenuitem>Customize</guimenuitem> &mdash;
-                    Select the contents of the formatting and standard toolbars.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>The Appointment Editor's Insert Menu</title>
-      <para>
-        This menu contains: (FIXME: Insert Content Here)
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>File</guimenuitem></term>
-	    <listitem><para>
-             Choose a file to append to your appointment or appointment request.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Object</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>The Appointment Editor's Format Menu</title>
-      <para>
-         This menu contains two items, neither of which
-         have any functionality yet:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Font</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Paragraph</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>The Appointment Editor's Tools Menu</title>
-      <para>
-         This menu contains four items, including the
-         <guisubmenu>Forms</guisubmenu> submenu, which allows you to
-         alter calendar forms and create your own entries.  None of
-         this works yet, though.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Spelling</guimenuitem></term>
-	    <listitem><para>
-              Checks the spelling of your calendar entry.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Check Names</guimenuitem></term>
-	    <listitem><para> Checks the names listed here against
-	    those in your address book.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Address Book</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
-	    <listitem><para>
-               The Forms submenu lets you alter the
-	       appearance of Calendar Forms. 
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>The Appointment Editor's Actions Menu</title>
-      <para>
-        This menu contains:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
-	    <listitem><para>
-              Brings up the <interface>Meeting Invitation</interface> window, 
-              described in <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancel Invitation</guimenuitem></term>
-	    <listitem><para>
-              Cancels the event, notifying all attendees.  You may be prompted 
-              to specify an invitation message.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with the current event attached.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as Text</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with a text description of the current
-              event included in the message body.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1>
-    <title>Contact Manager Menus</title>
-    <para>
-     The contact manager has six menus: <guimenu>File</guimenu>,
-     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
-     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
-     <guimenu>Help</guimenu>.
-    </para>
-
-    <sect2 id="menuref-contact-edit">
-      <title>Contact Manager Edit Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-
-    <sect2 id="menuref-contact-view">
-      <title>Contact Manager View Menu</title>
-      <para>
-        This menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
-	  <listitem><para>
-             View your contacts as a table.  
-             When in table-view mode, this menu item reads 
-             <guimenuitem>As Minicards</guimenuitem>, and changes the view
-             back to the minicard format.
-           </para></listitem>
-	  </varlistentry>	  
-	</variablelist>      
-      </para>
-    </sect2>
-
-   <sect2 id="menuref-contact-tools">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Search for
-	    Contacts</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="contact-search"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains only one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="config-prefs-contact-ldap-add"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>The Contact Editor Menus</title>
-    <para>
-       This window has only one menu: the file menu.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Contact Editor File Menu</title>
-      <para>
-         This menu contains five items:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Save</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Save As</guimenuitem></term>
-	  <listitem><para>
-              Allows you to save the contact as an external 
-              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Print</guimenuitem></term>
-	  <listitem><para>
-             Prints the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Delete</guimenuitem></term>
-	  <listitem><para>
-             Deletes the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Close</guimenuitem></term>
-	  <listitem><para>
-              Closes the Contact Editor without saving.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
deleted file mode 100644
index b4423432e1..0000000000
--- a/doc/C/preface.sgml
+++ /dev/null
@@ -1,491 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-  <preface id="introduction">
-<!-- =============Introduction ============================= -->
-    <title>Introduction</title> 
-
-    <sect1 id="what"> 
-      <title>What is Evolution, and What Can It Do for Me?</title>
-      <para>
-        Information is useless unless it's organized and accessible;
-        it's hardly even worth the name if you can't look at it and be
-        <emphasis>informed</emphasis>.
-        <application>Evolution</application>'s goal is to make the
-        tasks of storing, organizing, and retrieving your personal
-        information easier, so you can work and communicate with
-        others.  That is, it's a highly evolved <glossterm
-        linkend="groupware">groupware</glossterm> program, an integral
-        part of the Internet-connected desktop. 
-      </para>
-      <para>
-        Without all the hot air, that means it's a tool to help you
-        get your work done.
-      </para>
-      <para>
-        Because it's part of the GNOME project,
-        <application>Evolution</application> is Free Software.  The
-        program and its source code are released under the terms of
-        the GNU <ulink type="help" url="gnome-help:gpl"><citetitle>General
-        Public License (GPL)</citetitle></ulink>, and the
-        documentation falls under the <ulink type="help"
-        url="gnome-help:fdl"><citetitle>Free Documentation
-        License</citetitle></ulink> (FDL). For more information about
-        the GPL and the FDL, visit the Free Software Foundation's
-        website at <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-      <para>
-        <note>
-           <title>This is a Beta release</title>
-           <para>
-             <application>Evolution</application> is now on the home
-             stretch to version 1.0.  Please help prepare for the 1.0
-             release by reporting bugs to us at <ulink
-             url="http://bugzilla.ximian.com">bugzilla.ximian.com</ulink>. There
-             are detailed bug reporting instructions in <xref
-             linkend="evolution-faq">.
-          </para>
-          <para>
-            Please send comments on the guide to
-            <email>aaron@ximian.com</email>. The first person to send
-            some good suggestions gets a free Ximian t-shirt.
-          </para>
-        </note>
-      </para>
-
-      <para>
-        <application>Evolution</application> can help you work in a
-        group by handling email, address and other contact
-        information, and one or more calendars.  It can do that on one
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
-      </para>
-      <para>
-        The <application>Evolution</application> project has four
-        central goals:
-
-        <itemizedlist>
-	  <listitem>
-	    <para>
-             The application must be <emphasis>both powerful and easy
-             to use</emphasis>. In other words, it needs a familiar
-             and intuitive interface that users can customize to their
-             liking, and users should have access to shortcuts for
-             complex tasks.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> must meet and
-              exceed the standards set by other groupware products.
-              It must include support for major network <glossterm
-              linkend="protocol">protocols</glossterm> so that it can
-              integrate seamlessly with existing hardware and network
-              environments.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               The project must support open standards and be open to
-               expansion, so that it can become a development platform
-               as well as an application.  From the simplest scripting
-               to the most complex network and component programming,
-               <application>Evolution</application> must offer
-               developers an environment for cutting-edge application
-               development.
-            </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Data must be safe: <application>Evolution</application>
-	    must not lose mail, corrupt mailbox files or other data,
-	    execute arbitrary <glossterm
-	    linkend="script">scripts</glossterm>, or delete files from
-	    your hard disk.
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      <application>Evolution</application> is designed to make most
-      daily tasks faster.  For example, it takes only one or two
-      clicks to enter an appointment or an address card sent to you
-      by email, or to send email to a contact or appointment.
-      <application>Evolution</application> makes displays faster and
-      more efficient, so searches are faster and memory usage is
-      lower.  People who get lots of mail will appreciate advanced
-      features like <link linkend="usage-mail-organize-vFolders">
-	Virtual Folders</link>, which let you save searches as though 
-      they were ordinary mail folders.
-    </para>
-    
-  </sect1>
-
-  <sect1 id="aboutbook">
-      <title>About This Book</title>
-      <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
-        <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
-        <link linkend="config">configuration</link>, is targeted at
-        more advanced users, but anyone who wants to change the way
-        <application>Evolution</application> looks or acts can benefit
-        from reading it.  
-      </para>
-      <formalpara>
-        <title>Typographical conventions</title>
-	<para>
-          Some kinds of words are marked off with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> typed at the command line</member>
-	    <member><guilabel>Labels</guilabel> for interface items</member>
-
-            <member> Menu selections look like this:
-                       <menuchoice>
-                          <guimenu>Menu</guimenu>
-                          <guisubmenu>Submenu</guisubmenu> 
-                          <guimenuitem>Menu Item</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-	  <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in the <xref linkend="apx-gloss">.</member>
-	  </simplelist>
-	  <tip id="example-tip">
-	      <title>Example Tip</title>
-	      <para>
-		Tips and bits of extra information will look like
-		this.
-	      </para>
-	    </tip>
-
-	  <example>
-	    <title>Example Example</title>
-	    <para>
-	      This is what an example looks like.
-	    </para>
-	  </example>
-
-	    <warning id="example-warning">
-	      <title>Example Warning</title>
-	      <para>
-		This is what a warning looks like.
-	      </para>
-	  </warning>
-        </para>
-      </formalpara>
-  </sect1>
-
-  <sect1 id="quickref-commontasks">
-    <title>Quick Reference for Common Tasks</title>
-    <para>
-      You might want to copy this section and tape it to the wall
-      next to your computer: it's a very short summary of most of
-      the things you'll want to do with
-      <application>Evolution</application>.
-    </para>
-    
-    <sect2 id="quickref-newthings">
-      <title>Opening or Creating Anything</title>
-      <para>
-	
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new folder</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <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>Enter a new Contact</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</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>
-
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for
-        navigating your mailbox with the keyboard instead of the
-        mouse:
-         <variablelist>
-
-          <varlistentry>
-	    <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.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Display the next page of a message in the preview pane</term>
-	    <listitem>
-	      <para>
-                Press the space bar.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message</term>
-	    <listitem>
-	      <para>
-                To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message</term>
-	    <listitem>
-	      <para>
-                Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or select
-                it and press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Create Filters and Virtual Folders</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select "Create Rule..."
-                menu items. You can also create filters and virtual
-                folders in the <guimenu>Tools</guimenu> menu.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-      </para>
-    </sect2>
-    <sect2 id="quickref-cal">
-      <title>Address Book</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-		<tip id="new-appt">
-		  <title>New Appointments Fast</title>
-		  <para>
-		    Double-click in a blank space to create a new contact.
-		  </para>
-		</tip>
-	      </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-  </sect2>
-    <sect2 id="quickref-contact">
-        <title>Contact Manager</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:
-
-        <variablelist>
-	  <varlistentry>
-	    <term>Edit a Contact</term>
-	    <listitem>
-	      <para>
-		You can edit a contact two ways:
-		<itemizedlist>
-		  <listitem>
-		    <para>
-		      Click once on the person's address card and you can
-		      edit the person's properties all in the same window.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Double-click on the contact's card and alter their details.
-		    </para>
-		  </listitem>
-		</itemizedlist>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-	
-	<variablelist>
-	  <varlistentry>
-	    <term>Deleting a Contact</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and click <guilabel>Delete</guilabel>
-		or select a contact and press the <guibutton>Delete</guibutton>
-		on the <guilabel>toolbar</guilabel>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-	
-        <variablelist>
-	  <varlistentry>
-	    <term>Email a Contact</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and select 
-		<guilabel>Send message to contact</guilabel>.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-</preface>
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
deleted file mode 100644
index 3aeb9b23e2..0000000000
--- a/doc/C/usage-calendar.sgml
+++ /dev/null
@@ -1,451 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>Managing your Schedule</title>
-  <para>
-    To begin using the calendar, select
-    <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts showing today's
-    schedule on a ruled background.  At the upper right, there's a
-    monthly calendar you can use to switch days.  Below that, there's
-    a <guilabel>TaskPad</guilabel>, where you can keep a list of tasks
-    separate from your calendar appointments.  The calendar's daily
-    view is shown in <xref linkend="usage-calendar-fig">.
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-    <guilabel>Event List</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Event List</guilabel> is responsible for showing you all of
-    your scheduled events, whether they are all day events or simply one time
-    events that last a half an hour.
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
-    <guilabel>Todo List</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Todo List</guilabel> compliments the <guilabel>Event List
-    </guilabel> as it keeps track of your chores or tasks which don't have
-    any time associated with them.  These may include "Clean Room" or "Call
-    Repairman".
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
-    <guilabel>Calendar Window</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Calendar Window</guilabel> has a graphical representation of
-    the calendar, so you can select what days to view in the <guilabel>Event
-    List</guilabel>.
-  </para>
-  
-    <sect1 id ="usage-calendar-view"> 
-    <title>Ways of Looking at your Calendar</title>
-
-    <para>
-       The toolbar offers you four different views of your calendar:
-       one day, five days, a week, or a month at once. Press the
-       calendar-shaped buttons on the right side of the toolbar to
-       switch between views. You can also select a range of
-       days&mdash; three days, ten days, a fortnight if you want
-       &mdash; in the small calendar at the upper right.
-    </para>
-    <para>
-       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
-       buttons will move you forward and back in your calendar pages.
-       If you're looking at only one day, you'll see tomorrow's page,
-       or yesterday's.  If you're looking at your calendar by week,
-       month, fortnight, or anything else, you'll move around by just
-       that much. To come back to today's listing, click
-       <guibutton>Today</guibutton>.
-    </para>
-    <para>
-       To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
-       box that appears.
-    </para>
-
-
-<!-- ############### FIXME FIXME FIXME ############
-Feature not yet implemented, and may not be implemented due to
-lack of time, resources, and interest.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Scheduling With the Evolution Calendar</title>
-    <para>
-      Of course, you'll want to use the calendar to do more than find
-      out what day it is. This section will tell you how to schedule
-      events, set alarms, and determine event recurrence.
-    </para>
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating events</title>
-      <para>
-	To create a new appointment, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the usual menu bar, tool bar, and
-	window full of choices for you.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
-
-      <para>
-        Your event must have a starting and ending date &mdash; by
-        default, today &mdash; but you can choose whether to give it
-        starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's event list rather than inside
-        it.  That makes it easy to have events that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day event, and the meetings at the conference would be timed
-        events.  Of course, events with specific starting and ending
-        times can also overlap.  When they do they're displayed as
-        multiple columns in the day view of the calendar.
-      </para>
-      <note>
-       <title>Doing Two Things At Once</title>
-         <para>
-           If you create calendar events that overlap,
-           <application>Evolution</application> will display them side
-           by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
-           multiple things at once.
-         </para>
-      </note>
-      <para>
-         You can have as many as four different
-         <guilabel>Alarms</guilabel>, any time prior to the event
-         you've scheduled.  You can have one alarm of each of the following types:
-          <variablelist>
-           <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
-	    <listitem>
-	      <para>
-	        A window will pop up on your screen to remind you of
-	        your event.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Audio</guilabel></term>
-	    <listitem>
-	      <para>
-	        Choose this to have your computer deliver a sound
-	        alarm.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Program</guilabel></term>
-	    <listitem>
-	      <para>
-	        Select this if you would like to run a program as a
-	        reminder.  You can enter its name in the text field,
-	        or find it with the <guibutton>Browse</guibutton>
-	        button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Mail</guilabel></term>
-	    <listitem>
-	      <para>
-	         <application>Evolution</application> will send an
-	         email reminder to the address you enter into the text
-	         field.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Classification</guilabel> 
-          and only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public event can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and
-         implementations of this feature have yet to be
-         determined. <!-- FIXME -->
-      </para>
-      <para>
-        <application>Evolution</application> lets you categorize your
-	appointments, which can help if you lead a busy life.  The bottom
-	section of the <guilabel>Appointment</guilabel> tab is where your
-	categorization is done.
-      </para>
-      
-      <tip>
-      <title>Adding a New Category</title>
-	<para>
-	 You can add a new category to your category list by clicking on
-         <guibutton>Edit Master Category List...</guibutton> and single-clicking
-	 on <guilabel> Click here to add a category</guilabel>.
-	</para>
-      </tip>
-
-      <para>
-	 The purpose of categories is to let you view all appointments which have
-	 similar activities.  To do this, change <guilabel>Any field contains</guilabel>
-	 to <guilabel>Has category</guilabel> and enter your category at right.
-      </para>
-
-      <para>
-	Clicking on the <guibutton>Categories</guibutton> button opens up the category
-	list.  To associate a category to an event, simply click the check box. 
-      </para>
-      <para>
-	Once you've selected your categories, click <guibutton>OK</guibutton> to
-	assign these categories to the event.  The categories you selected are now
-	listed in the text box to the right of the <guibutton>Categories...</guibutton>
-	button.
-      </para>
-
-      <para>
-        The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in events ranging from once every day up to once
-        every 100 years.  You can then choose a time and date when the
-        event will stop recurring, and, under
-        <guilabel>Exceptions</guilabel>, pick individual days when the
-        event will <emphasis>not</emphasis> recur. Make your
-        selections from left to right, and you'll form a sentence:
-        "Every two weeks on Monday and Friday until January 3, 2003"
-        or "Every month on the first Friday for 12 occurrences."
-      </para>
-
-      <para>
-	Once you're done with all those settings, click on the disk
-	icon in the toolbar.  That will save the event and close the
-	event editor window. If you want, you can alter an event
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event then
-	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
-      </para>
-    </sect2>
-    <sect2 id="usage-calendar-rsvp">
-      <title>RSVPs with the Calendar</title>
-      <para>
-	<application>Evolution</application> can be used to setup group events
-	and help you manage RSVPs.
-      </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.
-      </para>
-    </sect2>
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
-      </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
-
-      <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new event</interface> window.  Then describe
-	the event as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the event on your calendar and on
-	theirs as tentative, rather than a confirmed, event.
-      </para>
-      <para>
-	To mark a tentative event as confirmed, click once on the
-	event in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Event
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	event.
-      </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>The Task Pad</title>
-    <para>
-       The Task Pad, located in the lower right corner of the
-       calendar, lets you keep a list of tasks separate from your
-       calendar events.  Tasks are colored and sorted by priority and
-       due-date (see <xref linkend="config-prefs"> for more
-       information), and are included with calendar data during
-       synchronization with a hand-held device.  You can use the list
-       in a larger format by choosing the <guibutton>Tasks</guibutton>
-       button in the shortcut bar or in the folder tree.
-    </para>
-    <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button below the list.  <application>Evolution</application>
-       will pop up a small window with five items in it:
-     
-        <variablelist>
-	  <varlistentry>
-	  <term> <guilabel>Summary:</guilabel></term>
-	  <listitem>
-            <para>
-              The description you enter here will appear in the To Do
-              list itself.
-          </para>
-	  </listitem>
-	  </varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Due Date:</guilabel></term>
-	  <listitem>
-	    <para>
-            Decide when this item is
-            due.  You can either type in a date and time, or select one from
-            the <guibutton>Calendar</guibutton> and time drop-down menus.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Priority:</guilabel></term>
-	  <listitem>
-	    <para>
-             Select a level of importance from 1 (most important) to 9
-              (least important).
-            </para>
-	  </listitem> 
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Item Comments:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here.
-            </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-       Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of task
-       list.  To view or edit a detailed description of an item,
-       double-click on it, or select it and click
-       <guibutton>Edit</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       <application>Evolution</application> permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Keelyn, 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
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Red Sox are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Calendar</guimenuitem>
-      </menuchoice>.
-       You can place the calendar in any calendar folder and access it
-       from the folder view.  Alarms, configuration, and display for
-       each calendar are separate from each other.
-    </para>
-    
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
deleted file mode 100644
index a168ef1087..0000000000
--- a/doc/C/usage-contact.sgml
+++ /dev/null
@@ -1,638 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-contact">
-  <title>Working with Your Contacts</title>
-  <abstract>
-    <para>
-      The <application>Evolution</application> address book can
-      handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, it's a lot easier to update
-      <application>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held devices.  Since
-      <application>Evolution</application> supports the <glossterm
-      linkend="ldap">LDAP</glossterm> directory protocol, you can use
-      it with almost any type of existing directory server on your
-      network.
-    </para>
-    <para>
-      Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  When you look for someone's address, you can also
-      see a history of appointments with that person.  Or, you can
-      create address cards from emails with just a few clicks.  In
-      addition, searches and folders work in the same way they do in
-      the rest of <application>Evolution</application>.
-    </para>
-    <para>
-      This chapter will show you how to use the
-      <application>Evolution</application> address book 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
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Address Book</title>	
-    
-    <figure id="usage-contact-fig">
-      <title>Evolution Contact Interface</title>
-      <screenshot>
-	<screeninfo>Evolution Contact List Window</screeninfo>
-	<graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
-	</graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-      <guilabel>Contact List</guilabel>
-    </para>
-
-    <para>
-      The <guilabel>Contact List</guilabel> lists your contacts.
-    </para>
-
-    <para>
-       To open your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar, or select
-       one of your contacts folders from the folder bar.  <xref
-       linkend="usage-contact-fig"> shows the address book in all
-       its organizational glory.  By default, the address book
-       shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> view.  You can select
-       other views from the <guimenu>View</guimenu> menu, and adjust
-       the width of the columns by clicking and dragging the grey
-       column dividers.
-    </para>
-
-    <para>
-       The toolbar for the address book is quite simple.
-       <itemizedlist>
-	<listitem><para>
-           <guibutton>New</guibutton> creates a new card.
-	</para></listitem>
-
-	<listitem><para>
-           <guibutton>Find</guibutton> brings up an in-depth search window.
-         </para></listitem>
-	
-	<listitem><para>
-	    <guibutton>Print</guibutton> sends one or more of your cards to the printer.
-	</para></listitem>
-        <listitem><para>
-           <guibutton>Delete</guibutton> deletes a selected card.
-        </para></listitem>
-
-        <listitem><para> <guibutton>View All</guibutton> displays all
-           the address information in the folder.  Use this button to
-           refresh the display for a network folder, or to switch from
-           viewing the results of a search and see all your contacts.
-	    <!-- Lets xref to search feature -->
-           </para></listitem>
-
-        <listitem><para> <guibutton>Stop</guibutton> stops loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       Your contact information fills the rest of the display.  Move
-       through the cards alphabetically with the buttons and the
-       scrollbar to the right of the window. Of course, if you have
-       more than a few people listed, you'll want some way of finding
-       them more quickly, which is why there's a search feature.
-    </para>
-  </sect1>
-
-  <sect1 id="usage-contact-cards">
-    <title>The Contact Editor</title>
-    <para>
-      To delete a contact:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Click once on the contact.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Press the <guibutton>Delete</guibutton> button.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-       If you want to add or change cards, you'll use the contact
-       editor.  To change a card that already exists, double click on
-       it to open the contact editor window.  If you want to create a new
-       card, clicking the <guibutton>New</guibutton> button in the
-       toolbar will open the same window, with blank entry boxes for
-       you to fill in.
-    </para>
-    
-    <para>
-      The contact editor window has two tabs,
-      <guilabel>General</guilabel>, for basic contact information, and
-      <guilabel>Details</guilabel>, for a more specific description of
-      the person.  In addition, it contains a <guimenu>File</guimenu>
-      menu and a toolbar with three items: <guilabel>Save and
-      Close</guilabel>, <guilabel>Print</guilabel>, and
-      <guilabel>Delete</guilabel>.
-      </para>
-    
-    <figure id="usage-contact-editor-fig">
-      <title>Evolution Contact Editor</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="figures/contact-editor" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-    
-    <para> The <guilabel>General</guilabel> tab has seven sections,
-      each with an icon: a face, for name and company; a telephone
-      for phone numbers; an envelope for email address; a globe for
-      web page address; a house for postal address; a file folder
-      for contacts, and a briefcase for categories. 
-    </para>
-    <para>
-     <variablelist>
-	
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		            Enter the first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  Enter the middle name or initial, if any.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   Enter the last name (surname).
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Enter suffixes such as "Jr." or "III."
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	      </itemizedlist>
-	      </para>
-		<para>
-		  The <guilabel>Full Name</guilabel> field also
-		  interacts with the <guilabel>File As</guilabel>
-		  box to help you organize your contacts.
-		</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>.
-		</para>
-	    <tip>
-	      <title>Filing Suggestion</title>
-	      <para>
-		 Don't enter something entirely different from the
-		 actual name, since you might forget that you've filed
-		 Rupert's information under "F" for "Fictitious Ximian
-		 Employee."
-              </para>
-	    </tip>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Multiple Values for Fields</term>
-            <listitem>
-	      <para>
-                If you click on the small arrow buttons next to the
-                <guilabel>Primary Email</guilabel> field, you can also
-                choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will
-                store them all.  The arrow buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool; for
-       information on that, read <xref
-       linkend="usage-contact-organize">.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is much simpler:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    The briefcase - Describes the person's professional life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The face - Describes the person's personal life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The globe - Miscellanious notes
-	  </para>
-	</listitem>
-      </itemizedlist>
-
-      <tip>
-	<title>Contact Shortcuts</title>
-	<para>
-	  You can add cards from within an email message or calendar
-	  appointment.  While looking at an email, right-click on
-	  any email address or message, and choose
-	  <guimenuitem>Create Card for this Address</guimenuitem> or
-	  <guimenuitem>Create Card for this Sender</guimenuitem>
-	  from the menu.
-	</para>
-      </tip>
-    </para>
-  </sect1>
-
-  <sect1 id="contact-search">
-    <title>Searching for Contacts</title>
-    <para>
-      <application>Evolution</application> allows searching through contacts
-      quickly and easily.
-    </para>
-    <para>
-      To search through contacts:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Select your search focus in the search bar.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Enter your query.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Press return to search.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-      You can refine searches by doing several in
-      succession, or start over by pressing the <guibutton>Show
-	All</guibutton> button.
-    </para>
-    <para>
-      If there are no matches, the card display will be
-      blank. When you'd like to see all the cards again, press
-      <guilabel>Show All</guilabel>.
-    </para>
-    <example id="contact-quicksearch-ex">
-      <title>Refining a Quick Search</title>
-      <para>
-	Tom comes back from lunch and finds a note on his
-	keyboard: "Curtis in sales called for you, but he didn't
-	leave a number, and I forgot to write down the name of the
-	company he works for. He said it was important, though."
-	Tom is not at all annoyed.
-      </para>
-      <para>
-	He opens his contacts folder, and runs a quick search for
-	"Curtis." There are eighteen different people with that name
-	in the file. He then enters "Sales," and
-	<application>Evolution</application> narrows it down to the
-	right Curtis. He only becomes annoyed when he discovers that
-	the call was not actually important.
-      </para>
-    </example>
-    
-    <para>
-      To perform a complex search through your contacts:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Open
-	    <menuchoice>
-	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Search for contacts</guimenuitem>
-	    </menuchoice>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Name the rule in the <guilabel>Rule Name</guilabel> field.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Setup your criteria information in the <guilabel>If</guilabel> section.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    If you want to add more critera, click the <guibutton>Add
-	    Criterion</guibutton> button.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guibutton>Search</guibutton>.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-      To show all your contacts, select <guibutton>Show All</guibutton> in the
-      <guilabel>Search Bar</guilabel> or search with an empty query.
-    </para>
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizing your Address Book</title>
-    <para>
-       Organizing your address book 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
-       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>
-
-<!--
-    <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
-      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.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         <application>Evolution</application> offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way mail folders do.  For more
-         flexibility, you can also mark contacts as elements of
-         different categories.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
-	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
-	   linkend="usage-mainwindow"> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">.
-	 </para>
-	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  
-           That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
-	<para>
-           Then, you can refer to all the cards in that category by:
-           <!-- FIXME --> Waiting for Evolution to support the
-           operation.
-         </para>
-
-       <!-- FIXME: Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
-         </para>
-       -->
-
-      </sect3>
-    </sect2>
-  </sect1>
-  
-<!-- we need a LDAP server up for me to test this -->
-  <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards</title>
-    <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
-       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
-       duplicating work and keep up to date on developments within
-       their workgroup or across the entire company.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Ray wants to schedule a meeting with Company X, so he
-	    checks the network for the Company X address card so he
-	    knows whom to call there.  Since his company also shares
-	    calendars, he then learns that his co-worker Deanna has
-	    already scheduled a meeting with Company X next Thursday.
-	    He can either go to the meeting himself or ask Deanna to
-	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X. 
-	 </para>
-      </example>
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar.  It will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-
-          <listitem>
-	  <para>
-              Network folders are only available when you are
-              connected to the network.  If you use a laptop or have a
-              modem connection, you may wish to copy or cache the
-              network directory and then synchronize your copy with
-              the networked version periodically.  <!-- FIXME: HOW? -->
-	  </para>
-	  </listitem>
-
-          <listitem>
-	  <para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-          </para>
-	  </listitem>
-	  <listitem>
-	  <para>
-              Your ability to view, change, add, and delete contacts
-              depends on the settings of the LDAP server. 
-          </para>
-	  </listitem>
-       </itemizedlist>
-     </para>
-  </sect1>
-
-  <sect1 id="usage-contact-automate">
-    <title>Address Book Tools</title>
-    <para>
-       The address book works closely with
-       <application>Evolution</application>'s mail and calendar tools.
-       For example, you can use the address book to help you manage
-       mailing lists, and send or recieve address cards over email.
-       More tools are on the way, and when they arrive, <!-- FIXME -->
-       they will be described in this section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
-      <title>Send me a Card: Adding New Cards Quickly</title>
-      <para>
-	As noted before, when you get information about a person in
-	the mail or in a calendar entry, you can add it to an address
-	card.  To do so, right click on any email address or email
-	message, and select <guimenuitem>Add Address
-	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> can also add cards from a
-	hand-held device during HotSync operation.  For more
-	information about that, see <xref linkend="usage-sync">.
-      </para>
-    </sect2>
-
-    <sect2 id="contact-automation-lists">
-      <title>Managing a Mailing list</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>
-
-<!-- FIXME this feature not yet implemented 
-
-      <para>
-         You can also use the address book 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>
- -->
-
-    </sect2>
-    <!---  FIXME this feature not yet implemented 
-  <sect2 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.
-  </para>
-  </sect2>
-    -->
-    
-    
-  </sect1>
-</chapter> 
diff --git a/doc/C/usage-encryption.sgml b/doc/C/usage-encryption.sgml
deleted file mode 100644
index e36f17c652..0000000000
--- a/doc/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/doc/C/usage-exec-summary.sgml b/doc/C/usage-exec-summary.sgml
deleted file mode 100644
index 76724e4362..0000000000
--- a/doc/C/usage-exec-summary.sgml
+++ /dev/null
@@ -1,187 +0,0 @@
-<chapter id="usage-exec-summary">
-   <title>My Evolution</title>
-    <para>
-       My Evolution is designed to show you a
-       summary of important information: the appointments for a given
-       day, important email, and so forth. To see your My Evolution, 
-       click on the <guibutton>My Evolution</guibutton>
-       button in the shortcut bar, or select the
-       <guilabel>My Evolution</guilabel> folder in the folder
-       bar.
-    </para>
-
-    <sect1 id="exec-intro">
-      <title>Introducing My Evolution</title>
-      <para>
-        The first thing you'll want to do with My Evolution
-        is add a service. Go to
-      <menuchoice>
-	<guimenu>Tools</guimenu>
-	<guimenuitem>My Evolution Settings</guimenuitem>
-      </menuchoice>
-      then select one of the available
-      services.  Services may vary depending upon your system, but
-      most installations will have at least the following options:
-      <variablelist>
-
-	<varlistentry>
-	  <term>Mail</term>
-	  <listitem>
-	    <para>
-	      Display amount of unread email in your selected folders.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-          <varlistentry>
-             <term>RDF Summary</term>
-             <listitem>
-               <para>
-                  News headlines from sites that allow this
-                  feature.  The default
-                  is news about the GNOME project from <ulink
-                  url="www.gnome.org/gnome-news/">gnotices</ulink>.
-               </para>
-             </listitem>
-           </varlistentry>
-
-	<varlistentry>
-	  <term>Weather</term>
-	  <listitem>
-	    <para>
-	      Shows you the current weather for the cities of your choice.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>Schedule</term>
-	  <listitem>
-	    <para>
-	      Lets you see the events for the day.
-	    </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      <application>Evolution</application> comes with ... enabled by
-      default.
-    </para>
-    <sect2 id="new-components">
-      <title>Adding New Components</title>
-      <para>
-	To add a new service:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>My Evolution Settings</guimenuitem>
-	      </menuchoice>
-	      from the menubar.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the service you wish to add by clicking on the respective
-	      tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Choose <guibutton>OK</guibutton> when finished configuring the
-	      item.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="delete-components">
-      <title>Deleting Components</title>
-      <para>
-	To remove a service from My Evolution, do the following:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>My Evolution Settings</guimenuitem>
-	      </menuchoice>
-	      from the menubar.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guilabel>Enable</guilabel> button in the component you
-	      would like to disable.
-	      <!-- This is incorrect.  I am going to ask Iain if he could throw
-	      in an Enable button -->
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="modifying-components">
-      <title>Modifying Components</title>
-      <para>
-	Chances are, the components that you setup aren't going to be setup for
-	your needs.  For instance, you may choose that you want to use different
-	city choices than the default settings.
-	<application>Evolution</application> lets you configure all the
-	components in My Evolution.
-      </para>
-      <sect3 id="modifying-components-mail">
-	<title>Customizing My Evolution Mail Summary</title>
-	<para>
-	  To modify mail:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Choose
-		<menuchoice>
-		  <guimenu>Tools</guimenu>
-		  <guimenuitem>My Evolution Settings</guimenuitem>
-		</menuchoice>
-		from the menubar.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click the <guilabel>Mail</guilabel> tab at the top of the
-		window.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-	<para>
-	  The <guilabel>Mail</guilabel> service window is broken up into two
-	  sections.  The left section is where your mail folders are listed.
-	  The right section shows which folders are displayed.
-	</para>
-	<para>
-	  To add a folder to the summary, click on a folder in the
-	  <guilabel>All folders</guilabel> section and click the
-	  <guibutton>Add</guibutton> button.
-	</para>
-	<para>
-	  To remove a folder from the service, click on the folder in the
-	  <guilabel>Display folders</guilabel> section and click the
-	  <guibutton>Remove</guibutton> button.
-	</para>
-      </sect3>
-    </sect2>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-mail-org.sgml b/doc/C/usage-mail-org.sgml
deleted file mode 100644
index 19ad87ca12..0000000000
--- a/doc/C/usage-mail-org.sgml
+++ /dev/null
@@ -1,801 +0,0 @@
-<chapter id="usage-mail-organize">
-    <title>Organizing and Managing your Email</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
-      to help you do it.
-    </para>
-
-    <sect1 id="usage-mail-organize-columns">
-      <title>Sorting Mail with Column Headers</title>
-      <para>
-         By default, the message list has columns with the following
-         headings: an envelope icon indicating whether you have read
-         or replied to a message, an exclamation point indicating priority, and the
-         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-         <guilabel>Date</guilabel> fields. You can change their order
-         and remove them by dragging and dropping them.  
-
-      To add columns:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Right click on the column header
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guimenuitem>Add a Column</guimenuitem>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click and drag a column you want into a space between
-	    existing column headers.  A red arrow will show you where
-	    the column will be placed.
-	  </para>
-	</listitem>
-      </orderedlist>
-      </para>
-      <para>
-	Right-click on one of the column headers to get a list of
-	options:
-	<variablelist>
-	  
-	<varlistentry>
-	  <term><guimenuitem>Sort Ascending</guimenuitem></term>
-	  <listitem><para>
-	      Sorts the messages top to bottom.
-	    </para></listitem>
-	</varlistentry>
-	  
-	  <varlistentry>
-	    <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>
-	    <listitem><para>
-	      Groups messages instead of sorting them. This makes each contact
-	      with identical properties in the specified field to be placed in
-	      its own group and physically separated from others. 
-	    </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Remove this
-		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>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Field
-		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
-	      appear to show you where you're about to put the
-	      column.  
-          </para></listitem>
-	</varlistentry>
-	</variablelist>
-      </para>
-    </sect1>
-
-    <sect1 id="usage-mail-organize-folders">
-      <title>Getting Organized with Folders</title>
-      <para>
-	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the
-	toolbar. If you want to move several messages at once, click
-	on the ones you want to move while holding down the
-	<keycap>Ctrl</keycap> key, or use <keycap>Shift</keycap> to
-	select a range of messages.  If you create a filter with the
-	<interface>filter assistant</interface>, you can have mail
-	filed automatically.
-      </para>
-  </sect1>    
-
-  <sect1 id="usage-mail-organize-search">
-      <title>Searching for Messages</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster. You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains</guilabel></term>
-	  <listitem>
-	      <para>
-	        This will search message subjects and the messages
-	        themselves for the word or phrase you've entered in
-	        the search field.
-   	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term> <guilabel>Body contains</guilabel> </term>
-	    <listitem>
-	      <para>
-	        This will search only in message text, not the subject
-	        lines.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject contains</guilabel></term>
-	    <listitem>
-	      <para>
-	        This will show you messages where the search text is
-	        in the subject line.  It will not search in the
-	        message body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Body does not contain</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every email message that does not have the
-	        search text in the message body.  It will still show
-	        messages that have the search text in the subject
-	        line, if it is not also in the body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject does not contain</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every mail whose subject does not contain
-	        the search text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-        When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Evolution</application>
-        will show your search results in the message list.
-      </para>
-
-      <para>
-         If you think you'll want to return to a search again, you can
-         save it as a virtual folder by selecting <guilabel>Store
-         Search as Virtual Folder</guilabel>.
-      </para>
-
-      <para>
-         When you're done with the search, go back to seeing all your
-         messages by choosing <guimenuitem>Show All</guimenuitem> from
-         the <guilabel>Search</guilabel> drop-down box. If you're
-         sneaky, just enter a blank search: since every message has at
-         least one space in it, you'll see every message in the
-         folder.
-      </para>
-
-      <para>
-        If you'd like to perform a more complex search, open the
-        advanced search dialog by selecting
-        <guilabel>Advanced...</guilabel> from the
-        <guilabel>Search</guilabel> drop-down menu.  Then, create your
-        search criteria (each with the same options you saw in the
-        regular search bar), and decide whether you want to find
-        messages that match all of them, or messages that match even
-        one. Then, click <guibutton>Search</guibutton> to go and find
-        those messages.
-     </para>
-
-     <para>
-        You'll see a similar approach to sorting messages when you
-        create filters and virtual folders in the next few sections.
-     </para>
-
-    </sect1>
-
-    <sect1 id="usage-mail-organize-filters">
-      <title>Create Rules to Automatically Organize Mail</title>
-      <para>
-	Filters work very much like the mail room in a large company.
-	Their purpose is to bundle, sort, and distribute mail to the
-	various folders.  In addition, you can have multiple filters
-	performing multiple actions that may effect the same message
-	in several ways.  For example, your filters could put copies
-	of one message into multiple folders, or keep a copy and send
-	one to another person as well, and it can do that quickly. Of
-	course, it's also faster and more flexible than an actual
-	person with a pile of envelopes.
-      </para>
-
-    <sect2 id="usage-mail-org-filters-new">
-      <title>Making New Filters</title>
-      <para>
-	To create a new filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Filters</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Name your filter in the <guilabel>Rule name</guilabel> field.
-	      For each filter criterion, you must first select 
-	      which of the following parts of the message you want the filter to 
-	      examine:
-	      
-	      <itemizedlist>
-		<listitem><para>
-		    Sender - The sender's address.
-		  </para></listitem>
-		
-		
-		<listitem><para>
-		    Recipients - The recipients of the message.
-		  </para></listitem>
-	  
-		<listitem><para>
-		    Subject - The subject line of the message.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Specific Header - The filter can look at any header you
-		    want, even obscure or custom ones. Enter the header name
-		    in the first text box, and put your search text in the
-		    second one.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Message Body - Search in the actual text of the message.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Expression - For programmers only: match a message according to an
-		    expression you write in the Scheme language, used to
-		    define filters in <application>Evolution</application>.
-		  </para>
-		</listitem>
-		
-		<listitem><para> Date sent - Filter messages according to the date on
-		    which they were sent: First, choose the conditions you
-		    want a message to meet &mdash; <guilabel>before</guilabel>
-		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The filter will compare the
-		    message's time-stamp to the system clock when the filter
-		    is run, or to a specific time and date you choose from a
-		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter &mdash; perhaps you're
-		    looking for messages less than two days old.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Date Recieved - This works the same way as the <guilabel>Date Sent</guilabel> 
-		    option, except that it compares the time you got the message 
-		    with the dates you specify.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have filters set the
-		    priority of messages you recieve, and then have other filters 
-		    applied only to those messages which have a certain priority.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Status - Filters according to the status of a message, such as
-		    'New'.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Attachments - Create a filter based on whether or not you 
-		    have an attachment in the email.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Mailing List - Filter based on the mailing list it came from.
-		  </para>
-		</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.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Source Account - Filter messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the criterion for the condition.   If you want multiple
-	      criterion for this filter, press <guibutton>Add
-		criterion</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the actions for the filter in the <guilabel>Then</guilabel>
-	      section.  You can select any of the following options.
-	      <itemizedlist>
-		<listitem><para>
-		    Move to Folder - If you select this item, <application>Evolution</application>
-		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-		    to select a folder. 
-		  </para></listitem>
-
-		<listitem><para>
-		    Copy to Folder - If you select this item, <application>Evolution</application>
-		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-		    to select a folder. 
-		  </para></listitem>
-		
-		<listitem><para>
-		    Forward to Address - Select this, enter an address, and the addressee will
-		    get a copy of the message.
-		  </para></listitem>
-
-		<listitem><para>
-		    Delete - Marks the message for deletion.  You can still get the message
-		    back, at least until you <guimenuitem>Expunge</guimenuitem> your
-		    mail yourself.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Stop Processing - Select this if you want to tell all other filters to ignore 
-		    this message, because whatever you've done with it so far
-		    is plenty.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Assign Color - Select this item, and <application>Evolution</application>
-		    will mark the message with whatever color you please.
-		  </para></listitem>
-		
-		<listitem><para> 
-		    Assign Score - If you know that all mail with
-		    "important" somewhere in the message body line is
-		    important, you can give it a high priority score. In a subsequent filter you can 
-		    then arrange your messages by their priority score.
-		  </para></listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Set Status - If you want to add multiple actions for this filter, press
-	      <guibutton>Add filter</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    
-    <sect2 id="filters-edit">
-      <title>Editing Filters</title>
-      <para>
-	To edit a filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the filter in the <guilabel>Filter Rules</guilabel> section
-	      and press <guibutton>Edit</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Change the desired settings.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton> in the filter editor window.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton> in the filter manager window.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    
-    <sect2 id="filters-deleting">
-      <title>Deleting Filters</title>
-      <para>
-	To delete a filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
-	    </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the filter and press <guibutton>Delete</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <title>Changing Folder Names and Filters</title>
-	  <para>
-	    <itemizedlist>
-	      <listitem>
-		<para>
-		  Incoming email that your filters don't move goes into the Inbox; 
-		  outgoing mail that they don't move ends up in the Sent
-		  folder.  So be sure to change the filters that go with it.
-		</para>
-	      </listitem>
-	    </itemizedlist>
-	  </para>
-	</note>
-      </para>
-    </sect2>
-  </sect1>
-    
-    <sect1 id="usage-mail-organize-vfolders">
-      <title>Getting Really Organized with Virtual Folders</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, virtual folders can help
-	you stay on top of things.
-      </para>
-      <para>
-	A virtual folder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a virtual folder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the virtual folder criteria arrive or are
-	deleted, <application>Evolution</application> will
-	automatically place them in and remove them from the
-	virtual folder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any virtual folders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  Virtual folders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-
-    <note id="unmatched-vfolder">
-      <title>The Unmatched Virtual Folder</title>
-      <para>
-	Obveously, not all messages will fit into all your Virtual
-	Folders.  That's why <application>Evolution</application>
-	includes an UNMATCHED Virtual Folder.  The UNMATCHED Virtual
-	Folder displays messages that are not matched by other rules.
-      </para>
-    </note>
-
-
-    <example id="usage-mail-organize-vFolders-ex">
-      <title>Using Folders, Searches, and Virtual Folders</title>
-      <para>
-	To organize his mailbox, Jim sets up a virtual volder for emails from
-	his friend and co-worker Anna.  He has another one for messages that
-	have ximian.com in the address and <application>Evolution</application> in the subject line, so he
-	can keep a record of what people from work send him about
-	<application>evolution</application>.  If Anna sends him a message about
-	anything other than <application>Evolution</application>, it only shows up in the "Anna" folder.
-	When Anna sends him mail about the user interface for
-	<application>evolution</application>, he can see that message both in
-	the "Anna" virtual folder and in the "Internal Evolution Discussion"
-	virtual folder.
-       </para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
-
-    <sect2 id="vfolder-create">
-      <title>Creating Virtual Folders</title>
-      <para>
-	To create a virtual folder:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	    <menuchoice>
-	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Virtual Folder Editor</guimenuitem>
-	    </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Add</guibutton>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Name your virtual folder in the <guilabel>Rule name</guilabel> field.
-
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select your search criteria. For each criterion, you
-	      must first select which of the following parts of the
-	      message you want the search to examine:
-	      <itemizedlist>
-		<listitem><para>
-		    Sender - The sender's address.
-		  </para></listitem>
-		
-		
-		<listitem><para>
-		    Recipients - The recipients of the message.
-		  </para></listitem>
-	  
-		<listitem><para>
-		    Subject - The subject line of the message.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Specific Header - The virtual folder can look at any header you
-		    want, even obscure or custom ones. Enter the header name
-		    in the first text box, and put your search text in the
-		    second one.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Message Body - Search in the actual text of the message.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Expression - For programmers only: match a message according to an
-		    expression you write in the Scheme language, used to
-		    define virtual folders in <application>Evolution</application>.
-		  </para>
-		</listitem>
-		
-		<listitem><para> Date sent - Search messages according to the date on
-		    which they were sent: First, choose the conditions you
-		    want a message to meet &mdash; <guilabel>before</guilabel>
-		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The virtual folder will compare the
-		    message's time-stamp to the system clock when the filter
-		    is run, or to a specific time and date you choose from a
-		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter &mdash; perhaps you're
-		    looking for messages less than two days old.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Date Recieved - This works the same way as the <guilabel>Date Sent</guilabel> 
-		    option, except that it compares the time you got the message 
-		    with the dates you specify.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have virtual folders set the
-		    priority of messages you recieve, and then have other
-		    virtual folders 
-		    applied only to those messages which have a certain priority.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Status - Searches according to the status of a message, such as
-		    'New'.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Attachments - Create a virtual folder based on  whether or not you have an
-		    attachment in the email.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Mailing List - Search based on the mailing list it came from.
-		  </para>
-		</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.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Source Account - Search messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder sources.  You can select:
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    Specific folders only
-		    <note>
-		      <para>
-			If you select specific folders only, you need to specify the
-			source folders in the box below.
-		      </para>
-		    </note>
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    All local folders
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    With all active remote folders
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    With all local and active folders
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	 
-	    </para>
-	  </listitem>
-	  <listitem>
-	<para>
-	        If you want multiple criteria for this filter, press <guibutton>Add
-		criterion</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-    </orderedlist>
-
-      <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a Virtual Folder Rule</title>
-	<screenshot>
-	  <screeninfo>Creating a Virtual Folder Rule</screeninfo>
-	  <graphic fileref="figures/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	  </graphic>
-	</screenshot>
-      </figure>
-      </para>
-    </sect2>
-  </sect1>
-  <!--
-    <sect1 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>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/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
deleted file mode 100644
index b5c6ae61d4..0000000000
--- a/doc/C/usage-mail.sgml
+++ /dev/null
@@ -1,1447 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mail">
-  <title>Using Evolution for Email</title>
-  <abstract>
-    <title> A Guide to the Evolution Mailer</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways that matter:
-     <itemizedlist>
-       <listitem>
-         <para>
-           It can sort and organize your mail in a wide variety of ways with
-           folders, searches, and filters.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-          It can send and receive mail in HTML or as plain text, and
-          makes it easy to send and recieve multiple file attachments.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           It supports multiple mail sources, including <glossterm
-           linkend="imap">IMAP</glossterm>, <glossterm
-           linkend="pop">POP3</glossterm>, local
-           <systemitem><filename>mbox</filename></systemitem> and
-           <systemitem><filename>mh</filename></systemitem> files, and
-           even NNTP messages (newsgroups), which aren't technically
-           email.
-         </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Lets you enhance your security with encryption.
-	  </para>
-	</listitem>
-     </itemizedlist>
-    </para>
-    <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  Both the <link
-      linkend="usage-mail-organize-filters">filtering</link> and <link
-      linkend="usage-mail-organize-search">searching</link> functions
-      were built for speed and efficiency on gargantuan volumes of
-      mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">Virtual
-      Folder</link>, an advanced organizational feature not found in
-      mainstream mail clients.  If you get a lot of mail, or if you keep
-      every message you get in case you need to refer to it later,
-      you'll find this feature especially useful.
-    </para>
-  </abstract>
-
-  <sect1 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar. The first
-       time you use <application>Evolution</application>, it will
-       start with the <interface>Inbox</interface> open and show you a
-       message from Ximian welcoming you to the application.
-      </para>
-
-      <para>
-        Your <application>Evolution</application>
-        <guilabel>Inbox</guilabel> will look something like the one in
-        <xref linkend="usage-mail-intro-fig">.
-        If you find the <interface>view pane</interface> too small, you can resize
-        the pane, enlarge the whole window, or double-click on the
-        message in the <interface>message list</interface> to have it
-        open in a new window.  To change the sizes of a pane, just click
-        and hold on the divider between the two panes.  Then you can drag
-        up and down to select the size of the panes.  Just like with
-        folders, you can right-click on messages in the message list and
-        get a menu of possible actions.
-     </para>
-
- <!-- ==============Figure=================================== -->
-
-      <figure id="usage-mail-intro-fig">
-          <title>Evolution Mail</title>
-          <screenshot>
-            <screeninfo>Inbox</screeninfo>
-            <graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
-        </graphic>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-    <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-      <guilabel>Email Viewer</guilabel>
-    </para>
-    
-    <para>
-      This is where your email is displayed.
-    </para>
-
-    <para>
-      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
-      <guilabel>Email List</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Email List</guilabel> displays all the emails that you
-      have.  This includes all your read, unread, and email that is flagged 
-      to be deleted.
-    </para>
-    
-    <para>
-      Most of the mail-related actions you'll want to perform are
-      listed in the <guimenu>Message</guimenu> menu in the menu bar.
-      The most frequently used ones, like
-      <guimenuitem>Reply</guimenuitem> and
-      <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-      the toolbar. Almost all of them are also located in the
-      right-click menu and as keyboard shortcuts, which tend to be
-      faster once you get the hang of them.  You can choose whichever
-      way you like best; the idea is that the software should work the
-      way you want, rather than making you work the way the it does.
-      
-      <tip id="view-headers">
-	<title>Email Headers</title>
-	<para>
-	  To look at the complete headers for email messages, select
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Full
-	  Headers</guimenuitem></menuchoice>. To see absolutely every
-	  bit, choose
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Email Source
-	  </guimenuitem></menuchoice>.
-       </para>
-      </tip>
-
-    </para>
-    
-    <sect2 id="usage-mail-listorder">
-      <title>Sorting the message list</title>
-      <para>
-	<application>Evolution</application> helps you work by letting you sort
-	your email.  To sort by sender, subject, or date, click
-	on the bars with those labels at the top of the message
-	list. The direction of the arrow next to the label indicates
-	the direction of the sort, and if you click again, you'll
-	sort them in reverse order. For example, click once on
-	<guilabel>Date</guilabel> to sort messages by date from
-	oldest to newest.  Click again, and
-	<application>Evolution</application> sorts the list from
-	newest to oldest. You can also right-click on the message
-	header bars to get a set of sorting options, and add or
-	remove columns from the message list.  You can find detailed
-	instructions on how to customize your message display
-	columns in <xref linkend="usage-mail-organize-columns">.
-      </para>
-      <para>
-	You can also choose a threaded message view. Select
-	<menuchoice> 
-	  <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> 
-	</menuchoice> 
-	to turn the threaded view on or off.  When you select this option,
-	<application>Evolution</application> groups the replies to a
-	message with the original, so you can follow the thread of a
-	conversation from one message to the next.
-      </para>
-    </sect2>
-    
-    <sect2 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. 
-	To delete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click the message to select it
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press delete button or right click on the message and
-	      choose <guilabel>Delete</guilabel>.
-	    </para>
-	    <note>
-	      <title>Deleted but still here?</title>
-	      <para>
-		When you do this, your message is marked to be
-		deleted.  Your email is not gone until you have
-		expunged it. When you "Expunge" a folder, you remove
-		all the mail that you have marked for deletion.
-	      </para>
-	    </note>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Expunge</guimenuitem>
-	      </menuchoice>
-	      or press
-	      <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>E</keycap>
-	      </keycombo>
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <note>
-	<title>Trash is Actually a Virtual Folder?</title>
-	<para>
-	  Your trash bin is actually a Virtual Folder that displays
-          all messages you have marked for later deletion.  For more
-          information about Virtual Folders, see <xref
-          linkend="usage-mail-organize-vfolders">.  If you choose
-          <menuchoice> <guimenu>Actions</guimenu> <guimenuitem>Empty
-          Trash</guimenuitem> </menuchoice> you will expunge
-          <emphasis>all</emphasis> your folders.
-	</para>
-      </note>
-    </sect2>
-    <sect2 id="usage-mail-getnsend-undelete">
-      <title>Undeleting Messages</title>
-      <para>
-	To undelete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select a message you have marked for deletion.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <keycombo
-	      action="simul"><keycap>Ctrl</keycap><keycap>U</keycap>
-	      </keycombo>
-	      or choose
-	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Undelete</guimenuitem>
-	      </menuchoice>
-
-	    </para>
-	    <note>
-	      <title>What does Undelete actually do?</title>
-	      <para>
-                If you have marked a message for deletion, undeleting
-		it will unmark it, and the message will be removed
-		from the Trash folder. However, it can't bring back
-		messages that have been expunged.
-	      </para>
-	    </note>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-getnsend-get">
-    <title>Checking Mail</title>
-    <para>
-      Now that you've had a look around the
-      <interface>Inbox</interface>, it's time to check for new mail.
-      Click <guibutton>Get Mail</guibutton> in the toolbar to check
-      your mail.  If you haven't entered any mail settings yet, the
-      <interface>setup assistant</interface> will ask you for the
-      information it needs to check your email.
-    </para>
-    <para>
-      The assistant will give you several dialog boxes where you configure:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    your personal information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your outgoing email server information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your mail account identity name
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      To check your email, press the <guibutton>Check Mail</guibutton>
-      button.  If this is your first time checking mail, or you
-      haven't asked <application>Evolution</application> to store your
-      password, you'll be prompted for the password.  Enter your
-      password and your email will be downloaded.
-    </para>
-    <note id="badmailsettings">
-      <title>Can't Check Mail?</title>
-      <para>
-	If you get an error message instead of mail, you probably need to check
-	your network settings.  To learn how to do that,
-	 have a look at <xref linkend="config-prefs-mail-network">, or
-	 ask your system administrator.
-       </para>
-     </note>
-
-       <sect2 id="usage-mail-getnsend-get-news">
-	  <title>Using Evolution for News </title>
-	<para>
-	  Newsgroups are so similar to email that there's no reason not
-	  to read them side by side.  If you want to do that, add a
-	  news source to your configuration (see <xref
-	  linkend="config-prefs-network-news">). The news server will
-	  appear as a remote server, and will look quite similar to an
-	  IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-	  <application>Evolution</application> will also check for news
-	  messages.
-	</para>
-	</sect2>
-
-       <sect2 id="usage-mail-getnsend-get-attach">
-	 <title>Attachments and HTML Mail</title>
-	 <para>
-	   If someone sends you an <glossterm>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,
-	   including HTML formatting, will appear as part of the
-	   message.  To minimize download time, and to foil spammers
-	   who use server information to track their messages, images
-	   linked from an HTML message <emphasis>not</emphasis>
-	   display unless you select the
-	   <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	   Display</guisubmenu><guimenuitem>Load Images
-	   </guimenuitem></menuchoice> option.  For other files,
-	   <application>Evolution</application> will show an icon at
-	   the end of the message.
-     </para>
-     <para>
-       To Save an Attachment to Disk:
-       <orderedlist numeration="arabic">
-	 <listitem>
-	   <para>
-	     Open up the desired email
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Click on the down arrow at the bottom of the email for the desired
-	     attachment.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Select <guibutton>Save to Disk</guibutton>.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Choose the directory and filename you wish.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Click <guibutton>OK</guibutton>
-	   </para>
-	 </listitem>
-       </orderedlist>
-      </para>
-
-      <tip id="spaceandbs">
-	<title>Reading email with keyboard</title>
-	<para>
-	  You can click the spacebar to page down while you're reading an email,
-	  and press backspace to page up in an email.  This may help to make
-	  reading your email faster.
-	</para>
-      </tip>
-      <para>
-	To Open an Attachment in a Program:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open the mail message with the attachment you want to read.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the aarrow next the the attachment icon.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the program you'd like to use. It will start up
-	      and open the document.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    
-        <para>
-           <application>Evolution</application> can also display
-           HTML-formatted mail, complete with graphics.  Graphics
-           don't load automatically by default, because they can be
-           large and take a long time to download.  They can also be
-           used by spammers to help track who reads their email.  So
-           having them not load automatically helps protect your
-           privacy.
-      </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="usage-mail-getnsend-send">
-      <title>Writing and Sending Mail</title>
-      <para>
-         You can start writing a new email message by selecting
-         <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>
-         Mail Message</guimenuitem></menuchoice>, or by pressing the
-         <guibutton>Compose</guibutton> button in the Inbox toolbar.
-         When you do so, the <interface>New Message</interface> window
-         will open, as shown in <xref
-         linkend="usage-mail-newmsg-fig">.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-        <title>New Message Window</title>
-        <screenshot>
-          <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
-        </graphic>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
-      <para>
-      Enter an address in the <guilabel>To:</guilabel> field.  If you wish
-      enter a  subject in the <guilabel>Subject:</guilabel> and a message in
-      the big empty box at the bottom of the window.  Once you have revised
-      your message, press <guibutton>Send</guibutton>.
-    </para>
-
-      <sect2 id="usage-mail-getnsend-send-delay">
-        <title>Saving Messages for Later</title>
-        <para>
-           <application>Evolution</application> will send mail immediately unless you tell it to
-           do otherwise by selecting <menuchoice>
-           <guimenu>File</guimenu> <guimenuitem>Send
-           Later</guimenuitem></menuchoice>.  This will add your
-           messages to the <guilabel>Outbox</guilabel> queue.  Then,
-           when you press <guibutton>Send</guibutton> in another
-           message, or <guibutton>Get Mail</guibutton> in the main
-           mail window, all your unsent messages will go out at once.
-           You might want to use "Send Later" becuase it gives
-           you a chance to change your mind about a message before you send it.
-        </para>
-        <para>
-           To learn more about how you can specify message queue and
-           filter behavior, see <xref linkend="config-prefs-mail">.
-        </para>
-
-      <para>
-	You can also choose to save messages as drafts or as text
-	files. Your options are:
-       <itemizedlist>
-        <listitem><para>
-          Choose
-	  <menuchoice>
-	   <guimenu>File</guimenu>
-	    <guimenuitem>Save Draft</guimenuitem>
-          </menuchoice>
-          to store your messages in the drafts folder for later
-          revision.
-       </para></listitem>
-
-       <listitem><para>
-         If you'd like to have the message sent later, you
-         can choose <guimenuitem>Send Later</guimenuitem>. That way,
-         the message will be added to the queue, and you can send a 
-         batch of messages all at once.
-        </para></listitem>
-        
-        <listitem><para> 
-         If you prefer to save your message as a text file,
-         choose <guimenuitem>Save As</guimenuitem> and then choose a
-         file name.
-           </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-send-compose">
-      <title>Advanced Mail Composition</title>
-      <para>
-        In the next few sections, you'll see how
-	<application>Evolution</application> handles advanced email
-	features, including large recipient lists, attachments, and
-	forwarding.
-      </para>
-      <sect3 id="usage-mail-getnsend-send-attach">
-        <title>Attachments</title>
-        <para>
-	  To attach a file to your email:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Push the attach button in the composer toolbar
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Select the file you want to attach
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Press <guibutton>OK</guibutton>
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-	<para>
-	  You can drag a file from your desktop into the composer window to
-	  attach it as well.
-        </para>
-        <para>
-            To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
-            Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
-        </para>
-        <para>
-            When you send the message, a copy of the attached file
-            will go with it.  Be aware that big attachments can take a
-            long time to download.
-        </para>
-        <para>
-            When receiving a message that has an attached image,
-            <application>Evolution</application> gives you the choice
-            whether to view it or not.  You can choose to have it
-            always shown, load images only if the sender is in your
-            addressbook, or never load images.
-        </para>
-      </sect3>
-
-      <sect3 id="usage-mail-getnsend-send-to-types">
-	<title>Types of Recipients</title>
-        <para>
-	  <application>Evolution</application>, like most email
-	   programs, recognizes three types of addressee: primary
-	   recipients, secondary recipients, and hidden ("blind")
-	   recipients.
-         </para>
-         <para>
-            The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  To send mail to
-            more than one or two people, you can use the the
-            <guilabel>Cc:</guilabel> field.
-          </para>
-          <para>
-            Hearkening back to the dark ages when people used
-            typewriters and there were no copy machines, "Cc" stands
-            for "Carbon Copy."  Use it whenever you want to share a
-            message you've written to someone else.
-          </para>
-          <para>
-            <guilabel>Bcc:</guilabel> is a little more complex.  You
-            use it like <guilabel>Cc:</guilabel>, but people on the
-            <guilabel>Bcc:</guilabel> list are hidden from the other
-            recipients of the message. Use it to send mail to large
-            groups of people, especially if they don't know each other
-            or if privacy is a concern.
-          </para>
-
-            <example id="ex-mail-cc">
-              <title>Using the Cc: field</title>
-              <para>
-                 When Susan sends an email to a client, she puts her
-                 co-worker, Tim, in the in the
-                 <guilabel>Cc:</guilabel> field, so that he know
-                 what's going on.  The client can see that Tim also
-                 received the message, and knows that he can talk to
-                 Tim about the message as well.
-              </para>
-            </example>
-
-          <para>
-
-            <example id="ex-mail-bcc">
-              <title>Using the Bcc: field</title>
-              <para>
-                 Tim is sending an email announcement to all of his
-                 company's clients, some of whom are in competition
-                 with each other, and all of whom value their
-                 privacy. He needs to use the
-                 <guilabel>Bcc:</guilabel> field here.  If he puts
-                 every address from his address book's "Clients"
-                 category into the <guilabel>To:</guilabel> or
-                 <guilabel>Cc:</guilabel> fields, he'll make the
-                 company's <emphasis>entire</emphasis> client list
-                 public. But putting his "Clients" addressbook
-                 into the Bcc: section, that will cause them to be hidden
-                 from the competition.  It seems insignificant, but it can
-                 make a huge difference in some situations.
-             </para>
-            </example>
-          </para>
-        </sect3>
-
-        <sect3 id="usage-mail-getnsend-send-to">
-        <title>Choosing Recipients Quickly</title>
-        <para>
-	  If you have created address cards in the contact manager,
-          you can also enter nicknames or other portions of address
-          data, and <application>Evolution</application> will offer a
-          drop down list of possible address completions from your
-          address book.  If you enter a name or nickname that can go
-          with more than one card, Evolution will open a dialog box to
-          ask you which person you meant. Also,
-          <application>Evolution</application> will add a domain to
-          any unqualified addresses.  By default, this is your domain,
-          but you can choose which one mail preferences dialog.
-          </para>
-          <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
-            in your contact manager.  Select addresses and click on
-            the arrows to move them into the appropriate address
-            columns.
-          </para>
-          <para>
-            For more information about using email together with the
-            contact manager and the calendar, see <xref
-            linkend="usage-contact-automate"> and <xref
-            linkend="usage-calendar-apts">.
-          </para>
-        </sect3>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-reply">
-        <title>Replying to Messages</title>
-        <para>
-           To reply to a message, press the
-           <guibutton>Reply:</guibutton> button while it is selected,
-           or choose <guimenuitem>Reply to Sender:</guimenuitem> from
-           the message's right-click menu.  That will open the
-           <interface>message composer</interface>.  The
-           <guilabel>To:</guilabel> and <guilabel>Subject:</guilabel>
-           fields will already be filled, although you can alter them
-           if you wish.  In addition, the full text of the old message
-           is inserted into the new message, either grey (for
-           HTML display) or with the &gt; character before each line
-           (in plain text mode), to indicate that it's part of the
-           previous message.  People often intersperse their message
-           with the quoted material as shown in <xref
-           linkend="usage-mail-getnsend-reply-fig">.
-
-<!-- note that this figure should have a reply message ready to send,
-with quoted materials and the relevant replies interspersed-->
-<!-- I want to wait for the formatting bugs to be fixed first -->
- <!-- ==============Figure=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-         <title>Reply Message Window</title>
-         <screenshot>
-          <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
-        </graphic>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-        </para>
-        <para>
-          If you're reading a message with several recipients, you may
-           wish to use <guibutton>Reply to All</guibutton> instead of
-           <guibutton>Reply</guibutton>.  If there are large numbers
-           of people in the <guilabel>Cc:</guilabel> or
-           <guilabel>To:</guilabel> fields, this can save substantial
-           amounts of time.
-          <example>
-            <title>Using the Reply to All feature</title>
-            <para>
-              Susan sends an email to a client and sends copies to Tim
-              and to an internal company mailing list of co-workers.
-              If Tim wants to make a comment for all of them to read,
-              he uses <guibutton>Reply to All</guibutton>, but if he
-              just wants to tell Susan that he agrees with her, he
-              uses <guibutton>Reply</guibutton>.  Note that his reply
-              will not reach anyone that Susan put on her
-              <guilabel>Bcc</guilabel> list, since that list is not
-              shared with anyone.
-            </para>
-          </example>
-        </para>
-        <para>
-          If you're subscribed to a mailing list, and want your reply
-          to go just to the list, rather than to the sender, choose
-          <guibutton>Reply to List</guibutton> instead of
-          <guibutton>Reply</guibutton> or <guibutton>Reply to
-          All</guibutton>.
-          <note>
-            <title>What is a Mailing List?</title>
-            <para>
-              Mailing Lists are one of the most popular tools for
-              group collaboration on the Internet. Here's how they work: 
-              <simplelist>
-                <member>
-                  Someone sends a message to a single address, like
-                  <email>evolution@ximian.com</email>.
-                </member>
-                <member>
-                  That address belongs to a program that distributes
-                  the message to a list of recipients.
-                </member>
-             </simplelist>
-               The mail management program lets individuals subscribe
-               to or unsubscribe from the list at will, without
-               requiring the message writers to remember the addresses
-               of every recipient.
-            </para>
-            <para>
-              Mailing list servers can also let network administrators
-              control mail flow, list membership, and even moderate
-              the content of mailing lists.
-            </para>
-          </note>
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-        <para>
-           You are probably familiar with search and replace features
-           in any sort of text-editing software, and if you come from
-           a Linux or Unix background, you may know what
-           <guimenuitem>Find Regex</guimenuitem> does.  If you aren't
-           among the lucky who already know, here's a quick rundown of
-           the automated text searching features that the message
-           composer makes available to you.
-        </para>
-        <para>
-           <variablelist>
-            <varlistentry>
-              <term><guimenuitem>Find</guimenuitem></term>
-              <listitem><para> Enter a word or phrase, and
-              <application>Evolution</application> will find it
-              in your message.
-              </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><guimenuitem>Find Regex</guimenuitem></term>
-              <listitem>
-                <para>
-                  Find a regex, also called a
-                  <glossterm linkend="regular-expression">regular
-                  expression</glossterm>, in your composer window.
-               </para>
-             </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <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>
-               <listitem><para>
-                 Find a word or phrase, and replace it with
-                 something else.
-               </para></listitem>
-            </varlistentry>
-
-          </variablelist>
-        </para>
-
-        <para>
-            For all of these menu items, you can choose whether or not
-            to <guilabel>Search Backwards</guilabel> in the document
-            from the point where your cursor is.  For all but the
-            regular expression search (which doesn't need it), you are
-            offered a check box to determine whether the search is to
-            be <guilabel>Case Sensitive</guilabel> when it determines
-            a match.
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-html">
-        <title>Embellish your email with HTML</title>
-        <para>
-            Normally, you can't set text styles or insert pictures in
-            emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis, or use
-            <glossterm linkend="emoticon">emoticons</glossterm> to
-            convey their feelings.  However, most newer email programs
-            can display images and text styles as well as basic
-            alignment and paragraph formatting. They do this with
-            <glossterm linkend="html">HTML</glossterm>, just like web
-            pages do.
-        </para>
-        <note>
-          <title>HTML Mail is not a Default Setting</title>
-          <para>
-            Some people do not have HTML-capable mail clients, or
-            prefer not to receive HTML-enhanced mail because it is
-            slower to download and display.  <emphasis>Some</emphasis>
-            people refer to HTML mail as "the root of all evil" and
-            get very angry if you send them HTML mail, which is why
-            <application>Evolution</application> sends plain text
-            unless you explicitly ask for HTML.  To send HTML mail,
-            you will need to select <menuchoice>
-            <guimenu>Format</guimenu> <guimenuitem>
-            HTML</guimenuitem></menuchoice>.  Alternately, you can set
-            your default mail format preferences in the mail
-            configuration dialog.  See <xref
-            linkend="config-prefs-mail-other"> for more information.
-          </para>
-        </note>
-        <para>
-           HTML formatting tools are located in the toolbar just above
-           the space where you'll actually compose the message, and
-           they also appear in the <guimenu>Insert</guimenu> and
-           <guimenu>Format</guimenu> menus.
-          </para>
-          <para>
-            The icons in the toolbar are explained in <glossterm
-            linkend="tooltip">tool-tips</glossterm>, which appear when
-            you hold your mouse over the buttons.  The buttons fall
-            into four categories:
-            <variablelist>
-             <varlistentry>
-             <term>Headers and lists</term>
-              <listitem>
-                <para>
-                  At the left edge of the toolbar, you can choose
-                  <guilabel>Normal</guilabel> for a default text style
-                  or <guilabel>Header 1</guilabel> through
-                  <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6). Other styles
-                  include <guilabel>preformat</guilabel>, to use the HTML
-                  tag for preformatted blocks of text, and three types
-                  of bullet points for the highly
-                  organized.
-                </para>
-              </listitem>
-           </varlistentry>
-	  <varlistentry>
-	    <term>Text style</term>
-	    <listitem>
-	      <para>
-		Use these buttons to determine the way your letters
-		look.  If you have text selected, the style will
-		apply to the selected text.  If you do not have text
-		selected, the style will apply to whatever you type
-		next.  The buttons are:
-		<itemizedlist mark="none">
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
-		  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-		</itemizedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-              <term>Alignment</term>
-	    <listitem>
-	      <para>
-		Located next to the text style buttons, these three
-		paragraph icons should be familiar to users of most
-		word processing software.  The leftmost button will
-		make your text aligned to the left, the center
-		button, centered, and the right hand button,
-		aligned on the right side.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-            <varlistentry>
-              <term>Indentation rules</term>
-              <listitem>
-                <para>
-                  The button with the arrow pointing left will reduce
-                  a paragraph's indentation, and the right arrow will
-                  increase its indentation.
-               </para>
-            </listitem>
-          </varlistentry>
-
-            <varlistentry>
-              <term>Color Selection</term>
-              <listitem>
-                <para>
-                  At the far right is the color section tool.  The
-                  colored box displays the current text color; to
-                  choose a new one, click the arrow button just to the
-                  right. If you have text selected, the color will
-                  apply to the selected text.  If you do not have text
-                  selected, the color will apply to whatever you type
-                  next.
-               </para>
-            </listitem>
-          </varlistentry>
-
-
-          </variablelist>
-        </para>
-        <para>
-	The <guimenu>Insert</guimenu> gives you three opinions which let you
-           spruce up your email to make it more interesting:
-	<variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Insert Link</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
-                  messages.  If you don't want special link text, you can just enter the address
-                  directly, and <application>Evolution</application>
-                  will recognize it as a link.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Insert Image</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Lets you put an image alongside text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Insert Rule</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Inserts a horizontal line into the text to help divide two
-		sections.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  </variablelist>
-	To add a hyperlink to your HTML message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select the text you want to link from
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Right click on text and select
-	      <guimenuitem>Link</guimenuitem>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the address you wish to link to in the
-	      <guilabel>URL</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	To add an image to your HTML message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Insert</guimenu>
-		<guimenuitem>Image</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Browse</guibutton>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the image you want
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>Insert</guibutton>
-	    </para>
-	  </listitem>
-	</orderedlist>
-
-      </para>
-      <note>
-	<title>A Technical note on HTML Tags</title>
-	<para>
-	  The composer is a <acronym>WYSIWYG</acronym>
-	  (What You See Is What You Get)
-	  editor for HTML. That means that if you enter HTML
-	  directly into the composer&mdash; say, 
-	  <markup role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-	  the composer will assume you meant exactly that string
-	  of characters, and not "make this text bold," as an HTML
-	  composition tool or text editor would.
-	</para>
-        </note>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-fwd">
-        <title>Forwarding Mail</title>
-        <para>
-          The post office forwards your mail for you when you change
-          addresses, and you can forward a letter if it comes to you by mistake.
-          The email <guilabel>Forward</guilabel> button
-          works in much the same way.  It's particularly useful if you
-          have received a message and you think someone else would
-          like to see it.  You can forward a message as an attachment
-          to a new message (this is the default) or
-          you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-          portion of the message you are sending.  Attachment
-          forwarding is best if you want to send the full, unaltered
-          message on to someone else.  Inline forwarding is best if
-          you want to send portions of a message, or if you have a
-          large number of comments on different sections of the
-          message you are forwarding.  Remember to note from whom the
-          message came, and where, if at all, you have removed or
-          altered content.
-        </para>
-        <para>
-          To forward a message you are reading, press
-          <guibutton>Forward</guibutton> on the toolbar, or select
-          <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-          prefer to forward the message <glossterm linkend="inline">inline</glossterm>
-          instead of attached, select <menuchoice>
-          <guimenu>Message</guimenu> <guimenuitem>Forward
-          Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-          addressee as you would when sending a new message; the
-          subject will already be entered, but you can alter it.
-          Enter your comments on the message in the
-          <interface>composition frame</interface>, and press
-          <guibutton>Send</guibutton>.
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-ettiquette">
-        <title>Seven Tips for Email Courtesy</title>
-        <para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                 Don't send spam or forward chain mail.  If you must,
-                 watch out for hoaxes and urban legends, and make sure
-                 the message doesn't have multiple layers of
-                 greater-than signs, (&gt;) indicating multiple layers
-                 of careless in-line forwarding.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Always begin and close with a salutation. Say "please"
-                and "thank you," just like you do in real life. You
-                can keep your pleasantries short, but be pleasant!
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING!
-                Don't write a whole message in capital letters.  It
-                hurts people's ears.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-               Check your spelling and use complete sentences.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Don't send nasty emails (flames).  If you get one,
-                don't write back.
-              </para>
-            </listitem>
-	  
-	  <listitem>
-	    <para>
-	      When you reply or forward, include just enough of
-	      the previous message to provide context: not too
-	      much, not too little.
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	      Don't send <glossterm linkend="spam">spam</glossterm>.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para> Happy mailing! </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.
-
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    In the <guilabel>Store</guilabel> section, click on the
-	    folder to which you wish to subscribe.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guibutton>Subscribe</guibutton> to add it to the
-	    subscribed list.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Close the window.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-  </sect1>
-
-  <sect1 id="encryption">
-    <title>Encryption</title>
-    <sect2 id="encryption-whatis">
-      <title>What is Encryption?</title>
-      <para>
-	Encryption is an ancient method of keeping information safe
-	from prying eyes. <application>Evolution</application> can
-	help you keep your private messages secret.  To do that, it
-	makes use of the external application
-	<application>gpg</application>, an implementation of strong
-	<!-- <glossterm linkend="public-key-encryption"> --> Public Key
-	Encryption <!-- </glossterm> -->.
-      </para>
-
-	<note id="pub-priv">
-	  <title>Public Key?  Private Key?  Whats the difference?</title>
-	  <para>
-	    GPG uses two keys: public and private.  You can give your
-	    public key to anyone from whom you want to recieve
-	    encrypted messages, or put it on a public key server so
-	    that people can look it up before contacting you.
-	    <emphasis>Never give your private key to anyone,
-	    ever</emphasis>.  Your private key lets you decrypt any
-	    message encrypted with your public key.
-	  </para>
-	</note>
-
-      <para>
-        Using encryption takes a bit of forethought.  When you send a
-        message that is encrypted, you must encrypt it using your
-        intended recipient's public key.  To <emphasis>get</emphasis>
-        an encrypted message, you must make sure that the sender has
-        your public key in advance.
-      </para>
-
-      <para>
-	You can use encryption in two different ways:
-        <simplelist>
-          <member>
-             Encrypt the entire message, so that nobody but the recipient can read it.
-          </member>
-          <member>
-            Attach an encrypted signature to a plain text message, so
-            that the recipient can read the message without decrypting it, and 
-            only needs decryption to verify the sender's identity.
-           </member>
-         </simplelist>
-      </para>
-
-	<example> 
-         <title>Sending an Encrypted Messagee</title>
-	  <para>
-	    Kevin wants to send an encrypted message to his friend
-	    Rachel.  He looks up her public key on a general key
-	    server, and then tells
-	    <application>Evolution</application> to encrypt the
-	    message.  The message now reads "@#$23ui7yr87#@!48970fsd."
-	    When the information gets to Rachel, she decrypts it using
-	    her private key, and it appears as plain text for her to
-	    read.
-	  </para>
-	</example>
-    </sect2>
-
-    <sect2 id="encryption-keygen">
-      <title>Making Encryption Keys</title>
-      <para>
-        Before you can get or send encrypted mail, you need to
-	generate your public and private keys with GPG. Here's how:
-      </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>
-        <orderedlist numeration="arabic">
-	  <listitem>
-      	   <para>
-            Open a terminal and type <command>gpg --gen-key</command>.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para> 
-             Choose the default algorythm, "DSA and ElGamal."
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-            Choose a key length. The default, 1024 bits, should be
-            long enough.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Decide if you want your key to expire automatically, and if so, when.
-	  </para>
-         </listitem>
-
-
-	  <listitem>
-      	   <para>
-            Enter your name, email address, and any additional
-            personal information you think is appropriate. Do not
-            falsify this information, because it will be needed to
-            verify your identity later on.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Next, enter your passphrase. It does not have to be the
-             same as your email password or your login password. In
-             fact, it probably shouldn't. Don't forget it. If you lose
-             it, your keys will be useless and you will be unable to
-             decrypt messages sent to you with those keys.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Now, GPG will generate your keys.  This may take awhile,
-             so feel free to do something else while it's
-             happening. In fact, using your computer for something
-             else actually helps to generate better keys, because it
-             increases the randomness in the key generation seeds.
-	  </para>
-         </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	Once the keys are generated, you can view your key information
-        by typing <command>gpg --list-keys</command>.  You should see
-        something similar to this:
-        <programlisting>
-	    /home/you/.gnupg/pubring.gpg
-	    ----------------------------
-	    pub 1024D/32j38dk2 2001-06-20 you &lt;you@your-address.com&gt;
-	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	</programlisting>
-      </para>
-      <para>
-         GPG will create one list, or keyring, for your public keys
-         and one for your private keys. All the public keys you know
-         are stored in the file
-         <filename>~/.gnupg/pubring.gpg</filename>. If you want to
-         give other people your key, send them that file.
-      </para>
-      <para>
-          If you wish, you can upload your keys to a keyserver. Here's
-          how:
-        <orderedlist>
-	  <listitem>
-	    <para>
-              Check your public key ID with <command>gpg
---list-keys</command>. It will be the string after 1024D on the line
-beginning with "pub." In this example, it's 32j38dk2.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	     Enter the command <command>gpg --send-keys --keyserver
-wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
-32j38dk2. You will need your password to do this.
-             </para>
-           </listitem>
-    </orderedlist>
-
-	<note id="why-keyserver">
-	  <title>Why Use a Keyserver?</title>
-	  <para>
-	    Keyservers store your public keys for you so that your
-	    friends can decrypt your messages.  If you choose not to
-	    use a keyserver, you can manually send your people public
-	    key, include it in your signature file, or put it on your
-	    own web page. However, it's easier to publish them once,
-	    and then let people download them from the keyserver when
-	    they want.
-	  </para>
-	</note>
-
-      </para>
-    </sect2>
-
-    <sect2 id="encrypt-getting-key">
-      <title>Getting and Using Public Keys</title>
-      <para>
-	To encrypt a message to your someone else you'll need to use
-	their public key in combination with your private key.
-	<application>Evolution</application> does that for you, but
-	you still need to get their key and add it to your keyring.
-     </para>
-     <para>
-        To get public keys from a public key server, enter the
-        command:
-	<command>
-	  gpg --recv-keys --keyserver wwwkeys.pgp.net keyid
-	</command>, substituting "keyid" for your recipient's ID.  You
-	will need to type in your password, and then their ID will
-	automatically be added to your keyring. When you send mail to
-	them, <application>Evolution</application> will allow you to
-	encrypt your messages.
-      </para>
-      <para>
-        If someone sends you their public key directly, save it as a
-        plain text file and enter the command <command>gpg
-        filename</command>. This will add it to your keyring.
-      </para>
-    </sect2>
-
-    <sect2 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 with which you'd like to send
-	and recieve encrypted mail, and click the
-	<guibutton>Edit</guibutton> button.  In the
-	<guilabel>Security</guilabel> tab is a section labeled
-	<guilabel>Pretty Good Privacy</guilabel>.  Enter your key ID
-	and click <guibutton>OK</guibutton>.  Your key is now
-	integrated into your identity in
-	<application>Evolution</application>.
-      </para>
-    </sect2>
-
-    <sect2 id="encrypt-sending">
-      <title>Sending Encrypted Messages</title>
-      <para>
-	As you know, you can use encryption to hide the entire
-	message, or just to verify your signature. Once you've
-	generated your public and private keys, and have the public
-	keys of the people to whom you want to send mail, here's what
-	to do:
-      </para>
-    </sect2>
-    
-    <sect2 id="sign-msg">
-      <title>Signing a Message</title>
-      <para>
-	To sign a message, choose:
-	<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.
-	  Just choose the menu item
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-      <sect2 id="unencrypting">
-	<title>Unencrypting a Recieved Message</title>
-	<para>
-	  If you get an encrypted message, you will need to decrypt it
-	  before you read it. Remember, the sender has to have your
-	  public key before they can send you an encrypted message.
-	</para>
-	<para>
-	  When you view the message,
-	  <application>Evolution</application> will ask you for your
-	  PGP password.  Enter it, and the message will be displayed
-	  properly.  
-       </para>
-    </sect2>
-  </sect1>
-</chapter>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
deleted file mode 100644
index fe8f3458eb..0000000000
--- a/doc/C/usage-mainwindow.sgml
+++ /dev/null
@@ -1,768 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mainwindow">
-
-  <title>The Evolution Workspace</title>
-  <sect1 id="usage-mainwindow-starting">
-    <title>The First Time you Start Evolution</title>
-    <para>
-      Start <application>Evolution</application> by selecting
-      <guimenuitem>Evolution</guimenuitem> from your
-      <guimenu>Programs</guimenu> menu, or by typing
-      <command>evolution</command> at the command line.  The first
-      time you run the program, it will create a directory called
-      <filename>evolution</filename> in your home directory, where it
-      will keep all your <application>Evolution</application>-related
-      files. Then, it will offer to help you set up mail accounts and
-      import data from other applications.
-    </para>
-    <para>
-      The first screen welcomes you to the assistant.  It is estimated that
-      configuring your mail will take 2 to 5 minutes and importing mail will
-      take 1 to 2 minutes.
-    </para>
-
-    <sect2 id="first-step">
-      <title>Step 1 of 4</title>
-      <para>
-	The Identity window is the first of four steps in the
-	assistant.  The identity step will ask you to enter your basic
-	personal information.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Full Name &mdash; Your full name (Example: John Doe).
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Email Address &mdash; Your email address (Example: john@doe.com)
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Organization &mdash; The company where you work (optional).
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Signature file &mdash; 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
-	      <filename>.signature</filename> file in your home
-	      directory.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="second-step">
-      <title>Step 2 of 4</title>
-      <para>
-	The <guilabel>Recieving Email</guilabel> step lets you configure
-	receving email people have sent you.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Server Type &mdash; There are numerous types of servers which
-	      <application>Evolution</application> can download your email from:
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    POP &mdash; Downloads your email to your hard disk for
-		    permanent storage.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    IMAPv4 &mdash; Keeps the email on your server so you can
-		    access your email from any computer that supports IMAPv4 and
-		    have everything be the same.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Unix mbox spool-format file &mdash; Bad description, we're
-		    getting a better definition shortly.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Standard Unix mailbox file &mdash; Bad description, we're
-		    getting a better definition shortly.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Qmail maildir format files &mdash; If you download your
-		    mail using qmail, you'll want to use this.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    None &mdash; How do you  have None?  figure out!
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Email Server &mdash; 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
-	      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>Evolution</application> check
-	      by clicking <guibutton>Check for supported types</guibutton>.
-	    </para>
-	    <para>
-	      Remember Password &mdash; If you prefer to not enter your
-	      password everytime you check email, press this button.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-    <sect2 id="third-step">
-      <title>Step 3 or 4</title>
-      <para>
-	The <guilabel>Sending Email</guilabel> step lets you configure sending 
-	email.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Server Type &mdash; There are numerous server types that
-	      <application>Evolution</application> supports for sending your
-	      mail.
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    SMTP &mdash; Downloads mail into your mailbox file.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Sendmail &mdash; Uses another program to download your mail
-		    to your mailbox files.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Host &mdash; If you chose SMTP, enter the server's name
-	      or IP address here.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Server requires authentication &mdash; 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
-	      <guilabel>Password</guilabel>.  If you're not sure, ask
-	      your system administrator or ISP, or have
-	      <application>Evolution</application> check for you by
-	      clicking <guibutton>Check for supported
-	      types</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Username &mdash; 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
-	      your password every time you check email, press this
-	      button.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-  <sect2 id="fourth-step">
-      <title>Step 4 of 4</title>
-      <para>
-	Chances are, <application>Evolution</application> isn't your first email
-	program.  You're probably switching from another program and will want
-	access to your email from your old program.  It's for exactly these 
-	situations that <application>Evolution</application> includes an import 
-	feature.
-      </para>
-      <para>
-	<application>Evolution</application> can import the following types of
-	files:
-          <variablelist>
-           <varlistentry>
-	    <term>VCard (.vcf, gcrd)</term>
-	    <listitem>
-	      <para>
-	         The most common addressbook format.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Outlook Express 4 (.mbx)</term>
-	    <listitem>
-	      <para>
-                 Email file format used by Outlook Express 4.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>MBox (mbox)</term>
-	    <listitem>
-	      <para>
-	       The email box format used by Netscape, Evolution,
-	       Eudora, and many other email clients.
-  	     </para>
-	    </listitem>
-	  </varlistentry>
-       </variablelist>
-</para>
-<para>
-    <note>
-      <title>Outlook 2000</title>
-      <para>
-	Outlook 2000 uses a proprietary format that
-	<application>Evolution</application> cannot import directly.
-	To import files from Outlook 2000, you will need to boot to
-	Windows, import the files into Mozilla mail, then reboot and
-	import from Mozilla.  Please see the <xref linkend="evolution-faq">FAQ for more
-	information.
-      </para>
-    </note>     
-
-
-      Ask your system administrator if you aren't sure which you use.
-    </para>
-
-      <tip>
-	<title>Exporting Files From Evolution</title>
-	<para>
-          Evolution uses standard file types for all its information,
-          so you should have no trouble taking your information
-          elsewhere if you want.
-        </para>
-	<para>
-          For mail, that's <filename>mbox</filename>, for calendar,
-          <filename>iCal</filename>, and for the address book, vCards
-          in a <filename>.db3</filename> database.
-        </para>
-      </tip>
-    </sect2>
-  </sect1>
-
-  <sect1 id="ui-intro">
-    <title>What's What in Evolution</title>
-    <para>
-        Now that you've gotten the first-run configuration out of the
-        way, you're ready to get down to work.  Here's a quick
-        explanation of what's going on in your main
-        <application>Evolution</application> window.
-    </para>
-
-    <figure id="preface-basic-interface">
-      <title>The Evolution Main Window</title>
-      <screenshot>
-	<screeninfo>Inbox</screeninfo>
-	<graphic fileref="figures/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-      </screenshot>
-    </figure>
-    
-    <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-      <guilabel>Menubar</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Menubar</guilabel> gives you access to nearly all the
-      features that can be found in <application>Evolution</application>.
-    </para>
-
-    <para>
-      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
-      <guilabel>Toolbar</guilabel>
-    </para>
-
-    <para>
-      The <guilabel>Toolbar</guilabel> gives you fast and easy access to the
-      most used features in each component.
-    </para>
-    
-    <para>
-      <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
-      <guilabel>Shortcut Bar</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
-      components with the click of a click of a button.  
-    </para>
-    
-    <para>
-      <inlinegraphic fileref="figures/full-4" format="png"></inlinegraphic>
-      <guilabel>Status Bar</guilabel>
-    </para>
-    
-    <para>
-      Periodically, <application>Evolution</application> will need to quietly
-      display a message, or tell you the progress of a task.  This most
-      often happens when you're checking or sending email.  These progress
-      queues are shown here, in the <guilabel>Status Bar</guilabel>.  
-    </para>
-    
-    <para>
-      <inlinegraphic fileref="figures/full-5" format="png"></inlinegraphic>
-      <guilabel>Search Bar</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Search Bar</guilabel> lets you search through your email
-      with precision so you can easily find what you're looking for.
-    </para>
-
-
-  <sect2 id="usage-mainwindow-shortcutbar">
-    <title>The Shortcut Bar</title>
-    <para>
-        <application>Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       Take a look at the <guilabel>Shortcut Bar</guilabel>
-       The shortcut buttons in that category are:
-
-	    <variablelist>
-	      <varlistentry>
-		<term> <guibutton>My Evolution</guibutton></term>
-		<listitem>
-	    <para>
-		    Start your day here.  <guilabel>My Evolution</guilabel>
-		    gives you a quick summary of new or important messages,
-		    daily appointments and urgent tasks.  You can customize
-		    its appearance and content, and use it to access
-		    Evolution services.
-		  </para>
-		</listitem>
-	      </varlistentry>
-
-	<varlistentry>
-	  <term> <guibutton>Inbox</guibutton></term>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Inbox</guibutton> button to start
-	      reading your mail.  Your Inbox is also where you can
-	      access Evolution's tools to filter, sort, organize, and
-	      search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and To do lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-       <varlistentry>
-         <term><guibutton>Tasks</guibutton></term>
-	<listitem>
-	  <para>
-	     A full-size view of your calendar's task pad.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-	  
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="usage-mainwindow-folderbar">
-    <title>Folders and The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>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
-      downwards. On most computers, there will be three or four
-      folders at the base.  First is the <guilabel>Local</guilabel>
-      folder, which holds all the <application>Evolution</application>
-      data that's stored on your computer.  After that are
-      <guilabel>Other Contacts</guilabel>, <glossterm
-      linkend="ldap">LDAP</glossterm> contact directories stored on a
-      network, followed by any <glossterm
-      linkend="imap">IMAP</glossterm> mail folders you may have
-      available to you over your network.  Lastly, there are
-      <guilabel>Virtual Folders</guilabel>, discussed in <xref
-      linkend="usage-mail-organize-vfolders">,
-    </para>
-    <para>
-       
-      A typical <guilabel>Local</guilabel> folder contains the following folders:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>My Evolution</guilabel>, a quick summary to help you do
-	     your tasks.
-           </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-         <listitem>
-	    <para>
-	    <guilabel>Drafts</guilabel>, for messages you started and didn't finish.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail. 
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Outbox</guilabel>, for messages you have written
-	    but not yet sent.  This will be empty unless you use
-	    <application>Evolution</application> while offline.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Sent</guilabel>, for sent mail.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, a virtual folder view of all
-	    the messages you have marked for deletion but not yet
-	    <glossterm linkend="expunge">expunged</glossterm>. Note that 
-	    once you have expunged a message, it
-	    is permanently deleted.
-	   </para>
-	 </listitem>
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navigating without the Folder 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.
-       </para>
-     </tip>
-
-    <para>
-       If you get any serious amount of mail, you'll want more folders
-       than just your Inbox.  
-	To create a new folder:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice> <guimenu>File</guimenu>
-		<guisubmenu>New</guisubmenu>
-		<guimenuitem>Folder</guimenuitem></menuchoice>
-	      <keycombo action="simul">
-		<keycap>Shift</keycap>
-		<keycap>Ctrl</keycap>
-		<keycap>E</keycap>
-	      </keycombo>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the name of the folder in the <guilabel>Folder
-		Name</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder type.  The available options are.
-
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    Calendar
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Contacts
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Mail
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Mail Storage
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    My Evolution
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Tasks
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    vTrash
-		  </para>
-		</listitem>
-	      </itemizedlist>
-
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder for the new folder to go in.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    
-    <sect3 id="subfolders">
-    <title>Subfolders</title>
-      <para>
-        <application>Evolution</application> can also manage subfolders,
-	subfolders are folders inside of folders.  This works well if
-	you want to try to separate your home folders from your work
-	folders, or if you like to keep very organized.
-      </para>
-
-    
-
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-              Calendars must go in calendar folders, mail in mail
-	      folders, and contacts in contact folders.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>View</guimenuitem>, to view the folder. </para></listitem>
-	<listitem><para><guimenuitem>Open in New Window</guimenuitem>, to see it in a new Evolution window. </para></listitem>
-	<listitem><para><guimenuitem>Move</guimenuitem>, to move the folder to another location. </para></listitem>
-	<listitem><para><guimenuitem>Copy</guimenuitem>, to duplicate the folder. </para></listitem>
-	<listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder and all its contents. </para></listitem>
-	<listitem><para><guimenuitem>Rename</guimenuitem>, to change its name. </para></listitem>
-	<listitem><para><guimenuitem>Create New Folder</guimenuitem>, to create another folder in the same location. </para></listitem>
-	<listitem><para><guimenuitem>Add to Shortcut Bar</guimenuitem>, to add the folder to your shortcut bar. </para></listitem>
-	<listitem><para><guimenuitem>Properties</guimenuitem>, to view or change the folder properties. </para></listitem>
-
-      </itemizedlist>
-    </para>
-
-    <para>
-      You can also rearrange folders and messages by dragging and
-      dropping them.
-    </para>
-
-    
-
-<!--
-    <tip>
-     <title>Context-Sensitive Help</title>
-      <para>
-	GNOME 2.0 offers context-sensitive help, which means you can
-	almost always get help on an item by right-clicking it.  If
-	you're not sure what something is, or don't know what you can
-	do with it, choosing <guimenuitem>Help</guimenuitem> from the
-	right-click menu is a good way to find out.
-      </para>
-    </tip>
--->
-
-	<para>
-	  Any time new information arrives in a mail folder, that folder label
-	  is displayed in bold text, along with the number of new messages in
-	  that folder inside of paranthesis.
-	</para>
-      </sect3>
-    </sect2>
-    
-    <sect2 id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  That means that, depending on the context, menu bar items
-      will change.  If you're looking at your Inbox, most of the menu
-      items will relate to mail; some will relate to other components
-      of <application>Evolution</application> and some, especially
-      those in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. 
-   </para>
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu></term>
-
-          <listitem><para> 
-            Anything even related to a file or to the operations
-            of the application generally  falls under this
-            menu: creating things, saving them to disk, 
-            printing them, and quitting the program itself.  
-
-            </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu></term>
-          <listitem><para>
-              The <guimenu>Edit</guimenu> menu holds
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu></term>
-          <listitem><para>
-            This menu lets you decide how <application>Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <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
-	    the <guimenu>Actions</guimenu> menu.
-          </para></listitem>
-        </varlistentry>
-
-
-       <varlistentry>
-          <term> <guimenu>Tools</guimenu></term>
-          <listitem><para>
-             Tools for configuring, changing, and
-          setting up preferences go here.  For mail, that means things like
-          <guimenuitem>Mail Configuration</guimenuitem> and the
-          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu></term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with <guilabel>My Evolution</guilabel>, the summary of
-      everything that's going on.
-    </para>
-    </sect2>
-  </sect1>
- 
-</chapter>
-
diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml
deleted file mode 100644
index 1ff2283128..0000000000
--- a/doc/C/usage-notes.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<chapter id="usage-notes">
-  <title>Evolution Notes</title>
-  <abstract>
-    <title> An Overview of the Evolution Notes</title>
-    <para>
-      In the dark ages before email was invented, there were little
-      scraps of people which people used for short-term information
-      storage.  These scraps of paper were called notes.  Now, notes
-      are an almost necessary part of our lives, albeit in electronic
-      form.  It only makes sense, then, that
-      <application>Evolution</application> will eventually have a
-      Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
-     <itemizedlist>
-       <listitem>
-         <para>
-           Take down phone numbers, take school notes, take phone
-	   messages, or even write poetry.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Color code notes to organize them, or just to
-           make them look good.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Turn a note into an email or a text file.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Write <glossterm>Haiku</glossterm>
-         </para>
-       </listitem>
-     </itemizedlist>
-   </para>
-   <para>
-     You can start writing notes by clicking
-     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
-     it's not there yet. But when it is, it'll take you to the
-     notepad.
-   </para>
-  </abstract>
-</chapter>
-
-
-
diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml
deleted file mode 100644
index 747b6838d0..0000000000
--- a/doc/C/usage-print.sgml
+++ /dev/null
@@ -1,103 +0,0 @@
-<chapter id="usage-print">
-<title>Printing with Evolution</title>
-<para>
-  Like most GNOME applications, <application>Evolution</application> uses
-  the gnome-print system, so if you've used any other GNOME
-  application to print, you should be able to print from
-  <application>Evolution</application> immediately.
-</para>
-<para>
-  Whether you're printing a message, a calendar page, or a selection
-  of address cards, you can choose to print directly to a printer, or
-  save the print output to a postscript file.  You can also use the
-  preview feature to see how your printed output will look.
-</para>
-
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guibutton>Print Preview</guibutton> appears both as a button in
-      the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that shows you what would happen if
-      you were to print the current message, calendar, appointment, or
-      address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (the <guibutton>Fit</guibutton> button)
-      or match the width of the page and the window (the
-      <guibutton>Fit Width</guibutton> button).  None of these buttons
-      changes the way the page will be printed, but they do let you
-      get a better look.  If you're satisfied with the way the things
-      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.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest">, lets you choose the format for
-       printing&mdash; <guilabel>Generic
-       Postscript</guilabel>, whether to write to a PDF file,  and whether to print
-       to a file or to an actual printer in Generic Postscript.  If you choose a printer,
-       you'll be asked for the printer command (probably
-       <guilabel>lpr</guilabel>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
diff --git a/doc/C/usage-sync.sgml b/doc/C/usage-sync.sgml
deleted file mode 100644
index 83fef7f6df..0000000000
--- a/doc/C/usage-sync.sgml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-    <chapter id="usage-sync">
-      <title>Synchronizing Evolution with Hand-Held Devices</title>
-      <para>
-        This chapter covers is how to synchronize data 
-        installed and configured.  If you need information on how to
-        set up a synchronization system, consult <xref
-        linkend="config-sync">.
-      </para>
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device on its cradle and press the
-          HotSync button.
-        </para>
-        <para>
-	 If your environment is correctly configured to sync with your
-	 PDA, then it should sync with <application>Evolution</application>.
-        </para>
-       </sect1>
-    </chapter>