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

5 files changed, 285 insertions, 127 deletions

diff --git a/faq/en/ChangeLog b/faq/en/ChangeLog
index b4a1358..5b44a44 100644
--- a/faq/en/ChangeLog
+++ b/faq/en/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-18  Petr Kovar  <pknbe@volny.cz>
+
+	* *.xml: Updated several questions across the FAQ to conform
+	with Sylpheed 2.7.1, added couple of new ones.
+
 2009-08-31  Petr Kovar  <pknbe@volny.cz>
 
 	* *.xml: Even better formatting of qandaset tables. Markup
diff --git a/faq/en/faq.xml b/faq/en/faq.xml
index f649f37..d395f1c 100644
--- a/faq/en/faq.xml
+++ b/faq/en/faq.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!-- This document was created with Syntext Serna Free. -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY __faq__001 SYSTEM "faq_001.xml">
 <!ENTITY __faq__002 SYSTEM "faq_002.xml">
 <!ENTITY __faq__003 SYSTEM "faq_003.xml">
@@ -9,7 +10,11 @@
   <title>Sylpheed FAQ</title>
   <bookinfo>
     <abstract>
-      <para>This document contains answers to various questions which are frequently asked by Sylpheed users. It consists of three sections providing general information, information on Sylpheed installation and configuration, and on Sylpheed interface.</para>
+      <para>This document contains answers to various questions, which are
+       frequently asked by Sylpheed users. It consists of three sections providing
+       general information, information on Sylpheed installation and configuration,
+       and on Sylpheed interface.
+      </para>
     </abstract>
     <copyright>
       <year>2009</year>
@@ -29,7 +34,7 @@
       <surname>Kater</surname>
 <!-- affiliation>
         <address>
-          <email>paul AT nlpagan DOT net</email>
+          <email>paul at nlpagan.net</email>
         </address>
       </affiliation -->    </author>
     <author>
@@ -37,15 +42,15 @@
       <surname>Oberender</surname>
 <!-- affiliation>
         <address>
-          <email>j DOT obi AT troja DOT net</email>
+          <email>j.obi at troja.net</email>
         </address>
       </affiliation -->    </author>
     <author>
-      <firstname>François</firstname>
+      <firstname>Francois</firstname>
       <surname>Barriere</surname>
 <!-- affiliation>
         <address>
-          <email>barriere DOT francois AT libertysurf DOT fr</email>
+          <email>barriere.francois at libertysurf.fr</email>
         </address>
       </affiliation -->    </author>
     <author>
@@ -53,15 +58,15 @@
       <surname>Delhomme</surname>
 <!-- affiliation>
         <address>
-          <email>olivier DOT delhomme AT free DOT fr</email>
+          <email>olivier.delhomme at free.fr</email>
         </address>
       </affiliation -->    </author>
     <author>
       <firstname>Petr</firstname>
-      <surname>Kovář</surname>
+      <surname>Kovar</surname>
 <!-- affiliation>
         <address>
-          <email>pknbe AT volny DOT cz</email>
+          <email>pknbe at volny.cz</email>
         </address>
       </affiliation -->    </author>
     <revhistory>
@@ -73,10 +78,10 @@
       </revision>
       <revision>
         <revnumber>2.2</revnumber>
-        <date>2009/08/12</date>
+        <date>2009/09/18</date>
         <authorinitials>PK</authorinitials>
-        <revremark>Finished porting to DocBook XML.</revremark>
+        <revremark>Finished porting to DocBook XML, updated many questions across the document to conform with Sylpheed 2.7.1.</revremark>
       </revision>
 <!-- ******************************************************************************** -->    </revhistory>
   </bookinfo>
-<!-- missing outdated remark about Sylpheed and Claws -->&__faq__001;&__faq__002;&__faq__003;&__license;</book>
+&__faq__001;&__faq__002;&__faq__003;&__license;</book>
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>
diff --git a/faq/en/faq_002.xml b/faq/en/faq_002.xml
index 8da60b2..e60c2f1 100644
--- a/faq/en/faq_002.xml
+++ b/faq/en/faq_002.xml
@@ -12,10 +12,12 @@ FreeBSD, Solaris.
 GTK+ 2.4.0 or later (GTK+ 2.6.0 or later
 is recommended).
 A recent ANSI C compiler (gcc 2.7.2.3 should also
-work).
-Note: it is reported that Sun C will not compile
-Sylpheed.
-Optionally:</para>
+work).</para>
+        <note>
+          <para>It is reported that Sun C will not compile
+Sylpheed.</para>
+        </note>
+        <para>Optionally:</para>
         <itemizedlist>
           <listitem>
             <para>compface (for X-Face)</para>
