Added evolution-faq as an entity.

2001-05-22  Aaron Weber  <aaron@ximian.com>

	* C/evolution.sgml: Added evolution-faq as an entity.

	* C/apx-authors.sgml: Added ettore and duncan to authors for the FAQ.

	* C/evolution-faq.sgml: Put in <qandaset> form, made an entity
	included in evolution.sgml. This will require changes to makefiles
	and will break the current menu item for the FAQ.

svn path=/trunk/; revision=9918

6 files changed, 1196 insertions, 1074 deletions

diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
index 8ba08924b1..694e1158df 100644
--- a/doc/C/apx-authors.sgml
+++ b/doc/C/apx-authors.sgml
@@ -53,8 +53,10 @@ and other dedicated GNOME programmers.
     </para>
     <para>
       This manual was written by Aaron Weber
-      (<email>aaron@ximian.com</email>) and Kevin Breit
-      (<email>battery841@mypad.com</email>) with the help of the
+      (<email>aaron@ximian.com</email>), Kevin Breit
+      (<email>battery841@mypad.com</email>) Duncan Mak
+      (<email>duncan@ximian.com</email>) and Ettore Perazzoli
+      (<email>ettore@ximian.com</email>) with the help of the
       application programmers and the GNOME Documentation Project.
       Please send all comments and suggestions regarding the manual to
       the GNOME Documentation Project at
diff --git a/doc/C/evolution-faq.sgml b/doc/C/evolution-faq.sgml
index 4fdb3940c5..62621ba798 100644
--- a/doc/C/evolution-faq.sgml
+++ b/doc/C/evolution-faq.sgml
@@ -1,123 +1,114 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" []>
-
-  <article id="index">
-    <artheader>
-      <authorgroup>
-	<author>
-	  <firstname>Ettore</firstname>
-	  <surname>Perazzoli</surname>
-	</author>
-	<author>
-	  <firstname>Duncan</firstname>
-	  <surname>Mak</surname>
-	</author>
-      </authorgroup>
-
-      <title>Evolution Frequently Asked questions</title>
-      <abstract>
-	<para>
-	  This is a FAQ list and yadda yadda.
-	</para>
-      </abstract>
-    </artheader>
-
-
+<!--
+<!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.
+	</para>
+   
     <!-- Section: Getting and compiling -->
 
-    <sect1>
+    <sect1 id="get-and-compile">
       <title>
-	Getting and compiling
+	Getting and Compiling Evolution
       </title>
-
-      <!-- -->
-      <sect2>
-	<title>
+    <qandaset>
+      <qandaentry>
+	<question>
+	  <para>
 	  Where can I get the latest Evolution release?
-	</title>
-
-	<para>
-	  There are two main ways to install the latest Evolution
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	  There are two ways to install the latest Evolution
 	  release:
-	</para>
-
 	<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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Are binary snapshots available?
-	</title>
-
+	      <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>
-	  The snapshot builds are logged at <ulink
+	  You can check the status of snapshots at <ulink
 	  url="http://primates.ximian.com/~snapshot">http://primates.ximian.com/~snapshot</ulink>.
 	</para>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Why isn't a new snapshot available today?
-	</title>
-
-	<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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  How do I get Evolution from CVS?
-	</title>
-
-	<para>
-	  If you already have <ulink url="http://cvs.gnome.org">GNOME
-	    CVS</ulink> access, simply checkout the following modules:
-	  evolution, gtkhtml, gal.
-	</para>
-
-	<para>
-	  If you don't have a CVS account, you could 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.
+	</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.
+	  This only needs to be done once. Use this command:
 	</para>
 
 	<programlisting>
@@ -132,21 +123,22 @@ cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome login
 	<programlisting>
 cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co evolution gtkhtml gal
 	</programlisting>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  How should I compile Evolution avoiding conflicts with my
-	  existing GNOME installation?
-	</title>
-
+	</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:
+	  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>
@@ -157,7 +149,7 @@ cd /cvs/evolution
 	<para>
 	  If you install Evolution and the Evolution libraries in a
 	  non-standard prefix, make sure you set the appropriate
-	  environment variables in your shell's startup script:
+	  environment variables in the startup script for Evolution:
 	</para>
 
 	<programlisting>
