You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2017/06/04 12:57:14 UTC

[5/5] incubator-ponymail-site git commit: rebuild

rebuild


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/d4b17449
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/d4b17449
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/d4b17449

Branch: refs/heads/asf-site
Commit: d4b1744989d03e41102ac69c4f2b1f28aad0aab9
Parents: 005d4af
Author: Daniel Gruno <hu...@apache.org>
Authored: Sun Jun 4 14:56:43 2017 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Sun Jun 4 14:56:43 2017 +0200

----------------------------------------------------------------------
 content/about.html               | 25 ++++++++++++++++---------
 content/contribute.html          | 25 ++++++++++++++++---------
 content/docs.html                | 25 ++++++++++++++++---------
 content/docs/api.html            | 25 ++++++++++++++++---------
 content/docs/archiving.html      | 25 ++++++++++++++++---------
 content/docs/building.html       | 25 ++++++++++++++++---------
 content/docs/contributing.html   | 25 ++++++++++++++++---------
 content/docs/importing.html      | 25 ++++++++++++++++---------
 content/docs/install.centos.html | 25 ++++++++++++++++---------
 content/docs/install.debian.html | 25 ++++++++++++++++---------
 content/docs/install.fedora.html | 25 ++++++++++++++++---------
 content/docs/install.ubuntu.html | 25 ++++++++++++++++---------
 content/docs/installing.html     | 25 ++++++++++++++++---------
 content/downloads.html           | 25 ++++++++++++++++---------
 content/index.html               | 25 ++++++++++++++++---------
 content/source.html              | 25 ++++++++++++++++---------
 content/support.html             | 25 ++++++++++++++++---------
 17 files changed, 272 insertions(+), 153 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/about.html
----------------------------------------------------------------------
diff --git a/content/about.html b/content/about.html
index abf18db..8a830d7 100644
--- a/content/about.html
+++ b/content/about.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -90,9 +89,10 @@ into our projects.</p>
      <li>Tony Stevenson / pctony - committer</li>
      <li>Ulises Cerviño Beresi / ucb - committer</li>
  </ul></p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -103,10 +103,17 @@ into our projects.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/contribute.html
----------------------------------------------------------------------
diff --git a/content/contribute.html b/content/contribute.html
index 48b1cc3..e38de16 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -118,9 +117,10 @@ up to date with the latest master changes anyway, always rebase it;
 don't git pull or introduce merge commits, as it will complicate the
 rebasing process and will make it difficult to merge the pull request in
 a clean way</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -131,10 +131,17 @@ a clean way</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs.html
----------------------------------------------------------------------
diff --git a/content/docs.html b/content/docs.html
index b296547..402376e 100644
--- a/content/docs.html
+++ b/content/docs.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -55,9 +54,10 @@
 <li>import mbox data with import-mbox.py if need be (see <a href="/docs/importing.html">this doc</a> for details)</li>
 <li>All done :) But please see the <a href="/docs/installing.html">detailed installation instructions</a> for more details</li>
 </ol>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -68,10 +68,17 @@
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/api.html
----------------------------------------------------------------------
diff --git a/content/docs/api.html b/content/docs/api.html
index 78a8143..95703a2 100644
--- a/content/docs/api.html
+++ b/content/docs/api.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -200,9 +199,10 @@
 <pre>
 TBA
 </pre>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -213,10 +213,17 @@ TBA
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/archiving.html
----------------------------------------------------------------------
diff --git a/content/docs/archiving.html b/content/docs/archiving.html
index f9b36a1..f5ad7dd 100644
--- a/content/docs/archiving.html
+++ b/content/docs/archiving.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -109,9 +108,10 @@ setting for this (in <code>ponymail.cfg</code>). </p>
   #Replace '<em>.bar.tld' with '</em>.blorg.bar.tld'
   cropout:  &lt;([a-z]+).bar.tld&gt; &lt;\1.blorg.bar.tld&gt;
 </pre></p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -122,10 +122,17 @@ setting for this (in <code>ponymail.cfg</code>). </p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/building.html