@@ -56,11 +58,13 @@ See also the <filename>INSTALL</filename> file that is being distributed with th
       <answer>
         <para>When you run Sylpheed for the first time, it will
 ask you where you want to store your mailboxes. The
-default is <filename>$HOME/Mail</filename>. You can change this to
+default is <filename>$HOME/Mail</filename> (or <filename>%APPDATA%\Sylpheed\Mailboxes\Mail</filename> under Windows). You can change this to
 anything you like as long as it is a valid directory
 name.</para>
-        <para>Please note: When Sylpheed is executed for the first time, it automatically creates the configuration files under <filename>$HOME/.sylpheed-2.0/</filename>, and asks you the location of mailbox. The default is <filename>$HOME/Mail</filename>. If some files which are non-MH format already exist on the directory, you will have to specify another location.
+        <note>
+          <para>When Sylpheed is executed for the first time, it automatically creates the configuration files under <filename>$HOME/.sylpheed-2.0/</filename> (or <filename>%APPDATA%\Sylpheed\</filename> under Windows), and asks you the location of mailbox. As stated above, the default is <filename>$HOME/Mail</filename>, or <filename>%APPDATA%\Sylpheed\Mailboxes\Mail</filename> under Windows. If some files, which are non-MH format, already exist on the directory, you will have to specify another location.
 </para>
+        </note>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -70,8 +74,8 @@ name.</para>
       </question>
       <answer>
         <para>Sylpheed reports such an error if it can&apos;t create the default
-mailboxes (inbox, outbox, etc ...). This can be because <filename>$HOME/Mail</filename>
-already contains files with the same names. This occurs when switching from
+mailboxes (inbox, outbox, etc.). This can be because <filename>$HOME/Mail</filename>
+(or <filename>%APPDATA%\Sylpheed\Mailboxes\Mail</filename> under Windows) already contains files with the same names. This occurs when switching from
 Kmail to Sylpheed, in this case backup and remove the existing Mail
 directory or use another name for the Sylpheed mail directory.
 </para>
@@ -84,7 +88,7 @@ directory or use another name for the Sylpheed mail directory.
       </question>
       <answer>
         <para>After loading Sylpheed for the first time, you can
-add an e-mail account by clicking the<guimenu>Configuration</guimenu> menu. Select the option <guimenuitem>Create new account</guimenuitem> and fill in the appropriate fields.
+add an email account by clicking the <guimenu>Configuration</guimenu> menu. Select the option <guimenuitem>Create new account</guimenuitem> and fill in the appropriate fields.
 </para>
       </answer>
     </qandaentry>
@@ -101,6 +105,17 @@ your computer stops responding.
     </qandaentry>
     <qandaentry>
       <question>
+        <para>Can I set up an account for sending mail only?</para>
+      </question>
+      <answer>
+        <para>Yes, set up a new account using <menuchoice>
+            <guimenuitem>Configuration</guimenuitem>
+            <guimenuitem>Create new Account...</guimenuitem>
+          </menuchoice>  and set the Protocol to None (local).</para>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
         <para>Why does Sylpheed not delete my mails when I press &quot;Delete&quot;? I set a filter, and Sylpheed does not filter. I moved a mail to a different mailbox and it did not move.
 </para>
       </question>
@@ -108,7 +123,7 @@ your computer stops responding.
         <para>You have to click the <guiicon>Execute</guiicon> button.
 The other solution: in the configuration settings
 (<menuchoice>
-            <guimenuitem>Common preferences</guimenuitem>
+            <guimenuitem>Common preferences...</guimenuitem>
             <guimenuitem>Details</guimenuitem>
             <guimenuitem>Interface</guimenuitem>
           </menuchoice>), you have to
