http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/other-versions.html
----------------------------------------------------------------------
diff --git a/content/server/other-versions.html 
b/content/server/other-versions.html
index 1274c69..edffd4b 100644
--- a/content/server/other-versions.html
+++ b/content/server/other-versions.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-  Apache James Server 3 - Other versions</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Other 
versions</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -108,9 +105,44 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
<li class="collapsed">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
          <li class="expanded">
                           <a href="../server/index.html" 
title="Server">Server</a>
+                    <ul>
+                      <li class="none">
+                          <a href="../server/advantages.html" 
title="Advantages">Advantages</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/objectives.html" 
title="Objectives">Objectives</a>
+            </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                        <li class="collapsed">
+                          <a href="../server/quick-start.html" title="User 
Manual">User Manual</a>
                   </li>
+                      <li class="none">
+                          <a href="../mail.html#James_Mailing_lists" 
title="Mailing Lists">Mailing Lists</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/release-notes.html" 
title="Release Notes">Release Notes</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/apidocs/index.html" 
title="Javadoc">Javadoc</a>
+            </li>
+                      <li class="none">
+                          <a 
href="https://issues.apache.org/jira/browse/JAMES"; title="Issue Tracker">Issue 
Tracker</a>
+            </li>
+                      <li class="none">
+                          <a href="https://github.com/apache/james-project"; 
title="Sources">Sources</a>
+            </li>
+                      <li class="none">
+                          <a href="../server/rfcs.html" title="RFCs">RFCs</a>
+            </li>
+                      <li class="none">
+            <strong>Other versions</strong>
+          </li>
+                      <li class="none">
+                          <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
+            </li>
+              </ul>
+        </li>
                                                                                
                                                                                
                                                                                
                           <li class="collapsed">
                           <a href="../mailet/index.html" 
title="Mailets">Mailets</a>
                   </li>
@@ -159,27 +191,12 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
  
 
   <div class="section">
-<h2>Older versions<a name="Older_versions"></a></h2>
+<h2><a name="Older_versions"></a>Older versions</h2>
     
 <p>You can download and have a look to the last stable version</p>
     <span class="minibutton btn-download">
@@ -190,13 +207,13 @@
   </div>
   
 <div class="section">
-<h2>Older documentation<a name="Older_documentation"></a></h2>
+<h2><a name="Older_documentation"></a>Older documentation</h2>
     
 <ul>
       
-<li><a href="/2/index.html">Server v2</a></li>
+<li><a href="/server/2/index.html">Server v2</a></li>
       
-<li><a href="/archive/document_archive.html">Archive</a></li>
+<li><a href="/server/archive/document_archive.html">Archive</a></li>
     </ul>
   </div>
 
@@ -209,7 +226,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/packaging.html
----------------------------------------------------------------------
diff --git a/content/server/packaging.html b/content/server/packaging.html
index 838ef77..0c032e5 100644
--- a/content/server/packaging.html
+++ b/content/server/packaging.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-        Apache James Server 3 - Packaging</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - 
Packaging</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -165,7 +162,7 @@
                           <a href="../server/rfcs.html" title="RFCs">RFCs</a>
             </li>
                       <li class="none">
-                          <a href="../other-versions.html" title="Other 
versions">Other versions</a>
+                          <a href="../server/other-versions.html" title="Other 
versions">Other versions</a>
             </li>
                       <li class="none">
                           <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
@@ -220,27 +217,12 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
     
 
         <div class="section">
-<h2>Available packaging options<a name="Available_packaging_options"></a></h2>
+<h2><a name="Available_packaging_options"></a>Available packaging options</h2>
             
 <p>James components are assembled in various way, called packaging.</p>
 
@@ -284,7 +266,7 @@
 
         
 <div class="section">
-<h2>Support matrix<a name="Support_matrix"></a></h2>
+<h2><a name="Support_matrix"></a>Support matrix</h2>
             
 <p>
                 </p>
@@ -572,7 +554,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/quick-start-cassandra.html
----------------------------------------------------------------------
diff --git a/content/server/quick-start-cassandra.html 
b/content/server/quick-start-cassandra.html
index 58142e1..fede945 100644
--- a/content/server/quick-start-cassandra.html
+++ b/content/server/quick-start-cassandra.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-  Apache James Server 3 - Quick Start for Cassandra backend</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Quick Start 
for Cassandra backend</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -159,27 +156,12 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
  
 
 <div class="section">
-<h2>Quick Start for Cassandra backend<a 
name="Quick_Start_for_Cassandra_backend"></a></h2>
+<h2><a name="Quick_Start_for_Cassandra_backend"></a>Quick Start for Cassandra 
backend</h2>
 
   
 <p>The goal of the document is to allow anyone to start a James instance as an 
operational mail server.</p>
@@ -480,7 +462,7 @@ Step 6: Monitor
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/quick-start.html
----------------------------------------------------------------------
diff --git a/content/server/quick-start.html b/content/server/quick-start.html
index 6b86830..3308c51 100644
--- a/content/server/quick-start.html
+++ b/content/server/quick-start.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-  Apache James Server 3 - Quick Start</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Quick 
Start</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -165,7 +162,7 @@
                           <a href="../server/rfcs.html" title="RFCs">RFCs</a>
             </li>
                       <li class="none">