----------------------------------------------------------------------
diff --git a/content/docs/building.html b/content/docs/building.html
index e6c9908..8870665 100644
--- a/content/docs/building.html
+++ b/content/docs/building.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -52,9 +51,10 @@ $
 </code></pre>
 <p>You may choose to commit the initial JS changes first before 
 committing the new combined JS, but that's up to you.</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -65,10 +65,17 @@ committing the new combined JS, but that's up to you.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/contributing.html
----------------------------------------------------------------------
diff --git a/content/docs/contributing.html b/content/docs/contributing.html
index 764e314..d2e3899 100644
--- a/content/docs/contributing.html
+++ b/content/docs/contributing.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -58,9 +57,10 @@ and pull requests are welcome.</p>
 <h2 id='chat'>Chat<a href='#chat' style='color: rgba(0,0,0,0);'>&para;</a></h2>
 <p>IRC:
     - #ponymail on Freenode</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -71,10 +71,17 @@ and pull requests are welcome.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/importing.html
----------------------------------------------------------------------
diff --git a/content/docs/importing.html b/content/docs/importing.html
index 206354c..193b1a5 100644
--- a/content/docs/importing.html
+++ b/content/docs/importing.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -85,9 +84,10 @@ circumvent this by using the <code>--ignorebody "foo"</code> arg to ignore all t
 They can be found in gzip format at <a href="http://ponymail.info/mboxes/">http://ponymail.info/mboxes/</a></p>
 <p>(*) The digest depends on the [archiver] generator setting in ponymail.cfg
 If that varies between imports, then duplicates will occur</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -98,10 +98,17 @@ If that varies between imports, then duplicates will occur</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/install.centos.html
----------------------------------------------------------------------
diff --git a/content/docs/install.centos.html b/content/docs/install.centos.html
index ddcb3d5..aa9c265 100644
--- a/content/docs/install.centos.html
+++ b/content/docs/install.centos.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -155,9 +154,10 @@ elasticsearch settings once Pony mail is up and running.</p>
 <p>Refer to the <a href="installing.html">General installation documentation</a> for
 detailed information about archiving messages, OAuth, mail settings and
 much more.</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -168,10 +168,17 @@ much more.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/install.debian.html
----------------------------------------------------------------------
diff --git a/content/docs/install.debian.html b/content/docs/install.debian.html
index d94b209..34cb877 100644
--- a/content/docs/install.debian.html
+++ b/content/docs/install.debian.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -102,9 +101,10 @@ elasticsearch settings once Pony mail is up and running.</p>
 <p>Refer to the <a href="installing.html">General installation documentation</a> for
 detailed information about archiving messages, OAuth, mail settings and
 much more.</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -115,10 +115,17 @@ much more.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/install.fedora.html
----------------------------------------------------------------------
diff --git a/content/docs/install.fedora.html b/content/docs/install.fedora.html
index 8abce76..0efe942 100644
--- a/content/docs/install.fedora.html
+++ b/content/docs/install.fedora.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -130,9 +129,10 @@ elasticsearch settings once Pony mail is up and running.</p>
 <p>Refer to the <a href="installing.html">General installation documentation</a> for
 detailed information about archiving messages, OAuth, mail settings and
 much more.</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -143,10 +143,17 @@ much more.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/install.ubuntu.html
----------------------------------------------------------------------
diff --git a/content/docs/install.ubuntu.html b/content/docs/install.ubuntu.html
index 6738757..e15681a 100644
--- a/content/docs/install.ubuntu.html
+++ b/content/docs/install.ubuntu.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -116,9 +115,10 @@ elasticsearch settings once Pony mail is up and running.</p>
 <p>Refer to the <a href="installing.html">General installation documentation</a> for
 detailed information about archiving messages, OAuth, mail settings and
 much more.</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -129,10 +129,17 @@ much more.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/docs/installing.html
