You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by sv...@apache.org on 2020/12/28 17:31:12 UTC

svn commit: r1884886 [1/7] - in /maven/doxia/website/content: ./ book/ css/ developers/ doxia-example-book/ fonts/ issues/ js/ macros/ modules/ references/

Author: svn-site-role
Date: Mon Dec 28 17:31:11 2020
New Revision: 1884886

Log:
Site checkin for project Doxia Site

Added:
    maven/doxia/website/content/css/apache-maven-fluido-1.9.min.css
    maven/doxia/website/content/js/apache-maven-fluido-1.9.min.js
Removed:
    maven/doxia/website/content/css/apache-maven-fluido-1.7.min.css
    maven/doxia/website/content/js/apache-maven-fluido-1.7.min.js
Modified:
    maven/doxia/website/content/book/index.html
    maven/doxia/website/content/ci-management.html
    maven/doxia/website/content/css/print.css
    maven/doxia/website/content/developers/index.html
    maven/doxia/website/content/developers/macros.html
    maven/doxia/website/content/developers/modules.html
    maven/doxia/website/content/developers/sink.html
    maven/doxia/website/content/downloads.html
    maven/doxia/website/content/doxia-example-book/aegis-binding.html
    maven/doxia/website/content/doxia-example-book/bind.html
    maven/doxia/website/content/doxia-example-book/bindings.html
    maven/doxia/website/content/doxia-example-book/castor.html
    maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
    maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
    maven/doxia/website/content/doxia-example-book/http-transport.html
    maven/doxia/website/content/doxia-example-book/index.html
    maven/doxia/website/content/doxia-example-book/jms-transport.html
    maven/doxia/website/content/doxia-example-book/local-transport.html
    maven/doxia/website/content/doxia-example-book/transport-and-channel-api.html
    maven/doxia/website/content/doxia-example-book/transports.html
    maven/doxia/website/content/faq.html
    maven/doxia/website/content/fonts/glyphicons-halflings-regular.eot
    maven/doxia/website/content/fonts/glyphicons-halflings-regular.svg
    maven/doxia/website/content/fonts/glyphicons-halflings-regular.ttf
    maven/doxia/website/content/fonts/glyphicons-halflings-regular.woff
    maven/doxia/website/content/index.html
    maven/doxia/website/content/issue-management.html
    maven/doxia/website/content/issues/index.html
    maven/doxia/website/content/macros/index.html
    maven/doxia/website/content/macros/swf-macro.html
    maven/doxia/website/content/mailing-lists.html
    maven/doxia/website/content/modules/index.html
    maven/doxia/website/content/overview.html
    maven/doxia/website/content/project-info.html
    maven/doxia/website/content/references/apt-format.html
    maven/doxia/website/content/references/doxia-apt.html
    maven/doxia/website/content/references/fml-format.html
    maven/doxia/website/content/references/index.html
    maven/doxia/website/content/references/xdoc-format.html
    maven/doxia/website/content/resources.html
    maven/doxia/website/content/scm.html
    maven/doxia/website/content/team.html

Modified: maven/doxia/website/content/book/index.html
==============================================================================
--- maven/doxia/website/content/book/index.html (original)
+++ maven/doxia/website/content/book/index.html Mon Dec 28 17:31:11 2020
@@ -1,74 +1,75 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/book/index.apt at 2020-12-22
- | Rendered using Apache Maven Fluido Skin 1.7
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/book/index.apt at 2020-12-28
+ | Rendered using Apache Maven Fluido Skin 1.9
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
     <meta name="author" content="Trygve Laugstol
 Vincent Siveton" />
-    <meta name="Date-Creation-yyyymmdd" content="20120413" />
-    <meta name="Date-Revision-yyyymmdd" content="20201222" />
-    <meta http-equiv="Content-Language" content="en" />
+    <meta name="date" content="2012-04-13" />
     <title>Doxia &#x2013; Writing Books in Doxia</title>
-    <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../css/apache-maven-fluido-1.9.min.css" />
     <link rel="stylesheet" href="../css/site.css" />
     <link rel="stylesheet" href="../css/print.css" media="print" />
-    <script type="text/javascript" src="../js/apache-maven-fluido-1.7.min.js"></script>
+    <script src="../js/apache-maven-fluido-1.9.min.js"></script>
     <!-- Google Analytics -->
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-140879-1']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-140879-1', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
     </script>
   </head>
   <body class="topBarDisabled">
     <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
-        <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
-        <div class="clear"><hr/></div>
-      </div>
+      <header>
+        <div id="banner">
+          <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
+          <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
+          <div class="clear"><hr/></div>
+        </div>
 
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
+        <div id="breadcrumbs">
+          <ul class="breadcrumb">
       <li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Maven">Maven</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Doxia">Doxia</a><span class="divider">/</span></li>
     <li class="active ">Writing Books in Doxia <a href="https://github.com/apache/maven-doxia-site/tree/master/content/apt/book/index.apt"><img src="../images/accessories-text-editor.png" title="Edit" /></a></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-22</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-28</li>
       <li class="pull-right"><a href="../scm.html" title="Get Sources">Get Sources</a></li>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </header>
       <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">About Doxia</li>
+        <header id="leftColumn" class="span2">
+          <nav class="well sidebar-nav">
+  <ul class="nav nav-list">
+   <li class="nav-header">About Doxia</li>
     <li><a href="../index.html" title="What is Doxia?"><span class="none"></span>What is Doxia?</a></li>
     <li><a href="../overview.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../downloads.html" title="Downloads"><span class="none"></span>Downloads</a></li>
     <li><a href="../faq.html" title="FAQ"><span class="none"></span>FAQ</a></li>
-      <li class="nav-header">Documentation</li>
+   <li class="nav-header">Documentation</li>
     <li><a href="../references/index.html" title="Format References"><span class="icon-chevron-right"></span>Format References</a></li>
     <li><a href="../modules/index.html" title="Doxia Modules Guide"><span class="none"></span>Doxia Modules Guide</a></li>
     <li><a href="../macros/index.html" title="Doxia Macros Guide"><span class="none"></span>Doxia Macros Guide</a></li>
     <li class="active"><a href="#"><span class="none"></span>Writing Books</a></li>
     <li><a href="../issues/index.html" title="Issues &amp; Gotchas"><span class="none"></span>Issues &amp; Gotchas</a></li>
     <li><a href="../resources.html" title="External Resources"><span class="none"></span>External Resources</a></li>
-      <li class="nav-header">Developer Docs</li>
+   <li class="nav-header">Developer Docs</li>
     <li><a href="../developers/index.html" title="Developer Centre"><span class="icon-chevron-right"></span>Developer Centre</a></li>
     <li><a href="../doxia-tools/index.html" title="Doxia Tools"><span class="none"></span>Doxia Tools</a></li>
-      <li class="nav-header">Project Documentation</li>
+   <li class="nav-header">Project Documentation</li>
     <li><a href="../project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
-      <li class="nav-header">Maven Projects</li>
+   <li class="nav-header">Maven Projects</li>
     <li><a href="../../archetype/index.html" title="Archetype"><span class="none"></span>Archetype</a></li>
     <li><a href="../../resolver/index.html" title="Artifact Resolver"><span class="none"></span>Artifact Resolver</a></li>
     <li><a href="../index.html" title="Doxia"><span class="none"></span>Doxia</a></li>