-                          <a href="../other-versions.html" title="Other 
versions">Other versions</a>
+                          <a href="../server/other-versions.html" title="Other 
versions">Other versions</a>
             </li>
                       <li class="none">
                           <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
@@ -220,27 +217,12 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
  
 
 <div class="section">
-<h2>Quick Start<a name="Quick_Start"></a></h2>
+<h2><a name="Quick_Start"></a>Quick Start</h2>
 
   
 <p>The goal of the document is to allow anyone to start with James binary 
@@ -455,7 +437,7 @@ Step 9: Monitor
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/release-notes.html
----------------------------------------------------------------------
diff --git a/content/server/release-notes.html 
b/content/server/release-notes.html
index cd888cc..8b85c39 100644
--- a/content/server/release-notes.html
+++ b/content/server/release-notes.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-        Apache James Server 3 - Release Notes</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Release 
Notes</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -38,11 +37,9 @@
     <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="author" content="James Project Web Team" />
-    <meta name="Date-Revision-yyyymmdd" content="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -78,7 +75,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -140,7 +137,7 @@
                           <a href="../server/rfcs.html" title="RFCs">RFCs</a>
             </li>
                       <li class="none">
-                          <a href="../other-versions.html" title="Other 
versions">Other versions</a>
+                          <a href="../server/other-versions.html" title="Other 
versions">Other versions</a>
             </li>
                       <li class="none">
                           <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
@@ -195,22 +192,7 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
     
 
@@ -283,7 +265,7 @@
 
         
 <div class="section">
-<h2>Version 3.0-RC1<a name="Version_3.0-RC1"></a></h2>
+<h2><a name="Version_3.0-RC1"></a>Version 3.0-RC1</h2>
 
             
 <p>Released May 2017</p>
@@ -321,7 +303,7 @@
 
         
 <div class="section">
-<h2>Version 3.0-beta5<a name="Version_3.0-beta5"></a></h2>
+<h2><a name="Version_3.0-beta5"></a>Version 3.0-beta5</h2>
 
             
 <p>Released October 2016</p>
@@ -361,7 +343,7 @@
 
         
 <div class="section">
-<h2>Version 3.0-beta4<a name="Version_3.0-beta4"></a></h2>
+<h2><a name="Version_3.0-beta4"></a>Version 3.0-beta4</h2>
 
             
 <p>Released April 2012</p>
@@ -387,7 +369,7 @@
 
         
 <div class="section">
-<h2>Version 3.0-beta3 (Milestone 3)<a 
name="Version_3.0-beta3_Milestone_3"></a></h2>
+<h2><a name="Version_3.0-beta3_Milestone_3"></a>Version 3.0-beta3 (Milestone 
3)</h2>
 
             
 <p>Released 2011</p>
@@ -442,7 +424,7 @@
 
         
 <div class="section">
-<h2>Version 3.0-M2 (Milestone 2)<a name="Version_3.0-M2_Milestone_2"></a></h2>
+<h2><a name="Version_3.0-M2_Milestone_2"></a>Version 3.0-M2 (Milestone 2)</h2>
 
             
 <p>Released 09 November 2010</p>
@@ -470,7 +452,7 @@
 
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3>
+<h3><a name="Bug"></a>Bug</h3>
             
 <ul>
                 
@@ -509,7 +491,7 @@
 
             </div>
 <div class="section">
-<h3>Improvement<a name="Improvement"></a></h3>
+<h3><a name="Improvement"></a>Improvement</h3>
             
 <ul>
                 
@@ -532,7 +514,7 @@
 
             </div>
 <div class="section">
-<h3>New Feature<a name="New_Feature"></a></h3>
+<h3><a name="New_Feature"></a>New Feature</h3>
             
 <ul>
                 
@@ -543,7 +525,7 @@
 
             </div>
 <div class="section">
-<h3>Task<a name="Task"></a></h3>
+<h3><a name="Task"></a>Task</h3>
             
 <ul>
                 
@@ -574,7 +556,7 @@
 
         
 <div class="section">
-<h2>Version 3.0-M1 (Milestone 1)<a name="Version_3.0-M1_Milestone_1"></a></h2>
+<h2><a name="Version_3.0-M1_Milestone_1"></a>Version 3.0-M1 (Milestone 1)</h2>
 
             
 <p>Released 01 November 2010</p>
@@ -611,7 +593,7 @@
 
             
 <div class="section">
-<h3>Sub-task<a name="Sub-task"></a></h3>
+<h3><a name="Sub-task"></a>Sub-task</h3>
             
 <ul>
                 
@@ -640,7 +622,7 @@
 
             </div>
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3>
+<h3><a name="Bug"></a>Bug</h3>
             
 <ul>
                 
@@ -783,7 +765,7 @@
 
             </div>
 <div class="section">
-<h3>Improvement<a name="Improvement"></a></h3>
+<h3><a name="Improvement"></a>Improvement</h3>
             
 <ul>
                 
