http://git-wip-us.apache.org/repos/asf/james-site/blob/836f91b1/content/protocols/source-code.html
----------------------------------------------------------------------
diff --git a/content/protocols/source-code.html 
b/content/protocols/source-code.html
index f78eddf..462ab37 100644
--- a/content/protocols/source-code.html
+++ b/content/protocols/source-code.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 - 
-     Source Code</title>
+    <title>Apache James Project &#x2013; Source Code</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>
             |
@@ -182,30 +179,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>Get Source Code<a name="Get_Source_Code"></a></h2>
+<h2><a name="Get_Source_Code"></a>Get Source Code</h2>
     
 <div class="section">
-<h3>Anonymous Access<a name="Anonymous_Access"></a></h3>
+<h3><a name="Anonymous_Access"></a>Anonymous Access</h3>
       
 <p>The source can be checked out anonymously from GIT with the following 
command.</p>
       
@@ -216,7 +198,7 @@
 
     
 <div class="section">
-<h3>Developer Access<a name="Developer_Access"></a></h3>
+<h3><a name="Developer_Access"></a>Developer Access</h3>
       
 <p>Everyone can access the GIT repository via HTTP, but Committers must 
checkout the GIT repository via HTTPS.</p>
       
@@ -228,7 +210,7 @@
 
   
 <div class="section">
-<h2>Build Source Code<a name="Build_Source_Code"></a></h2>
+<h2><a name="Build_Source_Code"></a>Build Source Code</h2>
     
 <p>You can read a tutorial on how to build Apache James Server on <a 
class="externalLink" 
href="http://james.apache.org/server/3/dev-build.html";>http://james.apache.org/server/3/dev-build.html</a>.</p>
     
@@ -238,10 +220,10 @@
 
   
 <div class="section">
-<h2>Source Organization<a name="Source_Organization"></a></h2>
+<h2><a name="Source_Organization"></a>Source Organization</h2>
     
 <div class="section">
-<h3>Modules<a name="Modules"></a></h3>
+<h3><a name="Modules"></a>Modules</h3>
       
 <div style="float:left; margin=4px;">
         <img src="images/uml/org.apache.james.protocols-package.png" alt="" />
@@ -251,19 +233,19 @@
 <div style="clear:both; float:none;" />
     
 <div class="section">
-<h3>James Protocols API<a name="James_Protocols_API"></a></h3>
+<h3><a name="James_Protocols_API"></a>James Protocols API</h3>
       
 <p><tt>apache-james-protocols-api</tt> contains the interfaces, exceptions and 
Constants needed by the other projects.</p>
     </div>
     
 <div class="section">
-<h3>James Protocols Implementation<a 
name="James_Protocols_Implementation"></a></h3>
+<h3><a name="James_Protocols_Implementation"></a>James Protocols 
Implementation</h3>
       
 <p><tt>apache-james-protocols-impl</tt> provides common services that can be 
used by any mail protocol.</p>
     </div>
     
 <div class="section">
-<h3>James Protocols SMTP<a name="James_Protocols_SMTP"></a></h3>
+<h3><a name="James_Protocols_SMTP"></a>James Protocols SMTP</h3>
       
 <p><tt>apache-james-protocols-smtp</tt> implements the SMTP protocols with <a 
class="externalLink" 
href="http://james.apache.org/server/3/dev-extend-smtp-hook.html";>hooks</a> for 
extensions.</p>
     </div>
@@ -271,10 +253,10 @@
 
   
 <div class="section">
-<h2>IMAP4 Source Code<a name="IMAP4_Source_Code"></a></h2>
+<h2><a name="IMAP4_Source_Code"></a>IMAP4 Source Code</h2>
     
 <div class="section">
-<h3>Modules<a name="Modules"></a></h3>
+<h3><a name="Modules"></a>Modules</h3>
       
 <div style="float:left; margin:4px;">
         <img src="images/uml/org.apache.james.imap-withtest-package.png" 
alt="" />
@@ -284,17 +266,17 @@
 <div style="clear:both; float:none;" />
     
 <div class="section">
-<h3>Apache James IMAP API<a name="Apache_James_IMAP_API"></a></h3>
+<h3><a name="Apache_James_IMAP_API"></a>Apache James IMAP API</h3>
       
 <p><tt>apache-james-imap-api</tt> contains the interfaces, exceptions and 
Constants needed by the other projects.</p>
       
 <p>The following diagram represents some key (not all) interfaces of the IMAP 
API project.</p>
-<!-- Add an updated image... -->
-<!-- <img src="images/uml/org.apache.james.imap.api.png"/> -->
+
+
     </div>
     
 <div class="section">
-<h3>Apache James IMAP Message<a name="Apache_James_IMAP_Message"></a></h3>
+<h3><a name="Apache_James_IMAP_Message"></a>Apache James IMAP Message</h3>
       
 <p><tt>apache-james-imap-message</tt> allows to encode, decode and structure 
the IMAP requests and responses.</p>
       
@@ -303,7 +285,7 @@
     </div>
     
 <div class="section">
-<h3>Apache James IMAP Processor<a name="Apache_James_IMAP_Processor"></a></h3>
+<h3><a name="Apache_James_IMAP_Processor"></a>Apache James IMAP Processor</h3>
       
 <p><tt>apache-james-imap-processor</tt> implements the Chain Of Responsibility 
design pattern.</p>
       
@@ -312,7 +294,7 @@
     </div>
     
 <div class="section">
-<h3>Apache James Integration Test<a 
name="Apache_James_Integration_Test"></a></h3>
+<h3><a name="Apache_James_Integration_Test"></a>Apache James Integration 
Test</h3>
       
 <p>A <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/mpt";>specific 
integration project</a> is 
       responsible to test the IMAP protocol in conjunction with the <a 
