Updated several questions across the FAQ to conform with Sylpheed 2.7.1, added couple of new ones.

1 files changed, 108 insertions, 67 deletions

diff --git a/faq/en/faq_001.xml b/faq/en/faq_001.xml
index f5ec083..d35b8a3 100644
--- a/faq/en/faq_001.xml
+++ b/faq/en/faq_001.xml
@@ -36,8 +36,10 @@
           </listitem>
         </itemizedlist>
         <para>
-        You can always download this FAQ from <ulink url="http://sylpheeddoc.sf.net">http://sylpheeddoc.sf.net</ulink>.</para>
-        <para>Did not found your language in the list? Would you like to contribute with a new translation to the Sylpheed Documentation Project? Then please contact the Project members at <ulink url="http://sylpheeddoc.sourceforge.net/">their website</ulink>. Thank you.</para>
+        You can always download this FAQ from the <ulink url="http://sylpheeddoc.sourceforge.net/en/faq/sylpheed-faq.html">Sylpheed Documentation Project website</ulink>.</para>
+        <note>
+          <para>Did not found your language in the list? Would you like to contribute with a new translation to the Sylpheed Documentation Project? Then please contact the Project members at <ulink url="http://sylpheeddoc.sourceforge.net/">their website</ulink>. Thanks in advance.</para>
+        </note>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -48,7 +50,7 @@
       </question>
       <answer>
         <para>
-        Sylpheed is  an e-mail client (and news  reader)  based on GTK+,
+        Sylpheed is  an email client (and news  reader)  based on GTK+,
         running on the X Window System, and aiming for:</para>
         <itemizedlist>
           <listitem>
@@ -74,13 +76,10 @@
       </question>
       <answer>
         <para>
-        You can download it from <literal>
-            <ulink url="http://sylpheed.sraoss.jp/en/">http://sylpheed.sraoss.jp/en/</ulink>
-          </literal> There are links to download
-        the tarball sources,  and  also links to  sites  where you can
-        download  RPM&apos;s (for Redhat and   Mandrake), DEB packages for
-        Debian, and installations for Solaris and FreeBSD.
-      </para>
+        You can download it from the <ulink url="http://sylpheed.sraoss.jp/en/download.html">download page</ulink> on <ulink url="http://sylpheed.sraoss.jp/en/">Sylpheed website</ulink>.  There are links to download
+         tarball sources,  patches to the previous version, and  also links to the Sylpheed for Windows binaries, including the installer, the ZIP archive, and the patch to the previous Sylpheed for Windows version. </para>
+        <para>Depending on the state of the Sylpheed development cycle, you  may be offered links to development versions such as beta and RC releases. These might not be suitable for everyday use, however, so you may want to stick with the stable release, anyway.</para>
+        <para>Also on the download page, you can download Sylph-Searcher (which is a program that enables fast full-text search of messages stored in mailboxes of Sylpheed, or normal MH folders), and LibSylph (which is a library that provides Sylpheed core features independent from the UI of Sylpheed).</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -103,7 +102,7 @@
       </question>
       <answer>
         <para>
-         It means &apos;light weight&apos;, like air. This comes from the
+         It means <emphasis>light weight</emphasis>, like air. This comes from the
          name of the wind spirits, the Sylphs.
       </para>
       </answer>
@@ -131,7 +130,7 @@
       </question>
       <answer>
         <para>
-          Autocollection works since version 0.5.1. If you need it
+          Auto collection works since version 0.5.1. If you need it
           or want it, you should upgrade.
       </para>
       </answer>
@@ -213,8 +212,7 @@
     </qandaentry>
     <qandaentry>
       <question id="faq-html-sylpheed">
-        <para>
-         Does Sylpheed allow me to write HTML styled messages?
+        <para>Does Sylpheed allow me to write HTML styled messages?
       </para>
       </question>
       <answer>
@@ -222,13 +220,12 @@
          No. A discussion has gone around over this topic, and
          the outcome was that HTML mail is not wanted. If you
          really need to send HTML, you can of course attach a
-         webpage to an e-mail.</para>
+         web page to an email.</para>
       </answer>
     </qandaentry>
     <qandaentry>
       <question id="faq-completion-adress-sylpheed">
-        <para>
-         Does Sylpheed have name completion in the address fields?
+        <para>Does Sylpheed have name completion in the address fields?
       </para>
       </question>
       <answer>