@@ -122,7 +137,11 @@ check the <guilabel>Execute immediately when moving or deleting messages</guilab
 </para>
       </question>
       <answer>
-        <para>Yes, you can. In the configuration per account you
+        <para>Yes, you can. Under <menuchoice>
+            <guimenu>Configuration</guimenu>
+            <guimenuitem>Preferences for current account...</guimenuitem>
+            <guimenuitem>Advanced</guimenuitem>
+          </menuchoice>, you
 can specify the exact port addresses you want to use.
 </para>
       </answer>
@@ -213,20 +232,20 @@ can specify the exact port addresses you want to use.
     </qandaentry>
     <qandaentry>
       <question>
-        <para>How can I tell my browser/newsclient/other program to use Sylpheed as e-mail program?
+        <para>How can I tell my browser/newsclient/other program to use Sylpheed as email program?
 </para>
       </question>
       <answer>
         <para> In the settings part of the program, write
-       <computeroutput>sylpheed --compose</computeroutput></para>
+       <command>sylpheed --compose</command></para>
         <para>
 Specific options for typical browsers:</para>
         <itemizedlist>
           <listitem>
-            <para>Opera: <computeroutput>sylpheed --compose [mailto:%t][?subject=%s] </computeroutput></para>
+            <para>Opera: <command>sylpheed --compose [mailto:%t][?subject=%s] </command></para>
           </listitem>
           <listitem>
-            <para>Galeon: <computeroutput>sylpheed --compose &quot;mailto:%t?subject=%s&quot;</computeroutput></para>
+            <para>Galeon: <command>sylpheed --compose &quot;mailto:%t?subject=%s&quot;</command></para>
           </listitem>
         </itemizedlist>
       </answer>
@@ -324,9 +343,9 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
      to run <command>% locate m4 | less</command> or <command>% locate aclocal | less</command> to find additional directories containing those macros. If you find e.g. a
      <filename>gtk.m4</filename> in <filename>/opt/gnome/share/aclocal</filename>, change following line in
      <filename>autogen.sh</filename> from</para>
-        <programlisting>     aclocal -I ac \</programlisting>
+        <programlisting>aclocal -I ac \</programlisting>
         <para>     to</para>
-        <programlisting>     aclocal -I ac -I /opt/gnome/share/aclocal \</programlisting>
+        <programlisting>aclocal -I ac -I /opt/gnome/share/aclocal \</programlisting>
         <para>and run it again.
 </para>
       </answer>
@@ -365,24 +384,24 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
     </qandaentry>
     <qandaentry>
       <question>
-        <para>The folderlist is not updated after I manually moved/copied folders.
+        <para>The folder list is not updated after I manually moved/copied folders.
 </para>
       </question>
       <answer>
-        <para>You need to update Sylpheeds cache. Right click on the mailbox and choose
+        <para>You need to update Sylpheed cache. Right click on the mailbox and choose
      <guimenuitem>Rebuild folder tree</guimenuitem>.
 </para>
       </answer>
     </qandaentry>
     <qandaentry>
       <question>
-        <para>How can I revert original settings, e.g. for fonts, keybindings, etc.?
+        <para>How can I revert original settings, e.g. for fonts, key bindings, etc.?
 </para>
       </question>
       <answer>
-        <para>Sylpheed keeps its configuration files in <filename>$HOME/.sylpheed-2.0/sylpheedrc</filename> and creates default
+        <para>Sylpheed keeps its configuration files in <filename>$HOME/.sylpheed-2.0/sylpheedrc</filename> (or <filename>%APPDATA%\Sylpheed\sylpheedrc</filename> under Windows) and creates default
      entries, if none are found. So the easiest way is to quit Sylpheed,
-     temporarily renaming your <filename>$HOME/.sylpheed-2.0</filename> e.g. to <filename>*.bak</filename> and restarting
+     temporarily renaming your <filename>$HOME/.sylpheed-2.0</filename> (or <filename>%APPDATA%\Sylpheed\sylpheedrc</filename>) e.g. to <filename>*.bak</filename> and restarting
      Sylpheed in order to get default entries.
 </para>
       </answer>