@@ -84,32 +85,33 @@ Vincent Siveton" />
     <li><a href="../../skins/index.html" title="Skins"><span class="none"></span>Skins</a></li>
     <li><a href="../../surefire/index.html" title="Surefire"><span class="none"></span>Surefire</a></li>
     <li><a href="../../wagon/index.html" title="Wagon"><span class="none"></span>Wagon</a></li>
-      <li class="nav-header">ASF</li>
+   <li class="nav-header">ASF</li>
     <li><a href="https://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How Apache Works"><span class="none"></span>How Apache Works</a></li>
     <li><a href="https://www.apache.org/foundation/" class="externalLink" title="Foundation"><span class="none"></span>Foundation</a></li>
     <li><a href="https://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsoring Apache"><span class="none"></span>Sponsoring Apache</a></li>
     <li><a href="https://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks"><span class="none"></span>Thanks</a></li>
-</ul>
+  </ul>
+          </nav>
+          <div class="well sidebar-nav">
 <form id="search-form" action="https://www.google.com/search" method="get" >
   <input value="maven.apache.org/doxia/" name="sitesearch" type="hidden"/>
   <input class="search-query" name="q" id="query" type="text" />
 </form>
-<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-    <div id="twitter">
+<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
+            <hr />
+            <div id="poweredBy">
+              <div class="clear"></div>
+    <div id="twitter" style="border:none; margin-top: 10px">
     <a href="https://twitter.com/ASFMavenProject" class="twitter-follow-button" data-show-count="false" data-align="left" data-size="medium" data-show-screen-name="true" data-lang="en">Follow ASFMavenProject</a>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
     </div>
-            <div class="clear"></div>
-            <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../images/logos/maven-feather.png" /></a>
             </div>
           </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
+        </header>
+        <main id="bodyColumn"  class="span10" >
 <section>
 <h2><a name="Introduction"></a>Introduction</h2>
 <p>Doxia allows you to write books like user manuals and guides in any format supported by Doxia. Combined with the Doxia Book Maven you are able to include the manuals directly in your generated site with links to the off-line friendly formats like XDoc, PDF, RTF and LaTeX.</p>
@@ -203,16 +205,16 @@ Vincent Siveton" />
   &lt;/configuration&gt;
 &lt;/plugin&gt;
 </pre></div></section></section>
-        </div>
+        </main>
       </div>
     </div>
     <hr/>
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2005&#x2013;2020
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
+            <p>&#169;      2005&#x2013;2020
+<a href="https://www.apache.org/">The Apache Software Foundation</a>
+</p>
         </div>
       </div>
     </footer>

Modified: maven/doxia/website/content/ci-management.html
==============================================================================
--- maven/doxia/website/content/ci-management.html (original)
+++ maven/doxia/website/content/ci-management.html Mon Dec 28 17:31:11 2020
@@ -1,80 +1,80 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.1.1:ci-management at 2020-12-22
- | Rendered using Apache Maven Fluido Skin 1.7
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.1.1:ci-management at 2020-12-28
+ | Rendered using Apache Maven Fluido Skin 1.9
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20201222" />
-    <meta http-equiv="Content-Language" content="en" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
     <title>Doxia &#x2013; CI Management</title>
-    <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" />
     <link rel="stylesheet" href="./css/site.css" />
     <link rel="stylesheet" href="./css/print.css" media="print" />
-    <script type="text/javascript" src="./js/apache-maven-fluido-1.7.min.js"></script>
+    <script src="./js/apache-maven-fluido-1.9.min.js"></script>
     <!-- Google Analytics -->
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-140879-1']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-140879-1', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
     </script>
   </head>
   <body class="topBarDisabled">
     <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
-        <div class="pull-right"><a href="./" id="bannerRight"><img src="images/doxia-logo.png"  alt="Doxia"/></a></div>
-        <div class="clear"><hr/></div>
-      </div>
+      <header>
+        <div id="banner">
+          <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
+          <div class="pull-right"><a href="./" id="bannerRight"><img src="images/doxia-logo.png"  alt="Doxia"/></a></div>
+          <div class="clear"><hr/></div>
+        </div>
 
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
+        <div id="breadcrumbs">
+          <ul class="breadcrumb">
       <li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Maven">Maven</a><span class="divider">/</span></li>
       <li class=""><a href="index.html" title="Doxia">Doxia</a><span class="divider">/</span></li>
     <li class="active ">CI Management</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-22</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-28</li>
       <li class="pull-right"><a href="scm.html" title="Get Sources">Get Sources</a></li>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </header>
       <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">About Doxia</li>
+        <header id="leftColumn" class="span2">
+          <nav class="well sidebar-nav">
+  <ul class="nav nav-list">
+   <li class="nav-header">About Doxia</li>
     <li><a href="index.html" title="What is Doxia?"><span class="none"></span>What is Doxia?</a></li>
     <li><a href="overview.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="downloads.html" title="Downloads"><span class="none"></span>Downloads</a></li>
     <li><a href="faq.html" title="FAQ"><span class="none"></span>FAQ</a></li>
-      <li class="nav-header">Documentation</li>
+   <li class="nav-header">Documentation</li>
     <li><a href="references/index.html" title="Format References"><span class="icon-chevron-right"></span>Format References</a></li>
     <li><a href="modules/index.html" title="Doxia Modules Guide"><span class="none"></span>Doxia Modules Guide</a></li>
     <li><a href="macros/index.html" title="Doxia Macros Guide"><span class="none"></span>Doxia Macros Guide</a></li>
     <li><a href="book/index.html" title="Writing Books"><span class="none"></span>Writing Books</a></li>
     <li><a href="issues/index.html" title="Issues &amp; Gotchas"><span class="none"></span>Issues &amp; Gotchas</a></li>
     <li><a href="resources.html" title="External Resources"><span class="none"></span>External Resources</a></li>
-      <li class="nav-header">Developer Docs</li>
+   <li class="nav-header">Developer Docs</li>
     <li><a href="developers/index.html" title="Developer Centre"><span class="icon-chevron-right"></span>Developer Centre</a></li>
     <li><a href="doxia-tools/index.html" title="Doxia Tools"><span class="none"></span>Doxia Tools</a></li>
-      <li class="nav-header">Project Documentation</li>
+   <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
-    <ul class="nav nav-list">
-    <li><a href="index.html" title="About"><span class="none"></span>About</a></li>
-    <li><a href="team.html" title="Team"><span class="none"></span>Team</a></li>
-    <li><a href="mailing-lists.html" title="Mailing Lists"><span class="none"></span>Mailing Lists</a></li>
-    <li><a href="scm.html" title="Source Code Management"><span class="none"></span>Source Code Management</a></li>
-    <li><a href="issue-management.html" title="Issue Management"><span class="none"></span>Issue Management</a></li>
-    <li class="active"><a href="#"><span class="none"></span>CI Management</a></li>
-    </ul>
-</li>
-      <li class="nav-header">Maven Projects</li>
+     <ul class="nav nav-list">
+      <li><a href="index.html" title="About"><span class="none"></span>About</a></li>
+      <li><a href="team.html" title="Team"><span class="none"></span>Team</a></li>
+      <li><a href="mailing-lists.html" title="Mailing Lists"><span class="none"></span>Mailing Lists</a></li>
+      <li><a href="scm.html" title="Source Code Management"><span class="none"></span>Source Code Management</a></li>
+      <li><a href="issue-management.html" title="Issue Management"><span class="none"></span>Issue Management</a></li>
+      <li class="active"><a href="#"><span class="none"></span>CI Management</a></li>
+     </ul></li>
+   <li class="nav-header">Maven Projects</li>
     <li><a href="../archetype/index.html" title="Archetype"><span class="none"></span>Archetype</a></li>
     <li><a href="../resolver/index.html" title="Artifact Resolver"><span class="none"></span>Artifact Resolver</a></li>
     <li><a href="index.html" title="Doxia"><span class="none"></span>Doxia</a></li>