@@ -236,9 +233,9 @@
          Yes. When you search for a name that starts with &quot;<literal>don</literal>&quot;,
          type &quot;<literal>don</literal>&quot; (without the quotes) and press the <keycap>Tab</keycap> key.
          This will show you the correct name (when only one &quot;don&quot;
-         exists in your addressbook. Otherwise a dropdown list
+         exists in your address book. Otherwise a drop-down list
          appears, which allows you to select the name you want.
-         E.g. Donald Duck, Don Johnson. But also e-mail addresses
+         E.g. Donald Duck, Don Johnson. But also email addresses
          starting with &quot;<literal>don</literal>&quot; will appear in the list (like
          &quot;<literal>don.giovanni@maffia.org</literal>&quot;).
       </para>
@@ -246,8 +243,7 @@
     </qandaentry>
     <qandaentry>
       <question id="faq-tab-error-sylpheed">
-        <para>
-         Fine, but when I hit the Tab key I get an error message.
+        <para>Fine, but when I hit the Tab key I get an error message.
       </para>
       </question>
       <answer>
@@ -261,8 +257,7 @@
     </qandaentry>
     <qandaentry>
       <question id="faq-sylpheed-fast">
-        <para>
-         Why is Sylpheed so fast?
+        <para>Why is Sylpheed so fast?
       </para>
       </question>
       <answer>
@@ -272,20 +267,18 @@
     </qandaentry>
     <qandaentry>
       <question id="faq-patches-sylpheed">
-        <para>
-          Where can I get the current patches for Sylpheed?
+        <para>Where can I get the current patches for Sylpheed?
       </para>
       </question>
       <answer>
-        <para>In most cases, current patches are being posted by Sylpheed users and contributors to the <ulink url="http://www.sraoss.jp/mailman/listinfo/sylpheed">Sylpheed mailing list </ulink><email>sylpheed@sraoss.jp</email>.
-         (Also, see the Installation section on how to install a patch.)
+        <para>In most cases, current patches are being posted by Sylpheed users and contributors to the <ulink url="http://www.sraoss.jp/mailman/listinfo/sylpheed">Sylpheed mailing list</ulink> <email>sylpheed@sraoss.jp</email>.
+         (Also see the Installation section on how to install a patch.)
       </para>
       </answer>
     </qandaentry>
     <qandaentry>
       <question id="faq-send-patches-sylpheed">
-        <para>
-         How can I send in patches, report bugs, talk about Sylpheed with others?
+        <para>How can I send in patches, report bugs, talk about Sylpheed with others?
       </para>
       </question>
       <answer>
@@ -296,12 +289,17 @@
          a Japanese and an English list, so pick the right one!
          If you have made a patch that you want the world to know
          of, please post it either to the mailing list, or contact the Sylpheed author, Hiroyuki Yamamoto <email>hiro-y@kcn.ne.jp</email>. </para>
+        <para>Please supply the information of <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guimenuitem>Log window</guimenuitem>
+          </menuchoice>, or the contents of
+<filename>sylpheed.log</filename>, which is located under the configuration folder, when
+reporting bugs.</para>
       </answer>
     </qandaentry>
     <qandaentry>
       <question id="faq-content-type-header-sylpheed">
-        <para>
-         When I send mail, the Content-Type header says the mail is in
+        <para>When I send mail, the Content-Type header says the mail is in
          US-ASCII, even when I specified ISO-8859-1?
       </para>
       </question>
@@ -314,8 +312,7 @@
     </qandaentry>
     <qandaentry>
       <question id="faq-word-wrap-sylpheed">
-        <para>
-         Why does it look like word wrap is not working?
+        <para>Why does it look like word wrap is not working?
       </para>
       </question>
       <answer>
@@ -336,20 +333,33 @@
            is wrapped        </literallayout>This would cause you a lot of manual reformatting to get
         a presentable mail again.
 
-        Note: As of Sylpheed 0.8.0., active wordwrap has been
+         </para>
+        <note>
+          <para>As of Sylpheed 0.8.0., active word wrap has been
         implemented. You can turn it on in <menuchoice>
-            <guisubmenu>Common Preferences</guisubmenu>
-            <guimenuitem>Compose</guimenuitem>
-            <guimenuitem>Editor</guimenuitem>
-            <guilabel>Wrap on input</guilabel>
-          </menuchoice>.
+              <guisubmenu>Common Preferences</guisubmenu>
+              <guimenuitem>Compose</guimenuitem>
+              <guimenuitem>Editor</guimenuitem>
+              <guilabel>Wrap on input</guilabel>
+            </menuchoice>.
       </para>
+        </note>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
+        <para>How do I copy my mail archive to another machine? </para>
+      </question>
+      <answer>
+        <para>You need to copy the <filename>sylpheed-2.0</filename> directory with your user profile, and your entire local mail archive. </para>
+        <para>Under UNIX, the user profile is stored in <filename>$HOME/.sylpheed-2.0</filename> by default, and your local mail archive is by default located in <filename>$HOME/Mail</filename>. </para>
+        <para>While under Windows 2000/XP, the user profile is stored in <filename>C:\Documents and Settings\<replaceable>(user name)</replaceable>\Application Data\Sylpheed</filename> by default, and your local mail archive is by default located in <filename>C:\Documents and Settings\<replaceable>(user name)</replaceable>\Application Data\Sylpheed\Mailboxes\Mail</filename>. </para>
+        <para>Under Windows Vista, the directory paths are <filename>C:\Users\<replaceable>(user name)</replaceable>\AppData\Sylpheed</filename>, and <filename>C:\Users\<replaceable>(user name)</replaceable>\AppData\Sylpheed\Mailboxes\Mail</filename>, respectively.</para>
       </answer>
     </qandaentry>
     <qandaentry>
       <question id="faq-import-mbox-sylpheed">
-        <para>
-         Can I import a mbox into Sylpheed&apos;s MH mailfolders?
+        <para>Can I import a mbox into Sylpheed&apos;s MH mailfolders?
       </para>
       </question>
       <answer>
@@ -367,12 +377,14 @@
       </question>
       <answer>
         <para>
-         Yes. Just make sure that you add /. to the end of a rule so
+         Yes. Just make sure that you add <computeroutput>/.</computeroutput> to the end of a rule so
          procmail knows you are filtering into an MH mail folder. Example:
-         <literal>0:</literal>
-         <literal>* ^Subject:.*sylpheed</literal>
-         <literal> sylpheedmail/.</literal>
-         Check man procmail for details.
+         </para>
+        <programlisting>0:
+* ^Subject:.*sylpheed
+sylpheedmail/.
+</programlisting>
+        <para>Check <command>man procmail</command> for details.
       </para>
       </answer>
     </qandaentry>
@@ -396,9 +408,10 @@
             <para>Upgrade to 0.4.65: some menu items have been moved</para>
           </listitem>
           <listitem>
-            <para>Upgrade to 0.7.3: many keybindings have changed</para>
+            <para>Upgrade to 0.7.3: many key bindings have changed</para>
           </listitem>
         </itemizedlist>
+        <para>You should always read the <filename>NEWS</filename> document (and also <filename>NEWS-<replaceable>x</replaceable>.0</filename> if you are upgrading from a very old version) that is included in the release tarballs. The NEWS can also be viewed on the <ulink url="http://sylpheed.sraoss.jp/en/news.html">appropriate Sylpheed website page</ulink>. </para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -411,7 +424,7 @@
          Just press <keycombo>
             <keycap>Alt</keycap>
             <keycap>U</keycap>
-          </keycombo>or select <guimenuitem>Update summary</guimenuitem> from the <guimenu>View</guimenu> menu.
+          </keycombo> or select <guimenuitem>Update summary</guimenuitem> from the <guimenu>View</guimenu> menu.
       </para>
       </answer>
     </qandaentry>
@@ -423,7 +436,7 @@
       <answer>
         <para>
          If one wishes to use gvim as an external editor it&apos;s
-         necessary to start it with the no-fork option <command>-f</command>, i.e. 
+         necessary to start it with the no-fork option <parameter>-f</parameter>, i.e. 
          in the configuration dialog box you need to enter  
          <command>gvim -f %s</command>. If not the editor forks and open up a 
          separate file and when one quits the editor the changes
@@ -439,7 +452,7 @@
       </question>
       <answer>
         <para>
-         Yes, select the part in the textview and choose <guiicon>Reply</guiicon>.
+         Yes, select the part in the text view and choose <guiicon>Reply</guiicon>.
       </para>
       </answer>
     </qandaentry>
@@ -460,16 +473,44 @@
       </answer>
     </qandaentry>
     <qandaentry>
+      <question>
+        <para> Does Sylpheed provide an anti-spam feature? </para>
+      </question>
+      <answer>
+        <para>Yes. It has a  <ulink url="http://www.bogofilter.org/">bogofilter</ulink>  and a  <ulink url="http://bsfilter.org/index-e.html">bsfilter</ulink> support. Just go to <menuchoice>
+            <guimenu>Configuration</guimenu>
+            <guimenuitem>Common preferences...</guimenuitem>
+            <guimenuitem>Junk mail</guimenuitem>
+          </menuchoice> and check <guilabel>Enable Junk mail control</guilabel>. Then you can select a <guilabel>Learning command</guilabel> preset of your choice, or possibly use custom commands.</para>
+        <para>You can also use other spam filters thanks to the Actions functionality (available under <menuchoice>
+            <guimenu>Configuration</guimenu>
+            <guimenuitem>Actions...</guimenuitem>
+          </menuchoice>).</para>
+        <note>
+          <para>You need to have bogofilter, bsfilter, or other spam filter properly installed on your system prior to the junk mail configuration in Sylpheed, unless you use Sylpheed for Windows, which comes with  bsfilter included in the installation program (since version 2.7.0).</para>
+        </note>
+      </answer>
+    </qandaentry>
+    <qandaentry>
       <question id="faq-faq-sylpheed">
-        <para>Where can I find the latest FAQ on Sylpheed?
+        <para>Where can I find the latest Sylpheed FAQ and manual?
       </para>
       </question>
       <answer>
         <para>
-          Go to <ulink url="http://sylpheeddoc.sf.net">http://sylpheeddoc.sf.net</ulink> and check out 
-          the FAQ and manual from the sylpheeddoc project. Both
+          Go to <ulink url="http://sylpheeddoc.sourceforge.net/">http://sylpheeddoc.sourceforge.net</ulink> and check out 
+          the FAQ and manual from the Sylpheed Documentation Project (sylpheeddoc). Both
           documents are available in multiple languages there and
-          usually contain the latest updates. Also see the question about available language versions at the top of this section.      </para>
+          usually contain the latest updates. The direct links are as follows:</para>
+        <itemizedlist>
+          <listitem>
+            <para><ulink url="http://sylpheeddoc.sourceforge.net/en/faq/sylpheed-faq.html">current version of the English FAQ</ulink></para>
+          </listitem>
+          <listitem>
+            <para><ulink url="http://sylpheeddoc.sourceforge.net/en/manual/sylpheed.html">current version of the English manual</ulink></para>
+          </listitem>
+        </itemizedlist>
+        <para>Also see the question about available language versions at the top of this section.      </para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -486,20 +527,20 @@
       </question>
       <answer>
         <para>The current members of the Sylpheed Documentation Project are:</para>
-        <programlisting>Francois Barriere      fbarriere@users.sourceforge.net
-Petr Kovar             pknbe@users.sourceforge.net</programlisting>
+        <programlisting>Francois Barriere      fbarriere at users.sourceforge.net
+Petr Kovar             pknbe at users.sourceforge.net</programlisting>
         <para>Below is the list of former members of the Sylpheed Documentation Project. Big thank you goes to all of them!</para>
-        <programlisting>Martin   Bretschneider furbour@users.sourceforge.net
-Olivier  Delhomme      dup@users.sourceforge.net
-Doruk    Fisek         dobidik@users.sourceforge.net
-Melvin   Hadasht       mhadasht@users.sourceforge.net
-Nicolas  Kaiser        nikai@users.sourceforge.net
-Paul     Kater         pkater@users.sourceforge.net
-Ricardo  Mones Lastra  mones@users.sourceforge.net
-Jens     Oberender     jobi@users.sourceforge.net
-Marcelo  Ramos         hackpando@users.sourceforge.net
-Guido    Rudolphi      malatesta@users.sourceforge.net
-Frank    Weng          fweng@users.sourceforge.net</programlisting>
+        <programlisting>Martin   Bretschneider furbour at users.sourceforge.net
+Olivier  Delhomme      dup at users.sourceforge.net
+Doruk    Fisek         dobidik at users.sourceforge.net
+Melvin   Hadasht       mhadasht at users.sourceforge.net
+Nicolas  Kaiser        nikai at users.sourceforge.net
+Paul     Kater         pkater at users.sourceforge.net
+Ricardo  Mones Lastra  mones at users.sourceforge.net
+Jens     Oberender     jobi at users.sourceforge.net
+Marcelo  Ramos         hackpando at users.sourceforge.net
+Guido    Rudolphi      malatesta at users.sourceforge.net
+Frank    Weng          fweng at users.sourceforge.net</programlisting>
       </answer>
     </qandaentry>
   </qandaset>