class="externalLink" href="http://james.apache.org/mailbox";>Apache James 
mailbox</a> components.</p>
@@ -329,7 +311,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/protocols/team-list.html
----------------------------------------------------------------------
diff --git a/content/protocols/team-list.html b/content/protocols/team-list.html
index 3281b18..dd83760 100644
--- a/content/protocols/team-list.html
+++ b/content/protocols/team-list.html
@@ -18,11 +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 2016-12-06 -->
+<!-- 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 Protocols - Team list</title>
+    <title>Apache James Protocols &#x2013; Project Team</title>
     <style type="text/css" media="all">
       @import url("./css/james.css");
       @import url("./css/maven-base.css");
@@ -36,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="20161206" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <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"/>
-                      
+        
           <!-- Google Analytics -->
     <script type="text/javascript">
     
@@ -76,19 +74,11 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-12-06</span>
+        <span id="publishDate">Last Published: 2018-01-18</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
-                        <a href="../server/index.html" 
title="Server">Server</a>
-            |
-                        <a href="../hupa/index.html" title="Hupa">Hupa</a>
-            |
-                        <a href="index.html" title="Protocols">Protocols</a>
-            |
-                        <a href="../mailet/index.html" 
title="Mailets">Mailets</a>
-            |
-                        <a href="../mailbox/index.html" 
title="Mailbox">Mailbox</a>
+                        <a href="../documentation.html" title="James">James</a>
             |
                         <a href="../mime4j/index.html" 
title="Mime4J">Mime4J</a>
             |
@@ -98,9 +88,7 @@
             |
                         <a href="../jdkim/index.html" title="jDKIM">jDKIM</a>
             |
-                        <a href="../mpt/index.html" title="MPT">MPT</a>
-            |
-                        <a href="../postage/index.html" 
title="Postage">Postage</a>
+                        <a href="../hupa/index.html" title="Hupa">Hupa</a>
               
                 
       </div>
@@ -112,73 +100,7 @@
       <div id="navcolumn">
              
                 
-                                <h5>Documentation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" 
title="Introduction">Introduction</a>
-            </li>
-                  <li class="none">
-                          <a href="smtp.html" title="SMTP">SMTP</a>
-            </li>
-                  <li class="none">
-                          <a href="pop3.html" title="POP3">POP3</a>
-            </li>
-                  <li class="none">
-                          <a href="imap4.html" title="IMAP4">IMAP4</a>
-            </li>
-                  <li class="none">
-                          <a href="source-code.html" title="Source 
Code">Source Code</a>
-            </li>
-          </ul>
-                       <h5>References</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="apidocs/index.html" 
title="Javadoc">Javadoc</a>
-            </li>
-                  <li class="none">
-                          <a 
href="https://issues.apache.org/jira/browse/PROTOCOLS"; title="Issue 
Tracker">Issue Tracker</a>
-            </li>
-          </ul>
-                       <h5>About James</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Overview">Overview</a>
-            </li>
-                  <li class="none">
-                          <a href="../newsarchive.html" title="News">News</a>
-            </li>
-                  <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="../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">
-                          <a href="../support.html" title="Professional 
support">Professional support</a>
-            </li>
-          </ul>
-                       <h5>Download</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../download.cgi" 
title="Releases">Releases</a>
-            </li>
-          </ul>
-        <h5>Apache Software Foundation</h5>
+                 <h5>Apache Software Foundation</h5>
   <ul>
     <li>
       <strong>
@@ -214,11 +136,11 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section">
-<h2>The Team<a name="The_Team"></a></h2><a name="The_Team"></a>
+<h2><a name="Project_Team"></a>Project Team</h2><a name="Project_Team"></a>
 <p>A successful project requires many people to play many roles. Some members 
write code or documentation, while others are valuable as testers, submitting 
patches and suggestions.</p>
-<p>The team is comprised of Members and Contributors. Members have direct 
access to the source of a project and actively evolve the code-base. 
Contributors improve the project through submission of patches and suggestions 
to the Members. The number of Contributors to the project is unbounded. Get 
involved today. All contributions to the project are greatly appreciated.</p>
+<p>The project team is comprised of Members and Contributors. Members have 
direct access to the source of a project and actively evolve the code-base. 
Contributors improve the project through submission of patches and suggestions 
to the Members. The number of Contributors to the project is unbounded. Get 
involved today. All contributions to the project are greatly appreciated.</p>
 <div class="section">
-<h3>Members<a name="Members"></a></h3><a name="Members"></a>
+<h3><a name="Members"></a>Members</h3><a name="Members"></a>
 <p>The following is a list of developers with commit privileges that have 
directly contributed to the project in one way or another.</p>
 <table border="0" class="bodyTable">
 <tr class="a">
@@ -230,7 +152,6 @@
 <th>Organization URL</th>
 <th>Roles</th>
 <th>Time Zone</th>
-<th>Actual Time (GMT)</th>
 <th>Properties</th></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/a7e20b57e3ff53dcc50dc5c587b70169?d=mm&amp;s=60";
 alt="" /></td>
@@ -241,7 +162,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>2</td>
-<td><span id="developer-0">2</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/e81901854b7f5c44ddd92499fc51cacc?d=mm&amp;s=60";
 alt="" /></td>
@@ -252,7 +172,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>2</td>
-<td><span id="developer-1">2</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/e7b792910b5ff97e44e95af1f891efaf?d=mm&amp;s=60";
 alt="" /></td>
@@ -263,7 +182,6 @@
 <td>-</td>
 <td>Developer</td>
 <td>-</td>
-<td><span id="developer-2">-</span></td>
 <td>Donator=Serge was the original donator of the James code, which has since 
been massively
                     improved by people smarter than him. He tries to answer 