@@ -90,32 +90,33 @@
     <li><a href="../skins/index.html" title="Skins"><span class="none"></span>Skins</a></li>
     <li><a href="../surefire/index.html" title="Surefire"><span class="none"></span>Surefire</a></li>
     <li><a href="../wagon/index.html" title="Wagon"><span class="none"></span>Wagon</a></li>
-      <li class="nav-header">ASF</li>
+   <li class="nav-header">ASF</li>
     <li><a href="https://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How Apache Works"><span class="none"></span>How Apache Works</a></li>
     <li><a href="https://www.apache.org/foundation/" class="externalLink" title="Foundation"><span class="none"></span>Foundation</a></li>
     <li><a href="https://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsoring Apache"><span class="none"></span>Sponsoring Apache</a></li>
     <li><a href="https://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks"><span class="none"></span>Thanks</a></li>
-</ul>
+  </ul>
+          </nav>
+          <div class="well sidebar-nav">
 <form id="search-form" action="https://www.google.com/search" method="get" >
   <input value="maven.apache.org/doxia/" name="sitesearch" type="hidden"/>
   <input class="search-query" name="q" id="query" type="text" />
 </form>
-<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-    <div id="twitter">
+<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
+            <hr />
+            <div id="poweredBy">
+              <div class="clear"></div>
+    <div id="twitter" style="border:none; margin-top: 10px">
     <a href="https://twitter.com/ASFMavenProject" class="twitter-follow-button" data-show-count="false" data-align="left" data-size="medium" data-show-screen-name="true" data-lang="en">Follow ASFMavenProject</a>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
     </div>
-            <div class="clear"></div>
-            <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
             </div>
           </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
+        </header>
+        <main id="bodyColumn"  class="span10" >
 <section>
 <h2><a name="Overview"></a>Overview</h2><a name="Overview"></a>
 <p>This project uses <a class="externalLink" href="https://www.jenkins.io/">Jenkins</a>.</p></section><section>
@@ -124,16 +125,16 @@
 <div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="https://ci-builds.apache.org/job/Maven/job/maven-box/">https://ci-builds.apache.org/job/Maven/job/maven-box/</a></pre></div></section><section>
 <h2><a name="Notifiers"></a>Notifiers</h2><a name="Notifiers"></a>
 <p>No notifiers are defined. Please check back at a later date.</p></section>
-        </div>
+        </main>
       </div>
     </div>
     <hr/>
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2005&#x2013;2020
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
+            <p>&#169;      2005&#x2013;2020
+<a href="https://www.apache.org/">The Apache Software Foundation</a>
+</p>
         </div>
       </div>
     </footer>

Added: maven/doxia/website/content/css/apache-maven-fluido-1.9.min.css
==============================================================================
--- maven/doxia/website/content/css/apache-maven-fluido-1.9.min.css (added)
+++ maven/doxia/website/content/css/apache-maven-fluido-1.9.min.css Mon Dec 28 17:31:11 2020
@@ -0,0 +1,17 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.

[... 11 lines stripped ...]
Modified: maven/doxia/website/content/css/print.css
==============================================================================
--- maven/doxia/website/content/css/print.css (original)
+++ maven/doxia/website/content/css/print.css Mon Dec 28 17:31:11 2020
@@ -17,7 +17,5 @@
  * under the License.
  */
 
-/* $Id$ */
-
 #banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {display: none !important;}
 #bodyColumn, body.docs div.docs {margin: 0 !important;border: none !important}
\ No newline at end of file

Modified: maven/doxia/website/content/developers/index.html
==============================================================================
--- maven/doxia/website/content/developers/index.html (original)
+++ maven/doxia/website/content/developers/index.html Mon Dec 28 17:31:11 2020
@@ -1,81 +1,81 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/index.apt at 2020-12-22
- | Rendered using Apache Maven Fluido Skin 1.7
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/index.apt at 2020-12-28
+ | Rendered using Apache Maven Fluido Skin 1.9
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
     <meta name="author" content="Vincent Siveton" />
-    <meta name="Date-Creation-yyyymmdd" content="20080302" />
-    <meta name="Date-Revision-yyyymmdd" content="20201222" />
-    <meta http-equiv="Content-Language" content="en" />
+    <meta name="date" content="2008-03-02" />
     <title>Doxia &#x2013; Doxia Developers Centre</title>
-    <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../css/apache-maven-fluido-1.9.min.css" />
     <link rel="stylesheet" href="../css/site.css" />
     <link rel="stylesheet" href="../css/print.css" media="print" />
-    <script type="text/javascript" src="../js/apache-maven-fluido-1.7.min.js"></script>
+    <script src="../js/apache-maven-fluido-1.9.min.js"></script>
     <!-- Google Analytics -->
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-140879-1']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-140879-1', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
     </script>
   </head>
   <body class="topBarDisabled">
     <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
-        <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
-        <div class="clear"><hr/></div>
-      </div>
+      <header>
+        <div id="banner">
+          <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
+          <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
+          <div class="clear"><hr/></div>
+        </div>
 
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
+        <div id="breadcrumbs">
+          <ul class="breadcrumb">
       <li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Maven">Maven</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Doxia">Doxia</a><span class="divider">/</span></li>
     <li class="active ">Doxia Developers Centre <a href="https://github.com/apache/maven-doxia-site/tree/master/content/apt/developers/index.apt"><img src="../images/accessories-text-editor.png" title="Edit" /></a></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-22</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-28</li>
       <li class="pull-right"><a href="../scm.html" title="Get Sources">Get Sources</a></li>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </header>
       <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">About Doxia</li>
+        <header id="leftColumn" class="span2">
+          <nav class="well sidebar-nav">
+  <ul class="nav nav-list">
+   <li class="nav-header">About Doxia</li>
     <li><a href="../index.html" title="What is Doxia?"><span class="none"></span>What is Doxia?</a></li>
     <li><a href="../overview.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../downloads.html" title="Downloads"><span class="none"></span>Downloads</a></li>
     <li><a href="../faq.html" title="FAQ"><span class="none"></span>FAQ</a></li>