@@ -168,102 +160,109 @@ export GNOME_PATH=/opt/gnome:/usr
 	<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>.  <!-- FIXME portable? -->
-	</para>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  I get <computeroutput>make: *** No rule to make target
-	  `all-no-@BUILD_INCLUDED_LIBINTL@'</computeroutput>
-	</title>
-
-	<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>
-      </sect2>
-
-    </sect1> <!-- End Section: Getting and compiling -->
-
-    <!-- Section: Troubleshooting -->
-
-    <sect1>
+	  <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 <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>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  I get <computeroutput>Cannot initialize the Evolution
-	  shell</computeroutput>.
-	</title>
-
-	<para>
-	  Check that:
-	</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      <filename>oafd</filename> is listen 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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  I get <computeroutput>Cannot open composer window</computeroutput>.
-	</title>
-
-	<para>
+    <qandaset>
+      <qandaentry>
+	<question>
+	  <para>
+	    I get <computeroutput>Cannot initialize the Evolution
+	    shell</computeroutput>.
+	   </para>
+	</question>
+	<answer>
+	  <para>
+	    Check that:
+	  </para>
+
+	    <itemizedlist>
+	      <listitem>
+		<para>
+		  <filename>oafd</filename> is listen 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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
+	</answer>
+      </qandaentry>
+ 
+     <qandaentry>
+       <question>
+	<para>
 	  I updated my Evolution, but my addressbook contacts are no
 	  longer there, what should I do?
-	</title>
-
+	</para>
+	</question>
+	<answer>
 	<para>
 	  Evolution uses the <filename>libdb</filename> library to
 	  handle the addressbook database.  Two versions of
@@ -348,60 +347,66 @@ db_dump185 ~/evolution/local/Contacts/addressbook.db.backup | db_load ~/evolutio
 	  </listitem>
 
 	</itemizedlist>
-      </sect2>
+	</answer> 
+      </qandaentry>
 
-      <!-- -->
-      <sect2>
-    	<title>
+      <qandaentry>
+	<question>
+	  <para>
 	    Evolution reported an error when trying to retrieve from my
 	    local spool in <filename>/var/spool/mail/username</filename>.  Why?
-    	</title>
-
-        <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>
+    	  </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>
-	  Yes, we know this is a problem.  It will be fixed eventually.
-	</para>
-      </sect2>
+	  <para>
+	    Yes, we know this is a problem.  It will be fixed eventually.
+	  </para>
+	</answer>
+      </qandaentry>
 
-	<!-- -->
-      <sect2>
-	<title>
+      <qandaentry>
+      <question>
+	<para>
 	  Evolution crashes reporting that it couldn't allocate N
 	  billion bytes; how do I fix this?
-	</title>
-
-	<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>
-
+	</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>
+	    So, if this occurs to you, 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>
-	  So, if this occurs to you, 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>
-
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
 	  What is <command>killev</command> and why do I need to use it?
-	</title>
-
+	</para>
+	</question>
+	<answer>
 	<para>
 	  Evolution is actually made up of several components that run
 	  as separate processes.  Evolution's shell is not very good
@@ -417,19 +422,22 @@ chmod 1777 /var/spool/mail
 	  should try to exit the shell cleanly first, so you give a
 	  chance to the other components to clean things up properly.)
 	</para>
-      </sect2>
-
-      <sect2>
-	<title>
-	  What is <command>oaf-slay</command> and why do I need to use it?
-	</title>
+	</answer> 
+      </qandaentry>
 
-	<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.
+      <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>
@@ -446,64 +454,71 @@ chmod 1777 /var/spool/mail
 	  <application>Nautilus</application>. To avoid problems, do
 	  not run <command>oaf-slay</command> while you are in GNOME.
 	</para>
-      </sect2>
-
-    </sect1> <!-- End Section: Troubleshooting -->
-
-
-    <!-- Section: Debugging -->
-
-    <sect1>
-      <title>
-	Debugging
-      </title>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Where should I report bugs for Evolution?
-	</title>
-
-	<para>
-	  You should report bugs about Evolution into 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 before submitting it.
-	</para>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Can I just use Bug-Buddy?
-	</title>
-
-	<para>
-	  No.  The Ximian bug tracker does not yet have an email-based
-	  interface, so Bug Buddy cannot talk to it.  This will be
-	  fixed eventually.
-	</para>
-      </sect2>
+	</answer>
+      </qandaentry>
+    </qandaset>
+    </sect1>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  What is a stack trace (backtrace) and how do I get one?
-	</title>
-
-	<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 always include them in crash
-	  reports.
+    <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 should report bugs about Evolution into 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 before submitting it.
+ 	  </para>
+	</answer> 
+      </qandaentry>
+    
+      <qandaentry>
+	<question>
+	  <para>
+	    Can I just use Bug-Buddy?
+	  </para>
+	</question>
+	<answer>
+	<para>
+	  Not yet.  The Ximian bug tracker does not yet have an
+	  email-based interface, so Bug Buddy cannot talk to it.  This
+	  will be fixed eventually.
+	</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. Once we have <command>bug-buddy</command> working
+	   with our bug database, it will be much easier to do
+	   this. Until then, here's how:
 	</para>
 
 	<para>
@@ -602,247 +617,290 @@ bt
 attach PID
 	</programlisting>
 
-	<para>
-	  Where <userinput>PID</userinput> is the PID of the
-	  component.  Notice that this also works if you attach right
-	  after a crash dialog appears, before hitting "OK" or "Submit
-	  bug report".
-	</para>
-      </sect2>
-
-    </sect1> <!-- End Section: Debugging -->
-
-
-    <!-- Section: Features -->
-
-    <sect1>
-      <title>
-	Features
-      </title>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  How can I remove a folder?
-	</title>
-
-	<para>
-	  Currently there is no command in Evolution to remove a
-	  folder, so you have to remove it by hand.
-	</para>
-
-	<para>
-	  All the folders are stored in
-	  <filename>~/evolution/local</filename>.  Each folder is a
-	  directory containing the data files, as well as a
-	  <filename>subfolders</filename> directory that contains all
-	  its subfolders.  So for example if you have a subfolder of
-	  the <filename>Inbox</filename> called
-	  <filename>Foo</filename>, you can run the following command
-	  to get rid of it (and all it subfolders):
-	</para>
+ 	  <para>
+	    Where <userinput>PID</userinput> is the PID of the
+	    component.  Notice that this also works if you attach
+	    right after a crash dialog appears, before hitting "OK" or
+	    "Submit bug report".
+	  </para>
+	</answer> 
+      </qandaentry>
+    </qandaset>
+  </sect1> 
+  
+  <sect1 id="faq-features">
+    <title>Features</title>
+      <para>
+       Following is a list of questions about the features in
+       <application>Evolution</application>.   
+      </para>
 
-	<programlisting>
+    <qandaset>
+      <qandaentry>
+	<question>
+	  <para>
+	    How can I remove a folder?
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	    Currently there is no command in Evolution to remove a
+	    folder, so you have to remove it by hand.
+	  </para>
+
+	  <para>
+	    All the folders are stored in
+	    <filename>~/evolution/local</filename>.  Each folder is a
+	    directory containing the data files, as well as a
+	    <filename>subfolders</filename> directory that contains
+	    all its subfolders.  So for example if you have a
+	    subfolder of the <filename>Inbox</filename> called
+	    <filename>Foo</filename>, you can run the following
+	    command to get rid of it (and all it subfolders):
+          </para>
+
+	  <programlisting>
 rm -rf ~/evolution/local/Inbox/subfolders/Foo
-	</programlisting>
-
-	<para>
-	  You should do this after exiting Evolution.
-	</para>
-      </sect2>
-
-      <sect2>
-	<title>
-	  Why doesn't drag and drop between folders seem to work?
-	</title>
-
-	<para>
-	  The implementation isn't finished, although it's planned to
-	  be finished soon.
-	</para>
-
-	<para>
-	  In the meantime, you can copy the folders' contents by hand
-	  from the shell (please do this after quitting Evolution).
-	  For example:
-	</para>
-
-	<programlisting>
+          </programlisting>
+
+	  <para>
+	    You should do this after exiting Evolution.
+	  </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 planned
+	    to be finished soon.
+  	  </para>
+
+	  <para>
+	    In the meantime, you can copy the folders' contents by
+	    hand from the shell (please do this after quitting
+	    Evolution).  For example:
+	  </para>
+
+	  <programlisting>
 cp -r ~/evolution/local/Inbox/subfolders/Foo ~/evolution/local/Inbox/subfolders/Bar
-	</programlisting>
+	  </programlisting>
 
-	<para>
-	  Likewise, you can use <command>mv</command> to rename or
-	  move folders.
-	</para>
-      </sect2>
+	  <para>
+	    Likewise, you can use <command>mv</command> to rename or
+	    move folders.
+	  </para>
+	</answer>
+      </qandaentry>
 
-      <!-- -->
-      <sect2>
-	<title>
+      <qandaentry>
+      <question>
+	<para>
 	  Can I read mail from a mailbox file created by some other
 	  application (e.g. Mutt) without importing mail from it?
-	</title>
-
-	<para>
-	  No, but it's a planned feature.
 	</para>
-      </sect2>
+	</question>
+	<answer>
+	  <para>
+	    No, but it's a planned feature.
+	  </para>
+	</answer> 
+      </qandaentry>
+
+      <qandaentry>
+	<question>
+	  <para>
+	    Can Evolution sync to my Palm OS (tm) device?
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	    Yes.  Evolution needs to be compiled with Palm syncing
+	    support for this to work though.  Please refer to the
+	    <filename>README</filename> file for additional
+	    information on the requirements.
+ 	  </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 the 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>
+	    I cannot see the images that are contained in some HTML
+	    mail message I am getting.  Why?
+	  </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 for compose and
+	    displaying 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
+            proprietry 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 avaliable 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>
+    </qandaset>
+    </sect1> 
+  </appendix>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  Can Evolution sync to my Palm OS (tm) device?
-	</title>
 
-	<para>
-	  Yes.  Evolution needs to be compiled with Palm syncing
-	  support for this to work though.  Please refer to the
-	  <filename>README</filename> file for additional information
-	  on the requirements.
-	</para>
-      </sect2>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  What is the difference between a virtual folder (vfolder)
-	  and a regular folder?
-	</title>
 
-	<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>
-      </sect2>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  Can Evolution spell-check the messages while I compose them?
-	</title>
 
-	<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>
-      </sect2>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  I cannot see the images that are contained in some HTML mail
-	  message I am getting.  Why?
-	</title>
 
-	<para>
-	  Evolution currently doesn't support this, but it's a planned
-	  feature.
-	</para>
-      </sect2>
 
-      <sect2>
-	<title>
-	  Can I change the font that Evolution uses for compose and
-	  displaying mail messages?
-	</title>
 
-	<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>
-      </sect2>
 
-    <sect2>
-      <title>
-        How do I import my Outlook <filename>.pst</filename> files into Evolution?
-      </title>
-      
-      <para>
-        You cannot import these files directly into Evolution because the
-        <filename>.pst</filename> format is a proprietry
-        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>
-    </sect2>
-
-    <sect2>
-      <title>
-        If Mozilla can import <filename>.pst</filename> files, why can't Evolution?
-      </title> 
-
-      <para>
-        Mozilla on Windows accesses the <filename>.pst</filename>
-        files through the <filename>MAPI.DLL</filename>, which is only
-        avaliable 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>
-    </sect2>
 
 
-    </sect1> <!-- End Section: Features -->
 
-  </article>
diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
index 70c076bb30..e794d4a325 100644
--- a/doc/C/evolution.sgml
+++ b/doc/C/evolution.sgml
@@ -12,6 +12,7 @@
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
 <!ENTITY MENUREF SYSTEM "menuref.sgml">
+<!ENTITY FAQ SYSTEM "evolution-faq.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
@@ -33,7 +34,7 @@ implemented. -->
       <author><firstname>Kevin</firstname><surname>Breit</surname></author>
     </authorgroup>
     <copyright>
-      <year>2000</year>
+      <year>2001</year>
       <holder> Ximian, Inc., </holder>
     </copyright>
     
@@ -63,7 +64,7 @@ implemented. -->
     </legalnotice>
 
    <releaseinfo>
-      This is version 0.10 of the Evolution manual.
+      This is version 0.11 of the Evolution manual.
    </releaseinfo>
 
   </bookinfo>
@@ -126,7 +127,7 @@ implemented. -->
     </partintro>
     &MENUREF;
   </part>
- 
+  &FAQ;
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index 8ba08924b1..694e1158df 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -53,8 +53,10 @@ and other dedicated GNOME programmers.
     </para>
     <para>
       This manual was written by Aaron Weber
-      (<email>aaron@ximian.com</email>) and Kevin Breit
-      (<email>battery841@mypad.com</email>) with the help of the
+      (<email>aaron@ximian.com</email>), Kevin Breit
+      (<email>battery841@mypad.com</email>) Duncan Mak
+      (<email>duncan@ximian.com</email>) and Ettore Perazzoli
+      (<email>ettore@ximian.com</email>) with the help of the
       application programmers and the GNOME Documentation Project.
       Please send all comments and suggestions regarding the manual to
       the GNOME Documentation Project at
diff --git a/help/C/evolution-faq.sgml b/help/C/evolution-faq.sgml
index 4fdb3940c5..62621ba798 100644
--- a/help/C/evolution-faq.sgml
+++ b/help/C/evolution-faq.sgml
@@ -1,123 +1,114 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" []>
-
-  <article id="index">
-    <artheader>
-      <authorgroup>
-	<author>
-	  <firstname>Ettore</firstname>
-	  <surname>Perazzoli</surname>
-	</author>
-	<author>
-	  <firstname>Duncan</firstname>
-	  <surname>Mak</surname>
-	</author>
-      </authorgroup>
-
-      <title>Evolution Frequently Asked questions</title>
-      <abstract>
-	<para>
-	  This is a FAQ list and yadda yadda.
-	</para>
-      </abstract>
-    </artheader>
-
-
+<!--
+<!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.
+	</para>
+   
     <!-- Section: Getting and compiling -->
 
-    <sect1>
+    <sect1 id="get-and-compile">
       <title>
-	Getting and compiling
+	Getting and Compiling Evolution
       </title>
-
-      <!-- -->
-      <sect2>
-	<title>
+    <qandaset>
+      <qandaentry>
+	<question>
+	  <para>
 	  Where can I get the latest Evolution release?
-	</title>
-
-	<para>
-	  There are two main ways to install the latest Evolution
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	  There are two ways to install the latest Evolution
 	  release:
-	</para>
-
 	<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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Are binary snapshots available?
-	</title>
-
+	      <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>
-	  The snapshot builds are logged at <ulink
+	  You can check the status of snapshots at <ulink
 	  url="http://primates.ximian.com/~snapshot">http://primates.ximian.com/~snapshot</ulink>.
 	</para>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Why isn't a new snapshot available today?
-	</title>
-
-	<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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  How do I get Evolution from CVS?
-	</title>
-
-	<para>
-	  If you already have <ulink url="http://cvs.gnome.org">GNOME
-	    CVS</ulink> access, simply checkout the following modules:
-	  evolution, gtkhtml, gal.
-	</para>
-
-	<para>
-	  If you don't have a CVS account, you could 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.
+	</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.
+	  This only needs to be done once. Use this command:
 	</para>
 
 	<programlisting>
@@ -132,21 +123,22 @@ cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome login
 	<programlisting>
 cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co evolution gtkhtml gal
 	</programlisting>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  How should I compile Evolution avoiding conflicts with my
-	  existing GNOME installation?
-	</title>
-
+	</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:
+	  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>
@@ -157,7 +149,7 @@ cd /cvs/evolution
 	<para>
 	  If you install Evolution and the Evolution libraries in a
 	  non-standard prefix, make sure you set the appropriate
-	  environment variables in your shell's startup script:
+	  environment variables in the startup script for Evolution:
 	</para>
 
 	<programlisting>
@@ -168,102 +160,109 @@ export GNOME_PATH=/opt/gnome:/usr
 	<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>.  <!-- FIXME portable? -->
-	</para>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  I get <computeroutput>make: *** No rule to make target
-	  `all-no-@BUILD_INCLUDED_LIBINTL@'</computeroutput>
-	</title>
-
-	<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>
-      </sect2>
-
-    </sect1> <!-- End Section: Getting and compiling -->
-
-    <!-- Section: Troubleshooting -->
-
-    <sect1>
+	  <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 <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>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  I get <computeroutput>Cannot initialize the Evolution
-	  shell</computeroutput>.
-	</title>
-
-	<para>
-	  Check that:
-	</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      <filename>oafd</filename> is listen 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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  I get <computeroutput>Cannot open composer window</computeroutput>.
-	</title>
-
-	<para>
+    <qandaset>
+      <qandaentry>
+	<question>
+	  <para>
+	    I get <computeroutput>Cannot initialize the Evolution
+	    shell</computeroutput>.
+	   </para>
+	</question>
+	<answer>
+	  <para>
+	    Check that:
+	  </para>
+
+	    <itemizedlist>
+	      <listitem>
+		<para>
+		  <filename>oafd</filename> is listen 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>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
+	</answer>
+      </qandaentry>
+ 
+     <qandaentry>
+       <question>
+	<para>
 	  I updated my Evolution, but my addressbook contacts are no
 	  longer there, what should I do?