questions on the listserv and make
                     code
@@ -277,7 +195,6 @@
 <td>-</td>
 <td>Developer</td>
 <td>-</td>
-<td><span id="developer-3">-</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/6ff4291f354202f700240c1581368458?d=mm&amp;s=60";
 alt="" /></td>
@@ -288,7 +205,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-4">-</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/77aefc9ce8fe8cc4656b7689cd63e02d?d=mm&amp;s=60";
 alt="" /></td>
@@ -299,7 +215,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-5">-</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/ca8302ce2aee2df38897d1f66faa1538?d=mm&amp;s=60";
 alt="" /></td>
@@ -310,7 +225,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-6">-</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/3aed1b52eca0b4f18fcedba7729df5ce?d=mm&amp;s=60";
 alt="" /></td>
@@ -321,7 +235,6 @@
 <td><a class="externalLink" 
href="http://www.slc.co.uk";>http://www.slc.co.uk</a></td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-7">-</span></td>
 <td>Description=Danny is a member of the Apache Software Foundation and 
married father
                     of two by night, and by day works as lead technical 
consultant for the Student Loans
                     Company ltd.</td></tr>
@@ -334,7 +247,6 @@
 <td>-</td>
 <td>Developer</td>
 <td>-8</td>
-<td><span id="developer-8">-8</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/5c348f6d6763fdaa9e9bf51c69480d4f?d=mm&amp;s=60";
 alt="" /></td>
@@ -345,7 +257,6 @@
 <td>-</td>
 <td>Developer</td>
 <td>-</td>
-<td><span id="developer-9">-</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/3bd4b5011de9d9f0f5aafa7a2850388d?d=mm&amp;s=60";
 alt="" /></td>
@@ -356,7 +267,6 @@
 <td>-</td>
 <td>Developer</td>
 <td>-</td>
-<td><span id="developer-10">-</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/e07f0e8c5a765b3528fda6751f0376db?d=mm&amp;s=60";
 alt="" /></td>
@@ -367,7 +277,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-11">-</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/30f9094d5dbe2ce93f1a41afc9615b83?d=mm&amp;s=60";
 alt="" /></td>
@@ -378,7 +287,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-12">-</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/ffd7be99d3aa6de70221efcf2a435b75?d=mm&amp;s=60";
 alt="" /></td>
@@ -389,7 +297,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-13">-</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/af5bbbe065ded3a0661ca3d78b495c33?d=mm&amp;s=60";
 alt="" /></td>
@@ -400,7 +307,6 @@
 <td>-</td>
 <td>-</td>
 <td>-</td>
-<td><span id="developer-14">-</span></td>
 <td>Description=Former author to the mime4j product</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/59d2fca5c9b921d43785bad2c2f07466?d=mm&amp;s=60";
 alt="" /></td>
@@ -411,7 +317,6 @@
 <td>-</td>
 <td>Developer</td>
 <td>-</td>
-<td><span id="developer-15">-</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/a0176e178f8f08da2ac4524454b4184e?d=mm&amp;s=60";
 alt="" /></td>
@@ -422,7 +327,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-16">-</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/f474668bb659f341edf9bbf682946422?d=mm&amp;s=60";
 alt="" /></td>
@@ -433,7 +337,6 @@
 <td>-</td>
 <td>Developer, PMC Member</td>
 <td>-</td>
-<td><span id="developer-17">-</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/9feeb5e7f70a7e7789b7e9999221bb87?d=mm&amp;s=60";
 alt="" /></td>
@@ -444,7 +347,6 @@
 <td>-</td>
 <td>Developer, PMC Chair</td>
 <td>-</td>
-<td><span id="developer-18">-</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/e2c2dac8e24983b89df79134912b3e72?d=mm&amp;s=60";
 alt="" /></td>
@@ -455,7 +357,6 @@
 <td>-</td>
 <td>Emeritus</td>
 <td>1</td>
-<td><span id="developer-19">1</span></td>
 <td>-</td></tr>
 <tr class="b">
 <td><img 
src="http://www.gravatar.com/avatar/bb9cb5cc3b2b59865acacf56834bcc9a?d=mm&amp;s=60";
 alt="" /></td>
@@ -466,7 +367,6 @@
 <td>-</td>
 <td>PMC Member, Developer</td>
 <td>-</td>
-<td><span id="developer-20">-</span></td>
 <td>-</td></tr>
 <tr class="a">
 <td><img 
src="http://www.gravatar.com/avatar/dda39f96fb2ce9166664d044f40b2296?d=mm&amp;s=60";
 alt="" /></td>
@@ -477,43 +377,39 @@
 <td>-</td>
 <td>Developer</td>
 <td>-</td>
-<td><span id="developer-21">-</span></td>
 <td>-</td></tr>
 <tr class="b">
-<td><img 
src="http://www.gravatar.com/avatar/eb3a7ecd66922b3eb64bde7e0131bbf9?d=mm&amp;s=60";
 alt="" /></td>
+<td><img 
src="http://www.gravatar.com/avatar/ea9718445f488d6cadbb22e223f498f8?d=mm&amp;s=60";
 alt="" /></td>
 <td><a name="btellier"></a>btellier</td>
 <td>Benoit Tellier</td>
-<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
-<td>-</td>
-<td>-</td>
-<td>Developer</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Linagora</td>
+<td><a class="externalLink" 
href="https://linagora.com";>https://linagora.com</a></td>
+<td>PMC Member, Developer</td>
 <td>-</td>
-<td><span id="developer-22">-</span></td>
 <td>-</td></tr>
 <tr class="a">
-<td><img 
src="http://www.gravatar.com/avatar/04d4463cc1625d9ab1162919093870b7?d=mm&amp;s=60";
 alt="" /></td>