-      <li class="nav-header">Documentation</li>
+   <li class="nav-header">Documentation</li>
     <li><a href="../references/index.html" title="Format References"><span class="icon-chevron-right"></span>Format References</a></li>
     <li><a href="../modules/index.html" title="Doxia Modules Guide"><span class="none"></span>Doxia Modules Guide</a></li>
     <li><a href="../macros/index.html" title="Doxia Macros Guide"><span class="none"></span>Doxia Macros Guide</a></li>
     <li><a href="../book/index.html" title="Writing Books"><span class="none"></span>Writing Books</a></li>
     <li><a href="../issues/index.html" title="Issues &amp; Gotchas"><span class="none"></span>Issues &amp; Gotchas</a></li>
     <li><a href="../resources.html" title="External Resources"><span class="none"></span>External Resources</a></li>
-      <li class="nav-header">Developer Docs</li>
+   <li class="nav-header">Developer Docs</li>
     <li class="active"><a href="#"><span class="icon-chevron-down"></span>Developer Centre</a>
-    <ul class="nav nav-list">
-    <li><a href="../developers/modules.html" title="Create a Doxia Module"><span class="none"></span>Create a Doxia Module</a></li>
-    <li><a href="../developers/macros.html" title="Create a Doxia Macro"><span class="none"></span>Create a Doxia Macro</a></li>
-    <li><a href="../developers/sink.html" title="Using the Sink API"><span class="none"></span>Using the Sink API</a></li>
-    <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
-    <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
-    </ul>
-</li>
+     <ul class="nav nav-list">
+      <li><a href="../developers/modules.html" title="Create a Doxia Module"><span class="none"></span>Create a Doxia Module</a></li>
+      <li><a href="../developers/macros.html" title="Create a Doxia Macro"><span class="none"></span>Create a Doxia Macro</a></li>
+      <li><a href="../developers/sink.html" title="Using the Sink API"><span class="none"></span>Using the Sink API</a></li>
+      <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
+      <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
+     </ul></li>
     <li><a href="../doxia-tools/index.html" title="Doxia Tools"><span class="none"></span>Doxia Tools</a></li>
-      <li class="nav-header">Project Documentation</li>
+   <li class="nav-header">Project Documentation</li>
     <li><a href="../project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
-      <li class="nav-header">Maven Projects</li>
+   <li class="nav-header">Maven Projects</li>
     <li><a href="../../archetype/index.html" title="Archetype"><span class="none"></span>Archetype</a></li>
     <li><a href="../../resolver/index.html" title="Artifact Resolver"><span class="none"></span>Artifact Resolver</a></li>
     <li><a href="../index.html" title="Doxia"><span class="none"></span>Doxia</a></li>
@@ -91,32 +91,33 @@
     <li><a href="../../skins/index.html" title="Skins"><span class="none"></span>Skins</a></li>
     <li><a href="../../surefire/index.html" title="Surefire"><span class="none"></span>Surefire</a></li>
     <li><a href="../../wagon/index.html" title="Wagon"><span class="none"></span>Wagon</a></li>
-      <li class="nav-header">ASF</li>
+   <li class="nav-header">ASF</li>
     <li><a href="https://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How Apache Works"><span class="none"></span>How Apache Works</a></li>
     <li><a href="https://www.apache.org/foundation/" class="externalLink" title="Foundation"><span class="none"></span>Foundation</a></li>
     <li><a href="https://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsoring Apache"><span class="none"></span>Sponsoring Apache</a></li>
     <li><a href="https://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks"><span class="none"></span>Thanks</a></li>
-</ul>
+  </ul>
+          </nav>
+          <div class="well sidebar-nav">
 <form id="search-form" action="https://www.google.com/search" method="get" >
   <input value="maven.apache.org/doxia/" name="sitesearch" type="hidden"/>
   <input class="search-query" name="q" id="query" type="text" />
 </form>
-<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-    <div id="twitter">
+<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
+            <hr />
+            <div id="poweredBy">
+              <div class="clear"></div>
+    <div id="twitter" style="border:none; margin-top: 10px">
     <a href="https://twitter.com/ASFMavenProject" class="twitter-follow-button" data-show-count="false" data-align="left" data-size="medium" data-show-screen-name="true" data-lang="en">Follow ASFMavenProject</a>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
     </div>
-            <div class="clear"></div>
-            <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../images/logos/maven-feather.png" /></a>
             </div>
           </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
+        </header>
+        <main id="bodyColumn"  class="span10" >
 <section>
 <h2><a name="Doxia_Developers_Centre"></a>Doxia Developers Centre</h2>
 <p>This documentation centre is for those that are developing Doxia modules or macro.</p>
@@ -125,16 +126,16 @@
 <li><a href="./modules.html">Creating Doxia Modules</a></li>
 <li><a href="./macros.html">Creating Doxia Macros</a></li>
 <li><a href="./sink.html">Using the Doxia Sink API</a></li></ul></section>
-        </div>
+        </main>
       </div>
     </div>
     <hr/>
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2005&#x2013;2020
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
+            <p>&#169;      2005&#x2013;2020
+<a href="https://www.apache.org/">The Apache Software Foundation</a>
+</p>
         </div>
       </div>
     </footer>

Modified: maven/doxia/website/content/developers/macros.html
==============================================================================
--- maven/doxia/website/content/developers/macros.html (original)
+++ maven/doxia/website/content/developers/macros.html Mon Dec 28 17:31:11 2020
@@ -1,81 +1,81 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/macros.apt at 2020-12-22
- | Rendered using Apache Maven Fluido Skin 1.7
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/macros.apt at 2020-12-28
+ | Rendered using Apache Maven Fluido Skin 1.9
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
     <meta name="author" content="Vincent Siveton" />
-    <meta name="Date-Creation-yyyymmdd" content="20080302" />
-    <meta name="Date-Revision-yyyymmdd" content="20201222" />
-    <meta http-equiv="Content-Language" content="en" />
+    <meta name="date" content="2008-03-02" />
     <title>Doxia &#x2013; Doxia Developers Centre</title>
-    <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../css/apache-maven-fluido-1.9.min.css" />
     <link rel="stylesheet" href="../css/site.css" />
     <link rel="stylesheet" href="../css/print.css" media="print" />
-    <script type="text/javascript" src="../js/apache-maven-fluido-1.7.min.js"></script>
+    <script src="../js/apache-maven-fluido-1.9.min.js"></script>
     <!-- Google Analytics -->
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-140879-1']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-140879-1', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
     </script>
   </head>
   <body class="topBarDisabled">
     <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
-        <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
-        <div class="clear"><hr/></div>
-      </div>
+      <header>
+        <div id="banner">
+          <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
+          <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
+          <div class="clear"><hr/></div>
+        </div>
 
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
+        <div id="breadcrumbs">
+          <ul class="breadcrumb">
       <li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Maven">Maven</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Doxia">Doxia</a><span class="divider">/</span></li>
     <li class="active ">Doxia Developers Centre <a href="https://github.com/apache/maven-doxia-site/tree/master/content/apt/developers/macros.apt"><img src="../images/accessories-text-editor.png" title="Edit" /></a></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-22</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-28</li>
       <li class="pull-right"><a href="../scm.html" title="Get Sources">Get Sources</a></li>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </header>
       <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">About Doxia</li>
+        <header id="leftColumn" class="span2">
+          <nav class="well sidebar-nav">
+  <ul class="nav nav-list">
+   <li class="nav-header">About Doxia</li>
     <li><a href="../index.html" title="What is Doxia?"><span class="none"></span>What is Doxia?</a></li>
     <li><a href="../overview.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../downloads.html" title="Downloads"><span class="none"></span>Downloads</a></li>
     <li><a href="../faq.html" title="FAQ"><span class="none"></span>FAQ</a></li>
