From 22a920342f3972565be44118bd41c4702c3130eb Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 26 Apr 2012 22:52:47 +0000
Subject: [PATCH] Doc: update Thunderbird POP account setup doc

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1951 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/site/xdoc/faq.xml                      |  2 +-
 src/site/xdoc/thunderbirdimapmailsetup.xml |  5 ++-
 src/site/xdoc/thunderbirdmailsetup.xml     | 38 ++++++----------------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/site/xdoc/faq.xml b/src/site/xdoc/faq.xml
index f5fccdf9..f805166c 100644
--- a/src/site/xdoc/faq.xml
+++ b/src/site/xdoc/faq.xml
@@ -246,7 +246,7 @@ calendar.debug.log.verbose=true]]></source>
 
             <subsection name="Mail">
                 <p>
-                    <strong>Timout errors during IMAP sync (broken pipe)</strong>
+                    <strong>Timeout errors during IMAP sync (broken pipe)</strong>
                 </p>
                 <p>If you Exchange server is too slow, you may get timeout errors during
                     message fetch.
diff --git a/src/site/xdoc/thunderbirdimapmailsetup.xml b/src/site/xdoc/thunderbirdimapmailsetup.xml
index 6bfe2e19..f911ce50 100644
--- a/src/site/xdoc/thunderbirdimapmailsetup.xml
+++ b/src/site/xdoc/thunderbirdimapmailsetup.xml
@@ -44,7 +44,7 @@
                     <code>Re-test</code> to validate account settings, then <code>Create Account</code>:
                 </p>
                 <div style="width: 100%;text-align: center">
-                    <img src="images/thunderbirdAccount3.png" alt=""/>
+                    <img src="images/thunderbirdAccountPop3.png" alt=""/>
                 </div>
 
 
@@ -56,6 +56,9 @@
                 <p>Note: as communication between Thunderbird and DavMail is local, cleartext mode is not an issue,
                     except on shared machines (e.g. Terminal server).</p>
 
+                <p>Proceed to
+                    <a href="thunderbirdcalendarsetup.html">Thunderbird calendar setup</a>
+                </p>
             </subsection>
         </section>
     </body>
diff --git a/src/site/xdoc/thunderbirdmailsetup.xml b/src/site/xdoc/thunderbirdmailsetup.xml
index a3a47714..243b7d24 100644
--- a/src/site/xdoc/thunderbirdmailsetup.xml
+++ b/src/site/xdoc/thunderbirdmailsetup.xml
@@ -29,53 +29,35 @@
             </p>
 
             <subsection name="Create a new account">
+                <p>Choose <code>Add Mail Account...</code> under Account settings and enter name, email address
+                    and password:</p>
                 <div style="width: 100%;text-align: center">
                     <img src="images/thunderbirdAccount1.png" alt=""/>
                 </div>
 
-                <p>Edit common name and Exchange mail address:
-                </p>
+                <p>Click <code>Continue</code> and <code>Manual config</code> without waiting for automatic config:</p>
                 <div style="width: 100%;text-align: center">
                     <img src="images/thunderbirdAccount2.png" alt=""/>
                 </div>
 
-                <p>Choose POP as server type, located at localhost:
+                <p>Incoming server type is POP, server hostname is localhost, default port is 1110, no SSL and normal
+                    password authentication. Outgoing server is localhost, default port is 1025, no SSL and normal
+                    password authentication. Set your username (windows account name or email address) and click
+                    <code>Re-test</code> to validate account settings, then <code>Create Account</code>:
                 </p>
                 <div style="width: 100%;text-align: center">
                     <img src="images/thunderbirdAccount3.png" alt=""/>
                 </div>
 
 
-                <p>Populate in and out login names with Active Directory account name, i.e. domain\account
-                    with Exchange 2003 and earlier. You don't need the domain name prefix with
-                    Exchange 2007.
+                <p>Without SSL you will get the following warning, check box and confirm account creation:
                 </p>
                 <div style="width: 100%;text-align: center">
                     <img src="images/thunderbirdAccount4.png" alt=""/>
                 </div>
+                <p>Note: as communication between Thunderbird and DavMail is local, cleartext mode is not an issue,
+                    except on shared machines (e.g. Terminal server).</p>
 
-                <p>Edit account name (email address by default):
-                </p>
-                <div style="width: 100%;text-align: center">
-                    <img src="images/thunderbirdAccount5.png" alt=""/>
-                </div>
-
-                <p>Finish:
-                </p>
-                <div style="width: 100%;text-align: center">
-                    <img src="images/thunderbirdAccount6.png" alt=""/>
-                </div>
-
-            </subsection>
-            <subsection name="Create a new SMTP configuration">
-                <p>Create a new outgoing mail configuration under account settings:
-                </p>
-                <div style="width: 100%;text-align: center">
-                    <img src="images/thunderbirdSmtp.png" alt=""/>
-                </div>
-                <p>Server name is localhost, edit port according to DavMail settings.
-                    The connection must use authentication with Active Directory account and encryption is not needed.
-                </p>
                 <p>Proceed to
                     <a href="thunderbirdcalendarsetup.html">Thunderbird calendar setup</a>
                 </p>