-	</title>
-
+	</para>
+	</question>
+	<answer>
 	<para>
 	  Evolution uses the <filename>libdb</filename> library to
 	  handle the addressbook database.  Two versions of
@@ -348,60 +347,66 @@ db_dump185 ~/evolution/local/Contacts/addressbook.db.backup | db_load ~/evolutio
 	  </listitem>
 
 	</itemizedlist>
-      </sect2>
+	</answer> 
+      </qandaentry>
 
-      <!-- -->
-      <sect2>
-    	<title>
+      <qandaentry>
+	<question>
+	  <para>
 	    Evolution reported an error when trying to retrieve from my
 	    local spool in <filename>/var/spool/mail/username</filename>.  Why?
-    	</title>
-
-        <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>
+    	  </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>
-	  Yes, we know this is a problem.  It will be fixed eventually.
-	</para>
-      </sect2>
+	  <para>
+	    Yes, we know this is a problem.  It will be fixed eventually.
+	  </para>
+	</answer>
+      </qandaentry>
 
-	<!-- -->
-      <sect2>
-	<title>
+      <qandaentry>
+      <question>
+	<para>
 	  Evolution crashes reporting that it couldn't allocate N
 	  billion bytes; how do I fix this?
-	</title>
-
-	<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>
-
+	</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>
+	    So, if this occurs to you, 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>
-	  So, if this occurs to you, 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>
-
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
 	  What is <command>killev</command> and why do I need to use it?