-      <li class="nav-header">Documentation</li>
+   <li class="nav-header">Documentation</li>
     <li><a href="../references/index.html" title="Format References"><span class="icon-chevron-right"></span>Format References</a></li>
     <li><a href="../modules/index.html" title="Doxia Modules Guide"><span class="none"></span>Doxia Modules Guide</a></li>
     <li><a href="../macros/index.html" title="Doxia Macros Guide"><span class="none"></span>Doxia Macros Guide</a></li>
     <li><a href="../book/index.html" title="Writing Books"><span class="none"></span>Writing Books</a></li>
     <li><a href="../issues/index.html" title="Issues &amp; Gotchas"><span class="none"></span>Issues &amp; Gotchas</a></li>
     <li><a href="../resources.html" title="External Resources"><span class="none"></span>External Resources</a></li>
-      <li class="nav-header">Developer Docs</li>
+   <li class="nav-header">Developer Docs</li>
     <li><a href="../developers/index.html" title="Developer Centre"><span class="icon-chevron-down"></span>Developer Centre</a>
-    <ul class="nav nav-list">
-    <li><a href="../developers/modules.html" title="Create a Doxia Module"><span class="none"></span>Create a Doxia Module</a></li>
-    <li class="active"><a href="#"><span class="none"></span>Create a Doxia Macro</a></li>
-    <li><a href="../developers/sink.html" title="Using the Sink API"><span class="none"></span>Using the Sink API</a></li>
-    <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
-    <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
-    </ul>
-</li>
+     <ul class="nav nav-list">
+      <li><a href="../developers/modules.html" title="Create a Doxia Module"><span class="none"></span>Create a Doxia Module</a></li>
+      <li class="active"><a href="#"><span class="none"></span>Create a Doxia Macro</a></li>
+      <li><a href="../developers/sink.html" title="Using the Sink API"><span class="none"></span>Using the Sink API</a></li>
+      <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
+      <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
+     </ul></li>
     <li><a href="../doxia-tools/index.html" title="Doxia Tools"><span class="none"></span>Doxia Tools</a></li>
-      <li class="nav-header">Project Documentation</li>
+   <li class="nav-header">Project Documentation</li>
     <li><a href="../project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
-      <li class="nav-header">Maven Projects</li>
+   <li class="nav-header">Maven Projects</li>
     <li><a href="../../archetype/index.html" title="Archetype"><span class="none"></span>Archetype</a></li>
     <li><a href="../../resolver/index.html" title="Artifact Resolver"><span class="none"></span>Artifact Resolver</a></li>
     <li><a href="../index.html" title="Doxia"><span class="none"></span>Doxia</a></li>
@@ -91,32 +91,33 @@
     <li><a href="../../skins/index.html" title="Skins"><span class="none"></span>Skins</a></li>
     <li><a href="../../surefire/index.html" title="Surefire"><span class="none"></span>Surefire</a></li>
     <li><a href="../../wagon/index.html" title="Wagon"><span class="none"></span>Wagon</a></li>
-      <li class="nav-header">ASF</li>
+   <li class="nav-header">ASF</li>
     <li><a href="https://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How Apache Works"><span class="none"></span>How Apache Works</a></li>
     <li><a href="https://www.apache.org/foundation/" class="externalLink" title="Foundation"><span class="none"></span>Foundation</a></li>
     <li><a href="https://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsoring Apache"><span class="none"></span>Sponsoring Apache</a></li>
     <li><a href="https://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks"><span class="none"></span>Thanks</a></li>
-</ul>
+  </ul>
+          </nav>
+          <div class="well sidebar-nav">
 <form id="search-form" action="https://www.google.com/search" method="get" >
   <input value="maven.apache.org/doxia/" name="sitesearch" type="hidden"/>
   <input class="search-query" name="q" id="query" type="text" />
 </form>
-<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-    <div id="twitter">
+<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
+            <hr />
+            <div id="poweredBy">
+              <div class="clear"></div>
+    <div id="twitter" style="border:none; margin-top: 10px">
     <a href="https://twitter.com/ASFMavenProject" class="twitter-follow-button" data-show-count="false" data-align="left" data-size="medium" data-show-screen-name="true" data-lang="en">Follow ASFMavenProject</a>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
     </div>
-            <div class="clear"></div>
-            <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../images/logos/maven-feather.png" /></a>
             </div>
           </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
+        </header>
+        <main id="bodyColumn"  class="span10" >
 <section>
 <h2><a name="Create_a_New_Doxia_Macro"></a>Create a New Doxia Macro</h2>
 <p>You need to add the following <a class="externalLink" href="https://codehaus-plexus.github.io/plexus-containers/plexus-component-metadata/">plexus-component-metadata plugin</a> configuration to generate the correct Plexus <i>component.xml</i> file from annotations for the project containing your macro:</p>
@@ -175,16 +176,16 @@ public class MyMacro
 <li><a href="../doxia/apidocs/index.html">Doxia API Reference</a></li>
 <li><a href="../doxia-sitetools/apidocs/index.html">Doxia Sitetools API Reference</a></li>
 <li><a href="/plugin-developers/cookbook/plexus-plugin-upgrade.html">Upgrading from Plexus Javadoc Tags to Plexus Java Annotations</a></li></ul></section></section>
-        </div>
+        </main>
       </div>
     </div>
     <hr/>
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2005&#x2013;2020
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
+            <p>&#169;      2005&#x2013;2020
+<a href="https://www.apache.org/">The Apache Software Foundation</a>
+</p>
         </div>
       </div>
     </footer>

Modified: maven/doxia/website/content/developers/modules.html
==============================================================================
--- maven/doxia/website/content/developers/modules.html (original)
+++ maven/doxia/website/content/developers/modules.html Mon Dec 28 17:31:11 2020
@@ -1,81 +1,81 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/modules.apt.vm at 2020-12-22
- | Rendered using Apache Maven Fluido Skin 1.7
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/modules.apt.vm at 2020-12-28
+ | Rendered using Apache Maven Fluido Skin 1.9
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
     <meta name="author" content="Vincent Siveton" />
-    <meta name="Date-Creation-yyyymmdd" content="20080302" />
-    <meta name="Date-Revision-yyyymmdd" content="20201222" />
-    <meta http-equiv="Content-Language" content="en" />
+    <meta name="date" content="2008-03-02" />
     <title>Doxia &#x2013; Doxia Developers Centre</title>
-    <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../css/apache-maven-fluido-1.9.min.css" />
     <link rel="stylesheet" href="../css/site.css" />
     <link rel="stylesheet" href="../css/print.css" media="print" />
-    <script type="text/javascript" src="../js/apache-maven-fluido-1.7.min.js"></script>
+    <script src="../js/apache-maven-fluido-1.9.min.js"></script>
     <!-- Google Analytics -->
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-140879-1']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-140879-1', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
     </script>
   </head>
   <body class="topBarDisabled">
     <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