@@ -423,7 +442,7 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
         <para>In most cases, this is caused by fonts that use an unsuitable encoding on a not Unicode-based system. (On a Unicode-based system, fonts should support all thinkable characters for the vast majority of languages.)</para>
         <para>Choose <menuchoice>
             <guimenu>Configuration</guimenu>
-            <guimenuitem>Common preferences</guimenuitem>
+            <guimenuitem>Common preferences...</guimenuitem>
             <guimenuitem>Display</guimenuitem>
             <guimenuitem>General</guimenuitem>
           </menuchoice>, and click the button right to  <guilabel>Text font</guilabel>. Now, a special dialog appears that allows you to pick a desirable font family, style, and size.</para>
@@ -433,7 +452,7 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
     </qandaentry>
     <qandaentry>
       <question>
-        <para>How can I convert my old mailbox/adressbook from (some mailclient).
+        <para>How can I convert my old mailbox/adress book from (some mail client).
 </para>
       </question>
       <answer>
@@ -452,9 +471,9 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
 </para>
       </question>
       <answer>
-        <para>Sylpheeds config files can be found in <filename>$HOME/.sylpheed-2.0</filename>. They are in plain
+        <para>Sylpheed config files can be found in <filename>$HOME/.sylpheed-2.0</filename> (under Windows, the path is <filename>%APPDATA%\Sylpheed</filename>). They are in plain
      text format and quite easy to understand, so don&apos;t fear to take a look
-     into them using a texteditor.</para>
+     into them using a text editor.</para>
         <itemizedlist>
           <listitem>
             <para><filename>sylpheedrc</filename>      - main configuration: nearly all options from the
@@ -468,7 +487,7 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
             <para><filename>actionsrc</filename>       - user-defined actions</para>
           </listitem>
           <listitem>
-            <para><filename>addrbook-*.xml</filename>  - contents of your addressbook</para>
+            <para><filename>addrbook-*.xml</filename>  - contents of your address book</para>
           </listitem>
           <listitem>
             <para><filename>customheaderrc</filename>  - contains user-defined header lines</para>
@@ -491,7 +510,47 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
     </qandaentry>
     <qandaentry>
       <question>
-        <para>What to do when printing an e-mail prints off the paper?
+        <para>How do I change the location of user profile directory under Windows?</para>
+      </question>
+      <answer>
+        <para>The configuration files and the mailboxes are saved under the following
+location (<filename>%APPDATA%\Sylpheed</filename>) by default:</para>
+        <para><itemizedlist>
+            <listitem>
+              <para>Windows 2000/XP:
+<filename>C:\Documents and Settings\<replaceable>(user name)</replaceable>\Application Data\Sylpheed</filename></para>
+            </listitem>
+            <listitem>
+              <para>Windows Vista:
+<filename>C:\Users\<replaceable>(user name)</replaceable>\AppData\Sylpheed</filename></para>
+            </listitem>
+          </itemizedlist></para>
+        <para>If you want to change the location of the configuration files, you can
+specify it by the command line option <parameter>--configdir &quot;<replaceable>directory name</replaceable>&quot;</parameter>.
+Create a shortcut of <filename>sylpheed.exe</filename>, and append the option to the link target
+like the following:
+
+</para>
+        <screen>&quot;C:\Program Files\Sylpheed\sylpheed.exe&quot; --configdir &quot;D:\Sylpheed&quot;</screen>
+        <para>If <filename>sylpheed.ini</filename> file exists at the same location as <filename>sylpheed.exe</filename>, it will be
+loaded at startup. With this approach, you can make Sylpheed completely portable
+independent of drive letters etc., and you can install it in removable media
+such as USB memory.
+ </para>
+        <note>
+          <para>The installer version, and GnuPG and GPGME use registry.</para>
+        </note>
+        <para>The sample INI file is included in the Sylpheed for Windows installation package as <filename>sample-sylpheed.ini</filename>.
+Please copy or rename it to use.
+<literal>ipcport</literal> specifies the port number of socket for IPC (default is 50215).
+<literal>configdir</literal> specifies the location of configuration files as a relative
+path from the folder in which <filename>sylpheed.exe</filename> is located, or an absolute path.</para>
+        <para>(The text above is a slightly modified excerpt from the <filename>README-win32.txt</filename> file, which you should find within the <filename>C:\Program Files\Sylpheed</filename> directory.)</para>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
+        <para>What to do when printing an email prints off the paper?
 </para>
       </question>
       <answer>
