2011-11-19 [pawel] 3.7.10cvs94

[claws.git] / manual / faq.xml

diff --git a/manual/faq.xml b/manual/faq.xml
index bfd090629b75dcf76df42b695884ddd48ee7bf2a..516b053d7d5daee911cb9bd8369e0ee1bd335156 100644 (file)
--- a/manual/faq.xml
+++ b/manual/faq.xml
@@ -4,21 +4,14 @@
     <section>
     <title>What are the differences between Claws Mail and Sylpheed?</title>
     <para>
-       Claws Mail is the <emphasis>extended</emphasis> version of
-       Sylpheed, therefore you will find that it has all the features that
-       Sylpheed has and a lot more besides. It also includes some modified
-       dialogues to enhance usability. Further information can be found at 
+       Claws Mail is a fork of Sylpheed, therefore you will find that 
+       it has all the features that Sylpheed has and a lot more besides. 
+       It also includes some modified dialogues to enhance usability. 
+       Further information can be found at 
        <ulink url="http://www.claws-mail.org/features.php">
        http://www.claws-mail.org/features.php</ulink>.
     </para></section>
     <section>
-    <title>What does the word <quote>Sylpheed</quote> mean?</title>
-    <para>
-       <quote>Sylpheed</quote> is a corruption of the word 
-       <emphasis>Sylph</emphasis>. Sylphs are invisible beings (spirits) of
-       the air.
-    </para></section>
-    <section>
     <title>Does Claws Mail allow me to write HTML styled messages?</title>
     <para>
        No. A discussion has gone on around this topic, and the outcome was that
@@ -29,17 +22,17 @@
     <title>How can I submit patches, report bugs, and talk about Claws Mail
        with others?</title>
     <para>
-       Patches should be submitted via the SourceForge project Patch Tracker at 
-       <ulink url='http://sourceforge.net/tracker/?group_id=25528&amp;atid=384600'>
-       http://sourceforge.net/tracker/?group_id=25528&amp;atid=384600</ulink>, 
+       Patches should be submitted via our Bugzilla, 
+       <ulink url='http://www.thewildbeast.co.uk/claws-mail/bugzilla/'>
+       http://www.thewildbeast.co.uk/claws-mail/bugzilla/</ulink>, 
        but please follow the patch guidelines at 
        <ulink url="http://www.claws-mail.org/devel.php">
        http://www.claws-mail.org/devel.php</ulink>.
     </para>
     <para>
         Bug reports should be submitted at our Bugzilla, 
-        <ulink url="http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/">
-       http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/</ulink>.
+        <ulink url="http://www.thewildbeast.co.uk/claws-mail/bugzilla/">
+       http://www.thewildbeast.co.uk/claws-mail/bugzilla/</ulink>.
     </para>
     <para>
        To talk to others, you should join the Claws Mail users' mailing
@@ -75,7 +68,7 @@
     <para>
        If you do not ever want to send Return Receipts then you can use the
        option <quote>Never send Return Receipts</quote> in the
-       <quote>Configuration/Preferences/Other</quote> page.
+       <quote>Configuration/Preferences/Mail Handling/Sending</quote> page.
     </para></section>
     <section>
     <title>How can I make Claws Mail notify me when new mail