http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-antispam.html
----------------------------------------------------------------------
diff --git a/content/server/config-antispam.html 
b/content/server/config-antispam.html
index ffeeec7..8bd187e 100644
--- a/content/server/config-antispam.html
+++ b/content/server/config-antispam.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-cassandra.html
----------------------------------------------------------------------
diff --git a/content/server/config-cassandra.html 
b/content/server/config-cassandra.html
index 5ea0b63..a04f5a8 100644
--- a/content/server/config-cassandra.html
+++ b/content/server/config-cassandra.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -301,8 +304,10 @@
   <div class="section">
 <h2>Cassandra Configuration<a name="Cassandra_Configuration"></a></h2>
 
+    Note: Cassandra is only available with Guice distributions 
(cassandra-guice and cassandra-guice-ldap).
+
     
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/cassandra-template.properties";>cassandra-template.properties</a>
 to get some examples and hints.</p>
+<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra-template.properties</a>
 to get some examples and hints.</p>
 
       
 <dl>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-dnsservice.html
----------------------------------------------------------------------
diff --git a/content/server/config-dnsservice.html 
b/content/server/config-dnsservice.html
index d6ff435..1a8c4aa 100644
--- a/content/server/config-dnsservice.html
+++ b/content/server/config-dnsservice.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-domainlist.html
----------------------------------------------------------------------
diff --git a/content/server/config-domainlist.html 
b/content/server/config-domainlist.html
index 948e22e..4a9e3cf 100644
--- a/content/server/config-domainlist.html
+++ b/content/server/config-domainlist.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -308,7 +311,7 @@
 <p>This configuration block is defined by the <b>domainlist</b> tag.</p>
       
       
-<p>You must specify the DomainList class as attribute of the domainlist tag 
(org.apache.james.domainlist.jpa.JPADomainList, or 
org.apache.james.domainlist.xml.XMLDomainList, or...)</p> 
+<p>Using Spring, you must specify the DomainList class as attribute of the 
domainlist tag (org.apache.james.domainlist.jpa.JPADomainList, or 
org.apache.james.domainlist.xml.XMLDomainList, or...). This have no effect when 
using Guice.</p>
 
       
 <dl>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-elasticsearch.html
----------------------------------------------------------------------
diff --git a/content/server/config-elasticsearch.html 
b/content/server/config-elasticsearch.html
index 30cd69e..3e46146 100644
--- a/content/server/config-elasticsearch.html
+++ b/content/server/config-elasticsearch.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-events.html
----------------------------------------------------------------------
diff --git a/content/server/config-events.html 
b/content/server/config-events.html
index 72838e3..d7ac3f9 100644
--- a/content/server/config-events.html
+++ b/content/server/config-events.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
           </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -301,6 +304,8 @@
         <div class="section">
 <h2>Events System Configuration<a name="Events_System_Configuration"></a></h2>
 
+            This configuration applies only to Spring packaging.
+
             
 <p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events-template.xml";>events-template.xml</a>
 in GIT to get some examples and hints.</p>
 

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-fetchmail.html
----------------------------------------------------------------------
diff --git a/content/server/config-fetchmail.html 
b/content/server/config-fetchmail.html
index 39d638a..4eb55d4 100644
--- a/content/server/config-fetchmail.html
+++ b/content/server/config-fetchmail.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -301,6 +304,8 @@
   <div class="section">
 <h2>Fetchmail Configuration<a name="Fetchmail_Configuration"></a></h2>
 
+    This configuration file requires Spring packaging.
+
     
 <p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/fetchmail-template.xml";>fetchmail-template.xml</a>
 in GIT to get some examples and hints.</p>
 

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-guice.html
----------------------------------------------------------------------
diff --git a/content/server/config-guice.html b/content/server/config-guice.html
index 78a581b..5b0a6c6 100644
--- a/content/server/config-guice.html
+++ b/content/server/config-guice.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -302,15 +305,17 @@
 <h2>Guice configure Apache James Server<a 
name="Guice_configure_Apache_James_Server"></a></h2>
 
     
-<p>Such configuration is only developed for Cassandra backend.</p>
+<p>Such configuration only applies to Guice packaging.</p>
+
     
 <p>You are encouraged to contribute by developing a new backend guice module.