+<td><img 
src="http://www.gravatar.com/avatar/cd02dfde553afff7b32dd447ef36eef4?d=mm&amp;s=60";
 alt="" /></td>
 <td><a name="aduprat"></a>aduprat</td>
 <td>Antoine Duprat</td>
-<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
-<td>-</td>
-<td>-</td>
-<td>Developer</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Linagora</td>
+<td><a class="externalLink" 
href="https://linagora.com";>https://linagora.com</a></td>
+<td>PMC Member, Developer</td>
 <td>-</td>
-<td><span id="developer-23">-</span></td>
 <td>-</td></tr>
 <tr class="b">
-<td><img 
src="http://www.gravatar.com/avatar/c5cd319755f400f07d11f6ac386e8bf8?d=mm&amp;s=60";
 alt="" /></td>
+<td><img 
src="http://www.gravatar.com/avatar/d50bec27f390668095854859a3f2a280?d=mm&amp;s=60";
 alt="" /></td>
 <td><a name="rouazana"></a>rouazana</td>
 <td>Raphael Ouazana</td>
-<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
-<td>-</td>
-<td>-</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Linagora</td>
+<td><a class="externalLink" 
href="https://linagora.com";>https://linagora.com</a></td>
 <td>Developer</td>
 <td>-</td>
-<td><span id="developer-24">-</span></td>
 <td>-</td></tr></table></div>
 <div class="section">
-<h3>Contributors<a name="Contributors"></a></h3><a name="Contributors"></a>
+<h3><a name="Contributors"></a>Contributors</h3><a name="Contributors"></a>
 <p>The following additional people have contributed to this project through 
the way of suggestions, patches or documentation.</p>
 <table border="0" class="bodyTable">
 <tr class="a">
@@ -700,33 +596,24 @@
 <td><img 
src="http://www.gravatar.com/avatar/ea93d85ece90613e220e320dc5855327?d=mm&amp;s=60";
 alt="" /></td>
 <td>Richard O. Hammer [ROH]</td>
 <td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
-<td>-</td></tr></table><script type="text/javascript">
-function offsetDate(id, offset) {
-    var now = new Date();
-    var nowTime = now.getTime();
-    var localOffset = now.getTimezoneOffset();
-    var developerTime = nowTime + ( offset * 60 * 60 * 1000 )+ ( localOffset * 
60 * 1000 );
-    var developerDate = new Date(developerTime);
-
-    document.getElementById(id).innerHTML = developerDate;
-}
-
-function init(){
-    offsetDate('developer-0', '2');
-    offsetDate('developer-1', '2');
-    offsetDate('developer-8', '-8');
-    offsetDate('developer-19', '1');
-}
-
-window.onLoad = init();
-</script></div></div>
+<td>-</td></tr>
+<tr class="b">
+<td><img 
src="http://www.gravatar.com/avatar/5c0d7d42531a491f335add36f521bc82?d=mm&amp;s=60";
 alt="" /></td>
+<td>Luc Duzan</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>-</td></tr>
+<tr class="a">
+<td><img 
src="http://www.gravatar.com/avatar/fd8865ef869ea1a86814ee535509fad6?d=mm&amp;s=60";
 alt="" /></td>
+<td>Quynh Nguyen</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>-</td></tr></table></div></div>
       </div>
     </div>
     <div class="clear">
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2010-2016
+      <div class="xright">Copyright &#169;                    2010-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/advantages.html
----------------------------------------------------------------------
diff --git a/content/server/advantages.html b/content/server/advantages.html
index 9f6d49b..5ee1ef8 100644
--- a/content/server/advantages.html
+++ b/content/server/advantages.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 - Advantages</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - 
Advantages</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 @@
                           <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>
@@ -194,22 +191,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. -->
+        
 
  
 
@@ -221,7 +203,7 @@
 
         
 <div class="section">
-<h3>Standard<a name="Standard"></a></h3>
+<h3><a name="Standard"></a>Standard</h3>
 
           
 <p>100% pure Java Mail server designed to be a complete and portable enterprise
@@ -246,7 +228,7 @@
 
         
 <div class="section">
-<h3>Configurable<a name="Configurable"></a></h3>
+<h3><a name="Configurable"></a>Configurable</h3>
 
           
 <p>Configure the stores,...</p>
@@ -268,7 +250,7 @@
 
         
 <div class="section">
-<h3>Manageable<a name="Manageable"></a></h3>
+<h3><a name="Manageable"></a>Manageable</h3>
 
           
 <p>Manage domains, users,... via a <a href="manage-cli.html">command line 
client</a>, a <a href="manage-webadmin.html">
@@ -285,7 +267,7 @@
 
         
 <div class="section">
-<h3>Extensible<a name="Extensible"></a></h3>
+<h3><a name="Extensible"></a>Extensible</h3>
 
           
 <p>Apache James Server serves as a mail application platform.</p>
@@ -310,7 +292,7 @@
 
         
 <div class="section">
-<h3>Developer-Friendly<a name="Developer-Friendly"></a></h3>
+<h3><a name="Developer-Friendly"></a>Developer-Friendly</h3>
 
           
 <p>Apache James Server 3.0 is now built on top of Spring 3.0 or Guice in 
replacement of
@@ -329,7 +311,7 @@
 
         
 <div class="section">
-<h3>Performant<a name="Performant"></a></h3>
+<h3><a name="Performant"></a>Performant</h3>
 
           
 <p>A special focus has been brought to the performance: Apache James Server 
can process more than
@@ -351,7 +333,7 @@
 
         
 <div class="section">
-<h3>Secured<a name="Secured"></a></h3>
+<h3><a name="Secured"></a>Secured</h3>
 
           
 <p>Apache James Server is a secured mail server by default - <a 
