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.

- -

- Next bugfix release -

- -

Next minor release @@ -31,9 +23,6 @@

  • Create a new RPM package with redline rpm ant task
  • Implement Caldav attachments
  • Implement hide from Dock option on OSX
  • -
  • Implement multiple mailbox access over IMAP with domain/user/mailbox: - http://msexchangeteam.com/archive/2004/03/31/105275.aspx -
  • 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 @@

    The simplest way to secure communication between mail/calendar clients and DavMail is to create a self signed certificate:

    - - keytool -genkey -keyalg rsa -keysize 2048 -storepass password -keystore davmail.p12 -storetype + 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 @@ -31,8 +30,7 @@ davmail.ssl.keystoreType=PKCS12 davmail.ssl.keyPass=password davmail.ssl.keystoreFile=davmail.p12 -davmail.ssl.keystorePass=password]]> - +davmail.ssl.keystorePass=password]]>

    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]]> - +davmail.ssl.clientKeystorePass=password]]>