From 45f015e26cb330365b3fe34a9a668ee981019020 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 4 May 2010 20:50:22 +0000
Subject: [PATCH] Doc: update doc and roadmap

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1030 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/site/xdoc/faq.xml                       | 2 +-
 src/site/xdoc/index.xml                     | 2 +-
 src/site/xdoc/roadmap.xml                   | 9 +++++----
 src/site/xdoc/thunderbirddirectorysetup.xml | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/site/xdoc/faq.xml b/src/site/xdoc/faq.xml
index 45925605..7d28c8f8 100644
--- a/src/site/xdoc/faq.xml
+++ b/src/site/xdoc/faq.xml
@@ -99,7 +99,7 @@
                     to improve this in server (shared) mode.
                 </p>
                 <p>This is quite simple: you just need to get a server certificate in PKCS12 or JKS format and add it in
-                    the key store section in DavMail settings, see<a href="gettingstarted.html">Getting started</a>.
+                    the key store section in DavMail settings, see&#x20;<a href="gettingstarted.html">Getting started</a>.
                     You need to choose the key store type in davmail.ssl.keystoreType: PKCS12 for .p12 file and JKS for
                     java generated key stores. Then set the full path to your certificate file in
                     davmail.ssl.keystoreFile
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index fd5f8156..e18f097d 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -21,7 +21,7 @@
                             with attendees free/busy display.
                         </p>
                         <p>DavMail will soon also support the CardDav protocol to sync address books. This new feature
-                        is sponsored by french <a href="http://www.defense.gouv.fr/dga/">DGA</a> through project <a href="http://www.trustedbird.org">Trustedbird</a></p>
+                        is sponsored by <a href="http://www.defense.gouv.fr/dga/">French Defense / DGA</a> through project <a href="http://www.trustedbird.org">Trustedbird</a></p>
                         <div style="width: 100%;text-align: center">
                             <img src="images/davmailArchitecture.png" alt="DavMail Architecture" width="550"
                                  height="364"/>
diff --git a/src/site/xdoc/roadmap.xml b/src/site/xdoc/roadmap.xml
index 2233f980..d1356247 100644
--- a/src/site/xdoc/roadmap.xml
+++ b/src/site/xdoc/roadmap.xml
@@ -15,14 +15,14 @@
                 for improvement. The following section lists the expected new features
                 and enhancements in DavMail next versions.
             </p>
-            <subsection name="3.6.5">
+            <subsection name="3.6.7">
                 <p>
                     <strong>Next bugfix release</strong>
                 </p>
                 <ul>
-                    <li>Fix JavaMail client IMAP support</li>
                     <li>Create a new RPM package with redline rpm ant task</li>
-                    <li>Filter private events on shared calendars (Exchange bug)</li>
+                    <li>Change the subject line when replying to invites</li>
+                    <li>Growl support on OSX</li>
                 </ul>
             </subsection>
             <subsection name="3.7.0">
@@ -31,7 +31,8 @@
                 </p>
                 <ul>
                     <li>Implement CardDav protocol to sync address books. This new feature
-                        is sponsored by the french DGA through project trustedbird
+                        is sponsored by <a href="http://www.defense.gouv.fr/dga/">French Defense / DGA</a>
+                        through project <a href="http://www.trustedbird.org">Trustedbird</a>
                     </li>
                     <li>Implement Caldav attachments</li>
                     <li>Implement hide from Dock option on OSX</li>
diff --git a/src/site/xdoc/thunderbirddirectorysetup.xml b/src/site/xdoc/thunderbirddirectorysetup.xml
index bdd55de1..3103e870 100644
--- a/src/site/xdoc/thunderbirddirectorysetup.xml
+++ b/src/site/xdoc/thunderbirddirectorysetup.xml
@@ -20,11 +20,11 @@
                     <img src="images/thunderbirdDirectory1.png" alt=""/>
                 </div>
 
-                <p>Choose a name, host is always localhost, LDAP base context<code>ou=people</code>,
+                <p>Choose a name, host is always localhost, LDAP base context&#x20;<code>ou=people</code>,
                     adjust port to your settings and set user to your Active Directory account name,
                     i.e. domain\account. Leave other options to default values.
                 </p>
-                <p>You may also want to use this directory for mail completion in compoze window :
+                <p>You may also want to use this directory for mail completion in compose window :
                 </p>
                 <div style="width: 100%;text-align: center">
                     <img src="images/thunderbirdDirectory2.png" alt=""/>