-        <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
-        <div class="clear"><hr/></div>
-      </div>
+      <header>
+        <div id="banner">
+          <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
+          <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
+          <div class="clear"><hr/></div>
+        </div>
 
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
+        <div id="breadcrumbs">
+          <ul class="breadcrumb">
       <li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Maven">Maven</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Doxia">Doxia</a><span class="divider">/</span></li>
     <li class="active ">Doxia Developers Centre <a href="https://github.com/apache/maven-doxia-site/tree/master/content/apt/developers/modules.apt.vm"><img src="../images/accessories-text-editor.png" title="Edit" /></a></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-22</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-28</li>
       <li class="pull-right"><a href="../scm.html" title="Get Sources">Get Sources</a></li>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </header>
       <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">About Doxia</li>
+        <header id="leftColumn" class="span2">
+          <nav class="well sidebar-nav">
+  <ul class="nav nav-list">
+   <li class="nav-header">About Doxia</li>
     <li><a href="../index.html" title="What is Doxia?"><span class="none"></span>What is Doxia?</a></li>
     <li><a href="../overview.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../downloads.html" title="Downloads"><span class="none"></span>Downloads</a></li>
     <li><a href="../faq.html" title="FAQ"><span class="none"></span>FAQ</a></li>
-      <li class="nav-header">Documentation</li>
+   <li class="nav-header">Documentation</li>
     <li><a href="../references/index.html" title="Format References"><span class="icon-chevron-right"></span>Format References</a></li>
     <li><a href="../modules/index.html" title="Doxia Modules Guide"><span class="none"></span>Doxia Modules Guide</a></li>
     <li><a href="../macros/index.html" title="Doxia Macros Guide"><span class="none"></span>Doxia Macros Guide</a></li>
     <li><a href="../book/index.html" title="Writing Books"><span class="none"></span>Writing Books</a></li>
     <li><a href="../issues/index.html" title="Issues &amp; Gotchas"><span class="none"></span>Issues &amp; Gotchas</a></li>
     <li><a href="../resources.html" title="External Resources"><span class="none"></span>External Resources</a></li>
-      <li class="nav-header">Developer Docs</li>
+   <li class="nav-header">Developer Docs</li>
     <li><a href="../developers/index.html" title="Developer Centre"><span class="icon-chevron-down"></span>Developer Centre</a>
-    <ul class="nav nav-list">
-    <li class="active"><a href="#"><span class="none"></span>Create a Doxia Module</a></li>
-    <li><a href="../developers/macros.html" title="Create a Doxia Macro"><span class="none"></span>Create a Doxia Macro</a></li>
-    <li><a href="../developers/sink.html" title="Using the Sink API"><span class="none"></span>Using the Sink API</a></li>
-    <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
-    <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
-    </ul>
-</li>
+     <ul class="nav nav-list">
+      <li class="active"><a href="#"><span class="none"></span>Create a Doxia Module</a></li>
+      <li><a href="../developers/macros.html" title="Create a Doxia Macro"><span class="none"></span>Create a Doxia Macro</a></li>
+      <li><a href="../developers/sink.html" title="Using the Sink API"><span class="none"></span>Using the Sink API</a></li>
+      <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
+      <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
+     </ul></li>
     <li><a href="../doxia-tools/index.html" title="Doxia Tools"><span class="none"></span>Doxia Tools</a></li>
-      <li class="nav-header">Project Documentation</li>
+   <li class="nav-header">Project Documentation</li>
     <li><a href="../project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
-      <li class="nav-header">Maven Projects</li>
+   <li class="nav-header">Maven Projects</li>
     <li><a href="../../archetype/index.html" title="Archetype"><span class="none"></span>Archetype</a></li>
     <li><a href="../../resolver/index.html" title="Artifact Resolver"><span class="none"></span>Artifact Resolver</a></li>
     <li><a href="../index.html" title="Doxia"><span class="none"></span>Doxia</a></li>
@@ -91,32 +91,33 @@
     <li><a href="../../skins/index.html" title="Skins"><span class="none"></span>Skins</a></li>
     <li><a href="../../surefire/index.html" title="Surefire"><span class="none"></span>Surefire</a></li>
     <li><a href="../../wagon/index.html" title="Wagon"><span class="none"></span>Wagon</a></li>
-      <li class="nav-header">ASF</li>
+   <li class="nav-header">ASF</li>
     <li><a href="https://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How Apache Works"><span class="none"></span>How Apache Works</a></li>
     <li><a href="https://www.apache.org/foundation/" class="externalLink" title="Foundation"><span class="none"></span>Foundation</a></li>
     <li><a href="https://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsoring Apache"><span class="none"></span>Sponsoring Apache</a></li>
     <li><a href="https://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks"><span class="none"></span>Thanks</a></li>
-</ul>
+  </ul>
+          </nav>
+          <div class="well sidebar-nav">
 <form id="search-form" action="https://www.google.com/search" method="get" >
   <input value="maven.apache.org/doxia/" name="sitesearch" type="hidden"/>
   <input class="search-query" name="q" id="query" type="text" />
 </form>
-<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-    <div id="twitter">
+<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
+            <hr />
+            <div id="poweredBy">
+              <div class="clear"></div>
+    <div id="twitter" style="border:none; margin-top: 10px">
     <a href="https://twitter.com/ASFMavenProject" class="twitter-follow-button" data-show-count="false" data-align="left" data-size="medium" data-show-screen-name="true" data-lang="en">Follow ASFMavenProject</a>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
     </div>
-            <div class="clear"></div>
-            <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../images/logos/maven-feather.png" /></a>
             </div>
           </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
+        </header>
+        <main id="bodyColumn"  class="span10" >
 <section>
 <h2><a name="Create_a_New_Doxia_Module"></a>Create a New Doxia Module</h2>
 <p>First, the easiest way is to create a POM with <i>doxia-modules</i> as parent:</p>
@@ -193,16 +194,16 @@ public class MySinkFactory
 <li><a href="../macros/index.html">Doxia Macros Guide</a></li>
 <li><a href="../doxia/apidocs/index.html">Doxia API Reference</a></li>
 <li><a href="../doxia-sitetools/apidocs/index.html">Doxia Sitetools API Reference</a></li></ul></section></section>
-        </div>
+        </main>
       </div>
     </div>
     <hr/>
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2005&#x2013;2020
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
+            <p>&#169;      2005&#x2013;2020
+<a href="https://www.apache.org/">The Apache Software Foundation</a>
+</p>
         </div>
       </div>
     </footer>

Modified: maven/doxia/website/content/developers/sink.html
==============================================================================
--- maven/doxia/website/content/developers/sink.html (original)
+++ maven/doxia/website/content/developers/sink.html Mon Dec 28 17:31:11 2020
@@ -1,81 +1,81 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/sink.apt at 2020-12-22
- | Rendered using Apache Maven Fluido Skin 1.7
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/developers/sink.apt at 2020-12-28
+ | Rendered using Apache Maven Fluido Skin 1.9
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
     <meta name="author" content="Vincent Siveton" />
-    <meta name="Date-Creation-yyyymmdd" content="20080302" />
-    <meta name="Date-Revision-yyyymmdd" content="20201222" />
-    <meta http-equiv="Content-Language" content="en" />
+    <meta name="date" content="2008-03-02" />
     <title>Doxia &#x2013; Doxia Developers Centre</title>
-    <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../css/apache-maven-fluido-1.9.min.css" />
     <link rel="stylesheet" href="../css/site.css" />
     <link rel="stylesheet" href="../css/print.css" media="print" />
