updated Sylpheed FAQ to 2.2 (thanks to Petr Kovar).

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2663 ee746299-78ed-0310-b773-934348b2243d

13 files changed, 1001 insertions, 203 deletions

diff --git a/faq/en/COPYING b/faq/en/COPYING
new file mode 100644
index 00000000..4a0fe1c8
--- /dev/null
+++ b/faq/en/COPYING
@@ -0,0 +1,397 @@
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
diff --git a/faq/en/ChangeLog b/faq/en/ChangeLog
new file mode 100644
index 00000000..b7bb11a8
--- /dev/null
+++ b/faq/en/ChangeLog
@@ -0,0 +1,92 @@
+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.
+	* faq_003.xml: Ditto.
+
+2010-08-04  Petr Kovar  <pknbe@volny.cz>
+
+	* faq_001.xml: Some fixes to the recent updates.
+	* faq_002.xml: Ditto.
+	* faq_003.xml: Ditto.
+
+2010-07-30  Petr Kovar  <pknbe@volny.cz>
+
+	* COPYING: Add a copy of the GFDL 1.2 to distribute it within release
+	tarball.
+	* LICENSE: Add a legal notice to distribute it within release tarball.
+	* faq_001.xml: First round of updates with regard to Sylpheed 3.1.
+	* faq_002.xml: Ditto.
+	* faq_003.xml: Ditto.
+	* sylpheed-faq.sgml: Remove old SGML FAQ document.
+
+2010-04-14  Petr Kovar  <pknbe@volny.cz>
+
+	* NEWS: Prepare for the FAQ_EN_2_1 release.
+	* faq.xml: Prepare for the FAQ_EN_2_1 release.
+	* faq_001.xml: Minor edits.
+	* faq_002.xml: Ditto.
+	* faq_003.xml: Ditto.
+
+2010-03-22  Petr Kovar  <pknbe@volny.cz>
+
+	* faq.xml: Updated with regard to Sylpheed 3.0.1.
+	* faq_001.xml: Ditto.
+	* faq_002.xml: Ditto.
+	* faq_003.xml: Ditto.
+
+2009-10-02  Petr Kovar  <pknbe@volny.cz>
+
+	* NEWS: Add the file & prepare for the FAQ_EN_2_0 release.
+	* faq.xml: Prepare for the FAQ_EN_2_0 release.
+
+2009-10-02  Petr Kovar  <pknbe@volny.cz>
+
+	* faq_001.xml: Minor addition.
+
+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
+	'stable'.
+	* faq_001.xml: Fix typo, thanks to Randy Dunlap.
+
+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
+	cleaning.
+
+2009-08-27  Petr Kovar  <pknbe@volny.cz>
+
+	* *.xml: Better formatting of qandaset tables. Still using
+	the shade.verbatim parameter for the IE compatibility's sake.
+	qandaset TOCs are now generated in each FAQ chunk.
+
+2009-08-23  Petr Kovar  <pknbe@volny.cz>
+
+	* *.xml: First round of very basic FAQ updates.
+
+2009-08-12  Petr Kovar  <pknbe@volny.cz>
+
+	* *.xml: Finished porting to DocBook XML.
+	* ChangeLog: Add the file.
diff --git a/faq/en/LICENSE b/faq/en/LICENSE
new file mode 100644
index 00000000..bb2cce18
--- /dev/null
+++ b/faq/en/LICENSE
@@ -0,0 +1,9 @@
+Sylpheed FAQ
+
+    Copyright (c) 2010 The Sylpheed Documentation Project.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the file "COPYING".
+
diff --git a/faq/en/Makefile.am b/faq/en/Makefile.am
index e5bbaed1..eaa74da0 100644
--- a/faq/en/Makefile.am
+++ b/faq/en/Makefile.am
@@ -14,4 +14,5 @@ EXTRA_DIST = $(faqdata_DATA) \
      faq_001.xml \
      faq_002.xml \
      faq_003.xml \
-     fdl.xml 
+     fdl.xml \
+     LICENSE
diff --git a/faq/en/NEWS b/faq/en/NEWS
new file mode 100644
index 00000000..63b3d860
--- /dev/null
+++ b/faq/en/NEWS
@@ -0,0 +1,137 @@
+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
+================================================
+
+New revision of Sylpheed FAQ has been officially released from the Sylpheed
+Documentation Project to reflect changes in Sylpheed 3.0.
+
+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 in a .tar.gz or .zip archive from:
+
+https://sourceforge.net/projects/sylpheeddoc/files/
+
+DocBook XML source files are available in the Project CVS repository, see:
+
+https://sourceforge.net/scm/?type=cvs&group_id=20952
+
+
+Changes over the past 6 months
+------------------------------
+
+* New Q&A regarding new mail retrieval
+* New Q&A regarding Sylpheed plug-in interface
+* New Q&A on disabling/enabling the alternating row colors in the message list
+* Updated Q&A on setting up a new account
+* Corrected configuration directory paths under Windows Vista/Seven
+* Other minor edits throughout the document
+
+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.0 released on 2009-10-02
+================================================
+
+After a couple of dormant years, the Sylpheed FAQ has been officially released
+from the Sylpheed Documentation Project.
+
+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 in a .tar.gz archive from:
+
+https://sourceforge.net/projects/sylpheeddoc/files/
+
+DocBook XML source files are available in the Project CVS repository, see:
+
+https://sourceforge.net/scm/?type=cvs&group_id=20952
+
+
+Changes over the past 6 years
+-----------------------------
+
+* Many questions across the document have been updated to conform with the
+  latest Sylpheed version 2.7.1
+* The document has been migrated from LinuxDoc SGML to DocBook XML
+* The document is now licensed under the terms of the GFDL 1.2 or later
+  (was 1.1 or later)
+* A copy of the GFDL 1.2 is now distributed with the FAQ
+
+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!
diff --git a/faq/en/faq.xml b/faq/en/faq.xml
index f9dbc6d7..5fa63f08 100644
--- a/faq/en/faq.xml
+++ b/faq/en/faq.xml
@@ -83,6 +83,12 @@
         <authorinitials>PK</authorinitials>
         <revremark>Updated with regard to Sylpheed 3.0.2.</revremark>
       </revision>
+      <revision>
+        <revnumber>2.2</revnumber>
+        <date>2010/08/09</date>
+        <authorinitials>PK</authorinitials>
+        <revremark>Updates for the upcoming Sylpheed 3.1.</revremark>
+      </revision>
 <!-- ******************************************************************************** -->    </revhistory>
   </bookinfo>
 &__faq__001;&__faq__002;&__faq__003;&__license;</book>
diff --git a/faq/en/faq_001.xml b/faq/en/faq_001.xml
index 90413c19..802b6cdd 100644
--- a/faq/en/faq_001.xml
+++ b/faq/en/faq_001.xml
@@ -227,25 +227,32 @@ and/or procmail, and external programs on receiving (like inc or imget).</para>
     </qandaentry>
     <qandaentry>
       <question id="faq-completion-adress-sylpheed">
-        <para>Does Sylpheed have name completion in the address fields?
+        <para>Does Sylpheed have automatic name completion in the address fields?
       </para>
       </question>
       <answer>
         <para>
          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;
+         type &quot;<literal>don</literal>&quot; (without the quotes) and it will show you the correct name (when only one &quot;don&quot;
          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 email addresses
          starting with &quot;<literal>don</literal>&quot; will appear in the list (like
-         &quot;<literal>don.giovanni@maffia.org</literal>&quot;).
-      </para>
+         &quot;<literal>don.giovanni@maffia.org</literal>&quot;).</para>
+        <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>
+            <guimenuitem>Other</guimenuitem>
+            <guisubmenu>Address book</guisubmenu>
+            <guilabel>Address auto-completion:</guilabel>
+            <guilabel>Start with Tab</guilabel>
+          </menuchoice>.</para>
       </answer>
     </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 either get an error message or nothing happens at all.
       </para>
       </question>
       <answer>
@@ -253,8 +260,16 @@ and/or procmail, and external programs on receiving (like inc or imget).</para>
          When you want to use name completion, make sure that
          there are names in your address book. If there are no
          names, even Sylpheed has a hard time completing
-         something.
-      </para>
+         something.</para>
+        <para>If nothing happens at all when typing text in the address fields, make sure that you have the address auto-completion enabled by checking that the following preference is not selected:  <menuchoice>
+            <guimenu>Configuration</guimenu>
+            <guimenuitem>Common preferences...</guimenuitem>
+            <guimenuitem>Details</guimenuitem>
+            <guimenuitem>Other</guimenuitem>
+            <guisubmenu>Address book</guisubmenu>
+            <guilabel>Address auto-completion:</guilabel>
+            <guilabel>Disabled</guilabel>
+          </menuchoice>.</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -501,8 +516,9 @@ sylpheedmail/.
         <para>Are there any plug-ins extending standard Sylpheed functionality?</para>
       </question>
       <answer>
-        <para>Not yet, but they 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>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>
         <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>
@@ -510,7 +526,7 @@ sylpheedmail/.
     </qandaentry>
     <qandaentry>
       <question id="faq-faq-sylpheed">
-        <para>Where can I find the latest Sylpheed FAQ and manual?
+        <para>Where  I can find the latest Sylpheed FAQ and manual?
       </para>
       </question>
       <answer>
@@ -532,6 +548,17 @@ sylpheedmail/.
     </qandaentry>
     <qandaentry>
       <question>
+        <para>Where I can obtain source files for this document?</para>
+      </question>
+      <answer>
+        <para>The source DocBook XML files in which this document is written can be obtained from a <ulink url="http://sylpheeddoc.cvs.sourceforge.net/sylpheeddoc/">public CVS repository</ulink> that is part of the <ulink url="http://sylpheeddoc.sourceforge.net/">Sylpheed Documentation Project</ulink>. The source files with all the necessary build system, XSL stylesheets or snapshots are stored under the &quot;<ulink url="http://sylpheeddoc.cvs.sourceforge.net/viewvc/sylpheeddoc/doc/">doc</ulink>&quot; module in the CVS repository and can be checked out through anonymous CVS with the following commands (simply press Enter when prompted for a password):</para>
+        <para><command>cvs -d:pserver:anonymous@sylpheeddoc.cvs.sourceforge.net:/cvsroot/sylpheeddoc login</command></para>
+        <para><command>cvs -z3 -d:pserver:anonymous@sylpheeddoc.cvs.sourceforge.net:/cvsroot/sylpheeddoc co -P doc</command></para>
+        <para>The source files are also included in .tar.gz and .zip archives made available with each documentation release, these can be downloaded from the <ulink url="http://sourceforge.net/projects/sylpheeddoc/files/">appropriate project page</ulink>. For more information on the used project infrastructure, please see the <ulink url="http://sylpheeddoc.sourceforge.net/en/tools.html">project website</ulink>.</para>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
         <para>I have found an error and/or outdated information in this document!</para>
       </question>
       <answer>
