faq.xml: Expanded question about key bindings, and other

minor edits across the FAQ.
faq_001.xml: Ditto.
faq_002.xml: Ditto.
faq_003.xml: Ditto.
faq_004.xml: Delete the obsolete file.

6 files changed, 77 insertions, 37 deletions

diff --git a/faq/en/ChangeLog b/faq/en/ChangeLog
index 0cfe6a8..e99ac64 100644
--- a/faq/en/ChangeLog
+++ b/faq/en/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-01  Petr Kovar  <pknbe@volny.cz>
+
+	* faq.xml: Expanded question about key bindings, and other minor
+	edits across the FAQ.
+	* faq_001.xml: Ditto.
+	* faq_002.xml: Ditto.
+	* faq_003.xml: Ditto.
+	* faq_004.xml: Delete the obsolete file.
+
 2009-09-24  Petr Kovar  <pknbe@volny.cz>
 
 	* faq.xml: Change revision numbers to respect 'beta' and
diff --git a/faq/en/faq.xml b/faq/en/faq.xml
index b20bec4..c32b013 100644
--- a/faq/en/faq.xml
+++ b/faq/en/faq.xml
@@ -9,11 +9,7 @@
   <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>
@@ -77,7 +73,7 @@
       </revision>
       <revision>
         <revnumber>2.0</revnumber>
-        <date>2009/09/24</date>
+        <date>2009/10/01</date>
         <authorinitials>PK</authorinitials>
         <revremark>Finished porting to DocBook XML, updated many questions across the document to conform with Sylpheed 2.7.1.</revremark>
       </revision>
diff --git a/faq/en/faq_001.xml b/faq/en/faq_001.xml
index c1cd66c..8df341b 100644
--- a/faq/en/faq_001.xml
+++ b/faq/en/faq_001.xml
@@ -51,7 +51,7 @@
       <answer>
         <para>
         Sylpheed is  an email client (and news  reader)  based on GTK+,
-        running on the X Window System, and aiming for:</para>
+        running on the X Window System or Microsoft Windows, and aiming for:</para>
         <itemizedlist>
           <listitem>
             <para>Quick response</para>
@@ -63,9 +63,20 @@
             <para>Easy configuration, intuitive operation</para>
           </listitem>
           <listitem>
+            <para>High reliability</para>
+          </listitem>
+          <listitem>
+            <para>Internationalization and multilingualization support</para>
+          </listitem>
+          <listitem>
             <para>Abundant features</para>
           </listitem>
         </itemizedlist>
+        <para>As the Sylpheed README file reads: The appearance and interface are similar to some popular e-mail clients for
+Windows, such as Outlook Express or Becky!. Many commands are accessible with
+the keyboard like the Emacs-based mailers such as Mew and Wanderlust.
+So you will be able to migrate to Sylpheed without much discomfort, even if
+you are accustomed to other mailers.</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -118,8 +129,10 @@
          Mails are stored in the MH mailfile format as used by MH
          and EMH. Maildir,  mbox, and eml formats are not (yet)
          supported, although it is possible to import an mbox
-         file or an eml file into a Sylpheed mailbox.
-      </para>
+         file or an eml file into a Sylpheed mailbox.</para>
+        <para>You can manage your mails just with Sylpheed, or together with another mailer based on the MH format (e.g. Mew). The MH format has less possibility
+of losing mails on failures since one file corresponds to one mail. You can also utilize fetchmail
+and/or procmail, and external programs on receiving (like inc or imget).</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -410,6 +423,9 @@ sylpheedmail/.
           <listitem>
             <para>Upgrade to 0.7.3: many key bindings have changed</para>
           </listitem>
+          <listitem>
+            <para>Upgrade to 2.2.3 or former on Windows: all configuration files such as mailboxes or bsfilter files are removed when performing the upgrade and/or uninstallation, so please be careful</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>
diff --git a/faq/en/faq_002.xml b/faq/en/faq_002.xml
index e60c2f1..3e4ddc9 100644
--- a/faq/en/faq_002.xml
+++ b/faq/en/faq_002.xml
@@ -315,6 +315,29 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
     </qandaentry>
     <qandaentry>
       <question>
+        <para>How can I get the newest source code from the Sylpheed Subversion (SVN) repository?</para>
+      </question>
+      <answer>
+        <para>Move to an appropriate directory, and after you run the command specified below, a source tree named <filename>trunk</filename> will be created under that directory:</para>
+        <para><command>svn checkout svn://sylpheed.sraoss.jp/sylpheed/trunk</command></para>
+        <para>The subdirectories under the <filename>sylpheed</filename> directory are  as follows:</para>
+        <itemizedlist>
+          <listitem>
+            <para><filename>trunk/</filename> - main tree</para>
+          </listitem>
+          <listitem>
+            <para><filename>branches/</filename> - miscellaneous experimental branches</para>
+          </listitem>
+          <listitem>
+            <para><filename>tags/</filename> - release-tagged branches</para>
+          </listitem>
+        </itemizedlist>
+        <para>To update to the newest source tree, run the following command in the target directory:</para>
+        <para><command>svn update</command></para>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
         <para>I checked out the sources using SVN and can&apos;t find any configure script.
 </para>
       </question>
@@ -352,7 +375,7 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
     </qandaentry>
     <qandaentry>
       <question>
-        <para>I don&apos;t want to compile in support for ... any longer, but after running
+        <para>I don&apos;t want to compile in support for (...) any longer, but after running
      &quot;configure&quot;, those libraries are still used.
 </para>
       </question>
@@ -503,7 +526,7 @@ When that completes successfully, there is a <guimenuitem>Privacy</guimenuitem>
                         read messages, sort order, etc.</para>
           </listitem>
           <listitem>
-            <para><filename>menurc</filename>          - Key bindings</para>
+            <para><filename>menurc</filename>          - key bindings</para>
           </listitem>
         </itemizedlist>
       </answer>
diff --git a/faq/en/faq_003.xml b/faq/en/faq_003.xml
index d5d2c1d..f5d4fb3 100644
--- a/faq/en/faq_003.xml
+++ b/faq/en/faq_003.xml
@@ -102,7 +102,28 @@ widget_class &quot;*&quot; style &quot;default&quot;
 </para>
       </question>
       <answer>
-        <para>That is very simple. Suppose you want to assign a
+        <para>Unlike Sylpheed 1.x,  Sylpheed 2.x doesn&apos;t allow direct modification of the menu shortcuts by default. Nevertheless, you can use the following methods to configure them:</para>
+        <orderedlist>
+          <listitem>
+            <para><emphasis>Using GNOME 2.8 or later:</emphasis> run gconf-editor from <menuchoice>
+                <guimenu>Applications</guimenu>
+                <guisubmenu>System Tools</guisubmenu>
+                <guimenuitem>Configuration Editor</guimenuitem>
+              </menuchoice>. Select <menuchoice>
+                <guimenu>desktop</guimenu>
+                <guisubmenu>gnome</guisubmenu>
+                <guisubmenu>interface</guisubmenu>
+              </menuchoice> and check <guilabel>can-change-accels</guilabel> there.</para>
+          </listitem>
+          <listitem>
+            <para><emphasis>Using GNOME before 2.8, or other environments:</emphasis> add the following line to the file <filename>~/.gtkrc-2.0</filename> (or create a new one, if it doesn&apos;t exist):</para>
+            <programlisting>gtk-can-change-accels = 1</programlisting>
+          </listitem>
+          <listitem>
+            <para>When Sylpheed is not running, directly edit <filename>~/.sylpheed-2.0/menurc</filename> with a text editor.</para>
+          </listitem>
+        </orderedlist>
+        <para>After that, the key binding change itself is very simple. Suppose you want to assign a
      shortcut key to a function, e.g. sending all mail
      out should start when you press <keycombo>
             <keycap>Ctrl</keycap>
diff --git a/faq/en/faq_004.xml b/faq/en/faq_004.xml
deleted file mode 100644
index 0a67734..0000000
--- a/faq/en/faq_004.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><appendix id="sylpheed-faq-4">
-  <appendixinfo>
-    <title>The Sylpheed Documentation Team</title>
-  </appendixinfo>
-  <title>The Sylpheed Documentation Team</title>
-  <section>
-    <title>The Sylpheed Documentation Team</title>
-    <para>
-  The Sylpheed Documentation Team:</para>
-    <literallayout>
-Francois Barriere      fbarriere@users.sourceforge.net
-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
-</literallayout>
-<!-- - GNU Project - Free Software Foundation (FSF) --><!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" -->  </section>
-</appendix>
\ No newline at end of file