diff --git a/faq/en/faq_003.xml b/faq/en/faq_003.xml
index 41a5b6a..d5d2c1d 100644
--- a/faq/en/faq_003.xml
+++ b/faq/en/faq_003.xml
@@ -21,7 +21,7 @@
       <answer>
         <para>Yes. In <menuchoice>
             <guimenu>Configuration</guimenu>
-            <guimenuitem>Common preferences</guimenuitem>
+            <guimenuitem>Common preferences...</guimenuitem>
           </menuchoice>, under the
      <guimenuitem>Display</guimenuitem> tab.</para>
       </answer>
@@ -34,9 +34,9 @@
       <answer>
         <para>In <menuchoice>
             <guimenu>Configuration</guimenu>
-            <guimenuitem>Common preferences</guimenuitem>
-          </menuchoice>, under the
-     <guimenuitem>Display</guimenuitem> tab you can press the button <guibutton>Set display item of summary...</guibutton>. That pops up a screen with all the
+            <guimenuitem>Common preferences...</guimenuitem>
+          </menuchoice> under the
+     <guimenuitem>Display</guimenuitem> tab, you can press the button <guibutton>Set display item of summary...</guibutton>. That pops up a screen with all the
      options you can show or leave out of the message
      list.</para>
       </answer>
@@ -55,11 +55,12 @@
      Remember, if you want to use a command line editor
      like vi or emacs, to write the name of the shell
      (term, term, rxvt) with the <parameter>-e</parameter> parameter in front of
-     the editor. E.g.: <command>rxvt -e vi %s</command>. Also, make sure that you have checked <guilabel>Automatically launch the external editor</guilabel> in <menuchoice>
+     the editor. E.g.: <command>rxvt -e vi %s</command>.</para>
+        <para>Also, make sure that you have checked <guilabel>Automatically launch the external editor</guilabel> in <menuchoice>
             <guimenuitem>Common preferences</guimenuitem>
             <guimenuitem>Compose</guimenuitem>
             <guimenuitem>Editor</guimenuitem>
-          </menuchoice>, if you want the editor of your choise to be launched every time you begin composing a message. 
+          </menuchoice>, if you want the editor of your choice to be launched every time you begin composing a message. 
 </para>
       </answer>
     </qandaentry>
@@ -69,12 +70,15 @@
 </para>
       </question>
       <answer>
-        <para>You can set the GTK+ font by <filename>$HOME/.gtkrc</filename>, or
-     <filename>$HOME/.gtkrc.mine</filename>,
-     (which is included by <filename>$HOME/.gtkrc</filename>).
-     For example:
-     <computeroutput>style &quot;default&quot; { font = &quot;-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1 &quot; } widget_class &quot;*&quot; style &quot;default&quot;</computeroutput>
-</para>
+        <para>You can set the GTK+ font by <filename>$HOME/.gtkrc-2.0</filename>, or
+     <filename>$HOME/.gtkrc-2.0.mine</filename>,
+     (which is included by <filename>$HOME/.gtkrc-2.0</filename>).
+     For example:</para>
+        <programlisting>style &quot;default&quot; {
+       font = &quot;-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1 &quot;
+}
+widget_class &quot;*&quot; style &quot;default&quot;
+</programlisting>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -85,7 +89,7 @@
       <answer>
         <para>In <menuchoice>
             <guimenu>Configuration</guimenu>
-            <guimenuitem>Common preferences</guimenuitem>
+            <guimenuitem>Common preferences...</guimenuitem>
           </menuchoice>, there&apos;s a
      checkbox <guilabel>Save sent message to outbox</guilabel>. Uncheck it,
      and it&apos;s solved.
@@ -94,7 +98,7 @@
     </qandaentry>
     <qandaentry>
       <question>
-        <para>How can I change the key-bindings (hot-keys) in Sylpheed?
+        <para>How can I change the key bindings (hotkeys) in Sylpheed?
 </para>
       </question>
       <answer>