-	</title>
-
+	</para>
+	</question>
+	<answer>
 	<para>
 	  Evolution is actually made up of several components that run
 	  as separate processes.  Evolution's shell is not very good
@@ -417,19 +422,22 @@ chmod 1777 /var/spool/mail
 	  should try to exit the shell cleanly first, so you give a
 	  chance to the other components to clean things up properly.)
 	</para>
-      </sect2>
-
-      <sect2>
-	<title>
-	  What is <command>oaf-slay</command> and why do I need to use it?
-	</title>
+	</answer> 
+      </qandaentry>
 
-	<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.
+      <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>
@@ -446,64 +454,71 @@ chmod 1777 /var/spool/mail
 	  <application>Nautilus</application>. To avoid problems, do
 	  not run <command>oaf-slay</command> while you are in GNOME.
 	</para>
-      </sect2>
-
-    </sect1> <!-- End Section: Troubleshooting -->
-
-
-    <!-- Section: Debugging -->
-
-    <sect1>
-      <title>
-	Debugging
-      </title>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Where should I report bugs for Evolution?
-	</title>
-
-	<para>
-	  You should report bugs about Evolution into 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 before submitting it.
-	</para>
-      </sect2>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  Can I just use Bug-Buddy?
-	</title>
-
-	<para>
-	  No.  The Ximian bug tracker does not yet have an email-based
-	  interface, so Bug Buddy cannot talk to it.  This will be
-	  fixed eventually.
-	</para>
-      </sect2>
+	</answer>
+      </qandaentry>
+    </qandaset>
+    </sect1>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  What is a stack trace (backtrace) and how do I get one?
-	</title>
-
-	<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 always include them in crash
-	  reports.
+    <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 should report bugs about Evolution into 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 before submitting it.
+ 	  </para>
+	</answer> 
+      </qandaentry>
+    
+      <qandaentry>
+	<question>
+	  <para>
+	    Can I just use Bug-Buddy?
+	  </para>
+	</question>
+	<answer>
+	<para>
+	  Not yet.  The Ximian bug tracker does not yet have an
+	  email-based interface, so Bug Buddy cannot talk to it.  This
+	  will be fixed eventually.
+	</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. Once we have <command>bug-buddy</command> working
+	   with our bug database, it will be much easier to do
+	   this. Until then, here's how:
 	</para>
 
 	<para>