href="feature-security.html">read more</a>.</p>
@@ -374,7 +356,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/archive/announcement_2_1.html
----------------------------------------------------------------------
diff --git a/content/server/archive/announcement_2_1.html 
b/content/server/archive/announcement_2_1.html
index 017abfd..70a2fbb 100644
--- a/content/server/archive/announcement_2_1.html
+++ b/content/server/archive/announcement_2_1.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 - 
-  James 2.1 - Release Announcement</title>
+    <title>Apache James Project &#x2013; James 2.1 - Release 
Announcement</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,25 +156,10 @@
     </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>Release Announcement<a name="Release_Announcement"></a></h2>
+<h2><a name="Release_Announcement"></a>Release Announcement</h2>
 
 <p>The Java Apache Mail Enterprise Server (a.k.a. Apache James) Project is 
happy to announce the release 
 of version 2.1 of the Apache James server.</p>
@@ -222,7 +204,7 @@ to [email protected] and 
[email protected].
       <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/archive/architecture_v1_2.html
----------------------------------------------------------------------
diff --git a/content/server/archive/architecture_v1_2.html 
b/content/server/archive/architecture_v1_2.html
index 4bd2784..75efd7a 100644
--- a/content/server/archive/architecture_v1_2.html
+++ b/content/server/archive/architecture_v1_2.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 - 
-  James 1.2 - Architecture</title>
+    <title>Apache James Project &#x2013; James 1.2 - Architecture</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,26 +156,11 @@
     </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>James 1.2 - Architecture<a name="James_1.2_-_Architecture"></a></h2>
+<h2><a name="James_1.2_-_Architecture"></a>James 1.2 - Architecture</h2>
 
 
 <p>
@@ -218,7 +200,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/archive/architecture_v2_0.html
----------------------------------------------------------------------
diff --git a/content/server/archive/architecture_v2_0.html 
b/content/server/archive/architecture_v2_0.html
index 8af446d..08b4381 100644
--- a/content/server/archive/architecture_v2_0.html
+++ b/content/server/archive/architecture_v2_0.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 - 
-  Notes for developers</title>
+    <title>Apache James Project &#x2013; Notes for developers</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="Serge Knystautas" />
-    <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>
             |
@@ -160,27 +157,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>Architecture<a name="Architecture"></a></h2>
+<h2><a name="Architecture"></a>Architecture</h2>
 
   
 <p>
@@ -224,7 +206,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/archive/configuration_v2_0.html
----------------------------------------------------------------------
diff --git a/content/server/archive/configuration_v2_0.html 
b/content/server/archive/configuration_v2_0.html
index a7aa2b4..d6c6ffd 100644
--- a/content/server/archive/configuration_v2_0.html
+++ b/content/server/archive/configuration_v2_0.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 - 
-  Configuration</title>
+    <title>Apache James Project &#x2013; Configuration</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="Serge Knystautas" />
-    <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>
             |
@@ -160,27 +157,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>Configuration<a name="Configuration"></a></h2>
+<h2><a name="Configuration"></a>Configuration</h2>
 
 
 <p>
@@ -199,10 +181,10 @@
 
 
 <div class="section">
-<h2>James Server Configuration<a name="James_Server_Configuration"></a></h2>
+<h2><a name="James_Server_Configuration"></a>James Server Configuration</h2>
   
 <div class="section">
-<h3>James Configuration<a name="James_Configuration"></a></h3>
+<h3><a name="James_Configuration"></a>James Configuration</h3>
     
 <p>
         These tag elements control the JAMES spooling and identification
@@ -288,7 +270,7 @@
 
   
 <div class="section">
-<h3>SMTP Server Configuration<a name="SMTP_Server_Configuration"></a></h3>
+<h3><a name="SMTP_Server_Configuration"></a>SMTP Server Configuration</h3>
    
 <p>
       These tag elements affect the SMTP listener (for incoming messages).
@@ -347,7 +329,7 @@
 
   
 <div class="section">
-<h3>POP3 Server Configuration<a name="POP3_Server_Configuration"></a></h3>
+<h3><a name="POP3_Server_Configuration"></a>POP3 Server Configuration</h3>
     
 <p>
        These tag elements affect the POP3 server (for message retrieval)
@@ -414,7 +396,7 @@
 
   
 <div class="section">
-<h3>Users Manager Configuration<a name="Users_Manager_Configuration"></a></h3>
+<h3><a name="Users_Manager_Configuration"></a>Users Manager Configuration</h3>
     
 <p>
        These tag elements affect the configuration of the list of local users.
@@ -444,7 +426,7 @@
 
   
 <div class="section">
-<h3>Remote Manager Configuration<a 
name="Remote_Manager_Configuration"></a></h3>
+<h3><a name="Remote_Manager_Configuration"></a>Remote Manager 
Configuration</h3>
     
 <p>
        These tag elements affect the remote manager, a telnet based utility
@@ -520,7 +502,7 @@
 
   
 <div class="section">
-<h3>Transport Configuration<a name="Transport_Configuration"></a></h3>
+<h3><a name="Transport_Configuration"></a>Transport Configuration</h3>
     
 <p>
        These tag elements affect SMTP remote delivery, specifically, DNS
@@ -583,7 +565,7 @@
 
 
 <div class="section">
-<h2>The Mailet processor pipeline<a 
name="The_Mailet_processor_pipeline"></a></h2>
+<h2><a name="The_Mailet_processor_pipeline"></a>The Mailet processor 
pipeline</h2>
   
 <p>
      This is James sitemap. It defines how each incoming mail will be
@@ -604,7 +586,7 @@
 
   
 <div class="section">
-<h3>Matchers<a name="Matchers"></a></h3>
+<h3><a name="Matchers"></a>Matchers</h3>
     
 <p>
        The Matcher interface defines how match class should work. Their work is