@@ -864,7 +846,7 @@
 
             </div>
 <div class="section">
-<h3>New Feature<a name="New_Feature"></a></h3>
+<h3><a name="New_Feature"></a>New Feature</h3>
             
 <ul>
                 
@@ -913,7 +895,7 @@
 
             </div>
 <div class="section">
-<h3>Task<a name="Task"></a></h3>
+<h3><a name="Task"></a>Task</h3>
             
 <ul>
                 
@@ -1018,7 +1000,7 @@
 
             </div>
 <div class="section">
-<h3>Wish<a name="Wish"></a></h3>
+<h3><a name="Wish"></a>Wish</h3>
             
 <ul>
                 
@@ -1034,7 +1016,7 @@
 
         
 <div class="section">
-<h2>Version 2.3.1<a name="Version_2.3.1"></a></h2>
+<h2><a name="Version_2.3.1"></a>Version 2.3.1</h2>
             
 <p>Released 23 October 2006</p>
             
@@ -1045,21 +1027,21 @@
 
         
 <div class="section">
-<h2>Version 2.3.0 Final<a name="Version_2.3.0_Final"></a></h2>
+<h2><a name="Version_2.3.0_Final"></a>Version 2.3.0 Final</h2>
             
 <p>Released 23 October 2006</p>
         </div>
 
         
 <div class="section">
-<h2>Version 2.3.0rc5<a name="Version_2.3.0rc5"></a></h2>
+<h2><a name="Version_2.3.0rc5"></a>Version 2.3.0rc5</h2>
             
 <p>Released 12 October 2006</p>
             
 <p>Detail</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1075,14 +1057,14 @@
 
         
 <div class="section">
-<h2>Version 2.3.0rc4<a name="Version_2.3.0rc4"></a></h2>
+<h2><a name="Version_2.3.0rc4"></a>Version 2.3.0rc4</h2>
             
 <p>Released 2 October 2006</p>
             
 <p>Detail</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1096,7 +1078,7 @@
             </ul>
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1108,14 +1090,14 @@
 
         
 <div class="section">
-<h2>Version 2.3.0rc3<a name="Version_2.3.0rc3"></a></h2>
+<h2><a name="Version_2.3.0rc3"></a>Version 2.3.0rc3</h2>
             
 <p>Released 15 September 2006</p>
             
 <p>Detail</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1133,7 +1115,7 @@
             </ul>
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1143,7 +1125,7 @@
             </ul>
             
 <div class="section">
-<h3>Wish<a name="Wish"></a></h3></div>
+<h3><a name="Wish"></a>Wish</h3></div>
             
 <ul>
                 
@@ -1153,14 +1135,14 @@
 
         
 <div class="section">
-<h2>Version 2.3.0rc2<a name="Version_2.3.0rc2"></a></h2>
+<h2><a name="Version_2.3.0rc2"></a>Version 2.3.0rc2</h2>
             
 <p>Released 12 August 2006</p>
             
 <p>Detail</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1180,7 +1162,7 @@
             </ul>
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1188,7 +1170,7 @@
             </ul>
             
 <div class="section">
-<h3>Wish<a name="Wish"></a></h3></div>
+<h3><a name="Wish"></a>Wish</h3></div>
             
 <ul>
                 
@@ -1197,14 +1179,14 @@
         </div>
         
 <div class="section">
-<h2>Version 2.3.0rc1<a name="Version_2.3.0rc1"></a></h2>
+<h2><a name="Version_2.3.0rc1"></a>Version 2.3.0rc1</h2>
             
 <p>Released 25 July 2006</p>
             
 <p>Detail</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1214,7 +1196,7 @@
             </ul>
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1223,14 +1205,14 @@
         </div>
         
 <div class="section">
-<h2>Version 2.3.0b3<a name="Version_2.3.0b3"></a></h2>
+<h2><a name="Version_2.3.0b3"></a>Version 2.3.0b3</h2>
             
 <p>Released 15 July 2006</p>
             
 <p>Detail</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1245,14 +1227,14 @@
         </div>
         
 <div class="section">
-<h2>Version 2.3.0b2<a name="Version_2.3.0b2"></a></h2>
+<h2><a name="Version_2.3.0b2"></a>Version 2.3.0b2</h2>
             
 <p>Unreleased</p>
             
 <p>Detail</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1266,7 +1248,7 @@
             </ul>
             
 <div class="section">
-<h3>Improvement<a name="Improvement"></a></h3></div>
+<h3><a name="Improvement"></a>Improvement</h3></div>
             
 <ul>
                 
@@ -1274,7 +1256,7 @@
             </ul>
             
 <div class="section">
-<h3>New Feature<a name="New_Feature"></a></h3></div>
+<h3><a name="New_Feature"></a>New Feature</h3></div>
             
 <ul>
                 
@@ -1282,7 +1264,7 @@
             </ul>
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1295,14 +1277,14 @@
         </div>
         
 <div class="section">