@@ -602,247 +617,290 @@ bt
 attach PID
 	</programlisting>
 
-	<para>
-	  Where <userinput>PID</userinput> is the PID of the
-	  component.  Notice that this also works if you attach right
-	  after a crash dialog appears, before hitting "OK" or "Submit
-	  bug report".
-	</para>
-      </sect2>
-
-    </sect1> <!-- End Section: Debugging -->
-
-
-    <!-- Section: Features -->
-
-    <sect1>
-      <title>
-	Features
-      </title>
-
-      <!-- -->
-      <sect2>
-	<title>
-	  How can I remove a folder?
-	</title>
-
-	<para>
-	  Currently there is no command in Evolution to remove a
-	  folder, so you have to remove it by hand.
-	</para>
-
-	<para>
-	  All the folders are stored in
-	  <filename>~/evolution/local</filename>.  Each folder is a
-	  directory containing the data files, as well as a
-	  <filename>subfolders</filename> directory that contains all
-	  its subfolders.  So for example if you have a subfolder of
-	  the <filename>Inbox</filename> called
-	  <filename>Foo</filename>, you can run the following command
-	  to get rid of it (and all it subfolders):
-	</para>
+ 	  <para>
+	    Where <userinput>PID</userinput> is the PID of the
+	    component.  Notice that this also works if you attach
+	    right after a crash dialog appears, before hitting "OK" or
+	    "Submit bug report".
+	  </para>
+	</answer> 
+      </qandaentry>
+    </qandaset>
+  </sect1> 
+  
+  <sect1 id="faq-features">
+    <title>Features</title>
+      <para>
+       Following is a list of questions about the features in
+       <application>Evolution</application>.   
+      </para>
 