-       Have a look to the <i>james-server-cassandra-guice</i> artifact.
+       Have a look to the <i>james-server-cassandra-guice</i> artifact. This 
can easily be done
+      as a third party application.
     </p>
 
     
-<p>We provide a sample-configuration folder with needed files to run James. 
-      You can start by copying it and modify these files according to your 
needs.</p>
+<p>We provide a tested configuration for docker environment, for each Guice 
artifact, which can be a good base for your own configuration.
+       Have a look on <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice";>GitHub</a>.
 </p>
 
     
 <p>You can/must configure James for the following:</p>
@@ -331,7 +336,7 @@
       
 <tr class="b">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/cassandra-template.properties";>cassandra-template.properties</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra-template.properties</a></td>
         
 <td><a href="config-cassandra.html">Cassandra Configuration</a></td>
         
@@ -340,7 +345,7 @@
       
 <tr class="a">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice-template.xml";>dnsservice.xml</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/dnsservice.xml";>dnsservice.xml</a></td>
         
 <td><a href="config-dnsservice.html">DNS Service Configuration</a></td>
         
@@ -349,7 +354,7 @@
       
 <tr class="b">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/elasticsearch-template.properties";>elasticsearch-template.properties</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch-template.properties</a></td>
         
 <td><a href="config-elasticsearch.html">ElasticSearch Configuration</a></td>
         
@@ -358,7 +363,7 @@
       
 <tr class="a">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/imapserver-template.xml";>imapserver.xml</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/imapserver.xml";>imapserver.xml</a></td>
         
 <td><a href="config-imap4.html">IMAP4 Configuration</a></td>
         
@@ -367,7 +372,7 @@
       
 <tr class="b">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/lmtpserver-template.xml";>lmtpserver.xml</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/lmtpserver.xml";>lmtpserver.xml</a></td>
         
 <td><a href="config-smtp-lmtp.html">LMTP Configuration</a></td>
         
@@ -376,7 +381,7 @@
       
 <tr class="a">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer-template.xml";>mailetcontainer.xml</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml";>mailetcontainer.xml</a></td>
         
 <td><a href="config-mailetcontainer.html">Mailet Container 
Configuration</a></td>
         
@@ -385,7 +390,7 @@
       
 <tr class="b">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/pop3server-template.xml";>pop3server.xml</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/pop3server.xml";>pop3server.xml</a></td>
         
 <td><a href="config-pop3.html">POP3 Configuration</a></td>
         
@@ -394,7 +399,7 @@
       
 <tr class="a">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver-template.xml";>smtpserver.xml</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/smtpserver.xml";>smtpserver.xml</a></td>
         
 <td><a href="config-smtp-lmtp.html">SMTP Configuration</a></td>
         

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-imap4.html
----------------------------------------------------------------------
diff --git a/content/server/config-imap4.html b/content/server/config-imap4.html
index b272e4e..39bc460 100644
--- a/content/server/config-imap4.html
+++ b/content/server/config-imap4.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-mailbox.html
----------------------------------------------------------------------
diff --git a/content/server/config-mailbox.html 
b/content/server/config-mailbox.html
index f4fbdba..3f617a5 100644
--- a/content/server/config-mailbox.html
+++ b/content/server/config-mailbox.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -301,6 +304,8 @@
   <div class="section">
 <h2>Mailbox Configuration<a name="Mailbox_Configuration"></a></h2>
 
+      This configuration applies only to Spring packaging.
+
     
 <p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailbox-template.xml";>mailbox-template.xml</a>
 in GIT to get some examples and hints.</p>
     
@@ -315,7 +320,7 @@
         
 <dt><b>provider</b></dt>
         