-<h2>Version 2.3.0b1<a name="Version_2.3.0b1"></a></h2>
+<h2><a name="Version_2.3.0b1"></a>Version 2.3.0b1</h2>
             
 <p>Released 9 June 2006</p>
             
 <p>Details</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1319,7 +1301,7 @@
 
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1328,12 +1310,12 @@
         </div>
         
 <div class="section">
-<h2>Version 2.3.0a3<a name="Version_2.3.0a3"></a></h2>
+<h2><a name="Version_2.3.0a3"></a>Version 2.3.0a3</h2>
             
 <p>Details</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1354,12 +1336,12 @@
         </div>
         
 <div class="section">
-<h2>Version 2.3.0a2<a name="Version_2.3.0a2"></a></h2>
+<h2><a name="Version_2.3.0a2"></a>Version 2.3.0a2</h2>
             
 <p>Details</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1404,7 +1386,7 @@
 
             
 <div class="section">
-<h3>Improvement<a name="Improvement"></a></h3></div>
+<h3><a name="Improvement"></a>Improvement</h3></div>
             
 <ul>
                 
@@ -1433,7 +1415,7 @@
 
             
 <div class="section">
-<h3>New Feature<a name="New_Feature"></a></h3></div>
+<h3><a name="New_Feature"></a>New Feature</h3></div>
             
 <ul>
                 
@@ -1450,7 +1432,7 @@
 
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1459,7 +1441,7 @@
 
             
 <div class="section">
-<h3>Wish<a name="Wish"></a></h3></div>
+<h3><a name="Wish"></a>Wish</h3></div>
             
 <ul>
                 
@@ -1468,7 +1450,7 @@
         </div>
         
 <div class="section">
-<h2>Version 2.3.0a1<a name="Version_2.3.0a1"></a></h2>
+<h2><a name="Version_2.3.0a1"></a>Version 2.3.0a1</h2>
             
 <p>Released 15 February 2006</p>
             
@@ -1504,7 +1486,7 @@
 <p>Details</p>
             
 <div class="section">
-<h3>Bug<a name="Bug"></a></h3></div>
+<h3><a name="Bug"></a>Bug</h3></div>
             
 <ul>
                 
@@ -1597,7 +1579,7 @@
 
             
 <div class="section">
-<h3>Improvement<a name="Improvement"></a></h3></div>
+<h3><a name="Improvement"></a>Improvement</h3></div>
             
 <ul>
                 
@@ -1646,7 +1628,7 @@
 
             
 <div class="section">
-<h3>New Feature<a name="New_Feature"></a></h3></div>
+<h3><a name="New_Feature"></a>New Feature</h3></div>
             
 <ul>
                 
@@ -1663,7 +1645,7 @@
 
             
 <div class="section">
-<h3>Task<a name="Task"></a></h3></div>
+<h3><a name="Task"></a>Task</h3></div>
             
 <ul>
                 
@@ -1694,7 +1676,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/rfcs.html
----------------------------------------------------------------------
diff --git a/content/server/rfcs.html b/content/server/rfcs.html
index 9f9a6ac..1de0e0d 100644
--- a/content/server/rfcs.html
+++ b/content/server/rfcs.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-  Apache James Server 3 - RFC list</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - RFC 
list</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -139,7 +136,7 @@
             <strong>RFCs</strong>
           </li>
                       <li class="none">
-                          <a href="../other-versions.html" title="Other 
versions">Other versions</a>
+                          <a href="../server/other-versions.html" title="Other 
versions">Other versions</a>
             </li>
                       <li class="none">
                           <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
@@ -194,30 +191,15 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
  
 
   <div class="section">
-<h2>RFC List<a name="RFC_List"></a></h2>
+<h2><a name="RFC_List"></a>RFC List</h2>
     
 <div class="section">
-<h3>General RFCs<a name="General_RFCs"></a></h3>
+<h3><a name="General_RFCs"></a>General RFCs</h3>
       <a href="rfclist/basic/rfc0822.txt">RFC 822: Mail Message Format</a><br 
/>
       <a href="rfclist/basic/rfc1123.txt">RFC 1123: Requirements for Internet 
Hosts -- Application and Support (updated by RFC 2821)</a><br />
       <a href="rfclist/basic/rfc2045.txt">RFC 2045: Multipurpose Internet Mail 
Extensions (MIME) Part One: Format of Internet Message Bodies</a><br />
@@ -225,7 +207,7 @@
     </div>
     
 <div class="section">
-<h3>SMTP RFCs<a name="SMTP_RFCs"></a></h3>
+<h3><a name="SMTP_RFCs"></a>SMTP RFCs</h3>
       <a href="rfclist/smtp/rfc0821.txt">RFC 821: SMTP Protocol</a><br />
       <a href="rfclist/smtp/rfc0974.txt">RFC 974: Mail Routing and the Domain 
System</a><br />
       <a href="rfclist/smtp/rfc1652.txt">RFC 1652: SMTP Service Extension for 
8bit-MIMEtransport (elective, but widely adopted)</a><br />
@@ -243,17 +225,17 @@
     </div>
     
 <div class="section">