-	<programlisting>
+    <qandaset>
+      <qandaentry>
+	<question>
+	  <para>
+	    How can I remove a folder?
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	    Currently there is no command in Evolution to remove a
+	    folder, so you have to remove it by hand.
+	  </para>
+
+	  <para>
+	    All the folders are stored in
+	    <filename>~/evolution/local</filename>.  Each folder is a
+	    directory containing the data files, as well as a
+	    <filename>subfolders</filename> directory that contains
+	    all its subfolders.  So for example if you have a
+	    subfolder of the <filename>Inbox</filename> called
+	    <filename>Foo</filename>, you can run the following
+	    command to get rid of it (and all it subfolders):
+          </para>
+
+	  <programlisting>
 rm -rf ~/evolution/local/Inbox/subfolders/Foo
-	</programlisting>
-
-	<para>
-	  You should do this after exiting Evolution.
-	</para>
-      </sect2>
-
-      <sect2>
-	<title>
-	  Why doesn't drag and drop between folders seem to work?
-	</title>
-
-	<para>
-	  The implementation isn't finished, although it's planned to
-	  be finished soon.
-	</para>
-
-	<para>
-	  In the meantime, you can copy the folders' contents by hand
-	  from the shell (please do this after quitting Evolution).
-	  For example:
-	</para>
-
-	<programlisting>
+          </programlisting>
+
+	  <para>
+	    You should do this after exiting Evolution.
+	  </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 planned
+	    to be finished soon.
+  	  </para>
+
+	  <para>
+	    In the meantime, you can copy the folders' contents by
+	    hand from the shell (please do this after quitting
+	    Evolution).  For example:
+	  </para>
+
+	  <programlisting>
 cp -r ~/evolution/local/Inbox/subfolders/Foo ~/evolution/local/Inbox/subfolders/Bar
