From c22b26b41e62416c27a68289f226f216cdccca34 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Fri, 8 Oct 2010 09:38:29 +0000
Subject: [PATCH] Doc: update roadmap

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1502 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/site/xdoc/roadmap.xml  | 11 -----------
 src/site/xdoc/sslsetup.xml |  9 +++------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/site/xdoc/roadmap.xml b/src/site/xdoc/roadmap.xml
index 555ef9c2..a4fe9947 100644
--- a/src/site/xdoc/roadmap.xml
+++ b/src/site/xdoc/roadmap.xml
@@ -15,14 +15,6 @@
                 for improvement. The following section lists the expected new features
                 and enhancements in next DavMail versions.
             </p>
-            <subsection name="3.8.3">
-                <p>
-                    <strong>Next bugfix release</strong>
-                </p>
-                <ul>
-                    <li>Per service SSL setting</li>
-                </ul>
-            </subsection>
             <subsection name="3.9.0">
                 <p>
                     <strong>Next minor release</strong>
@@ -31,9 +23,6 @@
                     <li>Create a new RPM package with redline rpm ant task</li>
                     <li>Implement Caldav attachments</li>
                     <li>Implement hide from Dock option on OSX</li>
-                    <li>Implement multiple mailbox access over IMAP with domain/user/mailbox:
-                        http://msexchangeteam.com/archive/2004/03/31/105275.aspx
-                    </li>
                 </ul>
             </subsection>
             <subsection name="4.0">
diff --git a/src/site/xdoc/sslsetup.xml b/src/site/xdoc/sslsetup.xml
index 4053daca..8c44b969 100644
--- a/src/site/xdoc/sslsetup.xml
+++ b/src/site/xdoc/sslsetup.xml
@@ -20,8 +20,7 @@
                 <p>The simplest way to secure communication between mail/calendar clients and DavMail is to create a
                     self signed certificate:
                 </p>
-                <source>
-                    keytool -genkey -keyalg rsa -keysize 2048 -storepass password -keystore davmail.p12 -storetype
+                <source>keytool -genkey -keyalg rsa -keysize 2048 -storepass password -keystore davmail.p12 -storetype
                     pkcs12 -validity 3650 -dname cn=davmailhostname.company.com,ou=davmail,o=sf,o=net
                 </source>
 
@@ -31,8 +30,7 @@
 davmail.ssl.keystoreType=PKCS12
 davmail.ssl.keyPass=password
 davmail.ssl.keystoreFile=davmail.p12
-davmail.ssl.keystorePass=password]]>
-                </source>
+davmail.ssl.keystorePass=password]]></source>
                 <p>Restart DavMail, all DavMail listeners will switch to secure mode. You will also need to enable SSL
                     in
                     client applications and manually accept the certificate as it's not signed by a trusted
@@ -47,8 +45,7 @@ davmail.ssl.keystorePass=password]]>
                 <source><![CDATA[
 davmail.ssl.clientKeystoreType=PKCS12
 davmail.ssl.clientKeystoreFile=client.p12
-davmail.ssl.clientKeystorePass=password]]>
-                </source>
+davmail.ssl.clientKeystorePass=password]]></source>
             </subsection>
         </section>
     </body>