-<h3>LMTP RFCs<a name="LMTP_RFCs"></a></h3>
+<h3><a name="LMTP_RFCs"></a>LMTP RFCs</h3>
       <a href="rfclist/lmtp/rfc2033.txt">RFC 2033 : LMTP Local Mail Transfer 
Protocol</a><br />
     </div>
     
 <div class="section">
-<h3>JMAP standard<a name="JMAP_standard"></a></h3>
+<h3><a name="JMAP_standard"></a>JMAP standard</h3>
       <a class="externalLink" href="http://jmap.io";>JMAP specifications</a>
     </div>
     
 <div class="section">
-<h3>IMAP RFCs<a name="IMAP_RFCs"></a></h3>
+<h3><a name="IMAP_RFCs"></a>IMAP RFCs</h3>
       <a href="rfclist/imap4/rfc1731.txt">RFC 1731: IMAP4 Authentication 
Mechanisms</a><br />
       <a href="rfclist/imap4/rfc2060.txt">RFC 2060: IMAP Version 4rev1</a><br 
/>
       <a href="rfclist/imap4/rfc2086.txt">RFC 2086: IMAP4 ACL extension</a><br 
/>
@@ -274,12 +256,12 @@
     </div>
     
 <div class="section">
-<h3>ManageSieve RFC<a name="ManageSieve_RFC"></a></h3>
+<h3><a name="ManageSieve_RFC"></a>ManageSieve RFC</h3>
       <a class="externalLink" href="https://tools.ietf.org/html/rfc5804";>RFC 
5804: A Protocol for Remotely Managing Sieve Scripts</a>
     </div>
     
 <div class="section">
-<h3>Sieve RFCs<a name="Sieve_RFCs"></a></h3>
+<h3><a name="Sieve_RFCs"></a>Sieve RFCs</h3>
       <a class="externalLink" href="http://tools.ietf.org/html/rfc5228";>RFC 
5228: Sieve: An Email Filtering Language</a>
       <a class="externalLink" href="http://www.ietf.org/rfc/rfc2298.txt";>RFC 
2298: Extensible Message Format for Message Disposition Notifications</a>
       <a class="externalLink" href="http://tools.ietf.org/html/rfc5173";>RFC 
5173: Sieve Email Filtering: Body Extension</a>
@@ -287,15 +269,15 @@
     </div>
     
 <div class="section">
-<h3>POP3 RFCs<a name="POP3_RFCs"></a></h3>
+<h3><a name="POP3_RFCs"></a>POP3 RFCs</h3>
       <a href="rfclist/pop3/rfc1725.txt">RFC 1725: POP3 Protocol</a><br />
       <a href="rfclist/pop3/rfc1734.txt">RFC 1734: POP3 AUTHentication 
command</a><br />
       <a href="rfclist/pop3/rfc1939.txt">RFC 1939: POP3 Protocol (obsoletes 
RFC 1725)</a><br />
-      <!-- Add RFC 1082, 2449, 2595, 3206 -->
+      
     </div>
     
 <div class="section">
-<h3>NNTP RFCs (v 2.3.x only)<a name="NNTP_RFCs_v_2.3.x_only"></a></h3>
+<h3><a name="NNTP_RFCs_v_2.3.x_only"></a>NNTP RFCs (v 2.3.x only)</h3>
       <a href="rfclist/nntp/rfc0977.txt">RFC 977: NNTP Protocol</a><br />
       <a href="rfclist/nntp/rfc1036.txt">RFC 1036: Format of News 
Messages</a><br />
       <a href="rfclist/nntp/rfc2980.txt">RFC 2980: Common NNTP 
Extensions</a><br />
@@ -312,7 +294,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/upgrade-2.3.html
----------------------------------------------------------------------
diff --git a/content/server/upgrade-2.3.html b/content/server/upgrade-2.3.html
index 9134d29..02c0975 100644
--- a/content/server/upgrade-2.3.html
+++ b/content/server/upgrade-2.3.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-  Apache James Server 3 - Upgrading from Apache James Server 2.3</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Upgrading 
from Apache James Server 2.3</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -173,7 +170,7 @@
                           <a href="../server/rfcs.html" title="RFCs">RFCs</a>
             </li>
                       <li class="none">
-                          <a href="../other-versions.html" title="Other 
versions">Other versions</a>
+                          <a href="../server/other-versions.html" title="Other 
versions">Other versions</a>
             </li>
                       <li class="none">
                           <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
@@ -228,31 +225,16 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
  
 
   <div class="section">
-<h2>Migrate Apache James Server 2.3 to 3.0<a 
name="Migrate_Apache_James_Server_2.3_to_3.0"></a></h2>
+<h2><a name="Migrate_Apache_James_Server_2.3_to_3.0"></a>Migrate Apache James 
Server 2.3 to 3.0</h2>
   
     
 <div class="section">
-<h3>New Configuration<a name="New_Configuration"></a></h3>
+<h3><a name="New_Configuration"></a>New Configuration</h3>
 
       
 <p>You need to carefully review each <a href="config.html">configuration 
file</a>
@@ -272,7 +254,7 @@
 
     
 <div class="section">