@@ -561,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_002.xml b/faq/en/faq_002.xml
index 212449eb..58da0f34 100644
--- a/faq/en/faq_002.xml
+++ b/faq/en/faq_002.xml
@@ -444,7 +444,7 @@ mail checks.</para>
       </answer>
     </qandaentry>
     <qandaentry>
-      <question>
+      <question id="faq-environment-variables">
         <para>What environment variables have effect on Sylpheed?</para>
       </question>
       <answer>
@@ -467,6 +467,7 @@ mail checks.</para>
             <para><envar>LC_MESSAGES</envar> - locale settings, e.g. language and date format.</para>
           </listitem>
         </itemizedlist>
+        <para>For more information on how to make Sylpheed display your language, see the <link linkend="faq-display-language">relevant question</link>.</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -580,6 +581,21 @@ path from the folder in which <filename>sylpheed.exe</filename> is located, or a
     </qandaentry>
     <qandaentry>
       <question>
+        <para>Can I run multiple instances of Sylpheed?</para>
+      </question>
+      <answer>
+        <para>Yes, Sylpheed 3.1 adds support for this often requested feature. The format of the multiple instances command is as follows:</para>
+        <para><command>sylpheed --instance-id <replaceable>ID</replaceable> --configdir <replaceable>path-to-alternative-configdir</replaceable></command></para>
+        <para>Default <parameter>ID</parameter> is set to <literal>sylpheed</literal>, so you can specify any other instance
+<parameter>ID</parameter>. The <parameter>ID</parameter> is used for the name of unix domain
+socket (under UNIX), or mutex name (under Windows). <parameter>configdir</parameter> specifies the configuration directory, i.e. the location of  configuration files you want to use with the given instance.</para>
+        <warning>
+          <para>Do not share same configuration directories or mailboxes across multiple instances as this may lead to an unexpected application behavior!</para>
+        </warning>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
         <para>What to do when printing an email prints off the paper?</para>
       </question>
       <answer>
@@ -587,4 +603,4 @@ path from the folder in which <filename>sylpheed.exe</filename> is located, or a
       </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 d83ede43..7fded969 100644
--- a/faq/en/faq_003.xml
+++ b/faq/en/faq_003.xml
@@ -2,13 +2,24 @@
   <title>Sylpheed FAQ - Interface</title>
   <qandaset id="faq-interface">
 <?dbhtml cellspacing="13px" ?>    <qandaentry>
-      <question>
+      <question id="faq-display-language">
         <para>How do I make Sylpheed display my language?</para>
       </question>
       <answer>
         <para>You have to set some environment variables, such as
      <envar>LANG</envar>, <envar>LC_CTYPE</envar>, <envar>LC_MESSAGES</envar> to your local language.
      Usually <envar>LANG</envar> (or <envar>LC_ALL</envar>) is sufficient. Note that modern distributions and operating systems do this for you automatically.</para>
+        <para>Under UNIX, if you need to set e.g. the <envar>LANG</envar> environment variable manually, execute the following command (using <literal>sh</literal> or related shell):</para>
+        <para><command>export LANG=<replaceable>value</replaceable></command></para>
+        <para>Replace <replaceable>value</replaceable> with a valid ISO <ulink url="http://en.wikipedia.org/wiki/Language_code">language code</ulink> (e.g. <literal>en_GB</literal> for British English).</para>
+        <para>If you intend to set the displayed language manually under Windows, you can do so by creating the
+<envar>LANG</envar> environment variable with a valid ISO language code value under <menuchoice>
+            <guimenu>Control Panel</guimenu>
+            <guimenuitem>System</guimenuitem>
+            <guisubmenu>Advanced</guisubmenu>
+            <guibutton>Environment Variables</guibutton>
+          </menuchoice>.</para>
+        <para>Also see the <link linkend="faq-environment-variables">question</link> regarding environment variables that have effect on Sylpheed.</para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -235,6 +246,22 @@ parameter. Example: <command>gedit &apos;%s&apos;</command></para>
     </qandaentry>
     <qandaentry>
       <question>
+        <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>
+            <guimenu>Account preferences</guimenu>
+            <guisubmenu>Compose</guisubmenu>
+            <guimenuitem>Signature</guimenuitem>
+            <guilabel>Command output</guilabel>
+          </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>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
         <para>Where is the Bcc when I compose a mail?</para>
       </question>
       <answer>
@@ -279,4 +306,4 @@ parameter. Example: <command>gedit &apos;%s&apos;</command></para>
       </answer>
     </qandaentry>
   </qandaset>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/faq/en/sylpheed-faq-1.html b/faq/en/sylpheed-faq-1.html
index bd52065a..3c2f3291 100644
--- a/faq/en/sylpheed-faq-1.html
+++ b/faq/en/sylpheed-faq-1.html
@@ -47,91 +47,92 @@ font-weight : bold;
          </div>
          <div class="qandaset">
             <dl>
-               <dt>1.1. <a href="sylpheed-faq-1.html#d0e81">
+               <dt>1.1. <a href="sylpheed-faq-1.html#d0e90">
                              Are there FAQ's in other languages?
                            </a></dt>
-               <dt>1.2. <a href="sylpheed-faq-1.html#d0e120">
+               <dt>1.2. <a href="sylpheed-faq-1.html#d0e129">
                              What is Sylpheed?
                            </a></dt>
-               <dt>1.3. <a href="sylpheed-faq-1.html#d0e151">
+               <dt>1.3. <a href="sylpheed-faq-1.html#d0e160">
                              Where can I get Sylpheed?
                            </a></dt>
-               <dt>1.4. <a href="sylpheed-faq-1.html#d0e168"> 
+               <dt>1.4. <a href="sylpheed-faq-1.html#d0e177"> 
                               Who writes Sylpheed?
                            </a></dt>
-               <dt>1.5. <a href="sylpheed-faq-1.html#d0e178">
+               <dt>1.5. <a href="sylpheed-faq-1.html#d0e187">
                               What does the name Sylpheed mean?
                            </a></dt>
-               <dt>1.6. <a href="sylpheed-faq-1.html#d0e188">
+               <dt>1.6. <a href="sylpheed-faq-1.html#d0e197">
                               How does Sylpheed store mails?
                            </a></dt>
-               <dt>1.7. <a href="sylpheed-faq-1.html#d0e197">
+               <dt>1.7. <a href="sylpheed-faq-1.html#d0e206">
                              Why does the auto collection of mail not work?
                            </a></dt>
-               <dt>1.8. <a href="sylpheed-faq-1.html#d0e204">
+               <dt>1.8. <a href="sylpheed-faq-1.html#d0e213">
                               Does Sylpheed have mail filtering?
                            </a></dt>
-               <dt>1.9. <a href="sylpheed-faq-1.html#d0e218"> 
+               <dt>1.9. <a href="sylpheed-faq-1.html#d0e227"> 
                               Can Sylpheed handle IMAP mail?
                            </a></dt>
-               <dt>1.10. <a href="sylpheed-faq-1.html#d0e225">
+               <dt>1.10. <a href="sylpheed-faq-1.html#d0e234">
                               Can Sylpheed handle local unix mailboxes?
                            </a></dt>
-               <dt>1.11. <a href="sylpheed-faq-1.html#d0e232">
+               <dt>1.11. <a href="sylpheed-faq-1.html#d0e241">
                               Can Sylpheed handle IPv6?
                            </a></dt>
-               <dt>1.12. <a href="sylpheed-faq-1.html#d0e239">
+               <dt>1.12. <a href="sylpheed-faq-1.html#d0e248">
                               Does Sylpheed support encryption like GPG?
                            </a></dt>
-               <dt>1.13. <a href="sylpheed-faq-1.html#d0e246">
+               <dt>1.13. <a href="sylpheed-faq-1.html#d0e255">
                               How does Sylpheed check for MIME types?
                            </a></dt>
-               <dt>1.14. <a href="sylpheed-faq-1.html#d0e253">Does Sylpheed allow me to write HTML styled messages?
+               <dt>1.14. <a href="sylpheed-faq-1.html#d0e262">Does Sylpheed allow me to write HTML styled messages?
                            </a></dt>
-               <dt>1.15. <a href="sylpheed-faq-1.html#d0e260">Does Sylpheed have name completion in the address fields?
+               <dt>1.15. <a href="sylpheed-faq-1.html#d0e269">Does Sylpheed have automatic name completion in the address fields?
                            </a></dt>
-               <dt>1.16. <a href="sylpheed-faq-1.html#d0e282">Fine, but when I hit the Tab key I get an error message.
+               <dt>1.16. <a href="sylpheed-faq-1.html#d0e309">Fine, but when I hit the Tab key I either get an error message or nothing happens at all.
                            </a></dt>
-               <dt>1.17. <a href="sylpheed-faq-1.html#d0e289">Why is Sylpheed so fast?
+               <dt>1.17. <a href="sylpheed-faq-1.html#d0e334">Why is Sylpheed so fast?
                            </a></dt>
-               <dt>1.18. <a href="sylpheed-faq-1.html#d0e296">Where can I get the current patches for Sylpheed?
+               <dt>1.18. <a href="sylpheed-faq-1.html#d0e341">Where can I get the current patches for Sylpheed?
                            </a></dt>
-               <dt>1.19. <a href="sylpheed-faq-1.html#d0e309">How can I send in patches, report bugs, talk about Sylpheed with others?
+               <dt>1.19. <a href="sylpheed-faq-1.html#d0e354">How can I send in patches, report bugs, talk about Sylpheed with others?
                            </a></dt>
-               <dt>1.20. <a href="sylpheed-faq-1.html#d0e336">When I send mail, the Content-Type header says the mail is in
+               <dt>1.20. <a href="sylpheed-faq-1.html#d0e381">When I send mail, the Content-Type header says the mail is in
                               US-ASCII, even when I specified ISO-8859-1?
                            </a></dt>