@@ -116,8 +120,14 @@
      assigned to, will no longer have a shortcut key. If
      you want to remove the key binding, do the same
      thing, but press the <keycap>Delete</keycap> key on the menu item.
-     Then the key binding is removed.
-</para>
+     Then the key binding is removed.</para>
+        <para>Also see <menuchoice>
+            <guimenu>Configuration</guimenu>
+            <guimenuitem>Common preferences...</guimenuitem>
+            <guimenuitem>Details</guimenuitem>
+            <guimenuitem>Interface</guimenuitem>
+            <guilabel>Set key bindings...</guilabel>
+          </menuchoice> where you are able to reset the Default key bindings, or use other predefined key bindings.</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -127,7 +137,7 @@
       </question>
       <answer>
         <para>Of course! Not all windows, but by pressing <keycap>Escape</keycap>,
-     you can close the addressbook, the window of viewing
+     you can close the address book, the window of viewing
      a mail source (<menuchoice>
             <guimenu>View</guimenu>
             <guimenuitem>Message source</guimenuitem>
@@ -155,7 +165,7 @@
             <guimenuitem>Display</guimenuitem>
             <guimenuitem>General</guimenuitem>
           </menuchoice>  and choose the <guibutton>...</guibutton> labeled button.
-</para>
+For more options, see <command>man 3 strftime</command>.</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -186,7 +196,12 @@
       </question>
       <answer>
         <para>You need to double click the URL.
-</para>
+Also, check that you have configured your web browser correctly in <menuchoice>
+            <guimenu>Configuration</guimenu>
+            <guimenuitem>Common preferences...</guimenuitem>
+            <guimenuitem> Details</guimenuitem>
+            <guimenuitem>External commands</guimenuitem>
+          </menuchoice>. </para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -210,7 +225,40 @@ parameter. Example: <command>gedit &apos;%s&apos;</command>
             <guimenu>Configuration</guimenu>
             <guimenuitem>Preferences for current account...</guimenuitem>
             <guimenuitem>Compose</guimenuitem>
-          </menuchoice>. There you can check the <guilabel>Bcc</guilabel> checkbox and optionally enter an e-mail address.</para>
+          </menuchoice>. There you can check the <guilabel>Bcc</guilabel> checkbox and optionally enter an email address.</para>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
+        <para>How do I change the toolbar?</para>
+      </question>
+      <answer>
+        <para>Go to <menuchoice>
+            <guimenu>View</guimenu>
+            <guimenuitem>Customize toolbar...</guimenuitem>
+          </menuchoice> and select items from the <guilabel>Available items</guilabel> list to be displayed on the toolbar. You can modify the order by using the <guibutton>Up</guibutton> or <guibutton>Down</guibutton> button. The customization dialog also offers you to revert your modifications to default.</para>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
+        <para>Why isn&apos;t the next message displayed when I delete a message? </para>
+      </question>
+      <answer>
+        <para>Go to <menuchoice>
+            <guimenu>Configuration</guimenu>
+            <guimenuitem>Common preferences...</guimenuitem>
+            <guimenuitem>Details</guimenuitem>
+            <guimenuitem>Interface</guimenuitem>
+          </menuchoice>, and select <guilabel>Always open messages in summary when selected</guilabel>. </para>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
+        <para>How can I remove mailing list information from Subject headers?</para>
+      </question>
+      <answer>
+        <para>Very often, when you are subscribed to a mailing list, you will store each message from that list in a folder dedicated to that list. Depending on remote software solution and configuration,  mailing lists tend to include some words in the Subject header to identify the messages, optionally accompanied with a message number, for instance <literal>[sylpheed:33101]</literal>. These additions do not provide useful info if you have organized your folders as described, but Sylpheed allows you to disable displaying the additions in  summary, and/or, if you wish, delete the additions on reply.</para>
+        <para>To do that, right-click on a folder from the folder tree, and select  <guimenuitem>Properties...</guimenuitem> In the <guilabel>Folder properties</guilabel> dialog, check <guilabel>Don&apos;t display [...] or (...) at the beginning of subject in summary</guilabel>, or <guilabel>Delete [...] or (...) at the beginning of subject on reply</guilabel>, respectively.</para>
       </answer>
     </qandaentry>
   </qandaset>