-	</programlisting>
+	  </programlisting>
 
-	<para>
-	  Likewise, you can use <command>mv</command> to rename or
-	  move folders.
-	</para>
-      </sect2>
+	  <para>
+	    Likewise, you can use <command>mv</command> to rename or
+	    move folders.
+	  </para>
+	</answer>
+      </qandaentry>
 
-      <!-- -->
-      <sect2>
-	<title>
+      <qandaentry>
+      <question>
+	<para>
 	  Can I read mail from a mailbox file created by some other
 	  application (e.g. Mutt) without importing mail from it?
-	</title>
-
-	<para>
-	  No, but it's a planned feature.
 	</para>
-      </sect2>
+	</question>
+	<answer>
+	  <para>
+	    No, but it's a planned feature.
+	  </para>
+	</answer> 
+      </qandaentry>
+
+      <qandaentry>
+	<question>
+	  <para>
+	    Can Evolution sync to my Palm OS (tm) device?
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	    Yes.  Evolution needs to be compiled with Palm syncing
+	    support for this to work though.  Please refer to the
+	    <filename>README</filename> file for additional
+	    information on the requirements.
+ 	  </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 the 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>
+	    I cannot see the images that are contained in some HTML
+	    mail message I am getting.  Why?
+	  </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 for compose and
+	    displaying 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
+            proprietry 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 avaliable 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>
+    </qandaset>
+    </sect1> 
+  </appendix>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  Can Evolution sync to my Palm OS (tm) device?
-	</title>
 