-               <dt>1.21. <a href="sylpheed-faq-1.html#d0e343">Why does it look like word wrap is not working?
+               <dt>1.21. <a href="sylpheed-faq-1.html#d0e388">Why does it look like word wrap is not working?
                            </a></dt>
-               <dt>1.22. <a href="sylpheed-faq-1.html#d0e369">How do I copy my mail archive to another machine? </a></dt>
-               <dt>1.23. <a href="sylpheed-faq-1.html#d0e415">Can I import a mbox into Sylpheed's MH mailfolders?
+               <dt>1.22. <a href="sylpheed-faq-1.html#d0e414">How do I copy my mail archive to another machine? </a></dt>
+               <dt>1.23. <a href="sylpheed-faq-1.html#d0e460">Can I import a mbox into Sylpheed's MH mailfolders?
                            </a></dt>
-               <dt>1.24. <a href="sylpheed-faq-1.html#d0e428">
+               <dt>1.24. <a href="sylpheed-faq-1.html#d0e473">
                               Can I use procmail to sort my mails with the MH mail handling?
                            </a></dt>
-               <dt>1.25. <a href="sylpheed-faq-1.html#d0e445">
+               <dt>1.25. <a href="sylpheed-faq-1.html#d0e490">
                               When I upgrade Sylpheed, are there things I should be aware of?
                            </a></dt>
-               <dt>1.26. <a href="sylpheed-faq-1.html#d0e485">How can I quickly update the views in Sylpheed?
+               <dt>1.26. <a href="sylpheed-faq-1.html#d0e530">How can I quickly update the views in Sylpheed?
                            </a></dt>
-               <dt>1.27. <a href="sylpheed-faq-1.html#d0e504">Why can't I use gvim as external editor?
+               <dt>1.27. <a href="sylpheed-faq-1.html#d0e549">Why can't I use gvim as external editor?
                            </a></dt>
-               <dt>1.28. <a href="sylpheed-faq-1.html#d0e517">Can I quote just parts of the original message when replying?
+               <dt>1.28. <a href="sylpheed-faq-1.html#d0e562">Can I quote just parts of the original message when replying?
                            </a></dt>
-               <dt>1.29. <a href="sylpheed-faq-1.html#d0e527">Can I reply without quoting at all?
+               <dt>1.29. <a href="sylpheed-faq-1.html#d0e572">Can I reply without quoting at all?
                            </a></dt>
-               <dt>1.30. <a href="sylpheed-faq-1.html#d0e544"> Does Sylpheed provide an anti-spam feature? </a></dt>
-               <dt>1.31. <a href="sylpheed-faq-1.html#d0e582">Are there any plug-ins extending standard Sylpheed functionality?</a></dt>
-               <dt>1.32. <a href="sylpheed-faq-1.html#d0e603">Where can I find the latest Sylpheed FAQ and manual?
+               <dt>1.30. <a href="sylpheed-faq-1.html#d0e589"> Does Sylpheed provide an anti-spam feature? </a></dt>
+               <dt>1.31. <a href="sylpheed-faq-1.html#d0e627">Are there any plug-ins extending standard Sylpheed functionality?</a></dt>
+               <dt>1.32. <a href="sylpheed-faq-1.html#d0e651">Where  I can find the latest Sylpheed FAQ and manual?
                            </a></dt>
-               <dt>1.33. <a href="sylpheed-faq-1.html#d0e624">I have found an error and/or outdated information in this document!</a></dt>
-               <dt>1.34. <a href="sylpheed-faq-1.html#d0e634">Who are the members of the Sylpheed Documentation Project?</a></dt>
+               <dt>1.33. <a href="sylpheed-faq-1.html#d0e672">Where I can obtain source files for this document?</a></dt>
+               <dt>1.34. <a href="sylpheed-faq-1.html#d0e702">I have found an error and/or outdated information in this document!</a></dt>
+               <dt>1.35. <a href="sylpheed-faq-1.html#d0e712">Who are the members of the Sylpheed Documentation Project?</a></dt>
             </dl>
             <table border="0" summary="Q and A Set" cellspacing="13px">
                <col align="left" width="1%">
                <tbody>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e81"></a><a name="faq-languages"></a><b>1.1.</b></td>
+                     <td align="left" valign="top"><a name="d0e90"></a><a name="faq-languages"></a><b>1.1.</b></td>
                      <td align="left" valign="top">
                         <p>
                                    Are there FAQ's in other languages?
@@ -177,7 +178,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e120"></a><a name="faq-what-sylpheed"></a><b>1.2.</b></td>
+                     <td align="left" valign="top"><a name="d0e129"></a><a name="faq-what-sylpheed"></a><b>1.2.</b></td>
                      <td align="left" valign="top">
                         <p>
                                    What is Sylpheed?
@@ -223,7 +224,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e151"></a><a name="faq-get-sylpheed"></a><b>1.3.</b></td>
+                     <td align="left" valign="top"><a name="d0e160"></a><a name="faq-get-sylpheed"></a><b>1.3.</b></td>
                      <td align="left" valign="top">
                         <p>
                                    Where can I get Sylpheed?
@@ -249,7 +250,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e168"></a><a name="faq-writes-sylpheed"></a><b>1.4.</b></td>
+                     <td align="left" valign="top"><a name="d0e177"></a><a name="faq-writes-sylpheed"></a><b>1.4.</b></td>
                      <td align="left" valign="top">
                         <p> 
                                     Who writes Sylpheed?
@@ -267,7 +268,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e178"></a><a name="faq-sylpheed-name"></a><b>1.5.</b></td>
+                     <td align="left" valign="top"><a name="d0e187"></a><a name="faq-sylpheed-name"></a><b>1.5.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     What does the name Sylpheed mean?
@@ -286,7 +287,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e188"></a><a name="faq-sylpheed-store-mail"></a><b>1.6.</b></td>
+                     <td align="left" valign="top"><a name="d0e197"></a><a name="faq-sylpheed-store-mail"></a><b>1.6.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     How does Sylpheed store mails?
@@ -311,7 +312,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e197"></a><a name="faq-auto-collection-sylpheed"></a><b>1.7.</b></td>
+                     <td align="left" valign="top"><a name="d0e206"></a><a name="faq-auto-collection-sylpheed"></a><b>1.7.</b></td>
                      <td align="left" valign="top">
                         <p>
                                    Why does the auto collection of mail not work?
@@ -330,7 +331,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e204"></a><a name="faq-filtering-sylpheed"></a><b>1.8.</b></td>
+                     <td align="left" valign="top"><a name="d0e213"></a><a name="faq-filtering-sylpheed"></a><b>1.8.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     Does Sylpheed have mail filtering?
@@ -350,7 +351,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e218"></a><a name="faq-imap-sylpheed"></a><b>1.9.</b></td>
+                     <td align="left" valign="top"><a name="d0e227"></a><a name="faq-imap-sylpheed"></a><b>1.9.</b></td>
                      <td align="left" valign="top">
                         <p> 
                                     Can Sylpheed handle IMAP mail?
@@ -368,7 +369,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e225"></a><a name="faq-local-unix-sylpheed"></a><b>1.10.</b></td>
+                     <td align="left" valign="top"><a name="d0e234"></a><a name="faq-local-unix-sylpheed"></a><b>1.10.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     Can Sylpheed handle local unix mailboxes?
@@ -386,7 +387,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e232"></a><a name="faq-ipv6-sylpheed"></a><b>1.11.</b></td>
+                     <td align="left" valign="top"><a name="d0e241"></a><a name="faq-ipv6-sylpheed"></a><b>1.11.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     Can Sylpheed handle IPv6?
@@ -404,7 +405,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e239"></a><a name="faq-encryption-gpg-sylpheed"></a><b>1.12.</b></td>
+                     <td align="left" valign="top"><a name="d0e248"></a><a name="faq-encryption-gpg-sylpheed"></a><b>1.12.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     Does Sylpheed support encryption like GPG?
@@ -423,7 +424,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e246"></a><a name="faq-mime-types-sylpheed"></a><b>1.13.</b></td>
+                     <td align="left" valign="top"><a name="d0e255"></a><a name="faq-mime-types-sylpheed"></a><b>1.13.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     How does Sylpheed check for MIME types?
@@ -441,7 +442,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e253"></a><a name="faq-html-sylpheed"></a><b>1.14.</b></td>
+                     <td align="left" valign="top"><a name="d0e262"></a><a name="faq-html-sylpheed"></a><b>1.14.</b></td>
                      <td align="left" valign="top">
                         <p>Does Sylpheed allow me to write HTML styled messages?
                                  
@@ -460,9 +461,9 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e260"></a><a name="faq-completion-adress-sylpheed"></a><b>1.15.</b></td>
+                     <td align="left" valign="top"><a name="d0e269"></a><a name="faq-completion-adress-sylpheed"></a><b>1.15.</b></td>
                      <td align="left" valign="top">
-                        <p>Does Sylpheed have name completion in the address fields?
+                        <p>Does Sylpheed have automatic name completion in the address fields?
                                  
                         </p>
                      </td>
@@ -472,21 +473,21 @@ font-weight : bold;
                      <td align="left" valign="top">
                         <p>
                                     Yes. When you search for a name that starts with "<code class="literal">don</code>",