-    <script type="text/javascript" src="../js/apache-maven-fluido-1.7.min.js"></script>
+    <script src="../js/apache-maven-fluido-1.9.min.js"></script>
     <!-- Google Analytics -->
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-140879-1']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-140879-1', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
     </script>
   </head>
   <body class="topBarDisabled">
     <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
-        <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
-        <div class="clear"><hr/></div>
-      </div>
+      <header>
+        <div id="banner">
+          <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
+          <div class="pull-right"><a href=".././" id="bannerRight"><img src="../images/doxia-logo.png"  alt="Doxia"/></a></div>
+          <div class="clear"><hr/></div>
+        </div>
 
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
+        <div id="breadcrumbs">
+          <ul class="breadcrumb">
       <li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Maven">Maven</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Doxia">Doxia</a><span class="divider">/</span></li>
     <li class="active ">Doxia Developers Centre <a href="https://github.com/apache/maven-doxia-site/tree/master/content/apt/developers/sink.apt"><img src="../images/accessories-text-editor.png" title="Edit" /></a></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-22</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-28</li>
       <li class="pull-right"><a href="../scm.html" title="Get Sources">Get Sources</a></li>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </header>
       <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">About Doxia</li>
+        <header id="leftColumn" class="span2">
+          <nav class="well sidebar-nav">
+  <ul class="nav nav-list">
+   <li class="nav-header">About Doxia</li>
     <li><a href="../index.html" title="What is Doxia?"><span class="none"></span>What is Doxia?</a></li>
     <li><a href="../overview.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../downloads.html" title="Downloads"><span class="none"></span>Downloads</a></li>
     <li><a href="../faq.html" title="FAQ"><span class="none"></span>FAQ</a></li>
-      <li class="nav-header">Documentation</li>
+   <li class="nav-header">Documentation</li>
     <li><a href="../references/index.html" title="Format References"><span class="icon-chevron-right"></span>Format References</a></li>
     <li><a href="../modules/index.html" title="Doxia Modules Guide"><span class="none"></span>Doxia Modules Guide</a></li>
     <li><a href="../macros/index.html" title="Doxia Macros Guide"><span class="none"></span>Doxia Macros Guide</a></li>
     <li><a href="../book/index.html" title="Writing Books"><span class="none"></span>Writing Books</a></li>
     <li><a href="../issues/index.html" title="Issues &amp; Gotchas"><span class="none"></span>Issues &amp; Gotchas</a></li>
     <li><a href="../resources.html" title="External Resources"><span class="none"></span>External Resources</a></li>
-      <li class="nav-header">Developer Docs</li>
+   <li class="nav-header">Developer Docs</li>
     <li><a href="../developers/index.html" title="Developer Centre"><span class="icon-chevron-down"></span>Developer Centre</a>
-    <ul class="nav nav-list">
-    <li><a href="../developers/modules.html" title="Create a Doxia Module"><span class="none"></span>Create a Doxia Module</a></li>
-    <li><a href="../developers/macros.html" title="Create a Doxia Macro"><span class="none"></span>Create a Doxia Macro</a></li>
-    <li class="active"><a href="#"><span class="none"></span>Using the Sink API</a></li>
-    <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
-    <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
-    </ul>
-</li>
+     <ul class="nav nav-list">
+      <li><a href="../developers/modules.html" title="Create a Doxia Module"><span class="none"></span>Create a Doxia Module</a></li>
+      <li><a href="../developers/macros.html" title="Create a Doxia Macro"><span class="none"></span>Create a Doxia Macro</a></li>
+      <li class="active"><a href="#"><span class="none"></span>Using the Sink API</a></li>
+      <li><a href="../doxia/index.html" title="Doxia base"><span class="none"></span>Doxia base</a></li>
+      <li><a href="../doxia-sitetools/index.html" title="Doxia Sitetools"><span class="none"></span>Doxia Sitetools</a></li>
+     </ul></li>
     <li><a href="../doxia-tools/index.html" title="Doxia Tools"><span class="none"></span>Doxia Tools</a></li>
-      <li class="nav-header">Project Documentation</li>
+   <li class="nav-header">Project Documentation</li>
     <li><a href="../project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
-      <li class="nav-header">Maven Projects</li>
+   <li class="nav-header">Maven Projects</li>
     <li><a href="../../archetype/index.html" title="Archetype"><span class="none"></span>Archetype</a></li>
     <li><a href="../../resolver/index.html" title="Artifact Resolver"><span class="none"></span>Artifact Resolver</a></li>
     <li><a href="../index.html" title="Doxia"><span class="none"></span>Doxia</a></li>
@@ -91,32 +91,33 @@
     <li><a href="../../skins/index.html" title="Skins"><span class="none"></span>Skins</a></li>
     <li><a href="../../surefire/index.html" title="Surefire"><span class="none"></span>Surefire</a></li>
     <li><a href="../../wagon/index.html" title="Wagon"><span class="none"></span>Wagon</a></li>
-      <li class="nav-header">ASF</li>
+   <li class="nav-header">ASF</li>
     <li><a href="https://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How Apache Works"><span class="none"></span>How Apache Works</a></li>
     <li><a href="https://www.apache.org/foundation/" class="externalLink" title="Foundation"><span class="none"></span>Foundation</a></li>
     <li><a href="https://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsoring Apache"><span class="none"></span>Sponsoring Apache</a></li>
     <li><a href="https://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks"><span class="none"></span>Thanks</a></li>
-</ul>
+  </ul>
+          </nav>
+          <div class="well sidebar-nav">
 <form id="search-form" action="https://www.google.com/search" method="get" >
   <input value="maven.apache.org/doxia/" name="sitesearch" type="hidden"/>
   <input class="search-query" name="q" id="query" type="text" />
 </form>
-<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-    <div id="twitter">
+<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
+            <hr />
+            <div id="poweredBy">
+              <div class="clear"></div>
+    <div id="twitter" style="border:none; margin-top: 10px">
     <a href="https://twitter.com/ASFMavenProject" class="twitter-follow-button" data-show-count="false" data-align="left" data-size="medium" data-show-screen-name="true" data-lang="en">Follow ASFMavenProject</a>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
     </div>
-            <div class="clear"></div>
-            <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../images/logos/maven-feather.png" /></a>
             </div>
           </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
+        </header>
+        <main id="bodyColumn"  class="span10" >
 <section>
 <h2><a name="Using_the_Doxia_Sink_API"></a>Using the Doxia Sink API</h2>
 <ul>