----------------------------------------------------------------------
diff --git a/content/docs/installing.html b/content/docs/installing.html
index f158715..0801103 100644
--- a/content/docs/installing.html
+++ b/content/docs/installing.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -211,9 +210,10 @@ a bytestring to generate an ID. Medium is recommended for most setups
 (especially clustered setups), while full can be used for single-machine
 setups.
 N.B. At present, all the generators have issues, see (#176 #177 #178)</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -224,10 +224,17 @@ N.B. At present, all the generators have issues, see (#176 #177 #178)</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index e0376f2..6606bf1 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -58,9 +57,10 @@
 <li>Added a dry-run feature to the list editor (no changes made)</li>
 <li>Added a single-message edit feature for the liste editor</li>
 </ul>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -71,10 +71,17 @@
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 2e0b9c2..67de0a2 100644
--- a/content/index.html
+++ b/content/index.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -100,9 +99,10 @@ list size and available bandwidth.</p>
 <li>Set up notification system (depends on reply system) (works, but still <em>WIP!</em>)</li>
 <li>Have it work with ES with auth mode or via HTTPS</li>
 </ul>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -113,10 +113,17 @@ list size and available bandwidth.</p>
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/source.html
----------------------------------------------------------------------
diff --git a/content/source.html b/content/source.html
index 9add2e3..98f05c7 100644
--- a/content/source.html
+++ b/content/source.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -43,9 +42,10 @@
 <a href="https://git-wip-us.apache.org/repos/asf/incubator-ponymail-site.git">https://git-wip-us.apache.org/repos/asf/incubator-ponymail-site.git</a></p>
 <p>e.g. git clone -b asf-site https://git-wip-us.apache.org/repos/asf/incubator-ponymail-site.git ponymail-site</p>
 <p>See the BUILDING.txt file in the repo for instructions.</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -56,10 +56,17 @@
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/d4b17449/content/support.html
----------------------------------------------------------------------
diff --git a/content/support.html b/content/support.html
index 5bb7c3b..d867f3a 100644
--- a/content/support.html
+++ b/content/support.html
@@ -31,7 +31,6 @@
             <li><a href="/support.html"><i class="fa fa-question-circle"></i><span>Get support</span></a></li>
             <li><a href="/contribute.html"><i class="fa fa-share-alt"></i><span>Contribute</span></a></li>
             <li><a href="/about.html"><i class="fa fa-users"></i><span>About</span></a></li>
-            <li><a href="/apache.html"><i class="fa fa-info-circle"></i><span>ASF</span></a></li>
         </ul>
     </div>
 </div>
@@ -76,9 +75,10 @@
 <p>We are also on IRC, if you fancy a quick chat. You can find us in #PonyMail on Freenode.</p>
 <h2 id='securityissues'>Security issues<a href='#securityissues' style='color: rgba(0,0,0,0);'>&para;</a></h2>
 <p>Security issues and inquiries should be sent to: security@apache.org</p>
-<h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="display: inline-block; background: #BBB; margin: -10px; padding: 10px;">
+    <h4><a id="disclaimer"></a>Disclaimer</h4>
+<div style="width: 65%; float: left;">
 <p style="line-height: 12pt;">
-    <a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" align="right" width="220px" style="margin-left: 6px;"/></a>
     Apache Pony Mail (Incubating) is an effort undergoing incubation at
     The Apache Software Foundation (ASF), sponsored by the <a href="https://incubator.apache.org">
     Apache Incubator</a>. Incubation is required of all newly accepted projects
@@ -89,10 +89,17 @@
     completeness or stability of the code, it does indicate that the
     project has yet to be fully endorsed by the ASF.
 </p>
-<p style="font-size: 9pt; line-height: 12pt; text-align: center;">
-    Copyright 2016, the <a href="http://www.apache.org/">Apache Software Foundation</a>.<br/>
-    Apache Pony Mail and the Apache Pony Mail logo are trademarks of the Apache Software Foundation.
-    Apache and the Apache feather are registered trademarks of the
-    Apache Software Foundation.
-</p>
+</div>
+<div style="width: 20%; float: left; padding-top: 16px; margin-left: -8px;">
+<a href="https://incubator.apache.org"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png"/></a>
+</div>
+<div style="width: 15%; float: left; line-height: 15px; padding-left: 22px;">
+    <a class="item" target="_blank" href="http://incubator.apache.org/">Apache Incubator</a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/">About the ASF<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/security/">Security<span></span></a><br/>
+            <a class="item" target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a><br/>
+</div>
+</div>
 </body></html>