Accidentally copied over the Makefile.am and added all these files to the wrong directory. Cleaning up after my foolish mistake.

svn path=/trunk/; revision=15738

17 files changed, 2 insertions, 5565 deletions

diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index b9092f9fd4..40c4c87e1c 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -1,53 +1,3 @@
-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	\
-	figures/schedule.png			\
-	figures/exchange-identity.png		\
-	figures/exchange-receive.png		\
-	figures/exchange-receive-options.png
+SUBDIRS = C no
 
-
-docname = evolution
-lang = C
-omffile = evolution-C.omf
-sgml_ents =	\
-	apx-authors.sgml	\
-	apx-bugs.sgml		\
-	apx-gloss.sgml		\
-	config-prefs.sgml	\
-	config-sync.sgml	\
-	evolution-faq.sgml	\
-	menuref.sgml		\
-	preface.sgml		\
-	usage-calendar.sgml	\
-	usage-contact.sgml	\
-	usage-exec-summary.sgml	\
-	usage-mail-org.sgml	\
-	usage-mail.sgml		\
-	usage-exchange.sgml	\
-	usage-mainwindow.sgml	\
-	usage-print.sgml	\
-	usage-sync.sgml
-include $(top_srcdir)/help/sgmldocs.make
-dist-hook: app-dist-hook
+EXTRA_DIST = sgmldocs.make
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
deleted file mode 100644
index 9a0e3d2f42..0000000000
--- a/help/C/apx-authors.sgml
+++ /dev/null
@@ -1,71 +0,0 @@
-  <appendix id="authors">
-    <title>Authors</title>
-     <para>
-      <application>Evolution</application> was written by the Ximian
-      Evolution team and numerous other dedicated GNOME programmers.
-      You can see their names by selecting <menuchoice>
-      <guimenu>Help</guimenu> <guimenuitem>About</guimenuitem>
-      </menuchoice> from any Evolution window.
-     </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>
-     Ximian would like to thank Miles Lane for his contributions in
-     quality assurance, and the staff of the El Pelon Taqueria, on
-     Peterborough St. in Boston, for sustenance.
-    </para>
-
-   <para>
-      For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.ximian.com/products/ximian_evolution/"
-      type="http">Web page</ulink>.  Please send all comments,
-      suggestions, and bug reports to the <ulink
-      url="http://bugzilla.ximian.com" type="http">Ximian bug tracking
-      database</ulink>. Instructions for submitting bug reports can be
-      found on-line at the same location. You can also use the GNOME
-      bug report tool, <command>bug-buddy,</command> to submit your
-      defect reports.
-    </para>
-    <para>
-      This manual was written by Aaron Weber
-      (<email>aaron@ximian.com</email>), Kevin Breit
-      (<email>mrproper@ximian.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 file comments and suggestions for this manual as bugs in
-      the Ximian bug tracking system. If you contributed to this
-      project but do not see your name here, please contact Aaron
-      Weber (<email>aaron@ximian.com</email>) and he'll list you.
-    </para>
-      <para>
-       Partial list of Translators: 
-         <itemizedlist>
-            <listitem><para>
-              Daniel Persson for .se
-            </para></listitem>
-          
-            <listitem><para>
-              Hector Garcia Alvarez for .es
-            </para></listitem>
-
-            <listitem><para>
-	    Kjartan Maraas for .no
-            </para></listitem>
-           </itemizedlist>
-
-         </para>          
-    </appendix>
-
-
-
-
-
diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
deleted file mode 100644
index 7de959dda8..0000000000
--- a/help/C/apx-bugs.sgml
+++ /dev/null
@@ -1,39 +0,0 @@
- <appendix id="bugs">
-   
-  <title>Known bugs and limitations</title>
-  <abstract>
-    <para>
-      Ximian Evolution bug tracking is done at the <ulink
-							  url="http://bugzilla.ximian.com">Ximian bug tracking
-	System</ulink>.  You may use that, or the GNOME <application>Bug
-	Report Tool</application> (known as <command>bug-buddy</command>
-      at the command line) if you find bugs or would like to request new
-      features.
-    </para>
-    <para>
-      If you need additional help with Ximian Evolution, please visit
-      the Ximian support site at <ulink
-					url="http://support.ximian.com">ximian.com/support</ulink>.
-    </para>
-  </abstract>
-  
-  <para>
-    A number of often-requested features will not make it into
-    Ximian Evolution 1.0, but we plan to include them for version
-    1.1.  Some of them are:
-    <simplelist>
-      <member>Direct import of Microsoft Outlook contact cards</member>
-      <member>Synchronization of email with handheld devices</member>
-      <member>S/MIME support</member>
-      <member>Read foreign mail folders without importing them</member>
-      <member>Import of WINMAIL.DAT attachments</member>
-      <member>Playing a sound to indicate new mail arriving</member>
-    </simplelist>
-  </para>
-  <para>
-     A more complete list of feature requests and other issues with
-    Evolution is available online in the Ximian bug tracking system.
-  </para>
-  
-</appendix>
-
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
deleted file mode 100644
index 380f9e38be..0000000000
--- a/help/C/apx-gloss.sgml
+++ /dev/null
@@ -1,470 +0,0 @@
-<glossary id="apx-gloss">
-  
-  <title>Glossary</title>
-  
-  <glossentry id="assistant">
-    <glossterm>Assistant:</glossterm>
-    <glossdef>
-      <para>
-	See druid
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <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-fetching 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 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="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 <filename>/</filename>.
-     The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the root
-     account, or root's home directory, normally
-     <filename>/root</filename>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter:</glossterm>
-  <glossdef>
-   <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically when it's downloaded.  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="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.
-    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.  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>.
-   </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="public-key-encryption">
-  <glossterm>Public Key Encryption:</glossterm>
-  <glossdef>
-   <para>
-     A strong encryption method that uses a set of two "keys," one of
-     which is made public, and one of which is kept private. Data
-     encrypted using the public key can only be decrypted using the
-     private key.  The longer the keys, the more difficult it is to
-     break the encryption.
-   </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[au]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 by opening a command
-      line and typing in <command>man grep</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.  Often
-    times,  accomplish repetitive and tedious tasks, to save the
-    user time.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="search-base">
-    <glossterm>Search Base:</glossterm>
-    <glossdef>
-      <para>
-	LDAP can break contact lists into many groups.  The Search
-	Base tells LDAP the top group to use.  How much of the Search
-	Base that is searched is set by the <glossterm
-	linkend="search-scope">Search Scope</glossterm> option.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="search-scope">
-    <glossterm>Search Scope:</glossterm>
-    <glossdef>
-      <para>
-	Search Scope states how much of the <glossterm
-	linkend="search-base">Search Base</glossterm> to search.
-      </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, similar to 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="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 program which inserts itself into other files or programs and
-    which, when executed, spreads to 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. vFolder contents are
-    are updated dynamically.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
deleted file mode 100644
index e9f9ff4c4f..0000000000
--- a/help/C/config-prefs.sgml
+++ /dev/null
@@ -1,946 +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 appears.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Composer</guilabel></term>
-	    <listitem>
-	      <para>
-		Customizes the behavior of the email message composer.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Other</guilabel></term>
-	    <listitem>
-	      <para>
-		Configures miscellanious aspects of
-		<application>Evolution</application> such as character
-		set and encryption tools.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Account Editor Window</title>
-	<screenshot>
-	  <screeninfo>Account Editor Window</screeninfo>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-    <sect2 id="config-prefs-mail-identity">
-      <title>Working with the Accounts Tab</title> 
-      <para>
-         <application>Ximian Evolution</application> allows you to
-         maintain multiple accounts, or identities.  This is useful
-         want to keep personal and professional email separate, or if
-         you wear several hats at work. When you are writing an email
-         message, you can which account to use by selecting from the
-         drop-down list next to the <guilabel>From</guilabel> entry in
-         the message composer.
-       </para>
-
-       <para>
-         Clicking <guibutton>Get Mail</guibutton> will refresh any
-         IMAP, <filename>mh</filename>, or
-         <filename>mbox</filename> 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.  If
-         you don't want to check mail for a given account, select it
-         in the <guilabel>Accounts</guilabel> tab and click the
-         <guibutton>Disable</guibutton> button.
-       </para>
-       
-      <para>
-         To add a new account, simply click <guibutton>Add</guibutton>
-         to open the mail configuration assistant. To alter an
-         existing identity, select it in the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton> to open the account editor
-         dialog.
-      </para>
-     <para>
-         The account editor dialog has six sections:
-          <variablelist>
-
-	  <varlistentry> 
-	    <term>Identity:</term>
-           <listitem>
-	    <para>
-              Here, enter the name,
-              email address, and other identifying information for the
-              account.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Receiving Mail</term>
-           <listitem>
-	    <para>
-             Here, select the way you will be getting mail: you may
-             download mail from a server (<glossterm
-             linkend="pop">POP</glossterm>), read and keep it on the
-             server (Microsoft Exchange or <glossterm
-             linkend="imap">IMAP</glossterm>), or read it from files
-             that already exist on your desktop computer.  If you use
-             a server, it may permit or require you to use a Secure
-             Socket Layer (SSL) connection.  To turn SSL connections
-             on, just click the <guibutton>Use Secure Connection
-             (SSL)</guibutton> button.
-
-<note id="config-arbitrary-port">
-<title>Specifying Port Numbers</title>
-<para>
-Your system administrator may ask you to connect to a specific port on
-a mail server. To specify which port you use, just type a colon and
-the port number after the server name. For example, to connect to port
-143 on the server smtp.omniport.com, you would enter
-as
-<userinput>
-smtp.omniport.com:143
-</userinput> as the server name.
-</para>
-</note>
-
-	  </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Receiving Options</term>
-           <listitem>
-	    <para>
-              Here, decide whether you'd like to check for mail
-              automatically and how often. 
-
-              <variablelist>
-                <varlistentry>
-                   <term>If you chose POP:</term>
-                   <listitem>
-                     <para>
-                   <itemizedlist>
-			  <listitem>
-			    <para>Checking for new mail: If you would
-	                     like <application>Evolution</application>
-	                     to check for new mail automatically,
-	                     check the box and select a frequency in
-	                     minutes.
-                           </para>
-			  </listitem>
-
-			  <listitem>
-			    <para>
-                             Message Storage: If you'd like to store
-	                      copies of your mail on the server, check
-	                      this option.
-                           </para>
-			  </listitem>
-			</itemizedlist>
-                      </para>
-		    </listitem>
-                  </varlistentry> 
-
-                <varlistentry>
-                   <term>If you chose Microsoft Exchange:</term>
-                   <listitem>
-                     <para>
-
-	    <itemizedlist> <listitem>
-		<para>Checking for new mail: If you would like
-		<application>Evolution</application> to check for new mail
-		automatically, check the box and select a frequency in
-		minutes.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>Exchange Server: If your active directory user name
-		is different from your Exchange mail user name, check this
-		box and enter your mail username here.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>Create a Global Address List folder: If you would
-		like to have a seperate folder for the Active Directory's
-		Global Address List, leave this box checked. </para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-		  Active Directory Server Name: In most organizations,
-    		  the Active Directory server will be different from
-    		  the Exchange mail server.  If so, check the box and
-    		  enter the Active Directory server name here.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>Limit number of Responses: Select a maximum number
-		of results for an address search. A maximum number of
-		results limits the load on your system and on your network.
-		  </para>
-	      </listitem>
-	    </itemizedlist>                       
-                     </para>
-                   </listitem>
-                  </varlistentry> 
-
-                <varlistentry>
-                   <term>If you chose IMAP:</term>
-                   <listitem>
-                     <para>
-                      
-         <itemizedlist>
-	  <listitem>
-	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.  
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>If you want <application>Evolution</application>
-	    to check for new messages in <emphasis>all</emphasis> your
-	    IMAP folders, make sure the <guilabel>Check for new
-	    messages in all folders</guilabel> box is selected.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Show only subscribed folders: Check this box if you
-	    have more folders in your IMAP view than you want to
-	    read.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-              Override server-supplied namespace: If you like, enter a
-              specific directory where your server stores mail for
-              you.  Typical values are "mail" and "Mail."  For more
-              information about how to use IMAP mail, see <xref
-              linkend="usage-mail-subscriptions">.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Apply filters to new messages in INBOX on this
-	    server: If you'd like your filters to work on this account
-	    as well as on locally downloaded mail, check this box.</para>
-	  </listitem>
-	</itemizedlist>
-                     </para>
-                   </listitem>
-                  </varlistentry> 
-
-             
-                  </variablelist>  
-     </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Sending Mail</term>
-           <listitem>
-	    <para>
-              In this section, you will choose and configure a method
-              for sending mail.  You may choose <glossterm
-              linkend="smtp">SMTP</glossterm>, Microsoft Exchange (if
-              you have purchased the Ximian Connector for Microsoft
-              Exchange) or <glossterm
-              linkend="sendmail">sendmail</glossterm>.
-             </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Special Folders</term>
-           <listitem>
-	    <para>
-              Here, you can decide where this account will store the
-              messages that it has sent, and the messages that you
-              save as drafts.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Security</term>
-           <listitem>
-	    <para>
-              In this section, you will set the security options for
-              this account. Enter your PGP Key ID and decide how
-              frequently to encrypt and sign your messages. You can
-              learn more about PGP and encryption in <xref
-              linkend="encryption">.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-display">
-      <title>Mail Display Options</title>
-      <para>
-        In this tab you can decide how you would like
-        <application>Ximian Evolution</application> to display your
-        mail: how to display citations, how long to wait before
-        marking a message as read, and so forth.
-      </para>
-     <para>
-        This is also where you can decide how you would like
-        <application>Ximian Evolution</application> to handle inline
-        images in HTML mail that you get. There is a detailed
-        discussion of the issues surrounding these options in <xref
-        linkend="usage-mail-getnsend-get-attach-html">.
-     </para>
-     <para>
-       To hange the font which <application>Ximian
-        Evolution</application> uses to display mail, do the
-        following:
-       <orderedlist numeration="arabic">
-	  <listitem>
-            <para>
-              Open the Control Center by selecting <menuchoice>
-		<guimenu>System</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> from
-		the menu panel.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               Select the HTML Viewer settings tool.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>Choose the font and font size you would like to use.
-            </para>
-	  </listitem>
-	</orderedlist>
-
-       Alternately, open a terminal and run the
-       <command>gtkhtml-properties-capplet</command> command. This
-       will open the GNOME HTML Display Properties tool, and you can
-       select a font and other attributes of your HTML display,
-       including that in <application>Ximian Evolution</application>.
-     </para>
-     </sect2>
-
-    <sect2 id="config-prefs-mail-composer">
-      <title>Message Composer Preferences</title>
-      
-      <para>
-        Mercifully, there are only four preferences you can prefer in
-        the message composer preferences dialog:
-         <variablelist>
-	  <varlistentry>
-	    <term>Send mail in HTML format by default </term>
-	    <listitem>
-	      <para>
-                 If you would like all email messages that you compose
-                 to begin in HTML format, leave this box checked. You
-                 can convert messages between HTML and plain text by
-                 selecting the <menuchoice> <guimenu>Format</guimenu>
-                 <guimenuitem>HTML</guimenuitem> </menuchoice> toggle
-                 in the message composer.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Default Forward style</term>
-	    <listitem>
-	      <para>
-                  Select from: 
-                  <simplelist>
-                   <member><guilabel>Attachment:</guilabel> the
-                  message you forward appended to the message you send
-                  as a seperate file.</member>
-
-                  <member> <guilabel>Inline:</guilabel> The message
-                  you forward is included at the end of the message
-                  you send.</member>
-
-		  <member> 
-                     <guilabel>Quoted:</guilabel> The message
-                     you forward is included at the end of the message
-                     you send, and a greater-than symbol (&gt;) is
-                     inserted at the beginning of each line to
-                     indicate that it is quoted.
-                   </member>
-		</simplelist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Prompt when sending messages with an empty subject</term>
-	    <listitem>
-	      <para>
-                 The composer will warn you if you try to send a
-                 message without a subject.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Prompt when sending messages with only Bcc recipients defined</term>
-	    <listitem>
-	      <para>
-                 The composer will warn you if you try to send a
-                 message that has only <guilabel>Bcc</guilabel>
-                 recipients. This is important because some mail
-                 servers will fail to honor blind carbon copy if you
-                 do not have at least one recipient that is visible to
-                 all readers.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </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 configuration options that
-          didn't fit anywhere else.
-          <variablelist>
-
-	  <varlistentry>
-	    <term> 
-	      <guilabel>PGP binary path</guilabel>
-	    </term>
-	    <listitem>
-	      <para>
-                The complete path to your external encryption tool On
-                most Linux systems, this will be
-                <filename>/usr/bin/gpg</filename>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term> 
-	      <guilabel>Remember PGP Passphrase until Exit</guilabel>
-	    </term>
-	    <listitem>
-	      <para> Check this box if you want <application>Ximian
-                Evolution</application> to remember your PGP
-                passphrase for as long as it is running.  You will
-                still have to enter your passphrase again each time
-                you start <application>Ximian Evolution</application>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>
-	      <guilabel>Default Character Encoding</guilabel>
-	    </term>
-	    <listitem> <para> Choose a default character encoding for
-	      your messages.
-	      </para>
-              </listitem>
-             </varlistentry>
-
-	  <varlistentry>
-	    <term>
-	      <guilabel>Empty Trash Folders on Exit</guilabel>
-	    </term>
-	    <listitem> <para> If you would like to expunge all deleted
-	      mail when you quit <application>Ximian
-	      Evolution</application>, check this box.
-	      </para>
-              </listitem>
-             </varlistentry>
-
-	  <varlistentry>
-	    <term>
-	      <guilabel>Log filter actions to:</guilabel>
-	    </term>
-	    <listitem> <para> If you like, you can have
-	      <application>Ximian Evolution</application> write all
-	      its message filter actions to a log file. Select a log
-	      file here.
-	      </para>
-              </listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-
-<!-- NOT FOR 1.0, see usage-mail.sgml
-      <sect1 id="config-prefs-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>
--->
-
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuring the Calendar</title>
-       <para>
-          To set your calendar preferences, select
-          <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar
-          Settings</guimenuitem></menuchoice> from the Calendar
-          view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>General</guilabel>, <guilabel>Display</guilabel>, <guilabel>Task List</guilabel>, and <guilabel>Other</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>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-general">
-      <title>Calendar's General Settings</title>
-      <para>
-        The <guilabel>Time display</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time zone</term>
-	    <listitem>
-	      <para>
-		The city you're located in, to judge your time zone.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <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>Work Week</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>
-	  <varlistentry>
-	    <term>First day of the week</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Start of day</term>
-	    <listitem>
-	      <para>
-		Says what time of the day your weekday starts.  This will show all times till the end of the day, regardless of there is an appointment during the time period.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>End of day</term>
-	    <listitem>
-	      <para>
-		Sets the time the day ends at.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-display">
-      <title>Display</title>
-      <para>
-	The <interface>Display</interface> section lets you configure some visual properties of the calendar.
-      </para>
-      <para>The display properties you can set are:
-
-	<variablelist>
-	  <varlistentry>
-	    <term>Time divisions</term>
-	    <listitem>
-              <para>
-		Sets the increments shown on the daily view in the calendar.  You can set this to be:
-		<itemizedlist>
-		  <listitem>
-		    <para>
-		      5 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      10 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      15 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      30 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      60 minutes
-		    </para>
-		  </listitem>
-		</itemizedlist>
-              </para>
-            </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Show appointment end times in week and month views</term>
-	    <listitem>
-	      <para>
-		If there is space, <application>Evolution</application> will show the end times in the week and month views for each appointment.
-              </para>
-            </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Compress weekends in month view</term>
-	    <listitem>
-	      <para>
-		If checked, your weekends will be shown in one box, instead of one for each day in the month view.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Show week numbers in date navigator</term>
-	    <listitem>
-              <para>
-		This will show the week numbers next to the respective weeks in the calendar.
-	      </para>
-            </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-tasklist">
-      <title>Task List Settings</title>
-     <para>
-       You can choose what information the To Do list displays and the
-       way it is displayed.
-       <variablelist>
-	 <varlistentry>
-	   <term>Tasks due today</term>
-	    <listitem>
-	      <para>
-		Configures what color to set your tasks that are due today to.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Overdue tasks</term>
-	    <listitem>
-	      <para>
-		Configures what color to set your overdue items to.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-other">
-      <title>Other Calendar Settings</title>
-      <para> 
-	This configures miscellaneous items for the calendar and todo
-      list's functionality.
-	<variablelist>
-	  <varlistentry>
-	    <term>Ask for confirmation when deleting items</term>
-	    <listitem>
-	      <para>
-		When you delete an item in either the Task List or the
-		Calendar, you will be prompted to confirm that you
-		want to delete the item.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Create new appointments with a default reminder</term>
-	    <listitem>
-	      <para>
-		All your appointments will be created using a default
-		reminder enabled.  You can still change what way you
-		are reminded though.  If enabled, you can then set the
-		time before your appointment to be reminded.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-   </sect1>
-
-  <sect1 id="config-prefs-contact">
-    <title>Managing the Addressbook</title>
-    <para>
-      The addressbook does not have a large list of configuration
-      settings, but those that are there can be found in the
-      <guimenu>Tools</guimenu> menu.
-    </para>
-      
-    <sect2 id="config-prefs-contact-ldap-add">
-      <title>Adding Directory Servers</title>
-      <para>
-	To add a new <glossterm linkend="ldap">LDAP</glossterm> server
-	to your available contact folders:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Addressbook Sources</guimenuitem>
-	      </menuchoice>
-	      from the menu.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button on the right
-	      side.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the server information:
-	      <variablelist>
-		<varlistentry>
-		  <term>Account name</term>
-		  <listitem>
-		    <para>
-		      The name that you see on the screen.  This could
-		      be anything you wish.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Server name</term>
-		  <listitem>
-		    <para>
-		      Address of the server where the addressbook is located.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>My server requires authentication</term>
-		  <listitem>
-		    <para>
-		      Select this if the server requires
-		      <application>Evolution</application> to provide
-		      a server in order to access the LDAP contacts.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Port</term>
-		  <listitem>
-		    <para>
-		      The internet port
-		      <application>Evolution</application> connects to
-		      in order to access the LDAP database.  This is
-		      normally 389.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term><glossterm linkend="search-base">Search base</glossterm></term>
-		  <listitem>
-		    <para>
-		      The base entry to use for all your searches.
-		      Contact your administrator for information about
-		      the correct settings.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term><glossterm linkend="search-scope">Search
-		  scope</glossterm></term>
-		  <listitem>
-		    <para>
-		      How broad the search is in the directory.  The
-		      following options are available:
-		      <variablelist>
-			<varlistentry>
-			  <term>Base</term>
-			  <listitem>
-			    <para>
-			      Searches just the Search Base.  Most of the time,
-			      not very useful.
-			    </para>
-			  </listitem>
-			</varlistentry>
-			<varlistentry>
-			  <term>One</term>
-			  <listitem>
-			    <para>
-			      Searches the Search Base and one entry
-			      below it.
-			    </para>
-			  </listitem>
-			</varlistentry>
-			<varlistentry>
-			  <term>Sub</term>
-			  <listitem>
-			    <para>
-			      Searches the Search Base and all entries
-			      below it.
-			    </para>
-			  </listitem>
-			</varlistentry>
-		      </variablelist>
-		    </para>
-		  </listitem>
-		</varlistentry>
-	      </variablelist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton> to permanenty make
-	      changes or <guibutton>Apply</guibutton> to temporarily
-	      set the changes.
-	    </para>
-	  </listitem>
-	</orderedlist>
-
-	<example id="ldap-config-example">
-	  <title>LDAP Configuration</title>
-	  <para>
-	    Rich works at a large chip manufacturer.  He needs to
-	    access the company's LDAP server.  Their LDAP address is
-	    wemakechips.com.
-	  </para>
-	  <itemizedlist>
-	    <listitem>
-	      <para>
-		His Account Name would be: We Make Chips Employees
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		His Server Name would be: ldap.wemakechips.com
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		He will need to talk to the adminstrator's at the
-		company to learn about the search scope or the search base.
-	      </para>
-	    </listitem>
-	  </itemizedlist>
-	</example>
-      </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/help/C/config-sync.sgml b/help/C/config-sync.sgml
deleted file mode 100644
index 5ce42c3467..0000000000
--- a/help/C/config-sync.sgml
+++ /dev/null
@@ -1,133 +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>Ximian 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> by selecting
-       <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>,
-       and make sure that <application>Pilot Link</application> is
-       properly configured.
-    </para>
-    <para>
-        Once your computer and your Palm-OS device are talking happily
-        to each other, select the <glossterm
-        linkend="conduit">conduits</glossterm> you want under the
-        <guilabel>Pilot Conduits</guilabel> section of the Control
-        Center.  You may use conduits to synchronize data with several
-        applications; the <application>Ximian Evolution</application>
-        conduits are labelled <guilabel>EAddress</guilabel>, for the
-        contacts in your addressbook, <guilabel>ECalendar</guilabel>,
-        for your calendar, and <guilabel>ETodo</guilabel>, for your
-        task list.
-    </para>
-   <para>
-      To enable a conduit, click the
-        <guibutton>Enable</guibutton> to enable it, and click
-        <guibutton>Settings</guibutton> to change what it will do when
-        activated.  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 the behavior you want for each conduit you choose to use.
-      If you're not sure, go ahead and stick with
-      <guilabel>Synchronize</guilabel>.  Then, put your handheld on
-      its cradle and press the HotSync 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 the <filename>evolution</filename>
-	    directory inside your home directory.
-          </para>
-	</tip>
-       </para>
-
-    </chapter>
-
-
-
-
diff --git a/help/C/evolution-faq.sgml b/help/C/evolution-faq.sgml
deleted file mode 100644
index 8e658ff308..0000000000
--- a/help/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/help/C/evolution.sgml b/help/C/evolution.sgml
deleted file mode 100644
index 8cc6534a1d..0000000000
--- a/help/C/evolution.sgml
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.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-EXCHANGE SYSTEM "usage-exchange.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 MENUREF SYSTEM "menuref.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.  -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Ximian 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>2000-2002</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 1.0 of the Ximian Evolution manual. It describes
-      version 1.0 of the Ximian Evolution groupware suite.
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Getting Started with Ximian Evolution</title>
-     <partintro>
-      <para>
-        Part one of the <application>Ximian Evolution</application> manual
-        describes how to use <application>Ximian 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-EXCHANGE;
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Ximian Evolution</title>
-    <partintro>
-      <para>
-        <application>Ximian 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>Ximian
-        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>
-
-  &MENUREF;
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-
-</book>
\ No newline at end of file
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
deleted file mode 100644
index 340a408847..0000000000
--- a/help/C/menuref.sgml
+++ /dev/null
@@ -1,421 +0,0 @@
-<!--
-<!DOCTYPE Appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<appendix id="menuref">
-  <title>Quick Reference</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>Ximian Evolution</application>.
-   </para>
-
-
-<note id="shortcuts">
-<title>Custom Keyboard Shortcuts</title>
-<para>
-  If you have set custom keyboard shortcuts for your desktop, (you can
-   do this the control center: select
-   <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
-   from your menu panel), they may interfere with Evolution keyboard
-   shortcuts.
-</para>
-<para>
-   For example, if you have chosen Emacs-style key bindings for your
-   desktop-wide text editor, the shortcut
-   <keycombo action="simul">
-    <keycap>Ctrl</keycap>
-    <keycap>W</keycap>
-  </keycombo>
-  will act as "Cut region" rather than as "Close Window" in the
-  message composer.
-</para>
-</note>
-
-
-
-
-  <sect1 id="quickref-open">
-      <title>Opening or Creating Anything</title>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term>New Item:</term>
-	    <listitem>
-	      <para>
-                Press <keycombo action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> to open a new item
-		  for whatever part of <application>Ximian
-		  Evolution</application> you're working on. In mail,
-		  that means you'll create a new message. If you're
-		  looking at your addressbook, <keycombo
-		  action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> creates a new contact
-		  card, and in the calendar, a new appointment.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Create a new folder:</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>E</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>       
-                  Double-click in any blank space in the contact
-                  manager to create a new address card.  You can also
-                  use 
-                 <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>
-    </sect1> 
-    <sect1 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>Send and Receive Mail:</term>
-	    <listitem>
-	      <para>
-                Press <keycap>F9</keycap>, click the
-                <guibutton>Send/Receive</guibutton> button in the
-                toolbar, or choose
-                <menuchoice><guimenu>Actions</guimenu> 
-                 <guimenuitem>Send/Receive</guimenuitem></menuchoice>.
-                </para>
-	    </listitem>
-	  </varlistentry>
-        <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 messages.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Move the display up and down in the preview pane:</term>
-	    <listitem>
-	      <para>
-                Press the space bar to go a page down.  Press
-                <keycap>Backspace</keycap> to go a page up.
-                </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
-                <guimenuitem>Create Rule From
-                Message</guimenuitem>. You can also create filters and
-                virtual folders in the <guimenu>Tools</guimenu> menu.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-
-          <varlistentry>
-	    <term>Add Sender to Address Book:</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select <guimenuitem>Add
-                Sender to Address Book</guimenuitem>.  You can also
-                right-click on any email address to add it to your
-                address book.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-
-
-      </para>
-    </sect1>
-    <sect1 id="quickref-cal">
-      <title>Calendar</title>
-      <para>
-        <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new Appointment:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Task:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-		<tip id="new-appt">
-		  <title>New Appointments Fast</title>
-		  <para>
-		    Click on any blank spot in the calendar and start
-		    typing to create a new appointment entry.
-		  </para>
-		</tip>
-	      </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-  </sect1>
-    <sect1 id="quickref-contact">
-        <title>Addressbook</title>
-        <para>
-	Here are shortcuts for the most frequent addressbook actions:
-        <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>Creating a New Contact:</term>
-	    <listitem>
-	      <para>
-                  Double-click in any blank space in the contact
-                  manager to create a new address card.  You can also
-                  use <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>
-	</variablelist>
-      </para>
-  </sect1>
-</appendix>
\ No newline at end of file
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
deleted file mode 100644
index 9637beaf4c..0000000000
--- a/help/C/preface.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-  <preface id="introduction">
-    <title>About this Book</title> 
-      <sect1 id="organization">
-        <title>Organization</title>
-      <para>
-        This book is divided into two parts, with several
-        appendices. The first part is a <link linkend="usage">guided
-        tour</link>, which will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
-        general, this section is for you. The second section, covering
-        <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>
-      </sect1>
-
-      <sect1 id="typography">
-        <title>Typographical conventions</title>
-	<para>
-          In this book, we'll mark some words with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> you type at the command line</member>
-	    <member><guilabel>Labels</guilabel> for buttons and other portions of the graphical interface</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>
-</para>
-<para>
-We'll provide assorted bits of additional information in tips set off from the rest of the book, as well. 
-
-	  <tip id="example-tip">
-	      <title>Tip</title>
-	      <para>
-		Tips and bits of extra information will look like
-		this.
-	      </para>
-	    </tip>
-</para>
-
-<para>
-Examples are also set off from the rest of the text.  They look like this:
-
-	  <example>
-	    <title>Example Example</title>
-	    <para>
-	      This is what an example looks like.  We'll provide
-	      examples for some of the more complicated tasks you
-	      might be performing.
-	    </para>
-	  </example>
-</para>
-<para>
-Lastly, we'll have warnings, in cases where you should be careful:
-
-	    <warning id="example-warning">
-	      <title>Example Warning</title>
-	      <para>
-		This is what a warning looks like. If there's a chance
-		you'll run into trouble, we'll warn you beforehand.
-	      </para>
-	  </warning>
-        </para>
-    </sect1>
-</preface>
-
diff --git a/help/C/topic.dat b/help/C/topic.dat
deleted file mode 100644
index 57369e0e39..0000000000
--- a/help/C/topic.dat
+++ /dev/null
@@ -1,11 +0,0 @@
-index.html   Table of Contents
-introduction.html What is Evolution?
-usage-mainwindow.html Getting Started
-usage-summary.html The Evolution Summary
-usage-mail.html Getting and Sending Email
-usage-contact.html Using the Contact Manager
-usage-calendar.html Managing Your Schedule
-usage-exchange.html Connecting to Exchange Servers
-config-prefs.html Configuring Evolution
-menuref.html Quick Reference
-apx-gloss.html Glossary
\ No newline at end of file
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
deleted file mode 100644
index 05f5e8e3d8..0000000000
--- a/help/C/usage-calendar.sgml
+++ /dev/null
@@ -1,710 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>Managing your Schedule</title>
-
-     <para>
-      This chapter will show you how to use the Ximian Evolution
-      Calendar to manage your schedule alone or in conjunction with
-      peers.
-     </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:
-       <itemizedlist>
-	<listitem>
-	  <para>
-	    Day
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Work Week
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Week
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Month
-	  </para>
-	</listitem>
-      </itemizedlist>
-</para>
-<para>
-      Press the calendar-shaped buttons on the right side of the toolbar to
-      switch between views. 
-</para>
-<para>
-      You can also select an arbitrary range of days in the small
-      calendar at the upper right.  To do this, click and drag on the
-      days that you wish to view in your calendar.
-    </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 or
-       month, you'll move around by just that much.
-       To come back to today's listing, click the
-        <guibutton>Today</guibutton> button in the toolbar.
-    </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>
-
-  </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
-      appointments, set alarms, and determine appointment
-      recurrence. If you have installed the Ximian Connector for
-      Microsoft Exchange, you can also read <xref
-      linkend="full-advantage"> to learn about how to take full
-      advantage of the collaborative group scheduling functions
-      available on the Microsoft Exchange Server.
-    </para>
-
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating appointments</title>
-      <para>
-	To create a new appointment, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New Appointment</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the 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 appointment 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 appointment list, in the grey header under the date, rather than inside
-        it.  That makes it easy to have appointments that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day appointment, and the meetings at the conference would be timed
-        appointments.  Of course, appointments 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>
-      <para>
-	<application>Evolution</application> supports the use of
-	timezones.  If you share calendar files with friends or
-	co-workers, it is quite possible you will need to configure
-	your timezone.  To configure your timezone:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Calendar Settings</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Globe</guibutton> button in the
-	      <guilabel>Time</guilabel> section, located in the
-	      <guilabel>General</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Each red dot represents a major city.  Click a dot and click <guibutton>OK</guibutton> to select your time zone.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	You can also configure timezone information specific to the
-	Start and End time in each appointment.  To do that, simply
-	create a new appointment and click on a globe to customize the
-	timezone that the time exists in. For example, if you live in
-	New York but have a telephone meeting set for noon with
-	someone in California, you need to make sure that you're not
-	calling each other a few hours off.  Setting time-zones on a
-	per-appointment basis helps avoid that potential confusion.
-      </para>
-      <note>
-       <title>Multiple Simultanious Appointments</title>
-         <para>
-           If you create calendar appointments 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
-         <guilabel>Alarms</guilabel>, any time prior to the appointment
-         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 appointment.
-              </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>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Classification</guilabel> 
-         only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public appointment can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> an even 
-         higher level.
-      </para>
-      <para>
-	<application>Evolution</application> can handle not only time
-	that you're busy, but free time. This can be useful if you're
-	on a network sharing calendar files.  You can easily compare
-	schedules with other people, allowing easy setup of a RSVP.
-      </para>
-      <para>
-	To set your appointment to be free or busy, simply click the
-	box in the <guilabel>Show Time As</guilabel> section in the
-	<guilabel>Appointment Editor</guilabel>.
-      </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 Appointment 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 appointment, simply click the check box. 
-      </para>
-      <para>
-	Once you've selected your categories, click <guibutton>OK</guibutton> to
-	assign these categories to the appointment.  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 appointments ranging from once every day up to once
-        every 100 years.  You can then choose a time and date when the
-        appointment will stop recurring, and, under
-        <guilabel>Exceptions</guilabel>, pick individual days when the
-        appointment 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 to save and close the appointment editor window. 
-	If you want, you can alter an appointment
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the appointment then
-	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
-      </para>
-    </sect2>
-    <sect2 id="usage-calendar-rsvp">
-      <title>Sending an RSVP with the Calendar</title>
-      <para>
-	<application>Evolution</application> can be used to schedule
-	group meetings and help you manage responses to meeting
-	requests.
-      </para>
-      <para>
-	When you create a meeting or group appointment, you can
-	specify the attendees in several categories, such as "chair"
-	or "required."  When you save the appointment listing, each
-	attendee will be sent an email with the appointment
-	information and gives them the option to respond.
-      </para>
-
-      <note id="meeting-announce">
-       <title>Simple Announcements</title>
-        <para>
-           If you don't need to collect attendance information when
-           you're scheduling an event, and would rather just announce
-           it, select
-           <menuchoice><guimenu>Actions</guimenu><guimenuitem>Forward
-           as iCalendar</guimenuitem></menuchoice>.  That will open a
-           new email message with the event notification attached as
-           an announcement.  Recipients will be able to add the event
-           to their calendars with one click, but won't automatically
-           send you email about whether they'll attend.
-        </para>
-     </note>
-
-      <para>
-	To schedule a meeting:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Actions</guimenu> <guimenuitem>Schedule
-		Meeting</guimenuitem> </menuchoice>.  The
-		<guilabel>Scheduling</guilabel> and
-		<guilabel>Meeting</guilabel> tabs open.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      If you have multiple Evolution identities, choose the
-	      one you'll use by selecting an item in the
-	      <guilabel>Sent By</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the space labelled <guilabel>Click here to add an
-	      attendee</guilabel> to enter the names and email
-	      addresses of people you will invite, or click the
-	      <guibutton>Invite Others</guibutton> to select them from
-	      your addressbook.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Save the Appointment.
-	    </para>
-	  </listitem>
-	</orderedlist>
-	An email is now sent out to all the recipients, inviting them to your event.
-      </para>
-    </sect2>
-    <sect2 id="replying-to-rsvp">
-      <title>Replying to a Meeting Request</title>
-      <para>
-	Meeting requests are sent as iCal attachments.  To view or
-	respond to one, click on the attachment icon and view it
-	inline in the mail window.  All the details are shown about
-	the event including time and dates.  Then you can choose how
-	to reply to the RSVP.  Your choices are:
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Accept
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Tentatively Accept
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Decline
-	    </para>
-	  </listitem>
-	</itemizedlist>
-	Click <guibutton>OK</guibutton> and an email will be sent to
-	the organizer with your answer.  The event will also be added
-	to your calendar if you accept.
-      </para>
-    </sect2>
-
-    <sect2 id="recieving-rsvp-response">
-      <title>Getting Responses to Meeting Requests</title>
-      <para>
-	Once you get a reply to your meeting invitation, you'll need
-	to view it inline in the email.  Click the attachment and
-	select <guibutton>View Inline</guibutton>.  At the bottom, you
-	can click <guibutton>OK</guibutton> to update your attendee
-	list.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	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 appointment</interface> window.  Then
-	describe the appointment as you would any other. When you are
-	ready to send the invitation <guibutton>OK</guibutton>
-	<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 appointment on your calendar and on
-	theirs as tentative, rather than a confirmed, appointment.
-      </para>
-      <para>
-	To mark a tentative appointment as confirmed, click once on the
-	appointment in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Appointment
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Appointment Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	appointment.
-      </para>
-      <para>
-        When your meeting attendees get the email inviting them to the
-        meeting, they'll be able to enter the information into their
-        calendars and let you know if they'll be able to attend; if
-        they use <application>Ximian Evolution</application> or
-        another iCal compliant mail client, they can do this with just
-        one click. When you get a response from them, it will include
-        an iCal attachment. Opening and accepting this attachment will
-        change the meeting data in your calendar to indicate that they
-        have responded to your invitation, and whether they will be in
-        attendance.
-     </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 ############ -->
-    <sect2 id="usage-calendar-freebusy">
-      <title>The Free/Busy View</title>
-      <para>
-	<application>Evolution</application> has a Free/Busy window so
-	that you can view people's schedules together to help you
-	schedule appointments. Read <xref linkend="full-advantage"> to
-	learn about how to use this feature with the Ximian Connector
-	for Microsoft Exchange.
-      </para>
-      <para>
-	To access the free/busy view:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open or create an appointment in the
-	      <guilabel>Calendar</guilabel> window.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Schedule Meeting</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Open the <guilabel>Scheduling</guilabel> tab.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <figure>
-        <title>Appointment Scheduing Window</title>
-	<screenshot>
-	  <screeninfo>Appointment Scheduling Window</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="png" fileref="figures/freebusy"
-	  srccredit="Kevin Breit">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <para>
-	<inlinemediaobject>
-	  <imageobject>
-	    <imagedata fileref="figures/full-1" format="png">
-	  </imageobject>
-	</inlinemediaobject>
-	<guilabel>Invitee List</guilabel>
-      </para>
-      <para>
-	The <guilabel>Invitee List</guilabel> lists off the people who
-	have been invited to the respective appointment.  It also
-	shows their RSVP status.
-      </para>
-      <para>
-	<inlinemediaobject>
-	  <imageobject>
-	    <imagedata fileref="figures/full-2" format="png">
-	  </imageobject>
-	</inlinemediaobject>
-	<guilabel>Schedule Grid</guilabel>
-      </para>
-      <para>
-	The <guilabel>Schedule Grid</guilabel> shows the invitee's
-	published Free/Busy information.  This is where you compare
-	people's schedules to find free time to schedule the
-	appointment.
-      </para>
-      <para>
-	<inlinemediaobject>
-	  <imageobject>
-	    <imagedata fileref="figures/full-3" format="png">
-	  </imageobject>
-	</inlinemediaobject>
-	<guilabel>Meeting Scheduler</guilabel>
-      </para>
-      <para>
-	The <guilabel>Meeting Scheduler</guilabel> allows you to
-	schedule the meeting in the <guilabel>Free/Busy</guilabel> window.
-      </para>
-      <sect3 id="usage-calendar-freebusy-scheduling">
-	<title>Scheduling an Appointment</title>
-	<para>
-	  To schedule an appointment, you'll first need people's
-	  free/busy information.  If you're using the Ximian Connector
-	  for Microsoft Exchange, all of the information is already
-	  available to you in the Global Address List. Otherwise, each
-	  person will have to email you their schedule files and you
-	  will have to incorporate them into your calendar.
-        </para>
-        <para>
-          Regardless of how you get the information, Ximian Evolution
-          will display it in the <guilabel>Scheduling</guilabel> tab.
-          The pending appointment time will appear in white with bold
-          black borders.  Each attendee's free and busy times appear
-          color-coded next to their names in the attendee list.
-	</para>
-        <para>
-          Adjust the meeting time, either by dragging the meeting
-          borders or by using the <guilabel>Autopick</guilabel>
-          buttons to choose a time automatically, then click
-          <guibutton>Save and Close</guibutton>.  Attendees on an
-          Exchange server will have the appointment updated
-          automatically; others will receive email notification of any
-          change in plans.
-        </para>
-      </sect3>
-    </sect2>
-  </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 appointments.  You can use the list
-       in a larger window 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 in the toolbar.  <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>Start Date:</guilabel></term>
-	  <listitem>
-	    <para>
-	      The date you intend to start working.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Description:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here. For example, you can note that a task is
-              in progress, and display how close it is to completion.
-            </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Classification:</guilabel></term>
-	  <listitem>
-	    <para>
-	      Sets who will see it if your calendar is shared.
-	    </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      There are more options in the <guilabel>Details</guilabel> tab such as priority and progress settings.
-    </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 right click on it and select <guibutton>Open</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-    <para>
-      The list of tasks is sorted in a similar way to the list of
-      email messages in <application>Ximian Evolution
-      Mail</application>.  Click once on the message headers to change
-      the direction and type of sorting, or right-click to add or
-      remove columns from the display.
-    </para>
-    <sect2 id="task-folders">
-      <title>Folders for Your Tasks</title>
-      <para>
-	Like any other component in
-	<application>Evolution</application>, you can create a folder
-	to help organize your tasks.  To do this:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open the <guilabel>Folders Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Tasks</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Right click on <guibutton>Tasks</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <menuchoice><guimenuitem>Create New Folder</guimenuitem></menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the folder name.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </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>
-        Lucy, the office manager for a small company, has one calendar
-        for her own schedule. She maintains one for the conference
-        room, to schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Cubs are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Folder</guimenuitem>
-      </menuchoice>.
-       You'll need to tell the <guilabel>New Folder</guilabel> dialog that the new folder should be of the calendar type.  You can place the calendar in any calendar folder and access it
-       from the folder view.
-    </para>
-    <para>
-       Each calendar folder can hold only one calendar.
-    </para>
-  </sect1>
-</chapter>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
deleted file mode 100644
index aff3da93fe..0000000000
--- a/help/C/usage-contact.sgml
+++ /dev/null
@@ -1,617 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-contact">
-  <title>Working with Your Contacts</title>
-      <para>
-        This chapter will show you how to use the
-        <application>Evolution</application> addressbook to organize
-        any amount of contact information, share addresses over a
-        network, and several ways to save time with everyday tasks. To
-        learn about configuring the addressbook, see <xref
-        linkend="config-prefs-contact">. You can import contacts from
-        other contact management tools with the Import tool by
-        selecting
-        <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>,
-        or by mailing them to yourself as vCard attachments.
-      </para>
-
-    <para>
-       The toolbar for the addressbook is quite simple.
-       <itemizedlist>
-	<listitem><para>
-	  Click <guibutton>New Contact</guibutton> to create a new card, or double-click 
-	  in a blank space in the contact list. 
-	</para></listitem>
-
-	<listitem><para>
-           Click <guibutton>New List</guibutton> to create a new card, or double-click 
-           in a blank space in the contact list. 
-	</para></listitem>
-
-	<listitem><para> The <guiicon>printer</guiicon> icon sends one
-	    or more of your cards to the printer.  </para></listitem>
-
-        <listitem><para> The <guiicon>stop sign</guiicon> icon 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 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>
-	<mediaobject><imageobject><imagedata
-	fileref="figures/contact-editor" format="png" srccredit="Aaron
-	Weber">
-	</imageobject></mediaobject>
-      </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. As an example,
-		  we'll use the Ximian mascot, <userinput>Rupert
-		  T. Monkey</userinput>.  You'll notice that the
-		  <guilabel>File As</guilabel> field also fills in,
-		  but in reverse: <computeroutput>Monkey,
-		  Rupert</computeroutput>.  You can pick
-		  <computeroutput>Rupert Monkey </computeroutput> from
-		  the drop-down, or type in your own, such as
-		  <userinput> T. Rupert Monkey </userinput>.
-		</para>
-	    <tip>
-	      <title>Filing Suggestion</title>
-	      <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 downward pointing triangle 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.  Entries that have information in them have
-                a check mark next to them.  The 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 Addressbook</title>
-    <para>
-       Organizing your addressbook is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the addressbook does not allow Virtual Folders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category">.
-    </para>
-
-<!-- UNIMPLEMENTED FEATURE
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your addressbook share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </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.  To better integrate with email tools,
-         you can also create lists of contacts that you can send mail
-         to as a single person.
-      </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>
-
-       <!-- 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>
-
-      <sect3 id="usage-contact-organize-group-list">
-	<title>Creating a List of Contacts</title>
-	<para>
-           To create a list of contacts:
-
-         <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-                Open the list creation dialog box by clicking the
-                <guibutton>New List</guibutton> button or selecting
-                 <menuchoice>
-		  <guimenu>
-                     File
-                  </guimenu>
-		  <guisubmenu>
-                      New
-                   </guisubmenu>
-		  <guimenuitem>
-                     Contact List
-                   </guimenuitem>
-		</menuchoice>.
-               </para>
-	    </listitem>
-	    
-	    <listitem>
-	      <para>
-                Enter a name for the list.
-              </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-                Enter names or email addresses of contacts, or just
-	        drag contacts from the main window into the list.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-                 Choose whether you would like to hide the email
-                 addresses when you send a message to the list.
-                 Unless it is a very small list, it is recommended
-                 that you leave the addresses hidden.  This is the
-                 same thing as using the "Bcc:" feature discussed in
-                 <xref linkend="usage-mail-getnsend-send-to-types">.
-              </para>
-	    </listitem>
-	    
-	  </orderedlist>
-        </para>
-	<para>
-           When you are done, click <guibutton>OK</guibutton>. The
-           list will appear as a contact card, which you can use as
-           you would any other. That includes emailing the list to
-           another person, and, of course, sending email to the list.
-        </para>
-	<para>
-           To mail the list, open a new email and type the name you
-           chose for the list. Ximian Evolution will address the
-           message to the entire list when you send it. You can also
-           right-click on the list's address card in the Addressbook
-           and select <guimenuitem>Send Message to List</guimenuitem>.
-        </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>
-      The <glossterm linkend="ldap">LDAP</glossterm> protocol was
-      created to let users share contact information over a network.
-      LDAP allows for users to browse other people's addressbooks, or
-      maintain a shared set of contact information for a company or
-      department.  This feature comes in handy if you are in a group
-      where there are lots of people using the same contacts.  Such an
-      example would be the sales department of a company with their
-      client list.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Rich 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 LDAP 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.  You do this by dragging and dropping
-              your desired contacts into the local contacts list.
-	    </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>
-    <sect2 id="usage-contact-sharing-setup">
-      <title>Configuring Evolution to use LDAP</title>
-      <para>
-	For information about setting up
-	<application>Evolution</application> to use LDAP, please refer
-	to <xref linkend="config-prefs-contact-ldap-add" />
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 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.
-      <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>
-  </sect1>
-  
-<!-- Unimplemented features:
-      <para>
-         You can also use the addressbook to print postal addresses
-	 on mailing labels.  Future versions of
-	 <application>Evolution</application> will allow you to you
-	 export a group of cards to a spreadsheet, database, or word
-	 processor so you can print address labels or prepare large
-	 mailings.
-      </para>
-  <para>
-    Need a map or directions? Click <guibutton>MapIt</guibutton> from
-  within the addressbook, and <application>Evolution</application>
-  will map the address for you online.
-  </para>
-  -->
-</chapter> 
-
-
diff --git a/help/C/usage-exchange.sgml b/help/C/usage-exchange.sgml
deleted file mode 100644
index b87aee9cdc..0000000000
--- a/help/C/usage-exchange.sgml
+++ /dev/null
@@ -1,710 +0,0 @@
- <chapter id="usage-exchange">
-    <title>The Ximian Connector for Microsoft Exchange</title>
-    <para>
-    The Ximian Connector for Microsoft Exchange allows Ximian
-    Evolution clients to access accounts on Microsoft Exchange 2000
-    servers. It is available through Ximian Red Carpet in its own
-    channel, but cannot be used without a license file.  The license
-    file may be purchased from the Ximian online store at <ulink
-    url="http://store.ximian.com">store.ximian.com</ulink>. Unlike the
-    regular Ximian Evolution client, the Ximian Connector for
-    Microsoft Exchange is proprietary software and source code is not
-    available.
-    </para>
-    <para>
-      The Ximian Connector offers a significant price advantage over
-      other Exchange access methods for Linux and UNIX systems:
-    <variablelist>
-
-	<varlistentry>
-	  <term>Dual Computer Installation:</term>
-	  <listitem>
-	    <para>
-             The purchase of a second computer for each client imposes
-             a very heavy expense burden and is exceptionally
-             inconvenient.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Dual Boot or Virtual Machine:</term>
-	<listitem>
-	  <para>
-             Installation of multiple operating systems in a dual boot
-             or virtual machine configuration (such as VMWare) also
-             increases licensing and administration costs.  Users
-             often complain that such a system is inconvenient, slow,
-             and not integrated with the rest of their operating
-             system.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Outlook Web Access:</term>
-	<listitem>
-	  <para>
-            Outlook Web Access is a web interface for Exchange
-            servers, but works best in Microsoft Internet Explorer.
-            Outlook Web Access also is
-            not integrated with the rest of the host operating system
-            and offers only limited groupware functionality.
-          </para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </para>
-  <para>
-   The Ximian Connector offers a low cost, fully integrated, option
-   for Exchange 2000 server access in heterogeneous client
-   networks. This chapter will explain how to install, configure, and
-   use it.
-  </para>
-  <warning id="licensing">
-    <title>Exchange Client Licenses</title>
-    <para>
-      Each user will need a valid Microsoft <application>Exchange</application>2000 server
-      account and license.
-  </para>
-  </warning>
-
-  <sect1 id="features">
-    <title>Connector Features</title>
-    <para>
-      <application>Ximian Connector</application> supports the most
-      often used features of <application>Microsoft
-      Exchange</application>:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    General
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Remote <application>Exchange</application> Information Store</term>
-	      <listitem>
-		<para>
-		  Allows you to access mail, address book (including
-		  Global Address List folder), and calendars, and task
-		  folders on an <application>Exchange
-		  2000</application> server from
-		  <application>Evolution</application>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>Palm synchronization</term>
-	      <listitem>
-		<para>
-		  Supported for Contacts and Calendars on Exchange.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-	<listitem>
-	  <para>
-	    Mail
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Viewing Mail in <application>Exchange</application>Folder</term>
-	      <listitem>
-		<para></para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Sending Email via Exchange Protocols</term>
-	      <listitem>
-		<para>
-		  You may use the Microsoft Exchange mail transport
-		  protocol to send email. Make sure that the address
-		  you have entered as your email address is exactly
-		  the one that the Exchange server has on file. This
-		  may be "yourname@exchange-server.ximian.com" rather
-		  than "yourname@ximian.com.a"
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-	<listitem>
-	  <para>
-	    Calendar
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Meeting Request/Proposal</term>
-	      <listitem>
-		<para>
-		  Allows <application>Evolution</application> users to
-		  schedule meetings and view attendee availability for
-		  other users (<application>Evolution</application> or
-		  <application>Outlook</application> users) on
-		  <application>Exchange</application>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Adding iCalendar Meeting Requests to Calendar</term>
-	      <listitem>
-		<para>
-		  If you receive an iCalendar meeting request and add it
-		  to your calendar, it will be saved to your
-		  <application>Exchange</application> calendar.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-	<listitem>
-	  <para>
-	    Contacts
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Address Completion</term>
-	      <listitem>
-		<para>
-		  Supported for your <application>Exchange</application>
-		  Contacts folder.  Not yet supported for the Global
-		  Address List.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Adding vCards to Address Book</term>
-	      <listitem>
-		<para>
-		  If you receive a vCard attachment and click
-		  <guibutton>Save in Address Book</guibutton>, it will
-		  be saved to your <application>Exchange</application>address book.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>New Address Book entries can be created on
-		<application>Exchange</application> from received email
-		messages with a single click</term>
-	      <listitem>
-		<para>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-</itemizedlist>
-</para>
-
-<para>
-There are, however, some features which are not available:
-<itemizedlist>
-
-	      <listitem>
-		<para>
-		  Access to shared and public folders is not
-		  available, although the Global Address List is
-		  available.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-                Journal and Notes components are not available.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Work Offline (disconnected mode) support is not functional.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-               "Recall Message" function does not work yet.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-               Creation of an automatic "out-of-office" reply messages
-               is not available.
-	      </para>
-	    </listitem>
-
-      </itemizedlist>
-    </para>
-  </sect1>
-  <sect1 id="install">
-    <title>Installing the Connector</title>
-    <para>
-       To install the Ximian Connector, run Ximian Red Carpet by
-       selecting <menuchoice><guimenu>System</guimenu><guimenuitem>Get
-       Software</guimenuitem></menuchoice>.  Subscribe to the Ximian
-       Connector for Microsoft Exchange channel, select the Ximian
-       Connector for Microsoft
-       <application>Exchange</application>2000, and click the
-       <guibutton>Install</guibutton> button.  You can also install
-       the Connector by downloading the individual packages from
-       ftp.ximian.com if you wish.
-   </para>
-   <para>
-       Once you have installed the software, you will also need to
-       install a license file.  The license file is the verification
-       that you have paid for a license to use the Ximian
-       Connector. You can get the license file from the the Ximian
-       online store at <ulink
-       url="http://store.ximian.com">store.ximian.com</ulink>.  You
-       will need a browser with strong (128-bit or greater) encryption
-       to access the store. When you purchase a Ximian Connector
-       license, the store will mail you the license file with
-       instructions for installation. Once installed, the license file
-       unlocks the Ximian Connector functionality and you may connect
-       to an <application>Exchange</application>server.
-    </para>
- </sect1>
-
-  <sect1 id="configure">
-    <title>Configuration</title>
-    <para>
-      Once you have installed the Connector, you need to set up access
-      for your <application>Exchange</application>account on both the
-      <application>Exchange</application>server and within Evolution.
-    </para>
-
-       <sect2 id="config-server">
-       <title>Exchange Server Configuration</title>
-        <para>
-	  Check with your system administrator to ensure that:
-	<itemizedlist>
-	  <listitem>
-	    <para> 
-	      You have a valid account on the <application>Exchange</application>server.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para> You are permitted to access the account with
-	      WebDAV. This is the default setting for the
-	      <application>Exchange</application>server, so unless
-	      your system administrator has specifically turned it
-	      off, no changes should be necessary.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-	The Ximian website knowledge base, at <ulink type="http"
-	url="http://support.ximian.com">support.ximian.com</ulink>,
-	has additional information about checking to make sure that
-	your <application>Exchange</application>server will accept
-	connections from Ximian Evolution.
-      </para>
-    </sect2>
-    
-    <sect2 id="config-client">
-      <title>Evolution Settings for Connecting to an <application>Exchange</application>Server</title>
-      <para>
-	
-	Once you know that your server is ready for you to connect, start
-	Ximian Evolution and select
-	<menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Mail Settings</guimenuitem>
-	</menuchoice>
-	from any mail view. 
-     </para>
-      <sect3 id="config-exchange-new-account">
-	<title>Creating a New Exchange Account</title>
-	
-
-	<para>
-	  If you would like to create a new account for your Exchange
-	  server, click the <guibutton>Add</guibutton> button in the
-	  accounts list. The account creation assistant will guide you
-	  through the process, which is also described in <xref
-	  linkend="usage-mainwindow-starting">. If you're not sure
-	  about any of the information you need, just ask your system
-	  administrator.
-        </para>
-	<variablelist>
-	  <varlistentry>
-	    <term>Identity</term>
-	  <listitem>
-	      <para>Enter your name and email address. If you wish,
-	      you may add your organization and the location of your
-	      signature file. Only your name and email address are
-	      required.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Receiving Mail</term>
-	  <listitem>
-	      <para>
-                In this step, you'll enter information about the way
-                you check mail:
-                 <orderedlist>
-		  <listitem>
-		    <para>
-                      First, select <guilabel>Microsoft
-                      Exchange</guilabel> as your server type.
-                   </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-                     Enter the name of your Exchange email server, and
-                     the user name you would use to log in to a
-                     Windows workstation in your organization.
-                   </para>
-		  </listitem>
-		    <listitem>
-		    <para>
-                      If you wish, select the box labelled
-                      <guilabel>Use secure connection
-                      (SSL)</guilabel>, to take advantage of a more
-                      secure connection method. This may allow you to
-                      connect to the server from outside your
-                      firewall.
-                   </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-                       If you would like
-                       <application>Evolution</application> to
-                       remember your password, check the box labelled
-                       <guilabel>Remember this password</guilabel>.
-                     </para>
-		  </listitem>
-		</orderedlist>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Receiving Mail, Step Two</term>
-	  <listitem>
-	      <para>There are a few additional options in this step:
-               <orderedlist>
-		  <listitem>
-		    <para>
-                       Checking for New Mail: If you would like to
-                       check for new mail automatically, click the
-                       checkbox and enter an interval in minutes.
-                     </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-                      Exchange Server: If your Exchange mailbox name
-                      is different from your Windows name, enter your
-                      mailbox name here.
-                     </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-                     Active Directory: If you would like to use the
-    			   Global Address List (GAL), check the box
-    			   labelled <guilabel>Create a Global Address
-    			   List folder</guilabel> and enter the name
-    			   of the directory server.  To avoid strain
-    			   on the server, the maximum number of
-    			   responses to any Active Directory query has
-    			   been set to 500. If you would like to
-    			   change that, you may do so here as well.
-                     </para>
-		  </listitem>
-		</orderedlist>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Sending Mail</term>
-	  <listitem>
-	      <para>Select <guilabel>Microsoft Exchange</guilabel> as
-	      your email sending method. There is nothing else to do
-	      in this step.</para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Account Management</term>
-	  <listitem>
-	      <para>Enter a name that you will use to remember this
-	      account.  "Exchange Account" is a good suggestion. Note
-	      that you cannot have two accounts with the same name.
-	      If you'd like to make this your default account for
-	      sending email, check the <guilabel>Make this my default
-	      account</guilabel> box.</para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	<para>
-          You're done.  Click <guibutton>Finish</guibutton> and
-          <guibutton>OK</guibutton>, then quit
-          <application>Evolution</application> and start it again. Now
-          you're ready to get to work on the Exchange server.
-        </para>
-
-	<figure>
-        <title>Creating an Exchange Account, Step One: Identity</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step One: Identity</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="png" fileref="figures/exchange-identity" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-	<figure>
-        <title>Creating an Exchange Account, Step Two: Receiving Mail</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step Two: Receiving Mail</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="png" fileref="figures/exchange-receive" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-	<figure>
-        <title>Creating an Exchange Account, Step Three: Mail Options</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step Three: Mail Options</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="png" fileref="figures/exchange-receive-options" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-
-      </sect3>
-
-      <sect3 id="config-exchange-existing-account">
-	<title>Changing an Existing Account to Work with Exchange</title>
-	  <para>
-	    If you have an existing email account, and want to convert it
-	    to use for Exchange, select the account you want to convert
-	    and click the <guibutton>Edit</guibutton> button. You'll want
-	    to change settings in the following tabs of the account
-	    dialog:
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Identity</term>
-	      <listitem>
-	      <para>
-		 If your email address will change because you are moving
-		 to a new server, then change it in this tab. Otherwise,
-		 move to the next tab.
-	      </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Receiving Mail</term>
-	      <listitem>
-		<para>
-		  Select <guilabel>Microsoft Exchange</guilabel> as your
-		  server type. Enter your name of your server next to
-		  <guilabel>Host</guilabel>, and the user name for your
-		  account next to <guilabel>Username</guilabel>. If your
-		  server supports SSL (Secure Socket Layer) encryption, it
-		  you can check the <guilabel>Use SSL</guilabel> box to
-		  take advantage of more secure data transfers.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Receiving Options</term>
-	      <listitem>
-		  <para>
-		    Here, tab, you'll find some additional settings:
-		    <variablelist>
-		     <varlistentry>
-		      <term>Checking for New Mail</term>
-		       <listitem>
-			 <para>
-			    Select whether you would like to check for
-			    mail automatically, and if so, how often.
-			 </para>
-		       </listitem>
-		    </varlistentry>
-		    <varlistentry>
-		      <term>Exchange Server</term>
-		       <listitem>
-			 <para>
-			   If your Exchange server requires you to use a
-			   different mailbox name from the name you use to
-			   log in, select the second check-box and enter
-			   the mailbox name.  Check with your system
-			   administrator to be sure.
-			 </para>
-		       </listitem>
-		    </varlistentry>
-		    <varlistentry>
-		      <term>Active Directory</term>
-		       <listitem>
-			 <para>
-			   If you would like to use the Global Address
-			   List (GAL) maintained on your Exchange server,
-			   click the tab labelled <guilabel>Receiving
-			   Options</guilabel> and check the box labelled
-			   <guilabel>Create a Global Address List
-			   folder</guilabel>.  The GAL is maintained by
-			   your system administrator and you cannot add,
-			   change, or remove items from it using Ximian
-			   Evolution. However, you can use it to invite
-			   people to meetings and to look up addresses and
-			   other information. In many organizations, the
-			   GAL is stored on a different server from email.
-			   If this is the case, you should also specify
-			   the directory server name here.
-			 </para>
-		       </listitem>
-		    </varlistentry>
-		  </variablelist>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Sending Mail</term>
-	      <listitem>
-		<para>
-		  If you will use your Exchange server to send as well as
-		  receive mail, select <guilabel>Microsoft
-		  Exchange</guilabel> as your server type, and enter the
-		  server name as the <guilabel>Host</guilabel>. 
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	<para>
-
-        Once you have made those changes, click the
-        <guibutton>OK</guibutton> button.
-      </para>
-	<para>
-          Then, quit <application>Evolution</application> and start it
-          up again. Changes to the Ximian Connector accounts
-          configuration are not active until you have restarted the
-          application.
-       </para>
-      </sect3>      
-    </sect2>
-  </sect1>
-  
-  <sect1 id="access">
-    <title>Accessing the <application>Exchange</application>Server</title>
-    <para>
-      Like IMAP and LDAP data, information for
-      <application>Exchange</application>accounts is stored on the
-      server, not on your desktop computer.  This means that you can
-      access it from multiple locations. It also means that your
-      Microsoft <application>Exchange</application>account information
-      is in a seperate folder tree from the <guilabel>Local</guilabel>
-      tree in your folder bar. You'll see it below the local tree,
-      with the name you gave the account. If you have multiple
-      accounts, you will have multiple folder trees.
-    </para>
-    <para>
-      Click on any of the folder tree items to visit them; you may
-      have to enter your server password.  You can now create contact
-      cards, send and receive email as you would normally. If there
-      are items in your local calendar or addressbook that you'd like
-      to add to your <application>Exchange</application>stores, you
-      can copy and paste them over, or just drag items from one folder
-      to another as you would with two local stores.
-    </para>
-
-      <note id="save-to-local-or-exchange">
-	<title>Saving Attached Addresses and Appointments</title>
-	<para>
-          If you are using both an Exchange account and a local mail
-          account, you should be aware that whenever you save an email
-          address or appointment from an email message, it will be
-          saved in your Exchange contacts list or calendar, rather
-          than in your local account. The same is true of
-          synchronization with Palm-OS devices: tasks, appointments,
-          and addresses from your Palm-OS device will be synchronized
-          with those in the Exchange folders rather than local
-          folders.
-       </para>
-      </note>
-
-   <tip id="gal-empty">
-	<title>The Global Address List Is Empty At First</title>
-	<para>
-          To avoid unnecessary strain on the server, the GAL will
-          appear empty until you have searched for something in it.
-          If you want to display all the cards in the list, click in
-          the search box and press <keycap>Enter</keycap>.  This
-          enters a blank search: since every card contains a blank in
-          it, every card will appear.
-        </para>
-      </tip>
-    </sect1>
-    <sect1 id="full-advantage">
-      <title>Taking Full Advantage of the Exchange Server When Scheduling Appointments</title>
-      <para>
-        When you schedule a meeting with your calendar on the
-        <application>Exchange</application>server, you can check when
-        other local Exchange users are busy according to their
-        <application>Exchange</application>calendars. To do so:
-     </para>
-      <figure>
-        <title>Scheduling With Free/Busy Information</title>
-	<screenshot>
-	  <screeninfo>Using the Free/Busy Feature</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="png" fileref="figures/schedule" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-            Open a new appointment in the calendar.
-          </para>
-	</listitem>
-	<listitem>
-	  <para> Choose <menuchoice> <guimenu>Actions</guimenu>
-	      <guimenuitem>Schedule Meeting</guimenuitem>
-	      </menuchoice> in the meeting editor window.
-          </para>
-	</listitem>
-	<listitem>
-	  <para> Add attendees, either by entering their email
-            addresses into the list, or by clicking the
-            <guibutton>Invite Others</guibutton> button. If you choose
-            to so, it's best to use the Global Address List (GAL).
-            Choose the GAL from the drop-down list of address sources
-            at the top of the dialog box.
-         </para>
-	</listitem>
-	<listitem>
-	  <para>
-          Choose <guilabel>Options</guilabel> and then
-          <guilabel>Update Free/Busy</guilabel> to check participant
-          schedules and, if possible, update the meeting in all
-          participants' calendars.
-         </para>
- 	</listitem>
-      </orderedlist>
-      <tip id="autopick">
-	<title>Using Autopick to Adjust Meeting Times</title>
-	<para>
-         If meeting attendees are not available during the times you
-         have scheduled a meeting, you can "nudge" the meeting forward
-         or backward to the nearest available time.  To do so, just
-         click the arrows to the left or right of the
-         <guilabel>Autopick</guilabel> button. The autopick tool will
-         move the meeting to the nearest time during which all
-         attendees are available.  If you aren't satisfied with those
-         results, you can drag the edges of the meeting time to the
-         hours that you want to select.
-      </para>
-      </tip>
-    </sect1>
-</chapter>
-
-
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
deleted file mode 100644
index 1ff2283128..0000000000
--- a/help/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/help/C/usage-print.sgml b/help/C/usage-print.sgml
deleted file mode 100644
index 2ef026e2f1..0000000000
--- a/help/C/usage-print.sgml
+++ /dev/null
@@ -1,115 +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 your paper
-      looks, 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 your mail, calendar, or addressbook.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
-	</imageobject></mediaobject>
-	</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.
-
-	<note id="windows-ps">
-	  <title>Printing to PostScript?</title>
-	  <para>
-           PostScript is the file format used by most laser printers,
-           and in UNIX world is the easiest way to print to a file.
-           However, most systems running Microsoft Windows can't
-           recognize or handle PostScript files.  You'll need to print
-           to PDF if you want to share your file with Windows users.
-	  </para>
-	</note>
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
-	</imageobject></mediaobject>
-	</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/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
deleted file mode 100644
index 5b93a65736..0000000000
--- a/help/C/usage-sync.sgml
+++ /dev/null
@@ -1,39 +0,0 @@
-    <chapter id="usage-sync">
-      <title>Synchronizing Evolution with Hand-Held Devices</title>
-      <para>
-        This chapter is very short.  It describes how to synchronize
-        the data on your Palm-OS device with the data you store in
-        <application>Ximian Evolution</application>.  If you need
-        information on how to set up handheld synchronization, consult
-        <xref linkend="config-sync">.
-      </para>
-
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device in its cradle and press the
-          HotSync button.
-        </para>
-
-<tip id="sync-tip">
-<title>Palm OS v. 4.0 with Passwords</title>
-<para>
-If you use Palm OS v. 4.0 and have password protection turned on for
-your handheld device, you may encounter trouble synchronizing.  If
-this happens, try turning off password protection on your handheld,
-synchronize it with your desktop computer, and then re-enable password
-protection on your handheld.
-</para>
-</tip>
-        <para>
-	 If you have followed the set up instructions properly, your
-	 Palm-OS device will synchronize data with <application>Ximian
-	 Evolution</application>.
-        </para>
-
-         <para>
-            That's it.
-         </para>
-
-       </sect1>
-    </chapter>