-                                    type "<code class="literal">don</code>" (without the quotes) and press the <span><strong class="keycap">Tab</strong></span> key.
-                                    This will show you the correct name (when only one "don"
+                                    type "<code class="literal">don</code>" (without the quotes) and it will show you the correct name (when only one "don"
                                     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 email addresses
                                     starting with "<code class="literal">don</code>" will appear in the list (like
                                     "<code class="literal">don.giovanni@maffia.org</code>").
-                                 
+                        </p>
+                        <p>Prior to Sylpheed 3.1, users needed to press the <span><strong class="keycap">Tab</strong></span> key before the search would start. If you still prefer the previous behavior, you can enable it by checking <span class="guimenu">Configuration</span>-&gt;<span class="guimenuitem">Common preferences...</span>-&gt;<span class="guimenuitem">Details</span>-&gt;<span class="guimenuitem">Other</span>-&gt;<span class="guisubmenu">Address book</span>+<span class="guilabel">Address auto-completion:</span>+<span class="guilabel">Start with Tab</span>.
                         </p>
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e282"></a><a name="faq-tab-error-sylpheed"></a><b>1.16.</b></td>
+                     <td align="left" valign="top"><a name="d0e309"></a><a name="faq-tab-error-sylpheed"></a><b>1.16.</b></td>
                      <td align="left" valign="top">
-                        <p>Fine, but when I hit the Tab key I get an error message.
+                        <p>Fine, but when I hit the Tab key I either get an error message or nothing happens at all.
                                  
                         </p>
                      </td>
@@ -499,12 +500,14 @@ font-weight : bold;
                                     there are names in your address book. If there are no
                                     names, even Sylpheed has a hard time completing
                                     something.
-                                 
+                        </p>
+                        <p>If nothing happens at all when typing text in the address fields, make sure that you have the address auto-completion enabled
+                           by checking that the following preference is not selected:  <span class="guimenu">Configuration</span>-&gt;<span class="guimenuitem">Common preferences...</span>-&gt;<span class="guimenuitem">Details</span>-&gt;<span class="guimenuitem">Other</span>-&gt;<span class="guisubmenu">Address book</span>+<span class="guilabel">Address auto-completion:</span>+<span class="guilabel">Disabled</span>.
                         </p>
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e289"></a><a name="faq-sylpheed-fast"></a><b>1.17.</b></td>
+                     <td align="left" valign="top"><a name="d0e334"></a><a name="faq-sylpheed-fast"></a><b>1.17.</b></td>
                      <td align="left" valign="top">
                         <p>Why is Sylpheed so fast?
                                  
@@ -520,7 +523,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e296"></a><a name="faq-patches-sylpheed"></a><b>1.18.</b></td>
+                     <td align="left" valign="top"><a name="d0e341"></a><a name="faq-patches-sylpheed"></a><b>1.18.</b></td>
                      <td align="left" valign="top">
                         <p>Where can I get the current patches for Sylpheed?
                                  
@@ -537,7 +540,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e309"></a><a name="faq-send-patches-sylpheed"></a><b>1.19.</b></td>
+                     <td align="left" valign="top"><a name="d0e354"></a><a name="faq-send-patches-sylpheed"></a><b>1.19.</b></td>
                      <td align="left" valign="top">
                         <p>How can I send in patches, report bugs, talk about Sylpheed with others?
                                  
@@ -562,7 +565,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e336"></a><a name="faq-content-type-header-sylpheed"></a><b>1.20.</b></td>
+                     <td align="left" valign="top"><a name="d0e381"></a><a name="faq-content-type-header-sylpheed"></a><b>1.20.</b></td>
                      <td align="left" valign="top">
                         <p>When I send mail, the Content-Type header says the mail is in
                                     US-ASCII, even when I specified ISO-8859-1?
@@ -581,7 +584,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e343"></a><a name="faq-word-wrap-sylpheed"></a><b>1.21.</b></td>
+                     <td align="left" valign="top"><a name="d0e388"></a><a name="faq-word-wrap-sylpheed"></a><b>1.21.</b></td>
                      <td align="left" valign="top">
                         <p>Why does it look like word wrap is not working?
                                  
@@ -632,7 +635,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e369"></a><a name="d0e370"></a><b>1.22.</b></td>
+                     <td align="left" valign="top"><a name="d0e414"></a><a name="d0e415"></a><b>1.22.</b></td>
                      <td align="left" valign="top">
                         <p>How do I copy my mail archive to another machine? </p>
                      </td>
@@ -651,7 +654,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e415"></a><a name="faq-import-mbox-sylpheed"></a><b>1.23.</b></td>
+                     <td align="left" valign="top"><a name="d0e460"></a><a name="faq-import-mbox-sylpheed"></a><b>1.23.</b></td>
                      <td align="left" valign="top">
                         <p>Can I import a mbox into Sylpheed's MH mailfolders?
                                  
@@ -669,7 +672,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e428"></a><a name="faq-procmail-use-sylpheed"></a><b>1.24.</b></td>
+                     <td align="left" valign="top"><a name="d0e473"></a><a name="faq-procmail-use-sylpheed"></a><b>1.24.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     Can I use procmail to sort my mails with the MH mail handling?
@@ -693,7 +696,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e445"></a><a name="faq-upgrade-sylpheed"></a><b>1.25.</b></td>
+                     <td align="left" valign="top"><a name="d0e490"></a><a name="faq-upgrade-sylpheed"></a><b>1.25.</b></td>
                      <td align="left" valign="top">
                         <p>
                                     When I upgrade Sylpheed, are there things I should be aware of?
@@ -735,7 +738,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e485"></a><a name="faq-update-views-sylpheed"></a><b>1.26.</b></td>
+                     <td align="left" valign="top"><a name="d0e530"></a><a name="faq-update-views-sylpheed"></a><b>1.26.</b></td>
                      <td align="left" valign="top">
                         <p>How can I quickly update the views in Sylpheed?
                                  
@@ -752,7 +755,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e504"></a><a name="faq-gvim-external-editor-sylpheed"></a><b>1.27.</b></td>
+                     <td align="left" valign="top"><a name="d0e549"></a><a name="faq-gvim-external-editor-sylpheed"></a><b>1.27.</b></td>
                      <td align="left" valign="top">
                         <p>Why can't I use gvim as external editor?
                                  
@@ -775,7 +778,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e517"></a><a name="faq-quote-messages-sylpheed"></a><b>1.28.</b></td>
+                     <td align="left" valign="top"><a name="d0e562"></a><a name="faq-quote-messages-sylpheed"></a><b>1.28.</b></td>
                      <td align="left" valign="top">
                         <p>Can I quote just parts of the original message when replying?
                                  
@@ -792,7 +795,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e527"></a><a name="faq-not-quoting-sylpheed"></a><b>1.29.</b></td>
+                     <td align="left" valign="top"><a name="d0e572"></a><a name="faq-not-quoting-sylpheed"></a><b>1.29.</b></td>
                      <td align="left" valign="top">
                         <p>Can I reply without quoting at all?
                                  
@@ -809,7 +812,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e544"></a><a name="d0e545"></a><b>1.30.</b></td>
+                     <td align="left" valign="top"><a name="d0e589"></a><a name="d0e590"></a><b>1.30.</b></td>
                      <td align="left" valign="top">
                         <p> Does Sylpheed provide an anti-spam feature? </p>
                      </td>
@@ -831,7 +834,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e582"></a><a name="d0e583"></a><b>1.31.</b></td>
+                     <td align="left" valign="top"><a name="d0e627"></a><a name="d0e628"></a><b>1.31.</b></td>
                      <td align="left" valign="top">
                         <p>Are there any plug-ins extending standard Sylpheed functionality?</p>
                      </td>
@@ -839,10 +842,12 @@ sylpheedmail/.
                   <tr class="answer">
                      <td align="left" valign="top"><b></b></td>
                      <td align="left" valign="top">
-                        <p>Not yet, but they 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.
+                        <p>As of Sylpheed 3.1, there is an Attachment Tool Plug-in distributed with the Sylpheed source code and available under <code class="filename">plugin/attachment_tool/</code>.  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.
                         </p>
-                        <p>There is a page on the Sylpheed website dedicated to the <a href="http://sylpheed.sraoss.jp/en/plugin.html" target="_top">plug-in interface</a>. Additionally,  the <code class="filename">PLUGIN.txt</code> file distributed directly with Sylpheed can provide you with some basic information on the topic.
+                        <p>There is a page on the Sylpheed website dedicated to the <a href="http://sylpheed.sraoss.jp/en/plugin.html" target="_top">plug-in interface</a>. Additionally, the <code class="filename">PLUGIN.txt</code> file distributed directly with Sylpheed can provide you with some basic information on the topic.
                         </p>
                         <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
                            <h3 class="title">Note</h3>
@@ -852,9 +857,9 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e603"></a><a name="faq-faq-sylpheed"></a><b>1.32.</b></td>
+                     <td align="left" valign="top"><a name="d0e651"></a><a name="faq-faq-sylpheed"></a><b>1.32.</b></td>
                      <td align="left" valign="top">
-                        <p>Where can I find the latest Sylpheed FAQ and manual?
+                        <p>Where  I can find the latest Sylpheed FAQ and manual?
                                  
                         </p>
                      </td>
@@ -882,7 +887,26 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e624"></a><a name="d0e625"></a><b>1.33.</b></td>
+                     <td align="left" valign="top"><a name="d0e672"></a><a name="d0e673"></a><b>1.33.</b></td>
+                     <td align="left" valign="top">
+                        <p>Where I can obtain source files for this document?</p>
+                     </td>
+                  </tr>
+                  <tr class="answer">
+                     <td align="left" valign="top"><b></b></td>
+                     <td align="left" valign="top">
+                        <p>The source DocBook XML files in which this document is written can be obtained from a <a href="http://sylpheeddoc.cvs.sourceforge.net/sylpheeddoc/" target="_top">public CVS repository</a> that is part of the <a href="http://sylpheeddoc.sourceforge.net/" target="_top">Sylpheed Documentation Project</a>. The source files with all the necessary build system, XSL stylesheets or snapshots are stored under the "<a href="http://sylpheeddoc.cvs.sourceforge.net/viewvc/sylpheeddoc/doc/" target="_top">doc</a>" module in the CVS repository and can be checked out through anonymous CVS with the following commands (simply press Enter
+                           when prompted for a password):
+                        </p>
+                        <p><span><strong class="command">cvs -d:pserver:anonymous@sylpheeddoc.cvs.sourceforge.net:/cvsroot/sylpheeddoc login</strong></span></p>
+                        <p><span><strong class="command">cvs -z3 -d:pserver:anonymous@sylpheeddoc.cvs.sourceforge.net:/cvsroot/sylpheeddoc co -P doc</strong></span></p>
+                        <p>The source files are also included in .tar.gz and .zip archives made available with each documentation release, these can
+                           be downloaded from the <a href="http://sourceforge.net/projects/sylpheeddoc/files/" target="_top">appropriate project page</a>. For more information on the used project infrastructure, please see the <a href="http://sylpheeddoc.sourceforge.net/en/tools.html" target="_top">project website</a>.
+                        </p>
+                     </td>
+                  </tr>
+                  <tr class="question">
+                     <td align="left" valign="top"><a name="d0e702"></a><a name="d0e703"></a><b>1.34.</b></td>
                      <td align="left" valign="top">
                         <p>I have found an error and/or outdated information in this document!</p>
                      </td>
@@ -895,7 +919,7 @@ sylpheedmail/.
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e634"></a><a name="d0e635"></a><b>1.34.</b></td>
+                     <td align="left" valign="top"><a name="d0e712"></a><a name="d0e713"></a><b>1.35.</b></td>
                      <td align="left" valign="top">
                         <p>Who are the members of the Sylpheed Documentation Project?</p>
                      </td>
diff --git a/faq/en/sylpheed-faq-2.html b/faq/en/sylpheed-faq-2.html
index 807ac4f5..5e0d3aee 100644
--- a/faq/en/sylpheed-faq-2.html
+++ b/faq/en/sylpheed-faq-2.html
@@ -47,51 +47,52 @@ font-weight : bold;
          </div>
          <div class="qandaset">
             <dl>
-               <dt>2.1. <a href="sylpheed-faq-2.html#d0e652">What does it take to compile Sylpheed?</a></dt>
-               <dt>2.2. <a href="sylpheed-faq-2.html#d0e702">How do I set up Sylpheed?</a></dt>
-               <dt>2.3. <a href="sylpheed-faq-2.html#d0e735">Why did the creation of the mailbox fail?</a></dt>
-               <dt>2.4. <a href="sylpheed-faq-2.html#d0e748">How do I set up an account?</a></dt>
-               <dt>2.5. <a href="sylpheed-faq-2.html#d0e775">How many accounts can I set up in Sylpheed?</a></dt>
-               <dt>2.6. <a href="sylpheed-faq-2.html#d0e782">Can I set up an account for sending mail only?</a></dt>
-               <dt>2.7. <a href="sylpheed-faq-2.html#d0e797">Why does Sylpheed not delete my mails when I press "Delete"? I set a filter, and Sylpheed does not filter. I moved a mail
+               <dt>2.1. <a href="sylpheed-faq-2.html#d0e730">What does it take to compile Sylpheed?</a></dt>
+               <dt>2.2. <a href="sylpheed-faq-2.html#d0e780">How do I set up Sylpheed?</a></dt>
+               <dt>2.3. <a href="sylpheed-faq-2.html#d0e813">Why did the creation of the mailbox fail?</a></dt>
+               <dt>2.4. <a href="sylpheed-faq-2.html#d0e826">How do I set up an account?</a></dt>
+               <dt>2.5. <a href="sylpheed-faq-2.html#d0e853">How many accounts can I set up in Sylpheed?</a></dt>
+               <dt>2.6. <a href="sylpheed-faq-2.html#d0e860">Can I set up an account for sending mail only?</a></dt>
+               <dt>2.7. <a href="sylpheed-faq-2.html#d0e875">Why does Sylpheed not delete my mails when I press "Delete"? I set a filter, and Sylpheed does not filter. I moved a mail
                      to a different mailbox and it did not move.</a></dt>
-               <dt>2.8. <a href="sylpheed-faq-2.html#d0e818">Can I set up special addresses/ports for my mailserver/newsserver?</a></dt>
-               <dt>2.9. <a href="sylpheed-faq-2.html#d0e833">Does Sylpheed have options for threading messages?</a></dt>
-               <dt>2.10. <a href="sylpheed-faq-2.html#d0e852">Can I create multiple levels of subfolders to store mail?</a></dt>
-               <dt>2.11. <a href="sylpheed-faq-2.html#d0e859">Why isn't Sylpheed sending my mail out?</a></dt>
-               <dt>2.12. <a href="sylpheed-faq-2.html#d0e866">How do I apply a patch after downloading it?</a></dt>
-               <dt>2.13. <a href="sylpheed-faq-2.html#d0e900">How do I compile in support for compface pictures?</a></dt>
-               <dt>2.14. <a href="sylpheed-faq-2.html#d0e910">How do I make my own compface image?</a></dt>
-               <dt>2.15. <a href="sylpheed-faq-2.html#d0e920">How can I tell my browser/newsclient/other program to use Sylpheed as email program?</a></dt>
-               <dt>2.16. <a href="sylpheed-faq-2.html#d0e942">How do I enable GPG support in Sylpheed?</a></dt>
-               <dt>2.17. <a href="sylpheed-faq-2.html#d0e961">Mutt does not recognize Sylpheed's MH structure</a></dt>
-               <dt>2.18. <a href="sylpheed-faq-2.html#d0e977">Viewing a GIF file within Sylpheed causes a segmentation fault.</a></dt>
-               <dt>2.19. <a href="sylpheed-faq-2.html#d0e989">How Sylpheed checks for new mail?</a></dt>
-               <dt>2.20. <a href="sylpheed-faq-2.html#d0e1072">How can I make Sylpheed notify me when new mail arrives?</a></dt>
-               <dt>2.21. <a href="sylpheed-faq-2.html#d0e1082">Can I use a spell checker with Sylpheed?</a></dt>
-               <dt>2.22. <a href="sylpheed-faq-2.html#d0e1100">How can I make Sylpheed send my compface image in the mails?</a></dt>
-               <dt>2.23. <a href="sylpheed-faq-2.html#d0e1121">How can I get the newest source code from the Sylpheed Subversion (SVN) repository?</a></dt>
-               <dt>2.24. <a href="sylpheed-faq-2.html#d0e1160">I checked out the sources using SVN and can't find any configure script.</a></dt>
-               <dt>2.25. <a href="sylpheed-faq-2.html#d0e1175">Running "autogen.sh" gives error messages that "AM_PATH_GDK_PIXBUF" or
+               <dt>2.8. <a href="sylpheed-faq-2.html#d0e896">Can I set up special addresses/ports for my mailserver/newsserver?</a></dt>
+               <dt>2.9. <a href="sylpheed-faq-2.html#d0e911">Does Sylpheed have options for threading messages?</a></dt>
+               <dt>2.10. <a href="sylpheed-faq-2.html#d0e930">Can I create multiple levels of subfolders to store mail?</a></dt>
+               <dt>2.11. <a href="sylpheed-faq-2.html#d0e937">Why isn't Sylpheed sending my mail out?</a></dt>
+               <dt>2.12. <a href="sylpheed-faq-2.html#d0e944">How do I apply a patch after downloading it?</a></dt>
+               <dt>2.13. <a href="sylpheed-faq-2.html#d0e978">How do I compile in support for compface pictures?</a></dt>
+               <dt>2.14. <a href="sylpheed-faq-2.html#d0e988">How do I make my own compface image?</a></dt>
+               <dt>2.15. <a href="sylpheed-faq-2.html#d0e998">How can I tell my browser/newsclient/other program to use Sylpheed as email program?</a></dt>
+               <dt>2.16. <a href="sylpheed-faq-2.html#d0e1020">How do I enable GPG support in Sylpheed?</a></dt>
+               <dt>2.17. <a href="sylpheed-faq-2.html#d0e1039">Mutt does not recognize Sylpheed's MH structure</a></dt>
+               <dt>2.18. <a href="sylpheed-faq-2.html#d0e1055">Viewing a GIF file within Sylpheed causes a segmentation fault.</a></dt>
+               <dt>2.19. <a href="sylpheed-faq-2.html#d0e1067">How Sylpheed checks for new mail?</a></dt>
+               <dt>2.20. <a href="sylpheed-faq-2.html#d0e1150">How can I make Sylpheed notify me when new mail arrives?</a></dt>
+               <dt>2.21. <a href="sylpheed-faq-2.html#d0e1160">Can I use a spell checker with Sylpheed?</a></dt>
+               <dt>2.22. <a href="sylpheed-faq-2.html#d0e1178">How can I make Sylpheed send my compface image in the mails?</a></dt>
+               <dt>2.23. <a href="sylpheed-faq-2.html#d0e1199">How can I get the newest source code from the Sylpheed Subversion (SVN) repository?</a></dt>
+               <dt>2.24. <a href="sylpheed-faq-2.html#d0e1238">I checked out the sources using SVN and can't find any configure script.</a></dt>
+               <dt>2.25. <a href="sylpheed-faq-2.html#d0e1253">Running "autogen.sh" gives error messages that "AM_PATH_GDK_PIXBUF" or
                           "AM_PATH_(whatever)" is not found.</a></dt>
-               <dt>2.26. <a href="sylpheed-faq-2.html#d0e1222">I don't want to compile in support for (...) any longer, but after running
+               <dt>2.26. <a href="sylpheed-faq-2.html#d0e1300">I don't want to compile in support for (...) any longer, but after running
                           "configure", those libraries are still used.</a></dt>
-               <dt>2.27. <a href="sylpheed-faq-2.html#d0e1238">How can I select different applications to open with specific MIME types?</a></dt>
-               <dt>2.28. <a href="sylpheed-faq-2.html#d0e1248">How can I change the suggested mimetype for attachments?</a></dt>
-               <dt>2.29. <a href="sylpheed-faq-2.html#d0e1257">The folder list is not updated after I manually moved/copied folders.</a></dt>
-               <dt>2.30. <a href="sylpheed-faq-2.html#d0e1267">How can I revert original settings, e.g. for fonts, key bindings, etc.?</a></dt>
-               <dt>2.31. <a href="sylpheed-faq-2.html#d0e1289">What environment variables have effect on Sylpheed?</a></dt>
-               <dt>2.32. <a href="sylpheed-faq-2.html#d0e1325">Special characters (e.g. umlauts) are not displayed correctly.</a></dt>
-               <dt>2.33. <a href="sylpheed-faq-2.html#d0e1349">How can I convert my old mailbox/address book from (some mail client).</a></dt>
-               <dt>2.34. <a href="sylpheed-faq-2.html#d0e1365">What config files are there, and what are they used for?</a></dt>
-               <dt>2.35. <a href="sylpheed-faq-2.html#d0e1424">How do I change the location of user profile directory under Windows?</a></dt>
-               <dt>2.36. <a href="sylpheed-faq-2.html#d0e1498">What to do when printing an email prints off the paper?</a></dt>
+               <dt>2.27. <a href="sylpheed-faq-2.html#d0e1316">How can I select different applications to open with specific MIME types?</a></dt>
+               <dt>2.28. <a href="sylpheed-faq-2.html#d0e1326">How can I change the suggested mimetype for attachments?</a></dt>
+               <dt>2.29. <a href="sylpheed-faq-2.html#d0e1335">The folder list is not updated after I manually moved/copied folders.</a></dt>
+               <dt>2.30. <a href="sylpheed-faq-2.html#d0e1345">How can I revert original settings, e.g. for fonts, key bindings, etc.?</a></dt>
+               <dt>2.31. <a href="sylpheed-faq-2.html#d0e1367">What environment variables have effect on Sylpheed?</a></dt>
+               <dt>2.32. <a href="sylpheed-faq-2.html#d0e1408">Special characters (e.g. umlauts) are not displayed correctly.</a></dt>
+               <dt>2.33. <a href="sylpheed-faq-2.html#d0e1432">How can I convert my old mailbox/address book from (some mail client).</a></dt>
+               <dt>2.34. <a href="sylpheed-faq-2.html#d0e1448">What config files are there, and what are they used for?</a></dt>
+               <dt>2.35. <a href="sylpheed-faq-2.html#d0e1507">How do I change the location of user profile directory under Windows?</a></dt>
+               <dt>2.36. <a href="sylpheed-faq-2.html#d0e1581">Can I run multiple instances of Sylpheed?</a></dt>
+               <dt>2.37. <a href="sylpheed-faq-2.html#d0e1616">What to do when printing an email prints off the paper?</a></dt>
             </dl>
             <table border="0" summary="Q and A Set" cellspacing="13px">
                <col align="left" width="1%">
                <tbody>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e652"></a><a name="d0e653"></a><b>2.1.</b></td>
+                     <td align="left" valign="top"><a name="d0e730"></a><a name="d0e731"></a><b>2.1.</b></td>
                      <td align="left" valign="top">
                         <p>What does it take to compile Sylpheed?</p>
                      </td>
@@ -154,7 +155,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e702"></a><a name="d0e703"></a><b>2.2.</b></td>
+                     <td align="left" valign="top"><a name="d0e780"></a><a name="d0e781"></a><b>2.2.</b></td>
                      <td align="left" valign="top">
                         <p>How do I set up Sylpheed?</p>
                      </td>
@@ -178,7 +179,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e735"></a><a name="d0e736"></a><b>2.3.</b></td>
+                     <td align="left" valign="top"><a name="d0e813"></a><a name="d0e814"></a><b>2.3.</b></td>
                      <td align="left" valign="top">
                         <p>Why did the creation of the mailbox fail?</p>
                      </td>
@@ -195,7 +196,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e748"></a><a name="faq-account-setup"></a><b>2.4.</b></td>
+                     <td align="left" valign="top"><a name="d0e826"></a><a name="faq-account-setup"></a><b>2.4.</b></td>
                      <td align="left" valign="top">
                         <p>How do I set up an account?</p>
                      </td>
@@ -214,7 +215,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e775"></a><a name="d0e776"></a><b>2.5.</b></td>
+                     <td align="left" valign="top"><a name="d0e853"></a><a name="d0e854"></a><b>2.5.</b></td>
                      <td align="left" valign="top">
                         <p>How many accounts can I set up in Sylpheed?</p>
                      </td>
@@ -228,7 +229,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e782"></a><a name="d0e783"></a><b>2.6.</b></td>
+                     <td align="left" valign="top"><a name="d0e860"></a><a name="d0e861"></a><b>2.6.</b></td>
                      <td align="left" valign="top">
                         <p>Can I set up an account for sending mail only?</p>
                      </td>
@@ -241,7 +242,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e797"></a><a name="d0e798"></a><b>2.7.</b></td>
+                     <td align="left" valign="top"><a name="d0e875"></a><a name="d0e876"></a><b>2.7.</b></td>
                      <td align="left" valign="top">
                         <p>Why does Sylpheed not delete my mails when I press "Delete"? I set a filter, and Sylpheed does not filter. I moved a mail
                            to a different mailbox and it did not move.
@@ -259,7 +260,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e818"></a><a name="d0e819"></a><b>2.8.</b></td>
+                     <td align="left" valign="top"><a name="d0e896"></a><a name="d0e897"></a><b>2.8.</b></td>
                      <td align="left" valign="top">
                         <p>Can I set up special addresses/ports for my mailserver/newsserver?</p>
                      </td>
@@ -273,7 +274,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e833"></a><a name="d0e834"></a><b>2.9.</b></td>
+                     <td align="left" valign="top"><a name="d0e911"></a><a name="d0e912"></a><b>2.9.</b></td>
                      <td align="left" valign="top">
                         <p>Does Sylpheed have options for threading messages?</p>
                      </td>
@@ -287,7 +288,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e852"></a><a name="d0e853"></a><b>2.10.</b></td>
+                     <td align="left" valign="top"><a name="d0e930"></a><a name="d0e931"></a><b>2.10.</b></td>
                      <td align="left" valign="top">
                         <p>Can I create multiple levels of subfolders to store mail?</p>
                      </td>
@@ -299,7 +300,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e859"></a><a name="d0e860"></a><b>2.11.</b></td>
+                     <td align="left" valign="top"><a name="d0e937"></a><a name="d0e938"></a><b>2.11.</b></td>
                      <td align="left" valign="top">
                         <p>Why isn't Sylpheed sending my mail out?</p>
                      </td>
@@ -314,7 +315,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e866"></a><a name="d0e867"></a><b>2.12.</b></td>
+                     <td align="left" valign="top"><a name="d0e944"></a><a name="d0e945"></a><b>2.12.</b></td>
                      <td align="left" valign="top">
                         <p>How do I apply a patch after downloading it?</p>
                      </td>
@@ -343,7 +344,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e900"></a><a name="d0e901"></a><b>2.13.</b></td>
+                     <td align="left" valign="top"><a name="d0e978"></a><a name="d0e979"></a><b>2.13.</b></td>
                      <td align="left" valign="top">
                         <p>How do I compile in support for compface pictures?</p>
                      </td>
@@ -358,7 +359,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e910"></a><a name="d0e911"></a><b>2.14.</b></td>
+                     <td align="left" valign="top"><a name="d0e988"></a><a name="d0e989"></a><b>2.14.</b></td>
                      <td align="left" valign="top">
                         <p>How do I make my own compface image?</p>
                      </td>
@@ -373,7 +374,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e920"></a><a name="d0e921"></a><b>2.15.</b></td>
+                     <td align="left" valign="top"><a name="d0e998"></a><a name="d0e999"></a><b>2.15.</b></td>
                      <td align="left" valign="top">
                         <p>How can I tell my browser/newsclient/other program to use Sylpheed as email program?</p>
                      </td>
@@ -399,7 +400,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e942"></a><a name="d0e943"></a><b>2.16.</b></td>
+                     <td align="left" valign="top"><a name="d0e1020"></a><a name="d0e1021"></a><b>2.16.</b></td>
                      <td align="left" valign="top">
                         <p>How do I enable GPG support in Sylpheed?</p>
                      </td>
@@ -413,7 +414,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e961"></a><a name="d0e962"></a><b>2.17.</b></td>
+                     <td align="left" valign="top"><a name="d0e1039"></a><a name="d0e1040"></a><b>2.17.</b></td>
                      <td align="left" valign="top">
                         <p>Mutt does not recognize Sylpheed's MH structure</p>
                      </td>
@@ -426,7 +427,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e977"></a><a name="d0e978"></a><b>2.18.</b></td>
+                     <td align="left" valign="top"><a name="d0e1055"></a><a name="d0e1056"></a><b>2.18.</b></td>
                      <td align="left" valign="top">
                         <p>Viewing a GIF file within Sylpheed causes a segmentation fault.</p>
                      </td>
@@ -438,7 +439,7 @@ font-weight : bold;
                         </p><pre class="programlisting">image/gif gif</pre></td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e989"></a><a name="d0e990"></a><b>2.19.</b></td>
+                     <td align="left" valign="top"><a name="d0e1067"></a><a name="d0e1068"></a><b>2.19.</b></td>
                      <td align="left" valign="top">
                         <p>How Sylpheed checks for new mail?</p>
                      </td>
@@ -478,7 +479,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1072"></a><a name="d0e1073"></a><b>2.20.</b></td>
+                     <td align="left" valign="top"><a name="d0e1150"></a><a name="d0e1151"></a><b>2.20.</b></td>
                      <td align="left" valign="top">
                         <p>How can I make Sylpheed notify me when new mail arrives?</p>
                      </td>
@@ -491,7 +492,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1082"></a><a name="d0e1083"></a><b>2.21.</b></td>
+                     <td align="left" valign="top"><a name="d0e1160"></a><a name="d0e1161"></a><b>2.21.</b></td>
                      <td align="left" valign="top">
                         <p>Can I use a spell checker with Sylpheed?</p>
                      </td>
@@ -506,7 +507,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1100"></a><a name="d0e1101"></a><b>2.22.</b></td>
+                     <td align="left" valign="top"><a name="d0e1178"></a><a name="d0e1179"></a><b>2.22.</b></td>
                      <td align="left" valign="top">
                         <p>How can I make Sylpheed send my compface image in the mails?</p>
                      </td>
@@ -520,7 +521,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1121"></a><a name="d0e1122"></a><b>2.23.</b></td>
+                     <td align="left" valign="top"><a name="d0e1199"></a><a name="d0e1200"></a><b>2.23.</b></td>
                      <td align="left" valign="top">
                         <p>How can I get the newest source code from the Sylpheed Subversion (SVN) repository?</p>
                      </td>
@@ -554,7 +555,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1160"></a><a name="d0e1161"></a><b>2.24.</b></td>
+                     <td align="left" valign="top"><a name="d0e1238"></a><a name="d0e1239"></a><b>2.24.</b></td>
                      <td align="left" valign="top">
                         <p>I checked out the sources using SVN and can't find any configure script.</p>
                      </td>
@@ -576,7 +577,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1175"></a><a name="d0e1176"></a><b>2.25.</b></td>
+                     <td align="left" valign="top"><a name="d0e1253"></a><a name="d0e1254"></a><b>2.25.</b></td>
                      <td align="left" valign="top">
                         <p>Running "autogen.sh" gives error messages that "AM_PATH_GDK_PIXBUF" or
                                 "AM_PATH_(whatever)" is not found.
@@ -598,7 +599,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1222"></a><a name="d0e1223"></a><b>2.26.</b></td>
+                     <td align="left" valign="top"><a name="d0e1300"></a><a name="d0e1301"></a><b>2.26.</b></td>
                      <td align="left" valign="top">
                         <p>I don't want to compile in support for (...) any longer, but after running
                                 "configure", those libraries are still used.
@@ -614,7 +615,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1238"></a><a name="d0e1239"></a><b>2.27.</b></td>
+                     <td align="left" valign="top"><a name="d0e1316"></a><a name="d0e1317"></a><b>2.27.</b></td>
                      <td align="left" valign="top">
                         <p>How can I select different applications to open with specific MIME types?</p>
                      </td>
@@ -627,7 +628,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1248"></a><a name="d0e1249"></a><b>2.28.</b></td>
+                     <td align="left" valign="top"><a name="d0e1326"></a><a name="d0e1327"></a><b>2.28.</b></td>
                      <td align="left" valign="top">
                         <p>How can I change the suggested mimetype for attachments?</p>
                      </td>
@@ -639,7 +640,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1257"></a><a name="d0e1258"></a><b>2.29.</b></td>
+                     <td align="left" valign="top"><a name="d0e1335"></a><a name="d0e1336"></a><b>2.29.</b></td>
                      <td align="left" valign="top">
                         <p>The folder list is not updated after I manually moved/copied folders.</p>
                      </td>
@@ -653,7 +654,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1267"></a><a name="d0e1268"></a><b>2.30.</b></td>
+                     <td align="left" valign="top"><a name="d0e1345"></a><a name="d0e1346"></a><b>2.30.</b></td>
                      <td align="left" valign="top">
                         <p>How can I revert original settings, e.g. for fonts, key bindings, etc.?</p>
                      </td>
@@ -669,7 +670,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1289"></a><a name="d0e1290"></a><b>2.31.</b></td>
+                     <td align="left" valign="top"><a name="d0e1367"></a><a name="faq-environment-variables"></a><b>2.31.</b></td>
                      <td align="left" valign="top">
                         <p>What environment variables have effect on Sylpheed?</p>
                      </td>
@@ -703,10 +704,12 @@ font-weight : bold;
                               </li>
                            </ul>
                         </div>
+                        <p>For more information on how to make Sylpheed display your language, see the <a href="sylpheed-faq-3.html#faq-display-language">relevant question</a>.
+                        </p>
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1325"></a><a name="d0e1326"></a><b>2.32.</b></td>
+                     <td align="left" valign="top"><a name="d0e1408"></a><a name="d0e1409"></a><b>2.32.</b></td>
                      <td align="left" valign="top">
                         <p>Special characters (e.g. umlauts) are not displayed correctly.</p>
                      </td>
@@ -725,7 +728,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1349"></a><a name="d0e1350"></a><b>2.33.</b></td>
+                     <td align="left" valign="top"><a name="d0e1432"></a><a name="d0e1433"></a><b>2.33.</b></td>
                      <td align="left" valign="top">
                         <p>How can I convert my old mailbox/address book from (some mail client).</p>
                      </td>
@@ -746,7 +749,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1365"></a><a name="d0e1366"></a><b>2.34.</b></td>
+                     <td align="left" valign="top"><a name="d0e1448"></a><a name="d0e1449"></a><b>2.34.</b></td>
                      <td align="left" valign="top">
                         <p>What config files are there, and what are they used for?</p>
                      </td>
@@ -804,7 +807,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1424"></a><a name="d0e1425"></a><b>2.35.</b></td>
+                     <td align="left" valign="top"><a name="d0e1507"></a><a name="d0e1508"></a><b>2.35.</b></td>
                      <td align="left" valign="top">
                         <p>How do I change the location of user profile directory under Windows?</p>
                      </td>
@@ -851,7 +854,30 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1498"></a><a name="d0e1499"></a><b>2.36.</b></td>
+                     <td align="left" valign="top"><a name="d0e1581"></a><a name="d0e1582"></a><b>2.36.</b></td>
+                     <td align="left" valign="top">
+                        <p>Can I run multiple instances of Sylpheed?</p>
+                     </td>
+                  </tr>
+                  <tr class="answer">
+                     <td align="left" valign="top"><b></b></td>
+                     <td align="left" valign="top">
+                        <p>Yes, Sylpheed 3.1 adds support for this often requested feature. The format of the multiple instances command is as follows:</p>
+                        <p><span><strong class="command">sylpheed --instance-id <em class="replaceable"><code>ID</code></em> --configdir <em class="replaceable"><code>path-to-alternative-configdir</code></em></strong></span></p>
+                        <p>Default <em class="parameter"><code>ID</code></em> is set to <code class="literal">sylpheed</code>, so you can specify any other instance
+                           <em class="parameter"><code>ID</code></em>. The <em class="parameter"><code>ID</code></em> is used for the name of unix domain
+                           socket (under UNIX), or mutex name (under Windows). <em class="parameter"><code>configdir</code></em> specifies the configuration directory, i.e. the location of  configuration files you want to use with the given instance.
+                        </p>
+                        <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+                           <h3 class="title">Warning</h3>
+                           <p>Do not share same configuration directories or mailboxes across multiple instances as this may lead to an unexpected application
+                              behavior!
+                           </p>
+                        </div>
+                     </td>
+                  </tr>
+                  <tr class="question">
+                     <td align="left" valign="top"><a name="d0e1616"></a><a name="d0e1617"></a><b>2.37.</b></td>
                      <td align="left" valign="top">
                         <p>What to do when printing an email prints off the paper?</p>
                      </td>
diff --git a/faq/en/sylpheed-faq-3.html b/faq/en/sylpheed-faq-3.html
index 5a7cad84..c667c226 100644
--- a/faq/en/sylpheed-faq-3.html
+++ b/faq/en/sylpheed-faq-3.html
@@ -47,30 +47,31 @@ font-weight : bold;
          </div>
          <div class="qandaset">
             <dl>
-               <dt>3.1. <a href="sylpheed-faq-3.html#d0e1516">How do I make Sylpheed display my language?</a></dt>
-               <dt>3.2. <a href="sylpheed-faq-3.html#d0e1538">I don't like the default font. Can I change that?</a></dt>
-               <dt>3.3. <a href="sylpheed-faq-3.html#d0e1554">There are too many columns in the message list!</a></dt>
-               <dt>3.4. <a href="sylpheed-faq-3.html#d0e1573">How do I disable or enable the alternating row colors in the message list?</a></dt>
-               <dt>3.5. <a href="sylpheed-faq-3.html#d0e1607">Can I use a different editor to write my mails?</a></dt>
-               <dt>3.6. <a href="sylpheed-faq-3.html#d0e1645">How to change the font size in the Sylpheed interface?</a></dt>
-               <dt>3.7. <a href="sylpheed-faq-3.html#d0e1663">Sylpheed saves my outgoing mail (in Outbox). Can I make it stop doing that?</a></dt>
-               <dt>3.8. <a href="sylpheed-faq-3.html#d0e1679">How can I change the key bindings (hotkeys) in Sylpheed?</a></dt>
-               <dt>3.9. <a href="sylpheed-faq-3.html#d0e1770">Can I close windows without the mouse?</a></dt>
-               <dt>3.10. <a href="sylpheed-faq-3.html#d0e1786">Can I change the way the date is displayed in the message summary?</a></dt>
-               <dt>3.11. <a href="sylpheed-faq-3.html#d0e1813">Why can't I see the compface pictures?</a></dt>
-               <dt>3.12. <a href="sylpheed-faq-3.html#d0e1820">I still can't see the pictures. Why not?</a></dt>
-               <dt>3.13. <a href="sylpheed-faq-3.html#d0e1827">Why does the URL launcher not launch my web browser?</a></dt>
-               <dt>3.14. <a href="sylpheed-faq-3.html#d0e1844">Attachments with spaces in the name won't open!</a></dt>
-               <dt>3.15. <a href="sylpheed-faq-3.html#d0e1856">Where is the Bcc when I compose a mail?</a></dt>
-               <dt>3.16. <a href="sylpheed-faq-3.html#d0e1874">How do I change the toolbar?</a></dt>
-               <dt>3.17. <a href="sylpheed-faq-3.html#d0e1896">Why isn't the next message displayed when I delete a message? </a></dt>
-               <dt>3.18. <a href="sylpheed-faq-3.html#d0e1916">How can I remove mailing list information from Subject headers?</a></dt>
+               <dt>3.1. <a href="sylpheed-faq-3.html#d0e1634">How do I make Sylpheed display my language?</a></dt>
+               <dt>3.2. <a href="sylpheed-faq-3.html#d0e1700">I don't like the default font. Can I change that?</a></dt>
+               <dt>3.3. <a href="sylpheed-faq-3.html#d0e1716">There are too many columns in the message list!</a></dt>
+               <dt>3.4. <a href="sylpheed-faq-3.html#d0e1735">How do I disable or enable the alternating row colors in the message list?</a></dt>
+               <dt>3.5. <a href="sylpheed-faq-3.html#d0e1769">Can I use a different editor to write my mails?</a></dt>
+               <dt>3.6. <a href="sylpheed-faq-3.html#d0e1807">How to change the font size in the Sylpheed interface?</a></dt>
+               <dt>3.7. <a href="sylpheed-faq-3.html#d0e1825">Sylpheed saves my outgoing mail (in Outbox). Can I make it stop doing that?</a></dt>
+               <dt>3.8. <a href="sylpheed-faq-3.html#d0e1841">How can I change the key bindings (hotkeys) in Sylpheed?</a></dt>
+               <dt>3.9. <a href="sylpheed-faq-3.html#d0e1932">Can I close windows without the mouse?</a></dt>
+               <dt>3.10. <a href="sylpheed-faq-3.html#d0e1948">Can I change the way the date is displayed in the message summary?</a></dt>
+               <dt>3.11. <a href="sylpheed-faq-3.html#d0e1975">Why can't I see the compface pictures?</a></dt>
+               <dt>3.12. <a href="sylpheed-faq-3.html#d0e1982">I still can't see the pictures. Why not?</a></dt>
+               <dt>3.13. <a href="sylpheed-faq-3.html#d0e1989">Why does the URL launcher not launch my web browser?</a></dt>
+               <dt>3.14. <a href="sylpheed-faq-3.html#d0e2006">Attachments with spaces in the name won't open!</a></dt>
+               <dt>3.15. <a href="sylpheed-faq-3.html#d0e2018">Execute command for my dynamic signature seems not to be working!</a></dt>
+               <dt>3.16. <a href="sylpheed-faq-3.html#d0e2040">Where is the Bcc when I compose a mail?</a></dt>
+               <dt>3.17. <a href="sylpheed-faq-3.html#d0e2058">How do I change the toolbar?</a></dt>
+               <dt>3.18. <a href="sylpheed-faq-3.html#d0e2080">Why isn't the next message displayed when I delete a message? </a></dt>
+               <dt>3.19. <a href="sylpheed-faq-3.html#d0e2100">How can I remove mailing list information from Subject headers?</a></dt>
             </dl>
             <table border="0" summary="Q and A Set" cellspacing="13px">
                <col align="left" width="1%">
                <tbody>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1516"></a><a name="d0e1517"></a><b>3.1.</b></td>
+                     <td align="left" valign="top"><a name="d0e1634"></a><a name="faq-display-language"></a><b>3.1.</b></td>
                      <td align="left" valign="top">
                         <p>How do I make Sylpheed display my language?</p>
                      </td>
@@ -82,10 +83,20 @@ font-weight : bold;
                                 <code class="envar">LANG</code>, <code class="envar">LC_CTYPE</code>, <code class="envar">LC_MESSAGES</code> to your local language.
                                 Usually <code class="envar">LANG</code> (or <code class="envar">LC_ALL</code>) is sufficient. Note that modern distributions and operating systems do this for you automatically.
                         </p>
+                        <p>Under UNIX, if you need to set e.g. the <code class="envar">LANG</code> environment variable manually, execute the following command (using <code class="literal">sh</code> or related shell):
+                        </p>
+                        <p><span><strong class="command">export LANG=<em class="replaceable"><code>value</code></em></strong></span></p>
+                        <p>Replace <em class="replaceable"><code>value</code></em> with a valid ISO <a href="http://en.wikipedia.org/wiki/Language_code" target="_top">language code</a> (e.g. <code class="literal">en_GB</code> for British English).
+                        </p>
+                        <p>If you intend to set the displayed language manually under Windows, you can do so by creating the
+                           <code class="envar">LANG</code> environment variable with a valid ISO language code value under <span class="guimenu">Control Panel</span>-&gt;<span class="guimenuitem">System</span>-&gt;<span class="guisubmenu">Advanced</span>+<span class="guibutton">Environment Variables</span>.
+                        </p>
+                        <p>Also see the <a href="sylpheed-faq-2.html#faq-environment-variables">question</a> regarding environment variables that have effect on Sylpheed.
+                        </p>
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1538"></a><a name="d0e1539"></a><b>3.2.</b></td>
+                     <td align="left" valign="top"><a name="d0e1700"></a><a name="d0e1701"></a><b>3.2.</b></td>
                      <td align="left" valign="top">
                         <p>I don't like the default font. Can I change that?</p>
                      </td>
@@ -99,7 +110,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1554"></a><a name="d0e1555"></a><b>3.3.</b></td>
+                     <td align="left" valign="top"><a name="d0e1716"></a><a name="d0e1717"></a><b>3.3.</b></td>
                      <td align="left" valign="top">
                         <p>There are too many columns in the message list!</p>
                      </td>
@@ -115,7 +126,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1573"></a><a name="d0e1574"></a><b>3.4.</b></td>
+                     <td align="left" valign="top"><a name="d0e1735"></a><a name="d0e1736"></a><b>3.4.</b></td>
                      <td align="left" valign="top">
                         <p>How do I disable or enable the alternating row colors in the message list?</p>
                      </td>
@@ -139,7 +150,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1607"></a><a name="d0e1608"></a><b>3.5.</b></td>
+                     <td align="left" valign="top"><a name="d0e1769"></a><a name="d0e1770"></a><b>3.5.</b></td>
                      <td align="left" valign="top">
                         <p>Can I use a different editor to write my mails?</p>
                      </td>
@@ -159,7 +170,7 @@ font-weight : bold;
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1645"></a><a name="d0e1646"></a><b>3.6.</b></td>
+                     <td align="left" valign="top"><a name="d0e1807"></a><a name="d0e1808"></a><b>3.6.</b></td>
                      <td align="left" valign="top">
                         <p>How to change the font size in the Sylpheed interface?</p>
                      </td>
@@ -178,7 +189,7 @@ widget_class "*" style "default"
 </pre></td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1663"></a><a name="d0e1664"></a><b>3.7.</b></td>
+                     <td align="left" valign="top"><a name="d0e1825"></a><a name="d0e1826"></a><b>3.7.</b></td>
                      <td align="left" valign="top">
                         <p>Sylpheed saves my outgoing mail (in Outbox). Can I make it stop doing that?</p>
                      </td>
@@ -193,7 +204,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1679"></a><a name="d0e1680"></a><b>3.8.</b></td>
+                     <td align="left" valign="top"><a name="d0e1841"></a><a name="d0e1842"></a><b>3.8.</b></td>
                      <td align="left" valign="top">
                         <p>How can I change the key bindings (hotkeys) in Sylpheed?</p>
                      </td>
@@ -235,7 +246,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1770"></a><a name="d0e1771"></a><b>3.9.</b></td>
+                     <td align="left" valign="top"><a name="d0e1932"></a><a name="d0e1933"></a><b>3.9.</b></td>
                      <td align="left" valign="top">
                         <p>Can I close windows without the mouse?</p>
                      </td>
@@ -252,7 +263,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1786"></a><a name="d0e1787"></a><b>3.10.</b></td>
+                     <td align="left" valign="top"><a name="d0e1948"></a><a name="d0e1949"></a><b>3.10.</b></td>
                      <td align="left" valign="top">
                         <p>Can I change the way the date is displayed in the message summary?</p>
                      </td>
@@ -270,7 +281,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1813"></a><a name="d0e1814"></a><b>3.11.</b></td>
+                     <td align="left" valign="top"><a name="d0e1975"></a><a name="d0e1976"></a><b>3.11.</b></td>
                      <td align="left" valign="top">
                         <p>Why can't I see the compface pictures?</p>
                      </td>
@@ -284,7 +295,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1820"></a><a name="d0e1821"></a><b>3.12.</b></td>
+                     <td align="left" valign="top"><a name="d0e1982"></a><a name="d0e1983"></a><b>3.12.</b></td>
                      <td align="left" valign="top">
                         <p>I still can't see the pictures. Why not?</p>
                      </td>
@@ -296,7 +307,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1827"></a><a name="d0e1828"></a><b>3.13.</b></td>
+                     <td align="left" valign="top"><a name="d0e1989"></a><a name="d0e1990"></a><b>3.13.</b></td>
                      <td align="left" valign="top">
                         <p>Why does the URL launcher not launch my web browser?</p>
                      </td>
@@ -310,7 +321,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1844"></a><a name="d0e1845"></a><b>3.14.</b></td>
+                     <td align="left" valign="top"><a name="d0e2006"></a><a name="d0e2007"></a><b>3.14.</b></td>
                      <td align="left" valign="top">
                         <p>Attachments with spaces in the name won't open!</p>
                      </td>
@@ -324,7 +335,24 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1856"></a><a name="d0e1857"></a><b>3.15.</b></td>
+                     <td align="left" valign="top"><a name="d0e2018"></a><a name="d0e2019"></a><b>3.15.</b></td>
+                     <td align="left" valign="top">
+                        <p>Execute command for my dynamic signature seems not to be working!</p>
+                     </td>
+                  </tr>
+                  <tr class="answer">
+                     <td align="left" valign="top"><b></b></td>
+                     <td align="left" valign="top">
+                        <p>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 <span class="guimenu">Account preferences</span>-&gt;<span class="guisubmenu">Compose</span>-&gt;<span class="guimenuitem">Signature</span>+<span class="guilabel">Command output</span>) using either forward slashes or double
+                           backslashes for paths, for example:
+                        </p>
+                        <p><span><strong class="command">cmd /c 'c:\\signature.bat'</strong></span></p>
+                        <p>Note that it is also recommended to enclose paths with single quotes, as is illustrated above.</p>
+                     </td>
+                  </tr>
+                  <tr class="question">
+                     <td align="left" valign="top"><a name="d0e2040"></a><a name="d0e2041"></a><b>3.16.</b></td>
                      <td align="left" valign="top">
                         <p>Where is the Bcc when I compose a mail?</p>
                      </td>
