summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpknbe <pknbe>2010-04-01 01:06:27 +0000
committerpknbe <pknbe>2010-04-01 01:06:27 +0000
commit22e96494d5aa70946683d047d9ec154e6609dda0 (patch)
treed89ff2bcacf7b51400b96484469690a0d2217486
parent546274015a29e320feb4db02eed53963936059ab (diff)
downloadsylpheeddoc-doc-22e96494d5aa70946683d047d9ec154e6609dda0.tar.gz
sylpheeddoc-doc-22e96494d5aa70946683d047d9ec154e6609dda0.tar.xz
sylpheeddoc-doc-22e96494d5aa70946683d047d9ec154e6609dda0.zip
Make obsolete screenshots hopefully work again. Add current FAQ links from the FAQ doc. Remove obsolete comments.
-rw-r--r--manual/en/ChangeLog5
-rw-r--r--manual/en/manual.xml34
-rw-r--r--manual/en/manual_002.xml18
-rw-r--r--manual/en/manual_003.xml6
-rw-r--r--manual/en/manual_008.xml30
-rw-r--r--manual/en/manual_010.xml21
-rw-r--r--manual/en/manual_011.xml38
-rw-r--r--manual/en/manual_012.xml10
-rw-r--r--manual/en/manual_013.xml241
-rw-r--r--manual/en/manual_015.xml11
-rw-r--r--manual/en/manual_016.xml5
-rw-r--r--manual/en/manual_019.xml28
-rw-r--r--manual/en/manual_020.xml7
13 files changed, 183 insertions, 271 deletions
diff --git a/manual/en/ChangeLog b/manual/en/ChangeLog
index e989f57..71c8432 100644
--- a/manual/en/ChangeLog
+++ b/manual/en/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-01 Petr Kovar <pknbe@volny.cz>
+
+ * *.xml: Make obsolete screenshots hopefully work again. Add current FAQ
+ links from the FAQ doc. Remove obsolete comments.
+
2009-08-12 Petr Kovar <pknbe@volny.cz>
* *.xml: Finished porting to DocBook XML.
diff --git a/manual/en/manual.xml b/manual/en/manual.xml
index 46e33a4..319d85f 100644
--- a/manual/en/manual.xml
+++ b/manual/en/manual.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY __chapter__001 SYSTEM "manual_001.xml">
<!ENTITY __chapter__002 SYSTEM "manual_002.xml">
<!ENTITY __chapter__003 SYSTEM "manual_003.xml">
@@ -26,11 +26,11 @@
<title>Sylpheed User&apos;s Manual</title>
<bookinfo>
<abstract>
- <para>Sylpheed User&apos;s Manual authored by the Sylpheed Documentation Team deals with both the basic and advanced usage description of Sylpheed.</para>
+ <para>The Sylpheed User&apos;s Manual authored by the members of the Sylpheed Documentation Project deals with both the basic and advanced usage description of Sylpheed.</para>
</abstract>
<copyright>
- <year>2009</year>
- <holder>The Sylpheed Documentation Team</holder>
+ <year>2010</year>
+ <holder>The Sylpheed Documentation Project</holder>
</copyright>
<legalnotice>
<para>Permission is granted to copy, distribute and/or modify this document
@@ -43,41 +43,41 @@
<author>
<firstname>Paul</firstname>
<surname>Kater</surname>
- <affiliation>
+ <!-- affiliation>
<address>
<email>paul AT nlpagan DOT net</email>
</address>
- </affiliation>
+ </affiliation -->
</author>
<author>
<firstname>Nick</firstname>
<surname>Selby</surname>
- <affiliation>
+ <!-- affiliation>
<address>
<email>sylpheed AT nickselby DOT com</email>
</address>
- </affiliation>
+ </affiliation -->
</author>
<author>
<firstname>Francois</firstname>
<surname>Barriere</surname>
- <affiliation>
+ <!-- affiliation>
<address>
<email>barriere DOT francois AT libertysurf DOT fr</email>
</address>
- </affiliation>
+ </affiliation -->
</author>
<author>
<firstname>Petr</firstname>
- <surname>Kovář</surname>
- <affiliation>
+ <surname>Kovar</surname>
+ <!-- affiliation>
<address>
<email>pknbe AT volny DOT cz</email>
</address>
- </affiliation>
+ </affiliation -->
</author>
- <revhistory>
-<!-- ******************************************************************************** --> <revision>
+ <revhistory><!-- ******************************************************************************** -->
+ <revision>
<revnumber>2.1</revnumber>
<date>2006/01/15</date>
<authorinitials>FBe</authorinitials>
@@ -85,10 +85,10 @@
</revision>
<revision>
<revnumber>2.2</revnumber>
- <date>2009/08/12</date>
+ <date>2010/04/01</date>
<authorinitials>PK</authorinitials>
<revremark>Finished porting to DocBook XML.</revremark>
</revision>
-<!-- ******************************************************************************** --> </revhistory>
+ <!-- ******************************************************************************** --></revhistory>
</bookinfo>
&__chapter__001;&__chapter__002;&__chapter__003;&__chapter__004;&__chapter__005;&__chapter__006;&__chapter__007;&__chapter__008;&__chapter__009;&__chapter__010;&__chapter__011;&__chapter__012;&__chapter__013;&__chapter__014;&__chapter__015;&__chapter__016;&__chapter__017;&__chapter__018;&__chapter__019;&__chapter__020;&__license;</book>
diff --git a/manual/en/manual_002.xml b/manual/en/manual_002.xml
index 26a64d6..42e6e42 100644
--- a/manual/en/manual_002.xml
+++ b/manual/en/manual_002.xml
@@ -10,7 +10,7 @@
The default name for this directory is &quot;Mail&quot;.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/wizard_1.png"/>
+ <imagedata fileref="snapshots/wizard_1.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>Then the account preferences window shows up. Based on your
@@ -44,7 +44,7 @@
values.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_basic.png"/>
+ <imagedata fileref="snapshots/account_basic.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>The Receive tab is not used in this setup, since you are not polling
@@ -53,13 +53,13 @@
authentication.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_send.png"/>
+ <imagedata fileref="snapshots/account_send.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the Compose tab you can define your signature file.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_compose.png"/>
+ <imagedata fileref="snapshots/account_compose.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the Advanced tab you can edit the portnumbers for the servers you
@@ -94,26 +94,26 @@
values.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_pop_basic.png"/>
+ <imagedata fileref="snapshots/account_pop_basic.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>The Receive tab offers advanced POP3 options.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_pop_receive.png"/>
+ <imagedata fileref="snapshots/account_pop_receive.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the Send tab you can select headers and SMTP
authentication.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_send.png"/>
+ <imagedata fileref="snapshots/account_send.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the Compose tab you can define your signature file.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_compose.png"/>
+ <imagedata fileref="snapshots/account_compose.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the Advanced tab you can edit the portnumbers for the servers you
@@ -122,4 +122,4 @@
POP3 mailsystems. You select &quot;Message -&gt; receive new mail&quot; or press the
shortcut and see if there is new mail!</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_003.xml b/manual/en/manual_003.xml
index 22a4bab..1f7a294 100644
--- a/manual/en/manual_003.xml
+++ b/manual/en/manual_003.xml
@@ -8,7 +8,7 @@
Protocol box you select &quot;News (NNTP)&quot;.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_news_basic.png"/>
+ <imagedata fileref="snapshots/account_news_basic.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>Enter the newsserver information.</para>
@@ -17,7 +17,7 @@
<para>In the &quot;Compose&quot; tab you can define your signature file.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_compose.png"/>
+ <imagedata fileref="snapshots/account_compose.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the &quot;Advanced&quot; tab you can edit the portnumbers for the servers
@@ -27,4 +27,4 @@
groups will be downloaded from the server. From there you will find your
way, so good luck!</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_008.xml b/manual/en/manual_008.xml
index 6cca81b..fbbcd78 100644
--- a/manual/en/manual_008.xml
+++ b/manual/en/manual_008.xml
@@ -32,7 +32,7 @@ the sections covering the optional features they control (like the
In here you can set up how to receive messages.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_receive..png"/>
+ <imagedata fileref="snapshots/pref_receive.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -88,7 +88,7 @@ In here you can set up how to receive messages.</para>
In here you can set up how to send messages.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_send..png"/>
+ <imagedata fileref="snapshots/pref_send.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -124,7 +124,7 @@ In here you can set up how to send messages.</para>
Controls the composition window&apos;s behaviour...</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_compose.png"/>
+ <imagedata fileref="snapshots/pref_compose.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -177,7 +177,7 @@ In here you can control the quotation of your replies and forwarded
messages.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_quote.png"/>
+ <imagedata fileref="snapshots/pref_quote.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -205,7 +205,7 @@ messages.</para>
In here you can control the display options of Sylpheed.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_display..png"/>
+ <imagedata fileref="snapshots/pref_display.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -259,7 +259,7 @@ In here you can control the display options of Sylpheed.</para>
The message tab controls the message window options.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_message..png"/>
+ <imagedata fileref="snapshots/pref_message.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -329,7 +329,7 @@ The interface tab controls the Sylpheed&apos;s Graphical User Interface
behaviour.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_interface..png"/>
+ <imagedata fileref="snapshots/pref_interface.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -401,7 +401,7 @@ The other tab contains the settings that does not fit the
previous categories.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/pref_other..png"/>
+ <imagedata fileref="snapshots/pref_other.png" format="PNG"/>
</imageobject>
</mediaobject>
<itemizedlist>
@@ -482,7 +482,7 @@ the following areas:
<title id="Basic">Basic tab </title>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_basic..png"/>
+ <imagedata fileref="snapshots/account_basic.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the &quot;Basic&quot; tab you name the account. This is to make identifying
@@ -534,7 +534,7 @@ not by &apos;group&apos; and &apos;other&apos;, do not change these access right
<title id="Receive">Receive tab</title>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_pop_receive..png"/>
+ <imagedata fileref="snapshots/account_pop_receive.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>The <computeroutput>Receive</computeroutput> tab is only used for POP3 accounts. Here you
@@ -573,7 +573,7 @@ toolbar button (or menu entry).
<title id="Send">Send tab</title>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_send..png"/>
+ <imagedata fileref="snapshots/account_send.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the <computeroutput>Send</computeroutput> tab you can define the settings that apply
@@ -602,7 +602,7 @@ Visit <ulink url="http://www.dairiki.org/xface/">this page</ulink> for the detai
<title id="Compose">Compose tab</title>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_compose..png"/>
+ <imagedata fileref="snapshots/account_compose.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>In the <computeroutput>Compose</computeroutput> tab you can define your signature file,
@@ -629,7 +629,7 @@ not need to change (unless you really know what you are
doing).</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/account_advanced..png"/>
+ <imagedata fileref="snapshots/account_advanced.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>
@@ -653,7 +653,7 @@ the folder name and the corresponding directory path (relative to the mail
directory). In the <computeroutput>Compose</computeroutput> tab:</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/folder_prop_compose..png"/>
+ <imagedata fileref="snapshots/folder_prop_compose.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>You can select the account, choose to apply this setting also to
@@ -707,4 +707,4 @@ on a folder basis, but you can also change the <computeroutput>To:</computeroutp
settings).</para>
</section>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_010.xml b/manual/en/manual_010.xml
index a6c4e94..b21c8d9 100644
--- a/manual/en/manual_010.xml
+++ b/manual/en/manual_010.xml
@@ -2,22 +2,13 @@
<title>Recieving Messages</title>
<section>
<title>Using POP Reception Function in Sylpheed</title>
- <para>
-<!-- added 2001/07/19 -->
-Receiving messages from a POP server is very easy, once you set up Sylpheed the proper way. You can refer to the section &quot;Setting up an account&quot; on how to do this.</para>
- <para>
-Once you are connected to the internet, or by another network that gives you access to the POP server, simply press the &quot;Get new mail&quot; button (or press Alt-I) and Sylpheed will connect to the server to fetch your new mail. Once this is retrieved, any filters you may have set up will be executed and then the folder pane will show you, marked in bold, which folder/mailbox contains new messages.
-<!-- end addition 2001/07/19 --></para>
+ <para>Receiving messages from a POP server is very easy, once you set up Sylpheed the proper way. You can refer to the section &quot;Setting up an account&quot; on how to do this.</para>
+ <para>Once you are connected to the internet, or by another network that gives you access to the POP server, simply press the &quot;Get new mail&quot; button (or press Alt-I) and Sylpheed will connect to the server to fetch your new mail. Once this is retrieved, any filters you may have set up will be executed and then the folder pane will show you, marked in bold, which folder/mailbox contains new messages.</para>
</section>
<section>
<title>Using Other Programs such as fetchmail</title>
- <para>
-<!-- added 2001/07/19 -->
-Although it is not within the scope of this manual, a bit of information on fetchmail or getmail.</para>
- <para>
-You need to have either of these programs installed, and configured correctly. See the man pages/README files of the appropriate program on doing this.</para>
- <para>
-After setting the program up, you can invoke it, either by hand or through CRON, to get your mail. The mail will usually be downloaded into /var/spool/mail/your_user_id. You can then tell Sylpheed, through an account that looks in your local unix mailbox, to get mail from there. For this you press the &quot;Get mail&quot; button, or press &quot;Alt-I&quot;.
-<!-- end addition 2001/07/19 --></para>
+ <para>Although it is not within the scope of this manual, a bit of information on fetchmail or getmail.</para>
+ <para>You need to have either of these programs installed, and configured correctly. See the man pages/README files of the appropriate program on doing this.</para>
+ <para>After setting the program up, you can invoke it, either by hand or through CRON, to get your mail. The mail will usually be downloaded into /var/spool/mail/your_user_id. You can then tell Sylpheed, through an account that looks in your local unix mailbox, to get mail from there. For this you press the &quot;Get mail&quot; button, or press &quot;Alt-I&quot;.</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_011.xml b/manual/en/manual_011.xml
index eeabcf9..a151b29 100644
--- a/manual/en/manual_011.xml
+++ b/manual/en/manual_011.xml
@@ -2,41 +2,23 @@
<title>Composing Messages</title>
<section>
<title>Composing a New Message</title>
- <para>
-When you start writing a new message, you are presented a nice dialog in which you can enter all kinds of information. In the From: line you find a dropdown list. In there you can select the e-mail account you want to use as the sending account.</para>
- <para>
-In the To: / Cc: / Bcc: part, you write the e-mail address of the receiver. You can enter several e-mail addresses, as long as they are separated by commas. An important utility here is the button &quot;Address&quot;. When you click that, you see the address book. You can point at an address, click the &quot;To:&quot;, &quot;Cc:&quot; or &quot;Bcc:&quot; button, and Sylpheed will place the address in the selected line. The Bcc: may be greyed out. In order to make that accessible, you need to add the Bcc: line to the message. You do that through the Message menu, and checking the Bcc option.</para>
- <para>
-In the Subject line you enter a short descriptive text what your message will be about.</para>
- <para>
-You can move between these lines by pressing TAB (to skip to the next line) and SHIFT-TAB (to go back up). When you press TAB in the last line, you will be moved to the message body.</para>
- <para>
-Did you select a signature file in the settings for the active account, it will be in the message text already. You can now write your message. When you are done, you can click Send, Send later or Draft in the toolbar. Send attempts to send the message immediately. Send later will place it in the Send folder, and Draft will place it in the Draft folder.
-</para>
+ <para>When you start writing a new message, you are presented a nice dialog in which you can enter all kinds of information. In the From: line you find a dropdown list. In there you can select the e-mail account you want to use as the sending account.</para>
+ <para>In the To: / Cc: / Bcc: part, you write the e-mail address of the receiver. You can enter several e-mail addresses, as long as they are separated by commas. An important utility here is the button &quot;Address&quot;. When you click that, you see the address book. You can point at an address, click the &quot;To:&quot;, &quot;Cc:&quot; or &quot;Bcc:&quot; button, and Sylpheed will place the address in the selected line. The Bcc: may be greyed out. In order to make that accessible, you need to add the Bcc: line to the message. You do that through the Message menu, and checking the Bcc option.</para>
+ <para>In the Subject line you enter a short descriptive text what your message will be about.</para>
+ <para>You can move between these lines by pressing TAB (to skip to the next line) and SHIFT-TAB (to go back up). When you press TAB in the last line, you will be moved to the message body.</para>
+ <para>Did you select a signature file in the settings for the active account, it will be in the message text already. You can now write your message. When you are done, you can click Send, Send later or Draft in the toolbar. Send attempts to send the message immediately. Send later will place it in the Send folder, and Draft will place it in the Draft folder.</para>
</section>
<section>
<title>Replying to a Message</title>
- <para>
-<!-- added 2001/07/19 -->
-To reply to a message, you use the &quot;reply&quot; function. In Sylpheed you activate this through either the &quot;Reply&quot; button, or by pressing Alt-R.</para>
- <para>
-A new message window will be created, with the e-mail address of the recipient and the subject already set for you. Most of the things described in Composing a new message are also applicable to this window.
-<!-- end add 2001/07/19 --></para>
+ <para>To reply to a message, you use the &quot;reply&quot; function. In Sylpheed you activate this through either the &quot;Reply&quot; button, or by pressing Alt-R.</para>
+ <para>A new message window will be created, with the e-mail address of the recipient and the subject already set for you. Most of the things described in Composing a new message are also applicable to this window.</para>
</section>
<section>
<title>Replying to a Message with Quotation</title>
- <para>
-<!-- added 2001/07/19 -->
-If you want to have Sylpheed quote the text you are replying to, you need to go into the Configuration menu. There you select Common preferences, go to the Compose tab, and check the &quot;Quote message when replying&quot; box. There you can also edit the quotation mark (the mark put in front of each quoted line in the reply mail) and the reply attribution (which is placed in front of the reply text).
-<!-- end add 2001/07/19 -->
-</para>
+ <para>If you want to have Sylpheed quote the text you are replying to, you need to go into the Configuration menu. There you select Common preferences, go to the Compose tab, and check the &quot;Quote message when replying&quot; box. There you can also edit the quotation mark (the mark put in front of each quoted line in the reply mail) and the reply attribution (which is placed in front of the reply text).</para>
</section>
<section>
<title>Forwarding Messages</title>
- <para>
-<!-- added 2001/07/19 -->
-Forwarding a message means: you send the entire message, including headers (Sender address, date sent etc.) on to someone else. For this you press the &quot;Forward&quot; button, or you press Ctrl-F. A new message window is created, containing the text of the selected message. You can then supply the name(s) of the recipient(s) of the message as in composing a new message, perhaps add a few lines of text to the message and send it on its way.
-<!-- end add 2001/07/19 -->
-</para>
+ <para>Forwarding a message means: you send the entire message, including headers (Sender address, date sent etc.) on to someone else. For this you press the &quot;Forward&quot; button, or you press Ctrl-F. A new message window is created, containing the text of the selected message. You can then supply the name(s) of the recipient(s) of the message as in composing a new message, perhaps add a few lines of text to the message and send it on its way.</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_012.xml b/manual/en/manual_012.xml
index 7d928ec..eb452a3 100644
--- a/manual/en/manual_012.xml
+++ b/manual/en/manual_012.xml
@@ -2,7 +2,7 @@
<title>Address Book</title>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/address_book..png"/>
+ <imagedata fileref="snapshots/address_book.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>
@@ -30,7 +30,7 @@ selected at the moment of adding.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/address_book_basic..png"/>
+ <imagedata fileref="snapshots/address_book_basic.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>
@@ -41,7 +41,7 @@ window.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/address_book_address..png"/>
+ <imagedata fileref="snapshots/address_book_address.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>
@@ -111,7 +111,7 @@ contain, click the &quot;OK&quot; button to close the window.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/address_book_group..png"/>
+ <imagedata fileref="snapshots/address_book_group.png" format="PNG"/>
</imageobject>
</mediaobject>
</section>
@@ -314,4 +314,4 @@ of your LDAP database you will need to enter into that extended
tab of the LDAP server edit dialog box.
</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_013.xml b/manual/en/manual_013.xml
index a0e4da9..20c3b25 100644
--- a/manual/en/manual_013.xml
+++ b/manual/en/manual_013.xml
@@ -8,8 +8,7 @@ and efficently manage you mails. These tools are:</para>
<para>
The <computeroutput>filters</computeroutput>, that let you sort you incoming messages and move
them into your folders based on their sender, their content,
- using regular expressions.
- </para>
+ using regular expressions.</para>
</listitem>
<listitem>
<para>
@@ -18,21 +17,18 @@ and efficently manage you mails. These tools are:</para>
headers and body or just one of its parts.
It allows also the use of an external command to filter the whole
text or just a selected part in the message window or in the
- compose window.
- </para>
+ compose window.</para>
</listitem>
<listitem>
<para>
The <computeroutput>templates</computeroutput> that let you pre-define complete messages
- leaving placeholders in the text to be filled at composition time.
- </para>
+ leaving placeholders in the text to be filled at composition time.</para>
</listitem>
</itemizedlist>
<section>
<title>Filters </title>
<para>
-Written by Nick Selby (sylpheed@nickselby.com)
-</para>
+Written by Nick Selby (sylpheed@nickselby.com)</para>
<para>
Sylpheed provides powerful filters to allow users to automatically
pre-sort incoming mail based on a set of rules that the user defines.
@@ -40,14 +36,12 @@ As a most simple example, let&apos;s say you work at the Acme Grommet Company,
and you want all e-mail from your co-workers to be placed in one mailbox.
To accomplish this, you would set up a filter that would place all mail
whose &quot;From&quot; header includes the phrase &quot;acmegrommet.com&quot; into a specific
-mailbox.
-</para>
+mailbox.</para>
<para>
Sylpheed allows you much more control than just that simple setup;
you may create filters based on several variables, including an
&quot;If this AND that&quot; or &quot;If the message contains this OR does NOT contain that&quot;
-etc. It&apos;s very cool.
-</para>
+etc. It&apos;s very cool.</para>
</section>
<section>
<title>Finding The Filter Setting Dialog </title>
@@ -55,11 +49,10 @@ etc. It&apos;s very cool.
The filter settings dialog is located in the <computeroutput>Configuration</computeroutput> menu,
under the title &quot;Filter Setting&quot; or from the <computeroutput>Tools</computeroutput> menu, under in
the <computeroutput>Create filter rules</computeroutput> sub menu. You may also use establish a
-keyboard shortcut (see Keyboard Shortcuts).
-</para>
+keyboard shortcut (see Keyboard Shortcuts).</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/filters..png"/>
+ <imagedata fileref="snapshots/filters.png" format="PNG"/>
</imageobject>
</mediaobject>
</section>
@@ -71,12 +64,10 @@ Operator(s) and Processing instructions combine to create a Filter Rule.
* Operators
The dialog&apos;s first setting option establishes the Operator, the variable
that will tell the filter what specific text to look for to trigger a
-filter. Each Filter Rule may have up to two operator sets.
-</para>
+filter. Each Filter Rule may have up to two operator sets.</para>
<para>
Each Operator variable contains three sections: <computeroutput>Header</computeroutput>,
-<computeroutput>Keyword</computeroutput> and <computeroutput>Predicate</computeroutput>.
-</para>
+<computeroutput>Keyword</computeroutput> and <computeroutput>Predicate</computeroutput>.</para>
<para>
Header is a drop-down box which defines in which message header
Sylpheed&apos;s filter will search. Choices range from <computeroutput>Subject</computeroutput>
@@ -84,8 +75,7 @@ to <computeroutput>X-Mailer</computeroutput>. </para>
<para><computeroutput>Keyword</computeroutput> is a a text box in which you may enter the text
for which the filter will search. </para>
<para>Predicate allows you to choose to filter based on whether the operator
-contains, or does not contain, the text you enter in the Keyword field.
-</para>
+contains, or does not contain, the text you enter in the Keyword field.</para>
<para>
Example: Create an Operator in which the X-Mailer field of an incoming
message contains the word &apos;Eudora&apos;.</para>
@@ -93,26 +83,22 @@ message contains the word &apos;Eudora&apos;.</para>
<listitem>
<para>
Step 1. Under the <computeroutput>Header</computeroutput> drop-down box, select
- <computeroutput>X-Mailer</computeroutput>.
- </para>
+ <computeroutput>X-Mailer</computeroutput>.</para>
</listitem>
<listitem>
<para>
Step 2. In the <computeroutput>Keyword</computeroutput> text box, type &apos;eudora&apos;
- (case insensitive)
- </para>
+ (case insensitive)</para>
</listitem>
<listitem>
<para>
Step 3. Determine appropriate Predicate setting. Default
- is <computeroutput>Contains</computeroutput>.
- </para>
+ is <computeroutput>Contains</computeroutput>.</para>
</listitem>
</itemizedlist>
<para>The second Operator setting, which is set identically to the
first, also allows the user to select an AND/OR setting
-declaring the relationship between the two operators.
-</para>
+declaring the relationship between the two operators.</para>
<para>
Example: Create an Operator set which will process mail with
a <computeroutput>From</computeroutput> header of bob@acmegrommet.com AND a subject
@@ -121,43 +107,36 @@ of &quot;2001 Spring Grommet Collection&quot;</para>
<listitem>
<para>
Step 1. Under the first Operator set&apos;s Header drop-down
- box, select <computeroutput>From</computeroutput>.
- </para>
+ box, select <computeroutput>From</computeroutput>.</para>
</listitem>
<listitem>
<para>
Step 2. In the <computeroutput>Keyword</computeroutput> text box, type
- &apos;bob@acmegrommet.com&apos; (case insensitive).
- </para>
+ &apos;bob@acmegrommet.com&apos; (case insensitive).</para>
</listitem>
<listitem>
<para>
Step 3. Leave <computeroutput>Predicate</computeroutput> setting on default,
- <computeroutput>Contains</computeroutput>
- </para>
+ <computeroutput>Contains</computeroutput></para>
</listitem>
<listitem>
<para>
- Step 4. Leave <computeroutput>AND/OR</computeroutput> box on default setting, <computeroutput>and</computeroutput>.
- </para>
+ Step 4. Leave <computeroutput>AND/OR</computeroutput> box on default setting, <computeroutput>and</computeroutput>.</para>
</listitem>
<listitem>
<para>
Step 5. Under the second Operator set&apos;s <computeroutput>Header</computeroutput>
- drop-down box, select <computeroutput>Subject</computeroutput>.
- </para>
+ drop-down box, select <computeroutput>Subject</computeroutput>.</para>
</listitem>
<listitem>
<para>
Step 6. In the <computeroutput>Keyword</computeroutput> text box, type
- &apos;2001 spring grommet collection&apos; (case insensitive).
- </para>
+ &apos;2001 spring grommet collection&apos; (case insensitive).</para>
</listitem>
<listitem>
<para>
Step 7. Leave <computeroutput>Predicate</computeroutput> setting on default,
- <computeroutput>Contains</computeroutput>.
- </para>
+ <computeroutput>Contains</computeroutput>.</para>
</listitem>
</itemizedlist>
</section>
@@ -168,12 +147,10 @@ Once you&apos;ve established the Operator(s) that will define
which messages will be processed, it&apos;s time to tell
Sylpheed what to do with messages that match the operator(s).
You may choose between two radio button-selected settings:
-<computeroutput>Destination</computeroutput> and <computeroutput>Don&apos;t Receive</computeroutput>.
-</para>
+<computeroutput>Destination</computeroutput> and <computeroutput>Don&apos;t Receive</computeroutput>.</para>
<para>
Selecting <computeroutput>Destinations</computeroutput> will enable you to route
-the mail into a mailbox which you specify.
-</para>
+the mail into a mailbox which you specify.</para>
<para>
Selecting <computeroutput>Don&apos;t Receive</computeroutput> will instruct Sylpheed
to not download messages with that operator. Note that with
@@ -189,49 +166,41 @@ in your copy of Sylpheed. Select the mailbox you wish by either </para>
<itemizedlist>
<listitem>
<para>
- (a) double clicking on the mail folder name or
- </para>
+ (a) double clicking on the mail folder name or</para>
</listitem>
<listitem>
<para>
- (b) clicking the mail folder name and then clicking <computeroutput>OK</computeroutput>.
- </para>
+ (b) clicking the mail folder name and then clicking <computeroutput>OK</computeroutput>.</para>
</listitem>
</itemizedlist>
<para>
To specify that the message not be retrieved, and left
on your mail server, click the radio button to the left
-of the words <computeroutput>Don&apos;t Receive</computeroutput>.
-</para>
+of the words <computeroutput>Don&apos;t Receive</computeroutput>.</para>
</section>
<section>
<title>Filter Registration </title>
<para>
Now that you have set the Operator and the Processing Rule,
all that&apos;s left to do is tell Sylpheed to save the entire
-Filter Rule. <emphasis>If you skip this step, the filter won&apos;t work</emphasis>.
-</para>
+Filter Rule. <emphasis>If you skip this step, the filter won&apos;t work</emphasis>.</para>
<para>
The <computeroutput>Register Rules</computeroutput> configuration has three options:
-<computeroutput>Register</computeroutput>, <computeroutput>Substitute</computeroutput> and <computeroutput>Delete</computeroutput>.
-</para>
+<computeroutput>Register</computeroutput>, <computeroutput>Substitute</computeroutput> and <computeroutput>Delete</computeroutput>.</para>
<itemizedlist>
<listitem>
<para>
- <computeroutput>Register</computeroutput> saves the Filter Rule.
- </para>
+ <computeroutput>Register</computeroutput> saves the Filter Rule.</para>
</listitem>
<listitem>
<para>
<computeroutput>Substitute</computeroutput> modifies an existing registered
- Filter Rule.
- </para>
+ Filter Rule.</para>
</listitem>
<listitem>
<para>
<computeroutput>Delete</computeroutput> will remove a previously registered
- Filter Rule.
- </para>
+ Filter Rule.</para>
</listitem>
</itemizedlist>
<para>Example of Registering A Filter Rule: Create a Filter Rule
@@ -241,36 +210,30 @@ into the (previously created) mail folder &quot;Sylpheed Manual Mail&quot;.</par
<listitem>
<para>
Step 1. Under the first Operator set&apos;s <computeroutput>Header</computeroutput>
- drop-down box, select <computeroutput>Subject</computeroutput>.
- </para>
+ drop-down box, select <computeroutput>Subject</computeroutput>.</para>
</listitem>
<listitem>
<para>
Step 2. In the <computeroutput>Keyword</computeroutput> text box, type
- &apos;sylpheed manual&apos; (case insensitive).
- </para>
+ &apos;sylpheed manual&apos; (case insensitive).</para>
</listitem>
<listitem>
<para>
Step 3. Leave <computeroutput>Predicate</computeroutput> setting on default,
- <computeroutput>Contains</computeroutput>. Leave second Operator set empty.
- </para>
+ <computeroutput>Contains</computeroutput>. Leave second Operator set empty.</para>
</listitem>
<listitem>
<para>
Step 4. Click <computeroutput>Destinations</computeroutput> radio button;
- select &quot;Sylpheed Manual Mail&quot; folder.
- </para>
+ select &quot;Sylpheed Manual Mail&quot; folder.</para>
</listitem>
<listitem>
<para>
- Step 5. Click <computeroutput>Register</computeroutput>.
- </para>
+ Step 5. Click <computeroutput>Register</computeroutput>.</para>
</listitem>
<listitem>
<para>
- Step 6. Click <computeroutput>OK</computeroutput>.
- </para>
+ Step 6. Click <computeroutput>OK</computeroutput>.</para>
</listitem>
</itemizedlist>
<para>Example of Substituting A Filter Rule: Modify a previously
@@ -281,36 +244,30 @@ of &quot;Sylpheed Manual&quot; to sort mail not to the mail folder
<listitem>
<para>
Step 1. Under the first Operator set&apos;s <computeroutput>Header</computeroutput>
- drop-down box, select <computeroutput>Subject</computeroutput>.
- </para>
+ drop-down box, select <computeroutput>Subject</computeroutput>.</para>
</listitem>
<listitem>
<para>
Step 2. In the <computeroutput>Keyword</computeroutput> text box, type
- &apos;sylpheed manual&apos; (case insensitive).
- </para>
+ &apos;sylpheed manual&apos; (case insensitive).</para>
</listitem>
<listitem>
<para>
Step 3. Leave <computeroutput>Predicate</computeroutput> setting on default,
- <computeroutput>Contains</computeroutput>. Leave second Operator set empty.
- </para>
+ <computeroutput>Contains</computeroutput>. Leave second Operator set empty.</para>
</listitem>
<listitem>
<para>
Step 4. Click <computeroutput>Destinations</computeroutput> radio button;
- select &quot;Sylpheed Questions&quot; folder.
- </para>
+ select &quot;Sylpheed Questions&quot; folder.</para>
</listitem>
<listitem>
<para>
- Step 5. Click <computeroutput>Substitute</computeroutput>.
- </para>
+ Step 5. Click <computeroutput>Substitute</computeroutput>.</para>
</listitem>
<listitem>
<para>
- Step 6. Click <computeroutput>OK</computeroutput>.
- </para>
+ Step 6. Click <computeroutput>OK</computeroutput>.</para>
</listitem>
</itemizedlist>
<para>Example of Deleting a Filter Rule: Remove the previously
@@ -320,25 +277,21 @@ created Filter Rule which refers to Subject:Sylpheed Questions.</para>
<para>
Step 1. In the <computeroutput>Registered Rules</computeroutput> select box,
highlight the filter entitled
- &quot;<computeroutput>Subject:Sylpheed Manual: :::Sylpheed Questions:1:1:m</computeroutput>&quot;
- </para>
+ &quot;<computeroutput>Subject:Sylpheed Manual: :::Sylpheed Questions:1:1:m</computeroutput>&quot;</para>
</listitem>
<listitem>
<para>
- Step 2. Click the <computeroutput>Delete</computeroutput> Button.
- </para>
+ Step 2. Click the <computeroutput>Delete</computeroutput> Button.</para>
</listitem>
<listitem>
<para>
Step 3. Confirm the deletion by clicking <computeroutput>Yes</computeroutput> in the
confirmation pop-up that asks,
- <computeroutput>Do you really want to delete this rule?</computeroutput>
- </para>
+ <computeroutput>Do you really want to delete this rule?</computeroutput></para>
</listitem>
<listitem>
<para>
- Step 4. Click <computeroutput>OK</computeroutput>.
- </para>
+ Step 4. Click <computeroutput>OK</computeroutput>.</para>
</listitem>
</itemizedlist>
</section>
@@ -347,35 +300,29 @@ created Filter Rule which refers to Subject:Sylpheed Questions.</para>
<para>
One caveat about all this: the order in which Filter Rules
are created could adversely affect your intended message sorting,
-and one needs to consider this when creating or updating Filter Rules.
-</para>
+and one needs to consider this when creating or updating Filter Rules.</para>
<para>
For example, a Filter Rule saying, &quot;Move anything containing &apos;ABC&apos;
to Mailbox X&quot; listed above another Filter Rule saying &quot;Move anything
containing &apos;ABCDEF&apos; to Mailbox Y&quot; will cause the latter of these
-filters not to process.
-</para>
+filters not to process.</para>
<para>
Think about the way Sylpheed goes down its list: first, it would say..
&quot;Hmm, any messages with ABC? Ah, there&apos;s one! Move it&quot;.
Then it would think, &quot;Okay, any messages with ABCDEF?&quot;
To which the answer would be &quot;no&quot; - that ABCDEF was already
-filtered because it contained &quot;ABC&quot;.
-</para>
+filtered because it contained &quot;ABC&quot;.</para>
<para>
-Bummer.
-</para>
+Bummer.</para>
<para>
In order to avoid this, you must ensure that the more complex
Filter Rule is processed first, by placing it higher than a
-similar, conflicting Filter Rule.
-</para>
+similar, conflicting Filter Rule.</para>
<para>
To move a Registered Rule higher or lower within the Registered
Rule box, select the rule you would like to move, and click on
the <computeroutput>Up</computeroutput> or <computeroutput>Down</computeroutput> buttons. This will &quot;move&quot; the
-rule up or down, above or below a potentially conflicting Filter Rule.
-</para>
+rule up or down, above or below a potentially conflicting Filter Rule.</para>
</section>
<section>
<title>How to Filter Messages </title>
@@ -385,8 +332,7 @@ Filtering messages can be done in several ways:</para>
<listitem>
<para>
Sylpheed automatically filters incoming mail from
- POP servers.
- </para>
+ POP servers.</para>
</listitem>
<listitem>
<para>
@@ -394,14 +340,12 @@ Filtering messages can be done in several ways:</para>
in the <computeroutput>Common preferences</computeroutput> (<computeroutput>Configuration</computeroutput> menu),
you need to check the box called <computeroutput>Filter on incorporation</computeroutput>.
You find this box in the <computeroutput>Receive</computeroutput> tab in the space
- <computeroutput>Local spool</computeroutput>.
- </para>
+ <computeroutput>Local spool</computeroutput>.</para>
</listitem>
<listitem>
<para>
You can also select the option <computeroutput>Filter messages</computeroutput>
- from the Summary menu.
- </para>
+ from the Summary menu.</para>
</listitem>
</itemizedlist>
<para>Please note that, at time of writing, Sylpheed does -NOT YET-
@@ -414,19 +358,16 @@ If you feel that Sylpheed has not enough options to perform
filtering for you, then you can look at Sylpheed Claws which
has more options for filtering. You can find the Claws version
(the cutting edge, experimental version of Sylpheed)
-sylpheed-claws.sourceforge.net.
-</para>
+sylpheed-claws.sourceforge.net.</para>
<para>
Another option, if you do not want to work with an experimental
version of Sylpheed, is Procmail. Procmail is a powerful mail
filtering program that is triggered from the Mail Transport
Agent (i.e. Sendmail, Postfix, Qmail). Procmail is called by
-default from these programs after receiving e-mail.
-</para>
+default from these programs after receiving e-mail.</para>
<para>
The trick to procmail is to tell it that mail has to be filtered
-into MH mail folders. This is not difficult though.
-</para>
+into MH mail folders. This is not difficult though.</para>
<para>
Normally procmail moves mail into MBOX format, this is one large
file containing all mails in a folder. MH uses separate files
@@ -438,9 +379,7 @@ It is the &quot;slash dot&quot; that does the trick.</para>
<title>Actions </title>
<para>
The following section is a copy of
-<ulink url="http://melvin.hadasht.free.fr/home/sylpheed/actions/index.html">Melvin&apos;s page</ulink>.
-
-</para>
+<ulink url="http://melvin.hadasht.free.fr/home/sylpheed/actions/index.html">Melvin&apos;s page</ulink>.</para>
<para>
The &quot;actions&quot; feature is a convenient way for the user to
launch external commands to process a complete message file
@@ -472,8 +411,7 @@ to use the following syntax for the command:</para>
<para>
<computeroutput>%f</computeroutput> denotes the file name of the selected message.
If you selected more than one, then the command will be
- launched for each message with the appropriate file name.
- </para>
+ launched for each message with the appropriate file name.</para>
</listitem>
<listitem>
<para>
@@ -486,23 +424,20 @@ to use the following syntax for the command:</para>
command will be launched for each selected message
with the name of this message and with the list of
all selected messages. I did not find a practical
- example for this.).
- </para>
+ example for this.).</para>
</listitem>
<listitem>
<para>
<computeroutput>%p</computeroutput> denotes the current selected message part
of a multipart message. The part is decoded accordingly.
If the message is not a multipart message, it denotes
- the message body.
- </para>
+ the message body.</para>
</listitem>
<listitem>
<para>
Prepending <computeroutput>&gt;</computeroutput>: this will allow you to send
to the command&apos;s standard input a text that you will
- enter in a dialog window.
- </para>
+ enter in a dialog window.</para>
</listitem>
<listitem>
<para>
@@ -510,16 +445,14 @@ to use the following syntax for the command:</para>
the command&apos;s standard input a text that you will enter
in a dialog window. But in contrast to prepending
<computeroutput>&gt;</computeroutput>, the entered text is hidden
- (useful when entering passwords).
- </para>
+ (useful when entering passwords).</para>
</listitem>
<listitem>
<para>
Appending an ampersand <computeroutput>&amp;</computeroutput>: this will run
the command asynchronously. That means &quot;fire and forget&quot;.
Sylpheed won&apos;t wait for the command to finish, nor will
- it catch its output or its error messages.
- </para>
+ it catch its output or its error messages.</para>
</listitem>
<listitem>
<para>
@@ -527,8 +460,7 @@ to use the following syntax for the command:</para>
this will send the current displayed text or the current
selected text from the message view or the compose
window to the command standard input. The command will
- silently fail if more than one message is selected.
- </para>
+ silently fail if more than one message is selected.</para>
</listitem>
<listitem>
<para>
@@ -536,8 +468,7 @@ to use the following syntax for the command:</para>
will replace the current displayed text or the current
selected text from the message window or the compose
window with the command standard output. The command
- will silently fail if more than one message is selected.
- </para>
+ will silently fail if more than one message is selected.</para>
</listitem>
<listitem>
<para>
@@ -545,8 +476,7 @@ to use the following syntax for the command:</para>
insert the command output in the message. The difference
between the trailing <computeroutput>|</computeroutput> is that no text will be
deleted or replaced. Most used when composing mails to
- insert text.
- </para>
+ insert text.</para>
</listitem>
</itemizedlist>
<para><emphasis>Note</emphasis>: It is not possible to use actions containing
@@ -561,8 +491,7 @@ This dialog will also be displayed as soon as the command has
some output: error messages or even its standard output when
the command is not a &quot;pipe-out&quot; command. When multiple commands
are being run, they are run in parallel and each command output
-is separated from the outputs of the others.
-</para>
+is separated from the outputs of the others.</para>
</section>
<section>
<title>Examples </title>
@@ -575,9 +504,8 @@ per action, each action contains the menu name and the command
line separated by a colon and a space &quot;: &quot;.
Alternatively, you can use <computeroutput>Configuration -&gt; Actions...</computeroutput>
and for each example enter a menu name and copy&amp;paste the
-text after the colon and space &quot;: &quot; in the command definition.
-</para>
-<!-- missing table --> <para>The gpg-enc-syl script is to be found
+text after the colon and space &quot;: &quot; in the command definition.</para>
+ <!-- FIXME: missing table --><para>The gpg-enc-syl script is to be found
<ulink url="http://melvin.hadasht.free.fr/home/sylpheed/actions/gpg-enc-syl">here (gpg-enc-syl)</ulink>.
It calls gpg with the --yes command line option that you may want
to remove it. See gpg manual page for info.</para>
@@ -611,20 +539,18 @@ With Sylpheed you can define mail templates to use when replying
to messages. A template can contain raw text (that will be inserted
in the composed mail without any change), and placeholders that are
replaced at composition time by the actual value of the selected
-fields from the original message.
-</para>
+fields from the original message.</para>
<para>
A typical use of the template could be to define the legal notice
to be appended to your messages (the usual notice that contains a
text like: &quot;here are my own words and not those of my company, my
-boss is not liable for them, bla, bla, bla&quot;).
-</para>
+boss is not liable for them, bla, bla, bla&quot;).</para>
<para>
To define a new template, in the <computeroutput>Configuration</computeroutput> menu select
the <computeroutput>Templates</computeroutput> entry and fill the form:</para>
<mediaobject>
<imageobject>
- <imagedata fileref="snapshots/template..png"/>
+ <imagedata fileref="snapshots/template.png" format="PNG"/>
</imageobject>
</mediaobject>
<para>
@@ -634,8 +560,7 @@ composition window.
The content of the <computeroutput>To</computeroutput> field will be appended to the original
content of the corresponding field in the message you are composing.
The content of the <computeroutput>Subject</computeroutput> field will replace the orignal subject
-of the message you are composing.
-</para>
+of the message you are composing.</para>
<para>
In the upper pane, type in the text you want to put in the template,
use the <computeroutput>Symbols</computeroutput> button to open a help window that contains
@@ -648,20 +573,16 @@ it in the lower pane, modify its text, then use the <computeroutput>Substitute</
button. As you may guess, the <computeroutput>Delete</computeroutput> button removes the selected
template. Finally validate your changes with the <computeroutput>OK</computeroutput> button.
If you use the <computeroutput>Cancel</computeroutput> button, the form is closed and your changes
-are lost (deleted templates are back, added templates are lost).
-
-</para>
+are lost (deleted templates are back, added templates are lost).</para>
<para>
To use a template, open the composition window and select the template
from the <computeroutput>Tools/Templates</computeroutput> menu. You can then choose to insert
the template into your message or to completely replace the text of the
message by the template. This only affects the body of the message.
If you choose to insert the template, its text will be inserted at the
-cursor location.
-</para>
+cursor location.</para>
<para>
The placeholders are taken from the source message when replying, so
-they have no meaning when composing a new message.
-</para>
+they have no meaning when composing a new message.</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_015.xml b/manual/en/manual_015.xml
index ed4f5a1..ae6fa2d 100644
--- a/manual/en/manual_015.xml
+++ b/manual/en/manual_015.xml
@@ -3,12 +3,10 @@
<section>
<title>Importing Messages of mbox Format</title>
<para>
-<!-- added 2001/07/20 -->
Sylpheed lets you import messages of the Mbox format from the File menu. First you create
the mail folder where you want the messages to end up in, then you select File-&gt;import
Mbox file. Use the browse function to select the Mbox file and the Sylpheed mail folder,
-and press Ok. And voila, there is your mail, imported.
-</para>
+and press Ok. And voila, there is your mail, imported.</para>
<para>
That was easy, wasn&apos;t it?</para>
</section>
@@ -26,13 +24,12 @@ For import possibilities of the mail folders of these and more mail programs you
can download the program mbx2mbox at sourceforge.net. The project is located at
<ulink url="http://mbx2mbox.sourceforge.net">http://mbx2mbox.sourceforge.net</ulink>.</para>
</section>
-<!-- End added 2001/07/21 --><!-- start add 2001/09/04 --> <section>
+ <section>
<title>Exporting from Sylpheed MH format to mbox</title>
<para>
Sylpheed offers a way to export a mailbox to the standard mbox format through the
File menu. Just select the &quot;Export to mbox file...&quot; option and you can select the
folder to export (assisted by a browse dialog) and also select or enter the name
-of the mbox file you wish to generate.
-<!-- end add 2001/09/04 --></para>
+of the mbox file you wish to generate.</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_016.xml b/manual/en/manual_016.xml
index 9166091..5e489a9 100644
--- a/manual/en/manual_016.xml
+++ b/manual/en/manual_016.xml
@@ -5,8 +5,7 @@ What is netnews?</para>
<para>
Netnews, also called Usenet, is a collection of &quot;news servers&quot; that contain a great deal of information. News, as it is called in short, can be about anything. About making your own wine, about old cars or radios. You name it, and there probably is a newsgroup about it.</para>
<para>
-This is what we will set up here. Accessing newsgroups. Note that this is different from e-mails. You can almost compare it to a mailing list, but yet the concept is a bit different.
-<!-- added 2001/07/20 --></para>
+This is what we will set up here. Accessing newsgroups. Note that this is different from e-mails. You can almost compare it to a mailing list, but yet the concept is a bit different.</para>
<section>
<title>Adding and Deleting Servers</title>
<section>
@@ -75,4 +74,4 @@ after which you will find nicely formatted blocks of characters that don&apos;t
</para>
</section>
</section>
-<!-- end add 2001/07/20 --></chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_019.xml b/manual/en/manual_019.xml
index d80fe99..2861026 100644
--- a/manual/en/manual_019.xml
+++ b/manual/en/manual_019.xml
@@ -2,9 +2,27 @@
<title>Information</title>
<section>
<title>Websites on Sylpheed</title>
- <para>
-Here are some links to the Sylpheed FAQ in other languages:</para>
-<!-- missing links itemizedlist --> </section>
+ <para>Here are some links to the Sylpheed FAQ in other languages:</para>
+ <itemizedlist>
+ <listitem>
+ <para><ulink url="http://sylpheeddoc.sourceforge.net/fr/faq/faq.html">Sylpheed FAQ in French</ulink>, translated by Olivier Delhomme.</para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://sylpheeddoc.sourceforge.net/de/faq/faq.html">Sylpheed FAQ in German</ulink>, translated by Nicolas Kaiser.</para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://sylpheeddoc.sourceforge.net/es/faq/faq.html">Sylpheed FAQ in Spanish</ulink>, translated by Ricardo Mones Lastra.</para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://sylpheeddoc.sourceforge.net/zh_TW.Big5/sylpheed-faq.html">Sylpheed FAQ in Traditional Chinese</ulink>, courtesy of Franklin.</para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ You can always download the English FAQ from the <ulink url="http://sylpheeddoc.sourceforge.net/en/faq/sylpheed-faq.html">Sylpheed Documentation Project website</ulink>.</para>
+ <note>
+ <para>Did not find your language in the list? Would you like to contribute with a new translation to the Sylpheed Documentation Project? Then please contact the Project members at <ulink url="http://sylpheeddoc.sourceforge.net/">their website</ulink>. Thanks in advance.</para>
+ </note>
+ </section>
<section>
<title>Mailing Lists</title>
<para>
@@ -48,10 +66,10 @@ Send a mail to sylpheed-ctl@good-day.net that says</para>
<guilabel>unsubscribe</guilabel></para>
<para>
in the body.</para>
-<!-- added aug. 13, 2001 --> </section>
+ </section>
<section>
<title>Anonymous CVS</title>
<para>
This section has not been written yet.</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/manual/en/manual_020.xml b/manual/en/manual_020.xml
index 48e0d91..ea45359 100644
--- a/manual/en/manual_020.xml
+++ b/manual/en/manual_020.xml
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</para>
</section>
-<!-- add 2001/07/21 --> <section>
+ <section>
<title>Where to Get the Latest Version of This Document</title>
<para>
You can find the latest version of this document on the site of the Sylpheed documentation project at</para>
@@ -43,7 +43,6 @@ Nick Selby, for offering his well appreciated assistance in writing along in thi
<para>
All the people around the world who work hard on keeping the manual and FAQ up to date</para>
<para>
-And Linus Torvald, who got us a great operating system! ;-)
-<!-- end add 2001/07/21 --></para>
+And Linus Torvald, who got us a great operating system! ;-)</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>