@@ -853,7 +835,7 @@
 
   
 <div class="section">
-<h3>Mailet<a name="Mailet"></a></h3>
+<h3><a name="Mailet"></a>Mailet</h3>
     
 <p>
        Mailet are classes that process a message. They are
@@ -1220,7 +1202,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/archive/document_archive.html
----------------------------------------------------------------------
diff --git a/content/server/archive/document_archive.html 
b/content/server/archive/document_archive.html
index 0e0ad69..29d60a8 100644
--- a/content/server/archive/document_archive.html
+++ b/content/server/archive/document_archive.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 - 
-  James Document Archive - Table of Contents</title>
+    <title>Apache James Project &#x2013; James Document Archive - Table of 
Contents</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,26 +156,11 @@
     </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>James Document Archive<a name="James_Document_Archive"></a></h2>
+<h2><a name="James_Document_Archive"></a>James Document Archive</h2>
 
 
 <p>The Java Apache Mail Enterprise Server (a.k.a. Apache James) is a
@@ -193,7 +175,7 @@ users to upgrade to the current Release Build of James.</p>
 
 
 <div class="section">
-<h3>Table of Contents<a name="Table_of_Contents"></a></h3>
+<h3><a name="Table_of_Contents"></a>Table of Contents</h3>
 
 
 <p>
@@ -236,7 +218,7 @@ users to upgrade to the current Release Build of James.</p>
       <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/archive/install.html
----------------------------------------------------------------------
diff --git a/content/server/archive/install.html 
b/content/server/archive/install.html
index 6f3fe5f..8d598a9 100644
--- a/content/server/archive/install.html
+++ b/content/server/archive/install.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 - 
-  Installation</title>
+    <title>Apache James Project &#x2013; Installation</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="Serge Knystautas" />
-    <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>
             |
@@ -160,26 +157,11 @@
     </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>Step 0: Building. (only necessary for daily snapshots)<a 
name="Step_0:_Building._only_necessary_for_daily_snapshots"></a></h2> 
+<h2><a name="Step_0:_Building._only_necessary_for_daily_snapshots"></a>Step 0: 
Building. (only necessary for daily snapshots)</h2> 
 
 <p> If you have downloaded a binary distribution, you do not need to build 
James. 
   Proceed directory to Step 1. </p>
@@ -209,7 +191,7 @@
   avoid losing work. </p>
 </div> 
 <div class="section">
-<h2>Step 1: Installation.<a name="Step_1:_Installation."></a></h2> 
+<h2><a name="Step_1:_Installation."></a>Step 1: Installation.</h2> 
 
 <p> Download distibution. Extract or copy all the files in the archive or dist 
   directory intto your installation directory. </p>
@@ -217,7 +199,7 @@
 
 
 <div class="section">
-<h2>Step 2: Configuration.<a name="Step_2:_Configuration."></a></h2>
+<h2><a name="Step_2:_Configuration."></a>Step 2: Configuration.</h2>
   
 <p>
     Read the short and snappy documentation at docs/index.html for a proper
@@ -256,7 +238,7 @@
 
 
 <div class="section">
-<h2>Step 4: Kickstart.<a name="Step_4:_Kickstart."></a></h2>
+<h2><a name="Step_4:_Kickstart."></a>Step 4: Kickstart.</h2>
   
 <p>
     Once started you'll see a message saying Avalon is running. This means that
@@ -296,7 +278,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/archive/usingJDBC_v2.0.html
----------------------------------------------------------------------
diff --git a/content/server/archive/usingJDBC_v2.0.html 
b/content/server/archive/usingJDBC_v2.0.html
index ed31057..aae01ce 100644
--- a/content/server/archive/usingJDBC_v2.0.html
+++ b/content/server/archive/usingJDBC_v2.0.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 - 
-  Using JDBC</title>
+    <title>Apache James Project &#x2013; Using JDBC</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="Charles Benett" />
-    <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>
             |
@@ -160,27 +157,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>James 2.0 - Using JDBC<a name="James_2.0_-_Using_JDBC"></a></h2>
+<h2><a name="James_2.0_-_Using_JDBC"></a>James 2.0 - Using JDBC</h2>
 
   
 <p>
@@ -190,7 +172,7 @@
 
 
 <div class="section">
-<h2>Goals<a name="Goals"></a></h2>
+<h2><a name="Goals"></a>Goals</h2>
 
   
 <p>Main Goals.
@@ -231,7 +213,7 @@
 
 
 <div class="section">
-<h2>USE INSTRUCTIONS<a name="USE_INSTRUCTIONS"></a></h2>
+<h2><a name="USE_INSTRUCTIONS"></a>USE INSTRUCTIONS</h2>
 
   
 <p>
@@ -259,7 +241,7 @@ The only config properties you should need to set are:
 
 
 <div class="section">
-<h2>TEST INSTRUCTIONS (FOR USER REPOSITORIES)<a 
name="TEST_INSTRUCTIONS_FOR_USER_REPOSITORIES"></a></h2>
+<h2><a name="TEST_INSTRUCTIONS_FOR_USER_REPOSITORIES"></a>TEST INSTRUCTIONS 
(FOR USER REPOSITORIES)</h2>
   
 <p>
     </p>
@@ -284,7 +266,7 @@ The only config properties you should need to set are:
 
 
 <div class="section">
-<h2>MAIL REPOSITORY<a name="MAIL_REPOSITORY"></a></h2>
+<h2><a name="MAIL_REPOSITORY"></a>MAIL REPOSITORY</h2>
   
 <p>
 Mail repositories are now configured primarily by their 
&quot;destinationURL&quot; 
@@ -322,7 +304,7 @@ for other db products.
 
 
 <div class="section">