@@ -234,16 +235,16 @@ sink.unknown( &quot;script&quot;, new Ob
 <li><a href="../macros/index.html">Doxia Macros Guide</a></li>
 <li><a href="../doxia/apidocs/index.html">Doxia API Reference</a></li>
 <li><a href="../doxia-sitetools/apidocs/index.html">Doxia Sitetools API Reference</a></li></ul></section></section>
-        </div>
+        </main>
       </div>
     </div>
     <hr/>
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2005&#x2013;2020
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
+            <p>&#169;      2005&#x2013;2020
+<a href="https://www.apache.org/">The Apache Software Foundation</a>
+</p>
         </div>
       </div>
     </footer>

Modified: maven/doxia/website/content/downloads.html
==============================================================================
--- maven/doxia/website/content/downloads.html (original)
+++ maven/doxia/website/content/downloads.html Mon Dec 28 17:31:11 2020
@@ -1,73 +1,74 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/downloads.apt at 2020-12-22
- | Rendered using Apache Maven Fluido Skin 1.7
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from content/apt/downloads.apt at 2020-12-28
+ | Rendered using Apache Maven Fluido Skin 1.9
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
     <meta name="author" content="Vincent Siveton" />
-    <meta name="Date-Creation-yyyymmdd" content="20090302" />
-    <meta name="Date-Revision-yyyymmdd" content="20201222" />
-    <meta http-equiv="Content-Language" content="en" />
+    <meta name="date" content="2009-03-02" />
     <title>Doxia &#x2013; Download</title>
-    <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" />
     <link rel="stylesheet" href="./css/site.css" />
     <link rel="stylesheet" href="./css/print.css" media="print" />
-    <script type="text/javascript" src="./js/apache-maven-fluido-1.7.min.js"></script>
+    <script src="./js/apache-maven-fluido-1.9.min.js"></script>
     <!-- Google Analytics -->
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-140879-1']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-140879-1', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
     </script>
   </head>
   <body class="topBarDisabled">
     <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
-        <div class="pull-right"><a href="./" id="bannerRight"><img src="images/doxia-logo.png"  alt="Doxia"/></a></div>
-        <div class="clear"><hr/></div>
-      </div>
+      <header>
+        <div id="banner">
+          <div class="pull-left"><a href="https://www.apache.org/" id="bannerLeft"><img src="../images/apache-maven-project.png"  alt="Doxia Site"/></a></div>
+          <div class="pull-right"><a href="./" id="bannerRight"><img src="images/doxia-logo.png"  alt="Doxia"/></a></div>
+          <div class="clear"><hr/></div>
+        </div>
 
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
+        <div id="breadcrumbs">
+          <ul class="breadcrumb">
       <li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Maven">Maven</a><span class="divider">/</span></li>
       <li class=""><a href="index.html" title="Doxia">Doxia</a><span class="divider">/</span></li>
     <li class="active ">Download <a href="https://github.com/apache/maven-doxia-site/tree/master/content/apt/downloads.apt"><img src="./images/accessories-text-editor.png" title="Edit" /></a></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-22</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2020-12-28</li>
       <li class="pull-right"><a href="scm.html" title="Get Sources">Get Sources</a></li>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </header>
       <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">About Doxia</li>
+        <header id="leftColumn" class="span2">
+          <nav class="well sidebar-nav">
+  <ul class="nav nav-list">
+   <li class="nav-header">About Doxia</li>
     <li><a href="index.html" title="What is Doxia?"><span class="none"></span>What is Doxia?</a></li>
     <li><a href="overview.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li class="active"><a href="#"><span class="none"></span>Downloads</a></li>
     <li><a href="faq.html" title="FAQ"><span class="none"></span>FAQ</a></li>
-      <li class="nav-header">Documentation</li>
+   <li class="nav-header">Documentation</li>
     <li><a href="references/index.html" title="Format References"><span class="icon-chevron-right"></span>Format References</a></li>
     <li><a href="modules/index.html" title="Doxia Modules Guide"><span class="none"></span>Doxia Modules Guide</a></li>
     <li><a href="macros/index.html" title="Doxia Macros Guide"><span class="none"></span>Doxia Macros Guide</a></li>
     <li><a href="book/index.html" title="Writing Books"><span class="none"></span>Writing Books</a></li>
     <li><a href="issues/index.html" title="Issues &amp; Gotchas"><span class="none"></span>Issues &amp; Gotchas</a></li>
     <li><a href="resources.html" title="External Resources"><span class="none"></span>External Resources</a></li>
-      <li class="nav-header">Developer Docs</li>
+   <li class="nav-header">Developer Docs</li>
     <li><a href="developers/index.html" title="Developer Centre"><span class="icon-chevron-right"></span>Developer Centre</a></li>
     <li><a href="doxia-tools/index.html" title="Doxia Tools"><span class="none"></span>Doxia Tools</a></li>
-      <li class="nav-header">Project Documentation</li>
+   <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
-      <li class="nav-header">Maven Projects</li>
+   <li class="nav-header">Maven Projects</li>
     <li><a href="../archetype/index.html" title="Archetype"><span class="none"></span>Archetype</a></li>
     <li><a href="../resolver/index.html" title="Artifact Resolver"><span class="none"></span>Artifact Resolver</a></li>
     <li><a href="index.html" title="Doxia"><span class="none"></span>Doxia</a></li>
@@ -83,48 +84,49 @@
     <li><a href="../skins/index.html" title="Skins"><span class="none"></span>Skins</a></li>
     <li><a href="../surefire/index.html" title="Surefire"><span class="none"></span>Surefire</a></li>
     <li><a href="../wagon/index.html" title="Wagon"><span class="none"></span>Wagon</a></li>
-      <li class="nav-header">ASF</li>
+   <li class="nav-header">ASF</li>
     <li><a href="https://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How Apache Works"><span class="none"></span>How Apache Works</a></li>
     <li><a href="https://www.apache.org/foundation/" class="externalLink" title="Foundation"><span class="none"></span>Foundation</a></li>
     <li><a href="https://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsoring Apache"><span class="none"></span>Sponsoring Apache</a></li>
     <li><a href="https://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks"><span class="none"></span>Thanks</a></li>
-</ul>
+  </ul>
+          </nav>
+          <div class="well sidebar-nav">
 <form id="search-form" action="https://www.google.com/search" method="get" >
   <input value="maven.apache.org/doxia/" name="sitesearch" type="hidden"/>
   <input class="search-query" name="q" id="query" type="text" />
 </form>
-<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-    <div id="twitter">
+<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script>
+            <hr />
+            <div id="poweredBy">
+              <div class="clear"></div>
+    <div id="twitter" style="border:none; margin-top: 10px">
     <a href="https://twitter.com/ASFMavenProject" class="twitter-follow-button" data-show-count="false" data-align="left" data-size="medium" data-show-screen-name="true" data-lang="en">Follow ASFMavenProject</a>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
     </div>
-            <div class="clear"></div>
-            <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
             </div>
           </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
+        </header>
+        <main id="bodyColumn"  class="span10" >
 <section>
 <h2><a name="Maven_Doxia_Releases"></a>Maven Doxia Releases</h2>
 <p>Releases of Maven Doxia are made available in both binary and source distributions. Individual JARs are also made available through Apache Maven repositories.</p>
 <p>Releases of all Doxia sub-project components (currently Doxia, Doxia Sitetools and Doxia Tools) may be downloaded from Maven's central repository:</p>
 <ul>
 <li><a class="externalLink" href="http://repo.maven.apache.org/maven2/org/apache/maven/doxia/">http://repo.maven.apache.org/maven2/org/apache/maven/doxia/</a></li></ul></section>
-        </div>
+        </main>
       </div>
     </div>
     <hr/>
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2005&#x2013;2020
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
+            <p>&#169;      2005&#x2013;2020
+<a href="https://www.apache.org/">The Apache Software Foundation</a>
+</p>
         </div>
       </div>
     </footer>