-<h3>Tool to Migrate Users and Mails<a 
name="Tool_to_Migrate_Users_and_Mails"></a></h3>
+<h3><a name="Tool_to_Migrate_Users_and_Mails"></a>Tool to Migrate Users and 
Mails</h3>
 
      
 <p>Set in usersrepository23.xml configuration file the type of user repository 
you were
@@ -289,7 +271,7 @@
 
     
 <div class="section">
-<h3>Limitations<a name="Limitations"></a></h3>
+<h3><a name="Limitations"></a>Limitations</h3>
          
      
 <p>The migration is only available for the same backend.
@@ -319,7 +301,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/upgrade-database.html
----------------------------------------------------------------------
diff --git a/content/server/upgrade-database.html 
b/content/server/upgrade-database.html
index 7c247cd..7dad272 100644
--- a/content/server/upgrade-database.html
+++ b/content/server/upgrade-database.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-  Apache James Server 3 - Upgrading Database</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Upgrading 
Database</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -173,7 +170,7 @@
                           <a href="../server/rfcs.html" title="RFCs">RFCs</a>
             </li>
                       <li class="none">
-                          <a href="../other-versions.html" title="Other 
versions">Other versions</a>
+                          <a href="../server/other-versions.html" title="Other 
versions">Other versions</a>
             </li>
                       <li class="none">
                           <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
@@ -228,32 +225,17 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
  
 
   <div class="section">
-<h2>Upgrade Users and Domains<a name="Upgrade_Users_and_Domains"></a></h2>
+<h2><a name="Upgrade_Users_and_Domains"></a>Upgrade Users and Domains</h2>
   </div>
   
   
 <div class="section">
-<h2>Upgrade Mailbox<a name="Upgrade_Mailbox"></a></h2>
+<h2><a name="Upgrade_Mailbox"></a>Upgrade Mailbox</h2>
   
     
 <p>The easiest is to export your JPA Mailbox to a JCR or MailDir Mailbox and 
then import again.</p>
@@ -294,7 +276,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/server/upgrade.html
----------------------------------------------------------------------
diff --git a/content/server/upgrade.html b/content/server/upgrade.html
index 9ec0b67..7a50edd 100644
--- a/content/server/upgrade.html
+++ b/content/server/upgrade.html
@@ -18,12 +18,11 @@
   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-08-09 -->
+<!-- Generated by Apache Maven Doxia at 2018-01-18 -->
 <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" />
-    <title>Apache James Project - 
-        Apache James Server 3 - Upgrading from previous Apache James Server 
version</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Upgrading 
from previous Apache James Server version</title>
     <style type="text/css" media="all">
       @import url("../css/james.css");
       @import url("../css/maven-base.css");
@@ -37,11 +36,9 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.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="20170809" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -77,7 +74,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -173,7 +170,7 @@
                           <a href="../server/rfcs.html" title="RFCs">RFCs</a>
             </li>
                       <li class="none">
-                          <a href="../other-versions.html" title="Other 
versions">Other versions</a>
+                          <a href="../server/other-versions.html" title="Other 
versions">Other versions</a>
             </li>
                       <li class="none">
                           <a href="../download.cgi#Apache_James_Server" 
title="Download releases">Download releases</a>
@@ -228,27 +225,12 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. -->
+        
 
     
 
         <div class="section">
-<h2>Upgrade<a name="Upgrade"></a></h2>
+<h2><a name="Upgrade"></a>Upgrade</h2>
 
             
 <p>If you are already using Apache James 2.3, you may face important changes. 
@@ -269,7 +251,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
+      <div class="xright">Copyright &#169;                    2006-2018
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All Rights Reserved.      
                 

http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/support.html
----------------------------------------------------------------------
diff --git a/content/support.html b/content/support.html
index 44871a6..fd71b02 100644
--- a/content/support.html
+++ b/content/support.html
@@ -1,197 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  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-08-09 -->
-<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" />
-    <title>Apache James Project - 
-  Professional support</title>
-    <style type="text/css" media="all">
-      @import url("./css/james.css");
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-      @import url("./js/jquery/css/custom-theme/jquery-ui-1.8.5.custom.css");
-      @import url("./js/jquery/css/print.css");
-      @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/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="20170809" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
-                      
-          <!-- Google Analytics -->
-    <script type="text/javascript">
-    
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-1384591-1']);
-      _gaq.push(['_trackPageview']);
-
-      (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script').item(0); 
s.parentNode.insertBefore(ga, s);
-      })();
-
-    </script>
-    </head>
-  <body class="composite">
-    <div id="banner">
-                                      <a href="index.html" id="bannerLeft" 
title="james-logo.png">
-              
-                                                                            
-        <img src="images/logos/james-logo.png" alt="James Project" />
-                </a>
-                              <a href="http://www.apache.org/index.html"; 
id="bannerRight">
-              
-                                        
-        <img src="images/logos/asf_logo_small.png" alt="The Apache Software 
Foundation" />
-                </a>
-            <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-                
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-09</span>
-                      </div>
-            <div class="xright">                    <a href="index.html" 
title="Home">Home</a>
-            |
-                        <a href="documentation.html" title="James">James</a>
-            |
-                        <a href="mime4j/index.html" title="Mime4J">Mime4J</a>
-            |
-                        <a href="jsieve/index.html" title="jSieve">jSieve</a>
-            |
-                        <a href="jspf/index.html" title="jSPF">jSPF</a>
-            |
-                        <a href="jdkim/index.html" title="jDKIM">jDKIM</a>
-            |
-                        <a href="hupa/index.html" title="Hupa">Hupa</a>
-              
-                
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-                
-                                <h5>James components</h5>
-                  <ul>
-                                                                               
                                                                                
                                                                                
 <li class="expanded">