-	<para>
-	  Yes.  Evolution needs to be compiled with Palm syncing
-	  support for this to work though.  Please refer to the
-	  <filename>README</filename> file for additional information
-	  on the requirements.
-	</para>
-      </sect2>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  What is the difference between a virtual folder (vfolder)
-	  and a regular folder?
-	</title>
 
-	<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>
-      </sect2>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  Can Evolution spell-check the messages while I compose them?
-	</title>
 
-	<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>
-      </sect2>
 
-      <!-- -->
-      <sect2>
-	<title>
-	  I cannot see the images that are contained in some HTML mail
-	  message I am getting.  Why?
-	</title>
 
-	<para>
-	  Evolution currently doesn't support this, but it's a planned
-	  feature.
-	</para>
-      </sect2>
 
-      <sect2>
-	<title>
-	  Can I change the font that Evolution uses for compose and
-	  displaying mail messages?
-	</title>
 
-	<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>
-      </sect2>
 
-    <sect2>
-      <title>
-        How do I import my Outlook <filename>.pst</filename> files into Evolution?
-      </title>
-      
-      <para>
-        You cannot import these files directly into Evolution because the
-        <filename>.pst</filename> format is a proprietry
-        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>
-    </sect2>
-
-    <sect2>
-      <title>
-        If Mozilla can import <filename>.pst</filename> files, why can't Evolution?
-      </title> 
-
-      <para>
-        Mozilla on Windows accesses the <filename>.pst</filename>
-        files through the <filename>MAPI.DLL</filename>, which is only
-        avaliable 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>
-    </sect2>
 
 
-    </sect1> <!-- End Section: Features -->
 
-  </article>
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index 70c076bb30..e794d4a325 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -12,6 +12,7 @@
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
 <!ENTITY MENUREF SYSTEM "menuref.sgml">
+<!ENTITY FAQ SYSTEM "evolution-faq.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
@@ -33,7 +34,7 @@ implemented. -->
       <author><firstname>Kevin</firstname><surname>Breit</surname></author>
     </authorgroup>
     <copyright>
-      <year>2000</year>
+      <year>2001</year>
       <holder> Ximian, Inc., </holder>
     </copyright>
     
@@ -63,7 +64,7 @@ implemented. -->
     </legalnotice>
 
    <releaseinfo>
-      This is version 0.10 of the Evolution manual.
+      This is version 0.11 of the Evolution manual.
    </releaseinfo>
 
   </bookinfo>
@@ -126,7 +127,7 @@ implemented. -->
     </partintro>
     &MENUREF;
   </part>
- 
+  &FAQ;
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS;