NEWS: Prepare for the FAQ_EN_2_2 release.HEADFAQ_EN_2_2originmaster

faq_001.xml: Minor fixes.
faq_003.xml: Ditto.

4 files changed, 65 insertions, 8 deletions

diff --git a/faq/en/ChangeLog b/faq/en/ChangeLog
index a54b662..b7bb11a 100644
--- a/faq/en/ChangeLog
+++ b/faq/en/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-09  Petr Kovar  <pknbe@volny.cz>
 
+	* NEWS: Prepare for the FAQ_EN_2_2 release.
+	* faq_001.xml: Minor fixes.
+	* faq_003.xml: Ditto.
+
+2010-08-09  Petr Kovar  <pknbe@volny.cz>
+
 	* faq.xml: Second round of updates with regard to Sylpheed 3.1.
 	* faq_001.xml: Ditto.
 	* faq_002.xml: Ditto.
diff --git a/faq/en/NEWS b/faq/en/NEWS
index 0f12680..63b3d86 100644
--- a/faq/en/NEWS
+++ b/faq/en/NEWS
@@ -1,3 +1,54 @@
+Sylpheed FAQ revision 2.2 released on 2010-08-09
+================================================
+
+New revision of Sylpheed FAQ has been officially released from the Sylpheed
+Documentation Project to reflect changes in the upcoming Sylpheed 3.1.
+
+You can view the FAQ either as a multi-page or single-page HTML document at:
+
+http://sylpheeddoc.sourceforge.net/en/doc_faq.html
+
+Or download it together with source DocBook XML files in a .tar.gz or .zip
+archive from:
+
+https://sourceforge.net/projects/sylpheeddoc/files/
+
+The source DocBook XML files are also available in the Project CVS repository,
+see:
+
+https://sourceforge.net/scm/?type=cvs&group_id=20952
+
+
+Changes over the past 4 months
+------------------------------
+
+* New Q&A "Can I run multiple instances of Sylpheed?"
+* New Q&A "Execute command for my dynamic signature seems not to be working!"
+* Updated Q&A on environment variables
+* Updated Q&A on automatic name completion
+* Updated Q&A on Sylpheed plug-ins
+* Other minor edits throughout the document
+* To better comply with the GFDL license, the source DocBook XML files together
+  with the plain text copy of the GFDL license and appropriate legal notice are
+  now distributed in tarballs with each documentation release, and the exact way
+  of how to obtain the source files is mentioned explicitly in the document;
+  thanks to Ricardo Mones for pointing these legal issues out
+
+All other information on the Sylpheed Documentation Project including how to
+contribute to the documentation effort is available at:
+
+http://sylpheeddoc.sourceforge.net/
+
+
+Contributors to this and previous releases
+------------------------------------------
+
+Paul Kater, Jens Oberender, Francois Barriere, Olivier Delhomme, Petr Kovar
+
+
+Enjoy!
+
+
 Sylpheed FAQ revision 2.1 released on 2010-04-14
 ================================================
 
diff --git a/faq/en/faq_001.xml b/faq/en/faq_001.xml
index 2b2880f..802b6cd 100644
--- a/faq/en/faq_001.xml
+++ b/faq/en/faq_001.xml
@@ -239,7 +239,7 @@ and/or procmail, and external programs on receiving (like inc or imget).</para>
          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>
-        <para>Prior to Sylpheed 3.1, user needed to press the <keycap>Tab</keycap> key before the search would start. If you still prefer the previous behavior instead, you can  enable it by checking <menuchoice>
+        <para>Prior to Sylpheed 3.1, users needed to press the <keycap>Tab</keycap> key before the search would start. If you still prefer the previous behavior, you can enable it by checking <menuchoice>
             <guimenu>Configuration</guimenu>
             <guimenuitem>Common preferences...</guimenuitem>
             <guimenuitem>Details</guimenuitem>
@@ -252,7 +252,7 @@ and/or procmail, and external programs on receiving (like inc or imget).</para>
     </qandaentry>
     <qandaentry>
       <question id="faq-tab-error-sylpheed">
-        <para>Fine, but when I hit the Tab key I get an error message or nothing happens at all.
+        <para>Fine, but when I hit the Tab key I either get an error message or nothing happens at all.
       </para>
       </question>
       <answer>
@@ -516,9 +516,9 @@ sylpheedmail/.
         <para>Are there any plug-ins extending standard Sylpheed functionality?</para>
       </question>
       <answer>
-        <para>As of Sylpheed 3.1, there is an  Attachment Tool Plug-in distributed with the Sylpheed source code and available under <filename>plugin/attachment_tool/</filename>.  Its only function is to remove attachments from
+        <para>As of Sylpheed 3.1, there is an Attachment Tool Plug-in distributed with the Sylpheed source code and available under <filename>plugin/attachment_tool/</filename>.  Its only function is to remove attachments from
 selected messages and is provided more or less as a technology preview. More plug-ins are planned since Sylpheed 3.0, released in early 2010, and later supports a plug-in interface. In the future, some of the Sylpheed features  will be re-implemented as plug-ins, and, moreover, various other plug-ins will be released.</para>
-        <para>There is a page on the Sylpheed website dedicated to the <ulink url="http://sylpheed.sraoss.jp/en/plugin.html">plug-in interface</ulink>. Additionally,  the <filename>PLUGIN.txt</filename> file distributed directly with Sylpheed can provide you with some basic information on the topic.</para>
+        <para>There is a page on the Sylpheed website dedicated to the <ulink url="http://sylpheed.sraoss.jp/en/plugin.html">plug-in interface</ulink>. Additionally, the <filename>PLUGIN.txt</filename> file distributed directly with Sylpheed can provide you with some basic information on the topic.</para>
         <note>
           <para>If you are a developer interested in creating plug-ins for Sylpheed, see the <ulink url="http://sylpheed.sraoss.jp/wiki/index.php?PluginSpec">plug-in specification</ulink> on the Sylpheed wiki.</para>
         </note>
@@ -588,4 +588,4 @@ Frank    Weng          fweng at users.sourceforge.net</programlisting>
       </answer>
     </qandaentry>
   </qandaset>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/faq/en/faq_003.xml b/faq/en/faq_003.xml
index 8410a2a..7fded96 100644
--- a/faq/en/faq_003.xml
+++ b/faq/en/faq_003.xml
@@ -249,7 +249,7 @@ parameter. Example: <command>gedit &apos;%s&apos;</command></para>
         <para>Execute command for my dynamic signature seems not to be working!</para>
       </question>
       <answer>
-        <para>Under Windows, if you have created e.g. a simple batch file  to  echo a line to be included in your dynamic signature, you need to execute the command (specified under <menuchoice>
+        <para>Under Windows, if you have created e.g. a simple batch file to echo a line to be included in your dynamic signature, you need to execute the command (specified under <menuchoice>
             <guimenu>Account preferences</guimenu>
             <guisubmenu>Compose</guisubmenu>
             <guimenuitem>Signature</guimenuitem>
@@ -257,7 +257,7 @@ parameter. Example: <command>gedit &apos;%s&apos;</command></para>
           </menuchoice>) using either forward slashes or double
 backslashes for paths, for example:</para>
         <para><command>cmd /c &apos;c:\\signature.bat&apos;</command></para>
-        <para>Note that it is also recommended to enclose  paths with single quotes, as is illustrated above.</para>
+        <para>Note that it is also recommended to enclose paths with single quotes, as is illustrated above.</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -306,4 +306,4 @@ backslashes for paths, for example:</para>
       </answer>
     </qandaentry>
   </qandaset>
-</chapter>
\ No newline at end of file
+</chapter>