-                          <a href="documentation.html" title="About 
James">About James</a>
-                    <ul>
-                      <li class="none">
-                          <a href="mail.html" title="Mailing Lists">Mailing 
Lists</a>
-            </li>
-                      <li class="none">
-                          <a href="contribute.html" 
title="Contributing">Contributing</a>
-            </li>
-                      <li class="none">
-                          <a href="guidelines.html" 
title="Guidelines">Guidelines</a>
-            </li>
-                      <li class="none">
-                          <a href="http://wiki.apache.org/james"; 
title="Wiki">Wiki</a>
-            </li>
-                      <li class="none">
-                          <a 
href="https://issues.apache.org/jira/browse/JAMES"; title="Issue tracker">Issue 
tracker</a>
-            </li>
-                      <li class="none">
-                          <a href="team-list.html" title="Who We Are">Who We 
Are</a>
-            </li>
-                      <li class="none">
-                          <a href="license.html" title="License">License</a>
-            </li>
-                      <li class="none">
-                          <a href="thanks.html" title="Thanks">Thanks</a>
-            </li>
-                      <li class="none">
-            <strong>Professional support</strong>
-          </li>
-                      <li class="none">
-                          <a href="download.cgi" title="Download 
releases">Download releases</a>
-            </li>
-              </ul>
-        </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
<li class="collapsed">
-                          <a href="server/index.html" title="Server">Server</a>
-                  </li>
-                                                                               
                                                                                
                                                                                
                           <li class="collapsed">
-                          <a href="mailet/index.html" 
title="Mailets">Mailets</a>
-                  </li>
-                                                                               
                                                                                
                                                                                
                                                                                
             <li class="collapsed">
-                          <a href="mailbox/index.html" 
title="Mailbox">Mailbox</a>
-                  </li>
-                                                                               
                                                                                
                 <li class="collapsed">
-                          <a href="protocols/index.html" 
title="Protocols">Protocols</a>
-                  </li>
-                                                                               
                                                                                
                                         <li class="collapsed">
-                          <a href="mpt/index.html" title="MPT">MPT</a>
-                  </li>
-          </ul>
-        <h5>Apache Software Foundation</h5>
-  <ul>
-    <li>
-      <strong>
-        <a title="ASF" href="http://www.apache.org/";>ASF</a>
-      </strong>
-    </li>
-    <li>
-      <a title="Get Involved" 
href="http://www.apache.org/foundation/getinvolved.html";>Get Involved</a>
-    </li>
-    <li>
-      <a title="FAQ" href="http://www.apache.org/foundation/faq.html";>FAQ</a>
-    </li>
-    <li>
-      <a title="License" href="http://www.apache.org/licenses/"; >License</a>
-    </li>
-    <li>
-      <a title="Sponsorship" 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
-    </li>
-    <li>
-      <a title="Thanks" 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
-    </li>
-    <li>
-      <a title="Security" href="http://www.apache.org/security/";>Security</a>
-    </li>
-  </ul>
-                       <a href="http://maven.apache.org/"; title="Built by 
Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" 
src="./images/logos/maven-feather.png" />
-      </a>
-                   
-                
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
   distributed with this work for additional information
   regarding copyright ownership.  The ASF licenses this file
@@ -206,19 +15,192 @@
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
-  under the License. -->
+  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 2018-01-18 -->
+<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" />
+    <title>Apache James Project &#x2013; Professional support</title>
+    <style type="text/css" media="all">
+      @import url("./css/james.css");
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+      @import url("./js/jquery/css/custom-theme/jquery-ui-1.8.5.custom.css");
+      @import url("./js/jquery/css/print.css");
+      @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/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="20180118" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+          <!-- Google Analytics -->
+    <script type="text/javascript">
+    
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-1384591-1']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script').item(0); 
s.parentNode.insertBefore(ga, s);
+      })();
+
+    </script>
+    </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="index.html" id="bannerLeft" 
title="james-logo.png">
+              
+                                                                            
+        <img src="images/logos/james-logo.png" alt="James Project" />
+                </a>
+                              <a href="http://www.apache.org/index.html"; 
id="bannerRight">
+              
+                                        
+        <img src="images/logos/asf_logo_small.png" alt="The Apache Software 
Foundation" />
+                </a>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-01-18</span>
+                      </div>
+            <div class="xright">                    <a href="index.html" 
title="Home">Home</a>
+            |
+                        <a href="documentation.html" title="James">James</a>
+            |
+                        <a href="mime4j/index.html" title="Mime4J">Mime4J</a>
+            |
+                        <a href="jsieve/index.html" title="jSieve">jSieve</a>
+            |
+                        <a href="jspf/index.html" title="jSPF">jSPF</a>
+            |
+                        <a href="jdkim/index.html" title="jDKIM">jDKIM</a>
+            |
+                        <a href="hupa/index.html" title="Hupa">Hupa</a>
+              
+                
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                
+                                <h5>James components</h5>
+                  <ul>
+                                                                               
                                                                                
                                                                                
 <li class="expanded">