-<dd>Supported providers are: jpa (default), jcr, maildir, cassandra, memory. 
Be aware that maildir will only work on unix like operation systems!
+<dd>Supported providers are: jpa (default), jcr, maildir, memory. Be aware 
that maildir will only work on unix like operation systems!
         Cassandra mailbox need to be compiled and run using java 8.</dd>
       </dl>
 

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-mailetcontainer.html
----------------------------------------------------------------------
diff --git a/content/server/config-mailetcontainer.html 
b/content/server/config-mailetcontainer.html
index 17a7777..f8962a2 100644
--- a/content/server/config-mailetcontainer.html
+++ b/content/server/config-mailetcontainer.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-mailrepositorystore.html
----------------------------------------------------------------------
diff --git a/content/server/config-mailrepositorystore.html 
b/content/server/config-mailrepositorystore.html
index 45692de..a8862d4 100644
--- a/content/server/config-mailrepositorystore.html
+++ b/content/server/config-mailrepositorystore.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-pop3.html
----------------------------------------------------------------------
diff --git a/content/server/config-pop3.html b/content/server/config-pop3.html
index f4eddbb..2c1ed76 100644
--- a/content/server/config-pop3.html
+++ b/content/server/config-pop3.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-quota.html
----------------------------------------------------------------------
diff --git a/content/server/config-quota.html b/content/server/config-quota.html
index 357b879..4bfce2e 100644
--- a/content/server/config-quota.html
+++ b/content/server/config-quota.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -301,6 +304,8 @@
   <div class="section">
 <h2>Quota Configuration<a name="Quota_Configuration"></a></h2>
 
+    This configuration applies only to Spring packaging.
+
     
 <p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota-template.xml";>quota-template.xml</a>
 in GIT to get some examples and hints.</p>
     

http://git-wip-us.apache.org/repos/asf/james-site/blob/c03e4dfc/content/server/config-recipientrewritetable.html
----------------------------------------------------------------------
diff --git a/content/server/config-recipientrewritetable.html 
b/content/server/config-recipientrewritetable.html
index 1906925..88405c5 100644
--- a/content/server/config-recipientrewritetable.html
+++ b/content/server/config-recipientrewritetable.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-08 -->
+<!-- Generated by Apache Maven Doxia at 2017-06-14 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -34,10 +34,10 @@
       @import url("../js/fancybox/jquery.fancybox-1.3.4.css");
     </style>
     <script type="text/javascript" 
src="../js/jquery/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
+    <script type="text/javascript" 
src="../js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170608" />
+    <meta name="Date-Revision-yyyymmdd" content="20170614" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link title="DOAP" rel="meta" type="application/rdf+xml" 
href="http://james.apache.org//doap_james-project.rdf"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-08</span>
+        <span id="publishDate">Last Published: 2017-06-14</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -124,10 +124,13 @@
                           <a href="../server/features.html" title="1. 
Features">1. Features</a>
                   </li>
                       <li class="none">
-                          <a href="../server/install.html" title="2. Install 
James">2. Install James</a>
+                          <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
             </li>
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
-                          <a href="../server/config.html" title="3. Configure 
James">3. Configure James</a>
+                          <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
                           <a href="../server/config-system.html" 
title="System">System</a>
@@ -191,17 +194,17 @@
             </li>
               </ul>
         </li>
-                                                                               
                                               <li class="collapsed">
-                          <a href="../server/manage.html" title="4. Manage">4. 
Manage</a>
+                                                                               
                             <li class="collapsed">
+                          <a href="../server/manage.html" title="5. Manage">5. 
Manage</a>
                   </li>
                                                                                
                             <li class="collapsed">
-                          <a href="../server/monitor.html" title="5. 
Monitor">5. Monitor</a>
+                          <a href="../server/monitor.html" title="6. 
Monitor">6. Monitor</a>
                   </li>
                                                                                
           <li class="collapsed">
-                          <a href="../server/upgrade.html" title="6. 
Upgrade">6. Upgrade</a>
+                          <a href="../server/upgrade.html" title="7. 
Upgrade">7. Upgrade</a>
                   </li>
                                                                                
                                                                                
                                                                                
       <li class="collapsed">
-                          <a href="../server/dev.html" title="7. Developers 
Corner">7. Developers Corner</a>
+                          <a href="../server/dev.html" title="8. Developers 
Corner">8. Developers Corner</a>
                   </li>
               </ul>
         </li>
@@ -312,7 +315,7 @@
 <p>The default table for storing James' Recipient Rewrite mappings.</p>
 
      
-<p>Add a class attribute to recipientrewritetable tag 
(class=&quot;org.apache.james.rrt.jpa.JPARecipientRewriteTable).</p>
+<p>Using Spring, you should add a class attribute to recipientrewritetable tag 
(class=&quot;org.apache.james.rrt.jpa.JPARecipientRewriteTable). It has no 
effect with Guice packaging.</p>
 
      
 <dl>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to