@@ -337,7 +365,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1874"></a><a name="d0e1875"></a><b>3.16.</b></td>
+                     <td align="left" valign="top"><a name="d0e2058"></a><a name="d0e2059"></a><b>3.17.</b></td>
                      <td align="left" valign="top">
                         <p>How do I change the toolbar?</p>
                      </td>
@@ -350,7 +378,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1896"></a><a name="d0e1897"></a><b>3.17.</b></td>
+                     <td align="left" valign="top"><a name="d0e2080"></a><a name="d0e2081"></a><b>3.18.</b></td>
                      <td align="left" valign="top">
                         <p>Why isn't the next message displayed when I delete a message? </p>
                      </td>
@@ -363,7 +391,7 @@ widget_class "*" style "default"
                      </td>
                   </tr>
                   <tr class="question">
-                     <td align="left" valign="top"><a name="d0e1916"></a><a name="d0e1917"></a><b>3.18.</b></td>
+                     <td align="left" valign="top"><a name="d0e2100"></a><a name="d0e2101"></a><b>3.19.</b></td>
                      <td align="left" valign="top">
                         <p>How can I remove mailing list information from Subject headers?</p>
                      </td>
diff --git a/faq/en/sylpheed-faq.html b/faq/en/sylpheed-faq.html
index 4d8baf86..eada76e3 100644
--- a/faq/en/sylpheed-faq.html
+++ b/faq/en/sylpheed-faq.html
@@ -110,6 +110,14 @@ font-weight : bold;
                         <tr>
                            <td align="left" colspan="3">Updated with regard to Sylpheed 3.0.2.</td>
                         </tr>
+                        <tr>
+                           <td align="left">Revision 2.2</td>
+                           <td align="left">2010/08/09</td>
+                           <td align="left">PK</td>
+                        </tr>
+                        <tr>
+                           <td align="left" colspan="3">Updates for the upcoming Sylpheed 3.1.</td>
+                        </tr>
                      </table>
                   </div>
                </div>