-<h2>USERS REPOSITORY<a name="USERS_REPOSITORY"></a></h2>
+<h2><a name="USERS_REPOSITORY"></a>USERS REPOSITORY</h2>
   
 <p>
 I've added an &quot;AbstractJdbcUsersRepository&quot;, which takes care of 
most of the work
@@ -390,7 +372,7 @@ an upgraded &quot;avalon-excalibur.jar&quot; in the 
proposal.
       <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/archive/usingLDAP_v1_2.html
----------------------------------------------------------------------
diff --git a/content/server/archive/usingLDAP_v1_2.html 
b/content/server/archive/usingLDAP_v1_2.html
index 5a9fe37..1c180ff 100644
--- a/content/server/archive/usingLDAP_v1_2.html
+++ b/content/server/archive/usingLDAP_v1_2.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 - 
-  Using LDAP</title>
+    <title>Apache James Project &#x2013; Using LDAP</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="Charles Benett" />
-    <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>
             |
@@ -160,27 +157,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>James 1.2 - Using an LDAP Directory as a Users Repository<a 
name="James_1.2_-_Using_an_LDAP_Directory_as_a_Users_Repository"></a></h2>
+<h2><a 
name="James_1.2_-_Using_an_LDAP_Directory_as_a_Users_Repository"></a>James 1.2 
- Using an LDAP Directory as a Users Repository</h2>
 
   
 <p>
@@ -191,7 +173,7 @@
 
 
 <div class="section">
-<h2>Summary<a name="Summary"></a></h2>
+<h2><a name="Summary"></a>Summary</h2>
 
   
 <p>
@@ -358,7 +340,7 @@
 
 
 <div class="section">
-<h2>Installation<a name="Installation"></a></h2>
+<h2><a name="Installation"></a>Installation</h2>
 
   
 <p>
@@ -388,7 +370,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/archive/usingTLS_v1_2.html
----------------------------------------------------------------------
diff --git a/content/server/archive/usingTLS_v1_2.html 
b/content/server/archive/usingTLS_v1_2.html
index f46d9d6..af9594d 100644
--- a/content/server/archive/usingTLS_v1_2.html
+++ b/content/server/archive/usingTLS_v1_2.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 - 
-  Using TLS</title>
+    <title>Apache James Project &#x2013; Using TLS</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="Charles Benett" />
-    <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>
             |
@@ -160,27 +157,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>James 1.2.1 - Using TLS<a name="James_1.2.1_-_Using_TLS"></a></h2>
+<h2><a name="James_1.2.1_-_Using_TLS"></a>James 1.2.1 - Using TLS</h2>
 
   
 <p>
@@ -191,7 +173,7 @@
 
 
 <div class="section">
-<h2>Obtain JSSE<a name="Obtain_JSSE"></a></h2>
+<h2><a name="Obtain_JSSE"></a>Obtain JSSE</h2>
 
   
 <p>
@@ -211,7 +193,7 @@
 
 
 <div class="section">
-<h2>Enable TLS<a name="Enable_TLS"></a></h2>
+<h2><a name="Enable_TLS"></a>Enable TLS</h2>
 
   
 <p>
@@ -242,7 +224,7 @@
 
 
 <div class="section">
-<h2>Verify TLS-enabled JAMES<a name="Verify_TLS-enabled_JAMES"></a></h2>
+<h2><a name="Verify_TLS-enabled_JAMES"></a>Verify TLS-enabled JAMES</h2>
   
 <p>
     (Positive Test) Use an SSL client to open a socket to the appropriate port.
@@ -271,7 +253,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/config-antispam.html
----------------------------------------------------------------------
diff --git a/content/server/config-antispam.html 
b/content/server/config-antispam.html
index a816988..5cf01a9 100644
--- a/content/server/config-antispam.html
+++ b/content/server/config-antispam.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 - Antispam Configuration</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Antispam 
Configuration</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>
             |
@@ -230,7 +227,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>
@@ -285,27 +282,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>Antispam Configuration<a name="Antispam_Configuration"></a></h2>
+<h2><a name="Antispam_Configuration"></a>Antispam Configuration</h2>
   
     
 <p>Apache James Server Anti-Spam system can be configured via two main 
different mechanisms:</p>
@@ -320,7 +302,7 @@
 
     
 <div class="section">
-<h3>AntiSpam SMTP Hooks<a name="AntiSpam_SMTP_Hooks"></a></h3>
+<h3><a name="AntiSpam_SMTP_Hooks"></a>AntiSpam SMTP Hooks</h3>
   
       
 <p>&quot;FastFail&quot; SMTP Hooks acts to reject before spooling
@@ -335,7 +317,7 @@
 
     
 <div class="section">
-<h3>AntiSpam Mailets<a name="AntiSpam_Mailets"></a></h3>
+<h3><a name="AntiSpam_Mailets"></a>AntiSpam Mailets</h3>
     
     
 <ul>
@@ -374,7 +356,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/config-cassandra.html
----------------------------------------------------------------------
diff --git a/content/server/config-cassandra.html 
b/content/server/config-cassandra.html
index 4c728ef..17844a3 100644
--- a/content/server/config-cassandra.html
+++ b/content/server/config-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 - Cassandra Configuration</title>
+    <title>Apache James Project &#x2013; Apache James Server 3 - Cassandra 
Configuration</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>
             |
@@ -230,7 +227,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>
@@ -285,27 +282,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>Cassandra Configuration<a name="Cassandra_Configuration"></a></h2>
+<h2><a name="Cassandra_Configuration"></a>Cassandra Configuration</h2>
 
     Note: Cassandra is only available with Guice wiring (cassandra-guice and 
cassandra-guice-ldap).
 