+                          <a href="documentation.html" title="About 
James">About James</a>
+                    <ul>
+                      <li class="none">
+                          <a href="mail.html" title="Mailing Lists">Mailing 
Lists</a>
+            </li>
+                      <li class="none">
+                          <a href="contribute.html" 
title="Contributing">Contributing</a>
+            </li>
+                      <li class="none">
+                          <a href="guidelines.html" 
title="Guidelines">Guidelines</a>
+            </li>
+                      <li class="none">
+                          <a href="http://wiki.apache.org/james"; 
title="Wiki">Wiki</a>
+            </li>
+                      <li class="none">
+                          <a 
href="https://issues.apache.org/jira/browse/JAMES"; title="Issue tracker">Issue 
tracker</a>
+            </li>
+                      <li class="none">
+                          <a href="team-list.html" title="Who We Are">Who We 
Are</a>
+            </li>
+                      <li class="none">
+                          <a href="license.html" title="License">License</a>
+            </li>
+                      <li class="none">
+                          <a href="thanks.html" title="Thanks">Thanks</a>
+            </li>
+                      <li class="none">
+            <strong>Professional support</strong>
+          </li>
+                      <li class="none">
+                          <a href="download.cgi" title="Download 
releases">Download releases</a>
+            </li>
+              </ul>
+        </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
<li class="collapsed">
+                          <a href="server/index.html" title="Server">Server</a>
+                  </li>
+                                                                               
                                                                                
                                                                                
                           <li class="collapsed">
+                          <a href="mailet/index.html" 
title="Mailets">Mailets</a>
+                  </li>
+                                                                               
                                                                                
                                                                                
                                                                                
             <li class="collapsed">
+                          <a href="mailbox/index.html" 
title="Mailbox">Mailbox</a>
+                  </li>
+                                                                               
                                                                                
                 <li class="collapsed">
+                          <a href="protocols/index.html" 
title="Protocols">Protocols</a>
+                  </li>
+                                                                               
                                                                                
                                         <li class="collapsed">
+                          <a href="mpt/index.html" title="MPT">MPT</a>
+                  </li>
+          </ul>
+        <h5>Apache Software Foundation</h5>
+  <ul>
+    <li>
+      <strong>
+        <a title="ASF" href="http://www.apache.org/";>ASF</a>
+      </strong>
+    </li>
+    <li>
+      <a title="Get Involved" 
href="http://www.apache.org/foundation/getinvolved.html";>Get Involved</a>
+    </li>
+    <li>
+      <a title="FAQ" href="http://www.apache.org/foundation/faq.html";>FAQ</a>
+    </li>
+    <li>
+      <a title="License" href="http://www.apache.org/licenses/"; >License</a>
+    </li>
+    <li>
+      <a title="Sponsorship" 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+    </li>
+    <li>
+      <a title="Thanks" 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
+    </li>
+    <li>
+      <a title="Security" href="http://www.apache.org/security/";>Security</a>
+    </li>
+  </ul>
+                       <a href="http://maven.apache.org/"; title="Built by 
Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" 
src="./images/logos/maven-feather.png" />
+      </a>
+                   
+                
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        
 
  
 
   <div class="section">
-<h2>Professional support<a name="Professional_support"></a></h2>
+<h2><a name="Professional_support"></a>Professional support</h2>
 
     
 <p>Here is a list of companies which can provide you some support on James.</p>
 
     
 <div class="section">
-<h3>Linagora<a name="Linagora"></a></h3>
+<h3><a name="Linagora"></a>Linagora</h3>
       <a class="externalLink" href="https://www.linagora.com/ossa";><img 
src="images/linagora.png" alt="" /></a>
       
 <p>We are an Open Source Software Company.</p>
@@ -227,27 +209,27 @@
       
 <p>We are focused on large organizations both from private and public sector. 
We have set ourselves the goal of helping Governments to achieve their digital 
sovereignty.</p>
       
-<p>Linagora employs 4 James commiters and 3 PMC members. We can offer 
professional services related to James: support, feature development or project 
integration.</p>
+<p>Linagora employs 4 James committers and 3 PMC members. We can offer 
professional services related to James: support, feature development or project 
integration.</p>
     </div>
   </div>
 
 
 
-
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2017
-                        <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
-            All Rights Reserved.      
-                
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">Copyright &#169;                    2006-2018
+                        <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
+            All Rights Reserved.      
+                
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>


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

Reply via email to