@@ -441,22 +423,6 @@
 <dt><b>mailbox.blob.part.size</b></dt>
         
 <dd>Optional. Defaults to 102400 (100KB).<br /> Controls the size of blob 
parts used to store messages.</dd>
-        
-<dt><b>migration.v1.v2.on.the.fly</b></dt>
-        
-<dd>Optional. Defaults to false.<br /> Controls wether v1 to v2 migration 
should be run on the fly.</dd>
-        
-<dt><b>migration.v1.v2.thread.count</b></dt>
-        
-<dd>Optional. Defaults to 2.<br /> Controls the number of threads used to 
asynchronously migrate from v1 to v2.</dd>
-        
-<dt><b>migration.v1.v2.queue.length</b></dt>
-        
-<dd>Optional. Defaults to 1000.<br /> Controls the queue size of v1 to v2 
migration task. Drops when full.</dd>
-        
-<dt><b>migration.v1.read.fetch.size</b></dt>
-        
-<dd>Optional. Defaults to 10.<br /> Controls the fetch size of the request to 
retrieve all messages stored in V1 during the migration process.</dd>
       </dl>
 
 
@@ -467,7 +433,7 @@
 
   
 <div class="section">
-<h2>Cassandra migration process<a name="Cassandra_migration_process"></a></h2>
+<h2><a name="Cassandra_migration_process"></a>Cassandra migration process</h2>
     
 <p>Cassandra upgrades implies the creation of a new table. Thus restarting 
James is needed, as new tables are created on restart.</p>
 
@@ -486,6 +452,108 @@
 
     
 <p>Note that currently the progress can be tracked by logs.</p>
+
+    Here are the implemented migrations:
+
+    
+<div class="section">
+<h3><a name="From_V1_to_V2"></a>From V1 to V2</h3>
+
+      
+<p>Migration tag on git repository: <a class="externalLink" 
href="https://github.com/apache/james-project/releases/tag/cassandra_migration_v1_to_v2";>cassandra_migration_v1_to_v2</a></p>
+
+      
+<p>Goal is to create a messageV2 table that aims at replacing message table. 
Message table is both storing message
+        metadata and blobs. It have been proven inefficient. Instead version 2 
is chunking message blobs and storing it
+        in an other table. The migration process involves moving all messages 
from message table to messageV2 table
+        (contains only metadata) and blobs / blobParts tables.</p>
+
+      
+<p>Read more about this migration <a class="externalLink" 
href="https://medium.com/p/7e8607eb3c4f";>here</a>.</p>
+
+      
+<p>Summary of available options for this migration:</p>
+
+      
+<dl>
+        
+<dt><b>migration.v1.v2.on.the.fly</b></dt>
+        
+<dd>Only available on tag cassandra_migration_v1_to_v2. Optional. Defaults to 
false.<br /> Controls wether v1 to v2 migration should be run on the fly.</dd>
+        
+<dt><b>migration.v1.v2.thread.count</b></dt>
+        
+<dd>Only available on tag cassandra_migration_v1_to_v2. Optional. Defaults to 
2.<br /> Controls the number of threads used to asynchronously migrate from v1 
to v2.</dd>
+        
+<dt><b>migration.v1.v2.queue.length</b></dt>
+        
+<dd>Only available on tag cassandra_migration_v1_to_v2. Optional. Defaults to 
1000.<br /> Controls the queue size of v1 to v2 migration task. Drops when 
full.</dd>
+        
+<dt><b>migration.v1.read.fetch.size</b></dt>
+        
+<dd>Only available on tag cassandra_migration_v1_to_v2. Optional. Defaults to 
10.<br /> Controls the fetch size of the request to retrieve all messages 
stored in V1 during the migration process.</dd>
+      </dl>
+
+    </div>
+
+    
+<div class="section">
+<h3><a name="From_V2_to_V3"></a>From V2 to V3</h3>
+
+      
+<p>Migration tag on git repository: <a class="externalLink" 
href="https://github.com/apache/james-project/releases/tag/cassandra_migration_v2_to_v3";>cassandra_migration_v2_to_v3</a></p>
+
+      
+<p>Goal is to drop <b>message</b> table. After this migration, one can 
manually delete this table.</p>
+
+    </div>
+
+    
+<div class="section">
+<h3><a name="From_V3_to_V4"></a>From V3 to V4</h3>
+
+      
+<p>Migration tag on git repository: <a class="externalLink" 
href="https://github.com/apache/james-project/releases/tag/cassandra_migration_v3_to_v4";>cassandra_migration_v3_to_v4</a></p>
+
+      
+<p>Goal is to store attachments in the blob tables.</p>
+
+      
+<p>Summary of available options for this migration:</p>
+
+      
+<dl>
+        
+<dt><b>attachment.v2.migration.read.timeout</b></dt>
+        
+<dd>Optional. Defaults to one day.<br /> Controls how many milliseconds before 
the read on attachment v1 time out.</dd>
+      </dl>
+      
+    </div>
+
+    
+<div class="section">
+<h3><a name="From_V4_to_V5"></a>From V4 to V5</h3>
+
+      
+<p>Migration tag on git repository: <a class="externalLink" 
href="https://github.com/apache/james-project/releases/tag/cassandra_migration_v4_to_v5";>cassandra_migration_v4_to_v5</a></p>
+
+      
+<p>Goal is to store attachment ids in the separated AttachmentMessageId 
table.</p>
+
+      
+<p>Summary of available options for this migration:</p>
+
+      
+<dl>
+        
+<dt><b>message.attachmentids.read.timeout</b></dt>
+        
+<dd>Optional. Defaults to one day.<br /> Controls how many milliseconds before 
the read attachment ids on message time out.</dd>
+      </dl>
+
+    </div>
+
   </div>
 
 
@@ -497,7 +565,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.      
                 


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

Reply via email to