You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by po...@apache.org on 2021/05/18 14:10:49 UTC

[creadur-site] branch asf-site updated: WHISKER-19: Republish site

This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/creadur-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 4f1220e  WHISKER-19: Republish site
4f1220e is described below

commit 4f1220eba37b32db33f4e41a395a5a9a43bccc89
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Tue May 18 16:10:42 2021 +0200

    WHISKER-19: Republish site
---
 whisker/ci-management.html                 |  161 ++++
 whisker/css/maven-base.css                 |   27 +-
 whisker/css/maven-theme.css                |  301 +++---
 whisker/css/print.css                      |   21 +-
 whisker/dependency-convergence.html        |  472 +++++----
 whisker/dependency-info.html               |  184 ++++
 whisker/dependency-management.html         |  449 ++++-----
 whisker/distribution-management.html       |  382 +++-----
 whisker/examples/3rd-party-corporate.html  |  411 ++++----
 whisker/examples/3rd-party-group.html      |  411 ++++----
 whisker/examples/3rd-party-individual.html |  411 ++++----
 whisker/examples/copyright-notices.html    |  424 ++++-----
 whisker/examples/in-5-mins.html            |  420 ++++----
 whisker/examples/license-family.html       |  430 ++++-----
 whisker/faq.html                           | 1431 +++++++++++++++++-----------
 whisker/index.html                         |  426 ++++-----
 whisker/issue-management.html              |  159 ++++
 whisker/licenses.html                      |  162 ++++
 whisker/mailing-lists.html                 |  174 ++++
 whisker/meta-data.html                     |  442 +++++----
 whisker/modules.html                       |  403 +++-----
 whisker/plugin-management.html             |  510 +++++-----
 whisker/plugins.html                       |  424 ++++-----
 whisker/project-info.html                  |  425 ++++-----
 whisker/scm.html                           |  169 ++++
 whisker/summary.html                       |  196 ++++
 26 files changed, 5108 insertions(+), 4317 deletions(-)

diff --git a/whisker/ci-management.html b/whisker/ci-management.html
new file mode 100644
index 0000000..f922bac
--- /dev/null
+++ b/whisker/ci-management.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:ci-management at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; CI Management</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
+  <body class="composite">
+    <div id="banner">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+CI Management
+      </div>
+      <div class="xright">      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><strong>CI Management</strong></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+<section>
+<h2><a name="Overview"></a>Overview</h2><a name="Overview"></a>
+<p>This project uses Continuous Integration System.</p></section><section>
+<h2><a name="Access"></a>Access</h2><a name="Access"></a>
+<p>The following is a link to the continuous integration system used by the project:</p>
+<div class="source">
+<pre><a class="externalLink" href="https://ci-builds.apache.org/job/Creadur/job/Creadur-Tentacles/">https://ci-builds.apache.org/job/Creadur/job/Creadur-Tentacles/</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>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
+      of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      This is user documentation, not legal advice.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/whisker/css/maven-base.css b/whisker/css/maven-base.css
index 10edfb0..322efae 100644
--- a/whisker/css/maven-base.css
+++ b/whisker/css/maven-base.css
@@ -1,10 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 body {
   margin: 0px;
   padding: 0px;
 }
-img {
-  border:none;
-}
 table {
   padding:0px;
   width: 100%;
@@ -42,9 +58,6 @@ div.clear hr{
 #banner {
   padding: 0px;
 }
-#banner img {
-  border: none;
-}
 #breadcrumbs {
   padding: 3px 10px 3px 10px;
 }
@@ -152,4 +165,4 @@ div.clear hr{
   padding-right: 2px;
   border: 0px;
   margin: 0px;
-}
\ No newline at end of file
+}
diff --git a/whisker/css/maven-theme.css b/whisker/css/maven-theme.css
index 09355ed..4e2bdfb 100644
--- a/whisker/css/maven-theme.css
+++ b/whisker/css/maven-theme.css
@@ -1,140 +1,161 @@
-body {
-  padding: 0px 0px 10px 0px;
-}
-body, td, select, input, li{
-  font-family: Verdana, Helvetica, Arial, sans-serif;
-  font-size: 13px;
-}
-code{
-  font-family: Courier, monospace;
-  font-size: 13px;
-}
-a {
-  text-decoration: none;
-}
-a:link {
-  color:#36a;
-}
-a:visited  {
-  color:#47a;
-}
-a:active, a:hover {
-  color:#69c;
-}
-#legend li.externalLink {
-  background: url(../images/external.png) left top no-repeat;
-  padding-left: 18px;
-}
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
-  background: url(../images/external.png) right center no-repeat;
-  padding-right: 18px;
-}
-#legend li.newWindow {
-  background: url(../images/newwindow.png) left top no-repeat;
-  padding-left: 18px;
-}
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
-  background: url(../images/newwindow.png) right center no-repeat;
-  padding-right: 18px;
-}
-h2 {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #999;
-  color: #900;
-  background-color: #ddd;
-  font-weight:900;
-  font-size: x-large;
-}
-h3 {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #aaa;
-  color: #900;
-  background-color: #eee;
-  font-weight: normal;
-  font-size: large;
-}
-h4 {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #bbb;
-  color: #900;
-  background-color: #fff;
-  font-weight: normal;
-  font-size: large;
-}
-h5 {
-  padding: 4px 4px 4px 6px;
-  color: #900;
-  font-size: normal;
-}
-p {
-  line-height: 1.3em;
-  font-size: small;
-}
-#breadcrumbs {
-  border-top: 1px solid #aaa;
-  border-bottom: 1px solid #aaa;
-  background-color: #ccc;
-}
-#leftColumn {
-  margin: 10px 0 0 5px;
-  border: 1px solid #999;
-  background-color: #eee;
-}
-#navcolumn h5 {
-  font-size: smaller;
-  border-bottom: 1px solid #aaaaaa;
-  padding-top: 2px;
-  color: #000;
-}
-
-table.bodyTable th {
-  color: white;
-  background-color: #bbb;
-  text-align: left;
-  font-weight: bold;
-}
-
-table.bodyTable th, table.bodyTable td {
-  font-size: 1em;
-}
-
-table.bodyTable tr.a {
-  background-color: #ddd;
-}
-
-table.bodyTable tr.b {
-  background-color: #eee;
-}
-
-.source {
-  border: 1px solid #999;
-}
-dl {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #aaa;
-  background-color: #ffc;
-}
-dt {
-  color: #900;
-}
-#organizationLogo img, #projectLogo img, #projectLogo span{
-  margin: 8px;
-}
-#banner {
-  border-bottom: 1px solid #fff;
-}
-.errormark, .warningmark, .donemark, .infomark {
-  background: url(../images/icon_error_sml.gif) no-repeat;
-}
-
-.warningmark {
-  background-image: url(../images/icon_warning_sml.gif);
-}
-
-.donemark {
-  background-image: url(../images/icon_success_sml.gif);
-}
-
-.infomark {
-  background-image: url(../images/icon_info_sml.gif);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+body {
+  padding: 0px 0px 10px 0px;
+}
+body, td, select, input, li{
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: 13px;
+}
+code{
+  font-family: Courier, monospace;
+  font-size: 13px;
+}
+a {
+  text-decoration: none;
+}
+a:link {
+  color:#36a;
+}
+a:visited  {
+  color:#47a;
+}
+a:active, a:hover {
+  color:#69c;
+}
+#legend li.externalLink {
+  background: url(../images/external.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: url(../images/external.png) right center no-repeat;
+  padding-right: 18px;
+}
+#legend li.newWindow {
+  background: url(../images/newwindow.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+  background: url(../images/newwindow.png) right center no-repeat;
+  padding-right: 18px;
+}
+h2 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #999;
+  color: #900;
+  background-color: #ddd;
+  font-weight:900;
+  font-size: x-large;
+}
+h3 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  color: #900;
+  background-color: #eee;
+  font-weight: normal;
+  font-size: large;
+}
+h4 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #bbb;
+  color: #900;
+  background-color: #fff;
+  font-weight: normal;
+  font-size: large;
+}
+h5 {
+  padding: 4px 4px 4px 6px;
+  color: #900;
+  font-size: medium;
+}
+p {
+  line-height: 1.3em;
+  font-size: small;
+}
+#breadcrumbs {
+  border-top: 1px solid #aaa;
+  border-bottom: 1px solid #aaa;
+  background-color: #ccc;
+}
+#leftColumn {
+  margin: 10px 0 0 5px;
+  border: 1px solid #999;
+  background-color: #eee;
+  padding-bottom: 3px; /* IE-9 scrollbar-fix */
+}
+#navcolumn h5 {
+  font-size: smaller;
+  border-bottom: 1px solid #aaaaaa;
+  padding-top: 2px;
+  color: #000;
+}
+
+table.bodyTable th {
+  color: white;
+  background-color: #bbb;
+  text-align: left;
+  font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 1em;
+}
+
+table.bodyTable tr.a {
+  background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+  background-color: #eee;
+}
+
+.source {
+  border: 1px solid #999;
+}
+dl {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  background-color: #ffc;
+}
+dt {
+  color: #900;
+}
+#organizationLogo img, #projectLogo img, #projectLogo span{
+  margin: 8px;
+}
+#banner {
+  border-bottom: 1px solid #fff;
+}
+.errormark, .warningmark, .donemark, .infomark {
+  background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+  background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+  background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+  background-image: url(../images/icon_info_sml.gif);
+}
+
diff --git a/whisker/css/print.css b/whisker/css/print.css
index 49aae7e..18fcbad 100644
--- a/whisker/css/print.css
+++ b/whisker/css/print.css
@@ -1,7 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 #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
+}
diff --git a/whisker/dependency-convergence.html b/whisker/dependency-convergence.html
index d95cdd1..23e29ef 100644
--- a/whisker/dependency-convergence.html
+++ b/whisker/dependency-convergence.html
@@ -1,278 +1,233 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:dependency-convergence at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Reactor Dependency Convergence</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Reactor Dependency Convergence</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Reactor Dependency Convergence
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Reactor Dependency Convergence
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                          <li class="expanded">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                    <ul>
-                      <li class="none">
-                          <a href="distribution-management.html" title="Distribution Management">Distribution Management</a>
-            </li>
-                      <li class="none">
-                          <a href="index.html" title="About">About</a>
-            </li>
-                      <li class="none">
-                          <a href="dependencies.html" title="Dependencies">Dependencies</a>
-            </li>
-                      <li class="none">
-                          <a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a>
-            </li>
-                      <li class="none">
-                          <a href="plugins.html" title="Project Plugins">Project Plugins</a>
-            </li>
-                      <li class="none">
-                          <a href="integration.html" title="Continuous Integration">Continuous Integration</a>
-            </li>
-                      <li class="none">
-                          <a href="license.html" title="Project License">Project License</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-management.html" title="Dependency Management">Dependency Management</a>
-            </li>
-                      <li class="none">
-                          <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
-            </li>
-                      <li class="none">
-                          <a href="team-list.html" title="Project Team">Project Team</a>
-            </li>
-                      <li class="none">
-            <strong>Dependency Convergence</strong>
-          </li>
-                      <li class="none">
-                          <a href="source-repository.html" title="Source Repository">Source Repository</a>
-            </li>
-                      <li class="none">
-                          <a href="plugin-management.html" title="Plugin Management">Plugin Management</a>
-            </li>
-                      <li class="none">
-                          <a href="modules.html" title="Project Modules">Project Modules</a>
-            </li>
-                      <li class="none">
-                          <a href="project-summary.html" title="Project Summary">Project Summary</a>
-            </li>
-              </ul>
-        </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><strong>Dependency Convergence</strong></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Reactor Dependency Convergence<a name="Reactor_Dependency_Convergence"></a></h2><table border="0" class="bodyTable"><caption>
+<section>
+<h2><a name="Reactor_Dependency_Convergence"></a>Reactor Dependency Convergence</h2>
+<table border="0" class="bodyTable"><caption>
   <b>Legend:</b>
-</caption><tr class="a"><td><img alt="success" src="images/icon_success_sml.gif" /></td><td>All projects share one version of the dependency.</td></tr><tr class="b"><td><img alt="error" src="images/icon_error_sml.gif" /></td><td>At least one project has a differing version of the dependency.</td></tr></table><br /><table border="0" class="bodyTable"><caption>
+</caption>
+<tr class="a">
+<td><figure><figcaption>[Error]</figcaption><img src="images/icon_error_sml.gif" alt="" /></figure></td>
+<td>At least one dependency has a differing version of the dependency or has SNAPSHOT dependencies.</td></tr></table><br />
+<table border="0" class="bodyTable"><caption>
   <b>Statistics:</b>
-</caption><tr class="a"><th>Number of sub-projects:</th><td>8</td></tr><tr class="b"><th>Number of dependencies (NOD):</th><td>15</td></tr><tr class="a"><th>Number of unique artifacts (NOA):</th><td>15</td></tr><tr class="b"><th>Number of SNAPSHOT artifacts (NOS):</th><td>0</td></tr><tr class="a"><th>Convergence (NOD/NOA):</th><td><img alt="success" src="images/icon_success_sml.gif" />&#160;<b>100%</b></td></tr><tr class="b"><th>Ready for Release (100% Convergence and no SNAPSHOTS):</th> [...]
+</caption>
+<tr class="b">
+<th>Number of modules:</th>
+<td>8</td></tr>
+<tr class="a">
+<th>Number of dependencies (NOD):</th>
+<td>38</td></tr>
+<tr class="b">
+<th>Number of unique artifacts (NOA):</th>
+<td>42</td></tr>
+<tr class="a">
+<th>Number of version-conflicting artifacts (NOC):</th>
+<td>4</td></tr>
+<tr class="b">
+<th>Number of SNAPSHOT artifacts (NOS):</th>
+<td>0</td></tr>
+<tr class="a">
+<th>Convergence (NOD/NOA):</th>
+<td><figure><figcaption>[Error]</figcaption><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;<b>90 %</b></td></tr>
+<tr class="b">
+<th>Ready for release (100% convergence and no SNAPSHOTS):</th>
+<td><figure><figcaption>[Error]</figcaption><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;<b>Error</b><br />You do not have 100% convergence.</td></tr></table></section><section>
+<h3><a name="Dependencies_used_in_modules"></a>Dependencies used in modules</h3><section>
+<h4><a name="org.apache.maven:maven-artifact"></a>org.apache.maven:maven-artifact</h4>
+<table border="0" class="bodyTable">
+<tr class="a">
+<td><figure><figcaption>[Error]</figcaption><img src="images/icon_error_sml.gif" alt="" /></figure></td>
+<td>
+<table border="0" class="bodyTable">
+<tr class="b">
+<td width="25%">3.0</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-maven-plugin:maven-plugin:0.2-SNAPSHOT<br />\-&#160;org.apache.maven.plugin-tools:maven-plugin-annotations:jar:3.6.1:provided<br />&#160;&#160;&#160;\-&#160;(org.apache.maven:maven-artifact:jar:3.0:provided - omitted for conflict with 3.8.1)<br /></li><br /></ol></td></tr>
+<tr class="a">
+<td width="25%">3.8.1</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-maven-plugin:maven-plugin:0.2-SNAPSHOT<br />\-&#160;org.apache.maven:maven-plugin-api:jar:3.8.1:compile<br />&#160;&#160;&#160;\-&#160;org.apache.maven:maven-artifact:jar:3.8.1:compile<br /></li><br /></ol></td></tr></table></td></tr></table></section><section>
+<h4><a name="org.codehaus.plexus:plexus-classworlds"></a>org.codehaus.plexus:plexus-classworlds</h4>
+<table border="0" class="bodyTable">
+<tr class="b">
+<td><figure><figcaption>[Error]</figcaption><img src="images/icon_error_sml.gif" alt="" /></figure></td>
+<td>
+<table border="0" class="bodyTable">
+<tr class="a">
+<td width="25%">2.5.2</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-maven-plugin:maven-plugin:0.2-SNAPSHOT<br />\-&#160;org.apache.maven:maven-plugin-api:jar:3.8.1:compile<br />&#160;&#160;&#160;\-&#160;org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.4:compile<br />&#160;&#160;&#160;&#160;&#160;&#160;\-&#160;(org.codehaus.plexus:plexus-classworlds:jar:2.5.2:compile - omitted for conflict with 2.6.0)<br /></li><br /></ol></td></tr>
+<tr class="b">
+<td width="25%">2.6.0</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-maven-plugin:maven-plugin:0.2-SNAPSHOT<br />\-&#160;org.apache.maven:maven-plugin-api:jar:3.8.1:compile<br />&#160;&#160;&#160;\-&#160;org.codehaus.plexus:plexus-classworlds:jar:2.6.0:compile<br /></li><br /></ol></td></tr></table></td></tr></table></section><section>
+<h4><a name="org.codehaus.plexus:plexus-utils"></a>org.codehaus.plexus:plexus-utils</h4>
+<table border="0" class="bodyTable">
+<tr class="a">
+<td><figure><figcaption>[Error]</figcaption><img src="images/icon_error_sml.gif" alt="" /></figure></td>
+<td>
+<table border="0" class="bodyTable">
+<tr class="b">
+<td width="25%">3.0.17</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-maven-plugin:maven-plugin:0.2-SNAPSHOT<br />\-&#160;org.apache.maven:maven-plugin-api:jar:3.8.1:compile<br />&#160;&#160;&#160;\-&#160;org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.4:compile<br />&#160;&#160;&#160;&#160;&#160;&#160;\-&#160;(org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.2.1)<br /></li><br /></ol></td></tr>
+<tr class="a">
+<td width="25%">3.2.1</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-maven-plugin:maven-plugin:0.2-SNAPSHOT<br />\-&#160;org.apache.maven:maven-plugin-api:jar:3.8.1:compile<br />&#160;&#160;&#160;+-&#160;org.apache.maven:maven-model:jar:3.8.1:compile<br />&#160;&#160;&#160;|&#160;&#160;\-&#160;(org.codehaus.plexus:plexus-utils:jar:3.2.1:compile - omitted for duplicate)<br />&#160;&#160;&#160;+-&#160;org.apache.maven:maven-artifact:jar:3.8.1:compile<br />&#160;&#160;&#160;|&#160;&#160;\-&#160;(org.codehaus.plex [...]
+<h4><a name="org.hamcrest:hamcrest-core"></a>org.hamcrest:hamcrest-core</h4>
+<table border="0" class="bodyTable">
+<tr class="b">
+<td><figure><figcaption>[Error]</figcaption><img src="images/icon_error_sml.gif" alt="" /></figure></td>
+<td>
+<table border="0" class="bodyTable">
+<tr class="a">
+<td width="25%">1.3</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-velocity:jar:0.2-SNAPSHOT<br />\-&#160;junit:junit:jar:4.13.2:test<br />&#160;&#160;&#160;\-&#160;org.hamcrest:hamcrest-core:jar:1.3:test<br /></li><br /></ol></td></tr>
+<tr class="b">
+<td width="25%">2.1</td>
+<td>
+<ol style="list-style-type: decimal">
+<li>org.apache.creadur.whisker:apache-whisker-velocity:jar:0.2-SNAPSHOT<br />\-&#160;org.jmock:jmock-junit3:jar:2.12.0:test<br />&#160;&#160;&#160;\-&#160;org.jmock:jmock:jar:2.12.0:test<br />&#160;&#160;&#160;&#160;&#160;&#160;\-&#160;org.hamcrest:hamcrest-library:jar:2.1:test<br />&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;\-&#160;(org.hamcrest:hamcrest-core:jar:2.1:test - omitted for conflict with 1.3)<br /></li><br /></ol></td></tr></table></td></tr></table></section></section>
       </div>
     </div>
     <div class="clear">
@@ -280,16 +235,15 @@
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/dependency-info.html b/whisker/dependency-info.html
new file mode 100644
index 0000000..259c27a
--- /dev/null
+++ b/whisker/dependency-info.html
@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:dependency-info at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Dependency Information</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
+  <body class="composite">
+    <div id="banner">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Dependency Information
+      </div>
+      <div class="xright">      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><strong>Dependency Information</strong></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+<section>
+<h2><a name="Dependency_Information"></a>Dependency Information</h2><a name="Dependency_Information"></a><section>
+<h3><a name="Apache_Maven"></a>Apache Maven</h3><a name="Apache_Maven"></a>
+<div class="source">
+<pre>&lt;dependency&gt;
+  &lt;groupId&gt;org.apache.creadur.whisker&lt;/groupId&gt;
+  &lt;artifactId&gt;apache-whisker&lt;/artifactId&gt;
+  &lt;version&gt;0.2-SNAPSHOT&lt;/version&gt;
+  &lt;type&gt;pom&lt;/type&gt;
+&lt;/dependency&gt;</pre></div></section><section>
+<h3><a name="Apache_Buildr"></a>Apache Buildr</h3><a name="Apache_Buildr"></a>
+<div class="source">
+<pre>'org.apache.creadur.whisker:apache-whisker:pom:0.2-SNAPSHOT'</pre></div></section><section>
+<h3><a name="Apache_Ivy"></a>Apache Ivy</h3><a name="Apache_Ivy"></a>
+<div class="source">
+<pre>&lt;dependency org=&quot;org.apache.creadur.whisker&quot; name=&quot;apache-whisker&quot; rev=&quot;0.2-SNAPSHOT&quot;&gt;
+  &lt;artifact name=&quot;apache-whisker&quot; type=&quot;pom&quot; /&gt;
+&lt;/dependency&gt;</pre></div></section><section>
+<h3><a name="Groovy_Grape"></a>Groovy Grape</h3><a name="Groovy_Grape"></a>
+<div class="source">
+<pre>@Grapes(
+@Grab(group='org.apache.creadur.whisker', module='apache-whisker', version='0.2-SNAPSHOT')
+)</pre></div></section><section>
+<h3><a name="Gradle.2FGrails"></a>Gradle/Grails</h3><a name="Gradle.2FGrails"></a>
+<div class="source">
+<pre>compile 'org.apache.creadur.whisker:apache-whisker:0.2-SNAPSHOT'</pre></div></section><section>
+<h3><a name="Scala_SBT"></a>Scala SBT</h3><a name="Scala_SBT"></a>
+<div class="source">
+<pre>libraryDependencies += &quot;org.apache.creadur.whisker&quot; % &quot;apache-whisker&quot; % &quot;0.2-SNAPSHOT&quot;</pre></div></section><section>
+<h3><a name="Leiningen"></a>Leiningen</h3><a name="Leiningen"></a>
+<div class="source">
+<pre>[org.apache.creadur.whisker/apache-whisker &quot;0.2-SNAPSHOT&quot;]</pre></div></section></section>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
+      of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      This is user documentation, not legal advice.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/whisker/dependency-management.html b/whisker/dependency-management.html
index 2f7d184..e888505 100644
--- a/whisker/dependency-management.html
+++ b/whisker/dependency-management.html
@@ -1,274 +1,210 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:dependency-management at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Project Dependency Management</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Project Dependency Management</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Project Dependency Management
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Project Dependency Management
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                          <li class="expanded">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                    <ul>
-                      <li class="none">
-                          <a href="distribution-management.html" title="Distribution Management">Distribution Management</a>
-            </li>
-                      <li class="none">
-                          <a href="index.html" title="About">About</a>
-            </li>
-                      <li class="none">
-                          <a href="dependencies.html" title="Dependencies">Dependencies</a>
-            </li>
-                      <li class="none">
-                          <a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a>
-            </li>
-                      <li class="none">
-                          <a href="plugins.html" title="Project Plugins">Project Plugins</a>
-            </li>
-                      <li class="none">
-                          <a href="integration.html" title="Continuous Integration">Continuous Integration</a>
-            </li>
-                      <li class="none">
-                          <a href="license.html" title="Project License">Project License</a>
-            </li>
-                      <li class="none">
-            <strong>Dependency Management</strong>
-          </li>
-                      <li class="none">
-                          <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
-            </li>
-                      <li class="none">
-                          <a href="team-list.html" title="Project Team">Project Team</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a>
-            </li>
-                      <li class="none">
-                          <a href="source-repository.html" title="Source Repository">Source Repository</a>
-            </li>
-                      <li class="none">
-                          <a href="plugin-management.html" title="Plugin Management">Plugin Management</a>
-            </li>
-                      <li class="none">
-                          <a href="modules.html" title="Project Modules">Project Modules</a>
-            </li>
-                      <li class="none">
-                          <a href="project-summary.html" title="Project Summary">Project Summary</a>
-            </li>
-              </ul>
-        </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><strong>Dependency Management</strong></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Project Dependency Management<a name="Project_Dependency_Management"></a></h2><a name="Project_Dependency_Management"></a><div class="section"><h3>compile<a name="compile"></a></h3><a name="compile"></a><p>The following is a list of compile dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run the submodule:</p><table border="0" class="bodyTable"><tr class="a"><th>GroupId</th><th> [...]
+<section>
+<h2><a name="Project_Dependency_Management"></a>Project Dependency Management</h2><a name="Project_Dependency_Management"></a><section>
+<h3><a name="compile"></a>compile</h3><a name="compile"></a>
+<p>The following is a list of compile dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run the submodule:</p>
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>GroupId</th>
+<th>ArtifactId</th>
+<th>Version</th>
+<th>Type</th>
+<th>License</th></tr>
+<tr class="b">
+<td>commons-cli</td>
+<td><a class="externalLink" href="http://commons.apache.org/proper/commons-cli/">commons-cli</a></td>
+<td>1.4</td>
+<td>jar</td>
+<td><a class="externalLink" href="https://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="a">
+<td>commons-io</td>
+<td><a class="externalLink" href="https://commons.apache.org/proper/commons-io/">commons-io</a></td>
+<td>2.8.0</td>
+<td>jar</td>
+<td><a class="externalLink" href="https://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="b">
+<td>commons-logging</td>
+<td>commons-logging-api</td>
+<td>1.1</td>
+<td>jar</td>
+<td>-</td></tr>
+<tr class="a">
+<td>org.apache.commons</td>
+<td><a class="externalLink" href="https://commons.apache.org/proper/commons-collections/">commons-collections4</a></td>
+<td>4.4</td>
+<td>jar</td>
+<td><a class="externalLink" href="https://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="b">
+<td>org.apache.commons</td>
+<td><a class="externalLink" href="https://commons.apache.org/proper/commons-lang/">commons-lang3</a></td>
+<td>3.12.0</td>
+<td>jar</td>
+<td><a class="externalLink" href="https://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="a">
+<td>org.apache.velocity</td>
+<td><a class="externalLink" href="http://velocity.apache.org/engine/devel/">velocity</a></td>
+<td>1.7</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
+<td>org.jdom</td>
+<td><a class="externalLink" href="http://www.jdom.org">jdom</a></td>
+<td>1.1.3</td>
+<td>jar</td>
+<td><a class="externalLink" href="https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt">Similar to Apache License but with the acknowledgment clause removed</a></td></tr></table></section><section>
+<h3><a name="test"></a>test</h3><a name="test"></a>
+<p>The following is a list of test dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run unit tests for the submodule:</p>
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>GroupId</th>
+<th>ArtifactId</th>
+<th>Version</th>
+<th>Type</th>
+<th>License</th></tr>
+<tr class="b">
+<td>junit</td>
+<td><a class="externalLink" href="http://junit.org">junit</a></td>
+<td>4.13.2</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License 1.0</a></td></tr>
+<tr class="a">
+<td>org.jmock</td>
+<td><a class="externalLink" href="http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock-junit3">jmock-junit3</a></td>
+<td>2.12.0</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://jmock.org/license.html">BSD style</a></td></tr></table></section></section>
       </div>
     </div>
     <div class="clear">
@@ -276,16 +212,15 @@
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/distribution-management.html b/whisker/distribution-management.html
index 0ee4dd4..788de63 100644
--- a/whisker/distribution-management.html
+++ b/whisker/distribution-management.html
@@ -1,274 +1,143 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:distribution-management at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Project Distribution Management</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Project Distribution Management</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Project Distribution Management
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Project Distribution Management
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                          <li class="expanded">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                    <ul>
-                      <li class="none">
-            <strong>Distribution Management</strong>
-          </li>
-                      <li class="none">
-                          <a href="index.html" title="About">About</a>
-            </li>
-                      <li class="none">
-                          <a href="dependencies.html" title="Dependencies">Dependencies</a>
-            </li>
-                      <li class="none">
-                          <a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a>
-            </li>
-                      <li class="none">
-                          <a href="plugins.html" title="Project Plugins">Project Plugins</a>
-            </li>
-                      <li class="none">
-                          <a href="integration.html" title="Continuous Integration">Continuous Integration</a>
-            </li>
-                      <li class="none">
-                          <a href="license.html" title="Project License">Project License</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-management.html" title="Dependency Management">Dependency Management</a>
-            </li>
-                      <li class="none">
-                          <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
-            </li>
-                      <li class="none">
-                          <a href="team-list.html" title="Project Team">Project Team</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a>
-            </li>
-                      <li class="none">
-                          <a href="source-repository.html" title="Source Repository">Source Repository</a>
-            </li>
-                      <li class="none">
-                          <a href="plugin-management.html" title="Plugin Management">Plugin Management</a>
-            </li>
-                      <li class="none">
-                          <a href="modules.html" title="Project Modules">Project Modules</a>
-            </li>
-                      <li class="none">
-                          <a href="project-summary.html" title="Project Summary">Project Summary</a>
-            </li>
-              </ul>
-        </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><strong>Distribution Management</strong></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Overview<a name="Overview"></a></h2><a name="Overview"></a><p>The following is the distribution management information used by this project.</p><div class="section"><h3>Repository - apache.releases.https<a name="Repository_-_apache.releases.https"></a></h3><a name="Repository_-_apache.releases.https"></a><a class="externalLink" href="https://repository.apache.org/service/local/staging/deploy/maven2">https://repository.apache.org/service/local/staging/depl [...]
+<section>
+<h2><a name="Overview"></a>Overview</h2><a name="Overview"></a>
+<p>The following is the distribution management information used by this project.</p><section>
+<h3><a name="Repository_-_apache.releases.https"></a>Repository - apache.releases.https</h3><a name="Repository_-_apache.releases.https"></a><a class="externalLink" href="https://repository.apache.org/service/local/staging/deploy/maven2">https://repository.apache.org/service/local/staging/deploy/maven2</a></section><section>
+<h3><a name="Snapshot_Repository_-_apache.snapshots.https"></a>Snapshot Repository - apache.snapshots.https</h3><a name="Snapshot_Repository_-_apache.snapshots.https"></a><a class="externalLink" href="https://repository.apache.org/content/repositories/snapshots">https://repository.apache.org/content/repositories/snapshots</a></section><section>
+<h3><a name="Site_-_org.apache.creadur.whisker.site"></a>Site - org.apache.creadur.whisker.site</h3><a name="Site_-_org.apache.creadur.whisker.site"></a>
+<p>file:stage</p></section></section>
       </div>
     </div>
     <div class="clear">
@@ -276,16 +145,15 @@
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/examples/3rd-party-corporate.html b/whisker/examples/3rd-party-corporate.html
index e725b71..5f416b0 100644
--- a/whisker/examples/3rd-party-corporate.html
+++ b/whisker/examples/3rd-party-corporate.html
@@ -1,229 +1,159 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/examples/3rd-party-corporate.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - With A Corporate Third Party Work</title>
-    <style type="text/css" media="all">
-      @import url("../css/maven-base.css");
-      @import url("../css/maven-theme.css");
-      @import url("../css/site.css");
-    </style>
-    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; With A Corporate Third Party Work</title>
+    <link rel="stylesheet" href="../css/maven-base.css" />
+    <link rel="stylesheet" href="../css/maven-theme.css" />
+    <link rel="stylesheet" href="../css/site.css" />
+    <link rel="stylesheet" href="../css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    With A Corporate Third Party Work
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+With A Corporate Third Party Work
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="../meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="../apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="../faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-            <strong>3rd Party (Corporate)</strong>
-          </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="../project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="../project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="../index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="../meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="../apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="../apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="../faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><strong>3rd Party (Corporate)</strong></li>
+     <li class="none"><a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="../examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="../examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="../examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="../project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="With_A_Corporate_Third_Party_Work"></a>With A Corporate Third Party Work</h2>
+<p><a class="externalLink" href="http://creadur.apache.org/whisker"> Apache Whisker</a> is based around <a href="../meta-data.html">meta-data</a> describing the licensing qualities of documents included within <a href="../faq.html#complex-software-applications">complex software distributions</a>. Whisker just helps to maintain information more efficiently, and is <a href="../faq.html#what-whisker-is-not">no substitute</a> for solid legal work. Learn about copyright and software licensing [...]
+<p>For this example, we'll add the meta-data for a third party work licensed from a for- or non-profit corporation.</p>
+<p>If this isn't quite what you're looking for, take a look at:</p>
+<ul>
+<li><a href="./in-5-mins.html">Whisker in 5 minutes</a>, an MIT licensed project</li>
+<li>including a 3rd Party work licensed by
+<ul>
+<li>an <a href="./3rd-party-individual.html">individual</a></li>
+<li>an <a href="./3rd-party-group.html">informal group</a></li></ul></li>
+<li><a href="./license-family.html">Parameterising a template</a> for a <a href="../faq.html#what-is-license-family">license family</a>, featuring the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a></li>
+<li>All about <a href="./copyright-notices.html">copyright notices</a></li></ul>
+<p>or dive into sample meta-data:</p>
+<ul>
+<li><a href="./james.xml"> Apache James</a></li>
+<li><a href="./public-domain.xml"> Public Domain</a></li>
+<li><a href="./template-license.xml"> Template License</a></li>
+<li><a href="./license-family-sample.xml">License Family</a></li>
+<li>Whisker In 5 Minutes featuring the <a href="./in-5-mins-sample.xml">MIT License</a></li>
+<li>distributing work licensed from
+<ul>
+<li>an <a href="./3rd-party-individual-sample.xml"> individual maintainer</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate-sample.xml">corporation</a></li>
+<li>an informal <a href="./3rd-party-group-sample.xml">group</a></li></ul></li>
+<li><a href="./copyright-notices-sample.xml">copyright notices</a></li></ul>
+<p>Whisker treats individual maintainers, groups, for- and non-profit corporations as <a href="../faq.html#what-is-org">organisations</a>, so these examples are almost identical.</p>
+<p>If you're using an IDE then see the <a href="../meta-data.html">meta data reference</a> for a <a href="../faq.html#why-dtd">DTD</a>.</p>
+<p>If you have any questions, please try the <a href="../faq.html">FAQ</a> before asking on the <a href="../mail-lists.html">mail lists</a>.</p><section>
+<h3><a name="The_Story_So_Far"></a>The Story So Far</h3>
+<p>Let's assume <code>foo</code> is a simple project, with a single original source file: <code>HelloWorld.py</code>. The source for <code>foo</code> looks something like:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | LICENSE</pre></div><div class="section"><h4>Starting Definitions<a name="Starting_Definitions"></a></h4><p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <tt>foo</tt> is structured along these lines:</p><div class="source"><pre>&lt;manifest&gt;
+       | LICENSE</pre></div><section>
+<h4><a name="Starting_Definitions"></a>Starting Definitions</h4>
+<p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <code>foo</code> is structured along these lines:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;...&lt;/licenses&gt;
     &lt;notices&gt;...&lt;/notices&gt;
@@ -231,7 +161,10 @@
     &lt;primary-license&gt;...&lt;/primary-license&gt;
     &lt;primary-notice&gt;...&lt;/primary-notice&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <tt>foo</tt> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <tt>licenses</tt> above, and this data is referenced by <tt>id</tt> as <tt>primary-license</tt> below:</p><div class [...]
+    ...</pre></div>
+<p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <code>foo</code> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <code>licenses</code> above, and this data is referenced by <code>id</code> as <code>primary-license</code> below:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
         &lt;license
@@ -423,7 +356,10 @@
     &lt;primary-license id='osi:AL2'/&gt;
     &lt;primary-notice/&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's assume that our project <tt>foo</tt> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <tt>organisations</tt> (above) then referenced by id as the <tt>primary-organisation</tt> (below).</p><div class="source"><pre>&lt;manifest&gt;
+    ...</pre></div>
+<p>Let's assume that our project <code>foo</code> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <code>organisations</code> (above) then referenced by id as the <code>primary-organisation</code> (below).</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     ...
     &lt;organisations&gt;
         &lt;organisation
@@ -433,8 +369,15 @@
     &lt;/organisations&gt;
     ...
     &lt;primary-organisation id='apache.org'/&gt;
-    ...</pre></div></div><div class="section"><h4>Starting Contents<a name="Starting_Contents"></a></h4><p>Let's assume that the distribution for <tt>foo</tt> just contains the single source file <tt>HelloWorld.py</tt> (plus legal documentation generated by Whisker), like this:</p><div class="source"><pre>  foo--|
-       | HelloWorld.py</pre></div><p>The contents section of the meta-data should look quite a lot like:</p><div class="source"><pre>    ...
+    ...</pre></div></section><section>
+<h4><a name="Starting_Contents"></a>Starting Contents</h4>
+<p>Let's assume that the distribution for <code>foo</code> just contains the single source file <code>HelloWorld.py</code> (plus legal documentation generated by Whisker), like this:</p>
+<div class="source">
+<pre>  foo--|
+       | HelloWorld.py</pre></div>
+<p>The contents section of the meta-data should look quite a lot like:</p>
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -443,7 +386,14 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>It is essential that the <tt>id</tt> attributes in the <tt>with-license</tt> and <tt>by-organisation</tt> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></div></div><div class="section"><h3>Adding A Third Party to the Distribution<a name="Adding_A_Third_Party_to_the_Distribution"></a></h3><p>Let's add <tt>boo.png</tt> to the distribution, licensed under the same Apache License by (let's say) <i>T [...]
+&lt;/manifest&gt;</pre></div>
+<p>It is essential that the <code>id</code> attributes in the <code>with-license</code> and <code>by-organisation</code> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></section></section><section>
+<h3><a name="Adding_A_Third_Party_to_the_Distribution"></a>Adding A Third Party to the Distribution</h3>
+<p>Let's add <code>boo.png</code> to the distribution, licensed under the same Apache License by (let's say) <i>The Example Foundation</i> (of <code>example.org</code>) a hypothetical non-profit corporation. If <code>example.org</code> had chosen a different license, then this license might have to be added but otherwise the process would be analogous.</p><section>
+<h4><a name="Add_Organisation"></a>Add Organisation</h4>
+<p>As far as Whisker is concerned, data about a for- or non-profit corporation (like <i>The Example Foundation</i>) is entered entered as an <a href="../faq.html#what-is-org">organisation</a>. By checking that <i>The Example Foundation</i> isn't already described in the <code>organisations</code>, we discover that an <code>organisation</code> needs to be added. Pay particular attention to the <code>id</code> - we'll need to refer to this later when the contents are updated. For this exam [...]
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;...&lt;/licenses&gt;
     &lt;notices&gt;...&lt;/notices&gt;
@@ -458,9 +408,16 @@
     &lt;primary-license&gt;...&lt;/primary-license&gt;
     &lt;primary-notice&gt;...&lt;/primary-notice&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div></div><div class="section"><h4>Add Contents<a name="Add_Contents"></a></h4><p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p><div class="source"><pre>  foo--|
+    ...</pre></div></section><section>
+<h4><a name="Add_Contents"></a>Add Contents</h4>
+<p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | boo.png         &lt;- Newly added</pre></div><p>We need to add <tt>boo.png</tt> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Resources are grouped by organisation, so the <tt>by-organisation</tt> containing the new resource named <tt>boo.png</tt> needs to refer (by <tt>id</tt>) to the <tt>organisation</tt> we added earlier. After checking that <i>The Example Foundation</i>  [...]
+       | boo.png         &lt;- Newly added</pre></div>
+<p>We need to add <code>boo.png</code> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Resources are grouped by organisation, so the <code>by-organisation</code> containing the new resource named <code>boo.png</code> needs to refer (by <code>id</code>) to the <code>organisation</code> we added earlier. After checking that <i>The Example Foundation</i> doesn't distribute a <code>NOTICE< [...]
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -470,7 +427,11 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>That's about all there is to the addition of this new resource licensed from a for- or non-profit organisation.</p><p>If <i>The Example Foundation</i> had distributed a <tt>NOTICE</tt> for this resource, then (after finding that the <tt>NOTICE</tt> is not already included) a <tt>notice</tt> description would need to be added to <tt>notices</tt> above and referenced by id from the resource. Something like:</p><div class="source"><pre>    ...
+&lt;/manifest&gt;</pre></div>
+<p>That's about all there is to the addition of this new resource licensed from a for- or non-profit organisation.</p>
+<p>If <i>The Example Foundation</i> had distributed a <code>NOTICE</code> for this resource, then (after finding that the <code>NOTICE</code> is not already included) a <code>notice</code> description would need to be added to <code>notices</code> above and referenced by id from the resource. Something like:</p>
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -480,7 +441,11 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div></div></div><div class="section"><h3>And Finally<a name="And_Finally"></a></h3><p>We end up with this meta-data (<a href="./3rd-party-corporate-sample.xml">open</a> as an annotated sample):</p><div class="source"><pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;/manifest&gt;</pre></div></section></section><section>
+<h3><a name="And_Finally"></a>And Finally</h3>
+<p>We end up with this meta-data (<a href="./3rd-party-corporate-sample.xml">open</a> as an annotated sample):</p>
+<div class="source">
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
@@ -695,7 +660,10 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-plugin4maven/index.html">Maven build</a>) generates a <tt>LICENSE</tt> similar to:</p><div class="source"><pre>
+&lt;/manifest&gt;</pre></div>
+<p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-maven-plugin/index.html">Maven build</a>) generates a <code>LICENSE</code> similar to:</p>
+<div class="source">
+<pre>
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -880,7 +848,7 @@ Within the . directory
         from The Example Foundation  http://example.org/
             boo.png
 
-</pre></div></div></div>
+</pre></div></section></section>
       </div>
     </div>
     <div class="clear">
@@ -888,16 +856,15 @@ Within the . directory
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/examples/3rd-party-group.html b/whisker/examples/3rd-party-group.html
index e547bca..42f99c1 100644
--- a/whisker/examples/3rd-party-group.html
+++ b/whisker/examples/3rd-party-group.html
@@ -1,229 +1,159 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/examples/3rd-party-group.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - With A Third Party Work by an Informal Group</title>
-    <style type="text/css" media="all">
-      @import url("../css/maven-base.css");
-      @import url("../css/maven-theme.css");
-      @import url("../css/site.css");
-    </style>
-    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; With A Third Party Work by an Informal Group</title>
+    <link rel="stylesheet" href="../css/maven-base.css" />
+    <link rel="stylesheet" href="../css/maven-theme.css" />
+    <link rel="stylesheet" href="../css/site.css" />
+    <link rel="stylesheet" href="../css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    With A Third Party Work by an Informal Group
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+With A Third Party Work by an Informal Group
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="../meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="../apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="../faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-            <strong>3rd Party (Group)</strong>
-          </li>
-                  <li class="none">
-                          <a href="../examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="../project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="../project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="../index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="../meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="../apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="../apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="../faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><strong>3rd Party (Group)</strong></li>
+     <li class="none"><a href="../examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="../examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="../examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="../examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="../project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="With_A_Third_Party_Work_by_an_Informal_Group"></a>With A Third Party Work by an Informal Group</h2>
+<p><a class="externalLink" href="http://creadur.apache.org/whisker"> Apache Whisker</a> is based around <a href="../meta-data.html">meta-data</a> describing the licensing qualities of documents included within <a href="../faq.html#complex-software-applications">complex software distributions</a>. Whisker just helps to maintain information more efficiently, and is <a href="../faq.html#what-whisker-is-not">no substitute</a> for solid legal work. Learn about copyright and software licensing [...]
+<p>For this example, we'll add the meta-data for a third party work licensed from an <a href="../faq.html#third-party-ad-hoc">informal group</a>.</p>
+<p>If this isn't quite what you're looking for, take a look at:</p>
+<ul>
+<li><a href="./in-5-mins.html">Whisker in 5 minutes</a>, an MIT licensed project</li>
+<li>including a 3rd Party work licensed by
+<ul>
+<li>an <a href="./3rd-party-individual.html">individual</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate.html">corporation</a></li></ul></li>
+<li><a href="./license-family.html">Parameterising a template</a> for a <a href="../faq.html#what-is-license-family">license family</a>, featuring the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a></li>
+<li>All about <a href="./copyright-notices.html">copyright notices</a></li></ul>
+<p>or dive into sample meta-data:</p>
+<ul>
+<li><a href="./james.xml"> Apache James</a></li>
+<li><a href="./public-domain.xml"> Public Domain</a></li>
+<li><a href="./template-license.xml"> Template License</a></li>
+<li><a href="./license-family-sample.xml">License Family</a></li>
+<li>Whisker In 5 Minutes featuring the <a href="./in-5-mins-sample.xml">MIT License</a></li>
+<li>distributing work licensed from
+<ul>
+<li>an <a href="./3rd-party-individual-sample.xml"> individual maintainer</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate-sample.xml">corporation</a></li>
+<li>an informal <a href="./3rd-party-group-sample.xml">group</a></li></ul></li>
+<li><a href="./copyright-notices-sample.xml">copyright notices</a></li></ul>
+<p>Whisker treats individual maintainers, groups, for- and non-profit corporations as <a href="../faq.html#what-is-org">organisations</a>, so these examples are almost identical.</p>
+<p>If you're using an IDE then see the <a href="../meta-data.html">meta data reference</a> for a <a href="../faq.html#why-dtd">DTD</a>.</p>
+<p>If you have any questions, please try the <a href="../faq.html">FAQ</a> before asking on the <a href="../mail-lists.html">mail lists</a>.</p><section>
+<h3><a name="The_Story_So_Far"></a>The Story So Far</h3>
+<p>Let's assume <code>foo</code> is a simple project, with a single original source file: <code>HelloWorld.py</code>. The source for <code>foo</code> looks something like:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | LICENSE</pre></div><div class="section"><h4>Starting Definitions<a name="Starting_Definitions"></a></h4><p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <tt>foo</tt> is structured along these lines:</p><div class="source"><pre>&lt;manifest&gt;
+       | LICENSE</pre></div><section>
+<h4><a name="Starting_Definitions"></a>Starting Definitions</h4>
+<p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <code>foo</code> is structured along these lines:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;...&lt;/licenses&gt;
     &lt;notices&gt;...&lt;/notices&gt;
@@ -231,7 +161,10 @@
     &lt;primary-license&gt;...&lt;/primary-license&gt;
     &lt;primary-notice&gt;...&lt;/primary-notice&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <tt>foo</tt> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <tt>licenses</tt> above, and this data is referenced by <tt>id</tt> as <tt>primary-license</tt> below:</p><div class [...]
+    ...</pre></div>
+<p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <code>foo</code> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <code>licenses</code> above, and this data is referenced by <code>id</code> as <code>primary-license</code> below:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
         &lt;license
@@ -423,7 +356,10 @@
     &lt;primary-license id='osi:AL2'/&gt;
     &lt;primary-notice/&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's assume that our project <tt>foo</tt> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <tt>organisations</tt> (above) then referenced by id as the <tt>primary-organisation</tt> (below).</p><div class="source"><pre>&lt;manifest&gt;
+    ...</pre></div>
+<p>Let's assume that our project <code>foo</code> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <code>organisations</code> (above) then referenced by id as the <code>primary-organisation</code> (below).</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     ...
     &lt;organisations&gt;
         &lt;organisation
@@ -433,8 +369,15 @@
     &lt;/organisations&gt;
     ...
     &lt;primary-organisation id='apache.org'/&gt;
-    ...</pre></div></div><div class="section"><h4>Starting Contents<a name="Starting_Contents"></a></h4><p>Let's assume that the distribution for <tt>foo</tt> just contains the single source file <tt>HelloWorld.py</tt> (plus legal documentation generated by Whisker), like this:</p><div class="source"><pre>  foo--|
-       | HelloWorld.py</pre></div><p>The contents section of the meta-data should look quite a lot like:</p><div class="source"><pre>    ...
+    ...</pre></div></section><section>
+<h4><a name="Starting_Contents"></a>Starting Contents</h4>
+<p>Let's assume that the distribution for <code>foo</code> just contains the single source file <code>HelloWorld.py</code> (plus legal documentation generated by Whisker), like this:</p>
+<div class="source">
+<pre>  foo--|
+       | HelloWorld.py</pre></div>
+<p>The contents section of the meta-data should look quite a lot like:</p>
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -443,7 +386,14 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>It is essential that the <tt>id</tt> attributes in the <tt>with-license</tt> and <tt>by-organisation</tt> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></div></div><div class="section"><h3>Adding A Third Party to the Distribution<a name="Adding_A_Third_Party_to_the_Distribution"></a></h3><p>Let's add <tt>boo.png</tt> to the distribution, licensed under the same Apache License by (let's say) <i>T [...]
+&lt;/manifest&gt;</pre></div>
+<p>It is essential that the <code>id</code> attributes in the <code>with-license</code> and <code>by-organisation</code> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></section></section><section>
+<h3><a name="Adding_A_Third_Party_to_the_Distribution"></a>Adding A Third Party to the Distribution</h3>
+<p>Let's add <code>boo.png</code> to the distribution, licensed under the same Apache License by (let's say) <i>The Legion of the Bouncy Example</i> (of <code>example.org</code>) a hypothetical informal group. If <code>example.org</code> had chosen a different license, then this license might have to be added but otherwise the process would be analogous.</p><section>
+<h4><a name="Add_Organisation"></a>Add Organisation</h4>
+<p>As far as Whisker is concerned, data about an informal group corporation (like <i>The Legion of the Bouncy Example</i>) is entered entered as an <a href="../faq.html#what-is-org">organisation</a>. By checking that <i>The Legion of the Bouncy Example</i> isn't already described in the <code>organisations</code>, we discover that an <code>organisation</code> needs to be added. Pay particular attention to the <code>id</code> - we'll need to refer to this later when the contents are updat [...]
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;...&lt;/licenses&gt;
     &lt;notices&gt;...&lt;/notices&gt;
@@ -458,9 +408,16 @@
     &lt;primary-license&gt;...&lt;/primary-license&gt;
     &lt;primary-notice&gt;...&lt;/primary-notice&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div></div><div class="section"><h4>Add Contents<a name="Add_Contents"></a></h4><p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p><div class="source"><pre>  foo--|
+    ...</pre></div></section><section>
+<h4><a name="Add_Contents"></a>Add Contents</h4>
+<p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | boo.png         &lt;- Newly added</pre></div><p>We need to add <tt>boo.png</tt> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Resources are grouped by organisation, so the <tt>by-organisation</tt> containing the new resource named <tt>boo.png</tt> needs to refer (by <tt>id</tt>) to the <tt>organisation</tt> we added earlier. After checking that <i>The Legion of the Bouncy Ex [...]
+       | boo.png         &lt;- Newly added</pre></div>
+<p>We need to add <code>boo.png</code> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Resources are grouped by organisation, so the <code>by-organisation</code> containing the new resource named <code>boo.png</code> needs to refer (by <code>id</code>) to the <code>organisation</code> we added earlier. After checking that <i>The Legion of the Bouncy Example</i> doesn't distribute a <co [...]
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -470,7 +427,11 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>That's about all there is to the addition of this new resource licensed from an informal group.</p><p>If <i>The Legion of the Bouncy Example</i> had distributed a <tt>NOTICE</tt> for this resource, then (after finding that the <tt>NOTICE</tt> is not already included) a <tt>notice</tt> description would need to be added to <tt>notices</tt> above and referenced by id from the resource. Something like:</p><div class="source"><pre>    ...
+&lt;/manifest&gt;</pre></div>
+<p>That's about all there is to the addition of this new resource licensed from an informal group.</p>
+<p>If <i>The Legion of the Bouncy Example</i> had distributed a <code>NOTICE</code> for this resource, then (after finding that the <code>NOTICE</code> is not already included) a <code>notice</code> description would need to be added to <code>notices</code> above and referenced by id from the resource. Something like:</p>
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -480,7 +441,11 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div></div></div><div class="section"><h3>And Finally<a name="And_Finally"></a></h3><p>We end up with this meta-data (<a href="./3rd-party-group-sample.xml">open</a> as an annotated sample):</p><div class="source"><pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;/manifest&gt;</pre></div></section></section><section>
+<h3><a name="And_Finally"></a>And Finally</h3>
+<p>We end up with this meta-data (<a href="./3rd-party-group-sample.xml">open</a> as an annotated sample):</p>
+<div class="source">
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
@@ -695,7 +660,10 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-plugin4maven/index.html">Maven build</a>) generates a <tt>LICENSE</tt> similar to:</p><div class="source"><pre>
+&lt;/manifest&gt;</pre></div>
+<p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-maven-plugin/index.html">Maven build</a>) generates a <code>LICENSE</code> similar to:</p>
+<div class="source">
+<pre>
 
                                  Apache License
                            Version 2.0, January 2004
@@ -881,7 +849,7 @@ Within the . directory
         from The Legion of the Bouncy Example  http://example.org/
             boo.png
 
-</pre></div></div></div>
+</pre></div></section></section>
       </div>
     </div>
     <div class="clear">
@@ -889,16 +857,15 @@ Within the . directory
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/examples/3rd-party-individual.html b/whisker/examples/3rd-party-individual.html
index 10dc763..82978d6 100644
--- a/whisker/examples/3rd-party-individual.html
+++ b/whisker/examples/3rd-party-individual.html
@@ -1,229 +1,159 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/examples/3rd-party-individual.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - With An Individual Third Party Work</title>
-    <style type="text/css" media="all">
-      @import url("../css/maven-base.css");
-      @import url("../css/maven-theme.css");
-      @import url("../css/site.css");
-    </style>
-    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; With An Individual Third Party Work</title>
+    <link rel="stylesheet" href="../css/maven-base.css" />
+    <link rel="stylesheet" href="../css/maven-theme.css" />
+    <link rel="stylesheet" href="../css/site.css" />
+    <link rel="stylesheet" href="../css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    With An Individual Third Party Work
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+With An Individual Third Party Work
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="../meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="../apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="../faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-            <strong>3rd Party (Individual)</strong>
-          </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="../project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="../project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="../index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="../meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="../apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="../apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="../faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><strong>3rd Party (Individual)</strong></li>
+     <li class="none"><a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="../examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="../examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="../examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="../project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="With_An_Individual_Third_Party_Work"></a>With An Individual Third Party Work</h2>
+<p><a class="externalLink" href="http://creadur.apache.org/whisker"> Apache Whisker</a> is based around <a href="../meta-data.html">meta-data</a> describing the licensing qualities of documents included within <a href="../faq.html#complex-software-applications">complex software distributions</a>. Whisker just helps to maintain information more efficiently, and is <a href="../faq.html#what-whisker-is-not">no substitute</a> for solid legal work. Learn about copyright and software licensing [...]
+<p>For this example, we'll add the meta-data for a third party work licensed from an individual.</p>
+<p>If this isn't quite what you're looking for, take a look at:</p>
+<ul>
+<li><a href="./in-5-mins.html">Whisker in 5 minutes</a>, an MIT licensed project</li>
+<li>including a 3rd Party work licensed by
+<ul>
+<li>a for- or non-profit <a href="./3rd-party-corporate.html">corporation</a></li>
+<li>an <a href="./3rd-party-group.html">informal group</a></li></ul></li>
+<li><a href="./license-family.html">Parameterising a template</a> for a <a href="../faq.html#what-is-license-family">license family</a>, featuring the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a></li>
+<li>All about <a href="./copyright-notices.html">copyright notices</a></li></ul>
+<p>or dive into sample meta-data:</p>
+<ul>
+<li><a href="./james.xml"> Apache James</a></li>
+<li><a href="./public-domain.xml"> Public Domain</a></li>
+<li><a href="./template-license.xml"> Template License</a></li>
+<li><a href="./license-family-sample.xml">License Family</a></li>
+<li>Whisker In 5 Minutes featuring the <a href="./in-5-mins-sample.xml">MIT License</a></li>
+<li>distributing work licensed from
+<ul>
+<li>an <a href="./3rd-party-individual-sample.xml"> individual maintainer</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate-sample.xml">corporation</a></li>
+<li>an informal <a href="./3rd-party-group-sample.xml">group</a></li></ul></li>
+<li><a href="./copyright-notices-sample.xml">copyright notices</a></li></ul>
+<p>Whisker treats individual maintainers, groups, for- and non-profit corporations as <a href="../faq.html#what-is-org">organisations</a>, so these examples are almost identical.</p>
+<p>If you're using an IDE then see the <a href="../meta-data.html">meta data reference</a> for a <a href="../faq.html#why-dtd">DTD</a>.</p>
+<p>If you have any questions, please try the <a href="../faq.html">FAQ</a> before asking on the <a href="../mail-lists.html">mail lists</a>.</p><section>
+<h3><a name="The_Story_So_Far"></a>The Story So Far</h3>
+<p>Let's assume <code>foo</code> is a simple project, with a single original source file: <code>HelloWorld.py</code>. The source for <code>foo</code> looks something like:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | LICENSE</pre></div><div class="section"><h4>Starting Definitions<a name="Starting_Definitions"></a></h4><p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <tt>foo</tt> is structured along these lines:</p><div class="source"><pre>&lt;manifest&gt;
+       | LICENSE</pre></div><section>
+<h4><a name="Starting_Definitions"></a>Starting Definitions</h4>
+<p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <code>foo</code> is structured along these lines:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;...&lt;/licenses&gt;
     &lt;notices&gt;...&lt;/notices&gt;
@@ -231,7 +161,10 @@
     &lt;primary-license&gt;...&lt;/primary-license&gt;
     &lt;primary-notice&gt;...&lt;/primary-notice&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <tt>foo</tt> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <tt>licenses</tt> above, and this data is referenced by <tt>id</tt> as <tt>primary-license</tt> below:</p><div class [...]
+    ...</pre></div>
+<p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <code>foo</code> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <code>licenses</code> above, and this data is referenced by <code>id</code> as <code>primary-license</code> below:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
         &lt;license
@@ -423,7 +356,10 @@
     &lt;primary-license id='osi:AL2'/&gt;
     &lt;primary-notice/&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's assume that our project <tt>foo</tt> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <tt>organisations</tt> (above) then referenced by id as the <tt>primary-organisation</tt> (below).</p><div class="source"><pre>&lt;manifest&gt;
+    ...</pre></div>
+<p>Let's assume that our project <code>foo</code> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <code>organisations</code> (above) then referenced by id as the <code>primary-organisation</code> (below).</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     ...
     &lt;organisations&gt;
         &lt;organisation
@@ -433,8 +369,15 @@
     &lt;/organisations&gt;
     ...
     &lt;primary-organisation id='apache.org'/&gt;
-    ...</pre></div></div><div class="section"><h4>Starting Contents<a name="Starting_Contents"></a></h4><p>Let's assume that the distribution for <tt>foo</tt> just contains the single source file <tt>HelloWorld.py</tt> (plus legal documentation generated by Whisker), like this:</p><div class="source"><pre>  foo--|
-       | HelloWorld.py</pre></div><p>The contents section of the meta-data should look quite a lot like:</p><div class="source"><pre>    ...
+    ...</pre></div></section><section>
+<h4><a name="Starting_Contents"></a>Starting Contents</h4>
+<p>Let's assume that the distribution for <code>foo</code> just contains the single source file <code>HelloWorld.py</code> (plus legal documentation generated by Whisker), like this:</p>
+<div class="source">
+<pre>  foo--|
+       | HelloWorld.py</pre></div>
+<p>The contents section of the meta-data should look quite a lot like:</p>
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -443,7 +386,14 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>It is essential that the <tt>id</tt> attributes in the <tt>with-license</tt> and <tt>by-organisation</tt> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></div></div><div class="section"><h3>Adding A Third Party to the Distribution<a name="Adding_A_Third_Party_to_the_Distribution"></a></h3><p>Let's add <tt>boo.png</tt> to the distribution, licensed under the same Apache License by (let's say) <i>S [...]
+&lt;/manifest&gt;</pre></div>
+<p>It is essential that the <code>id</code> attributes in the <code>with-license</code> and <code>by-organisation</code> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></section></section><section>
+<h3><a name="Adding_A_Third_Party_to_the_Distribution"></a>Adding A Third Party to the Distribution</h3>
+<p>Let's add <code>boo.png</code> to the distribution, licensed under the same Apache License by (let's say) <i>Sam Smith</i> (of <code>example.org</code>) an individual maintainer. If <i>Sam</i> had chosen a different license, then this license might have to be added but otherwise the process would be analogous.</p><section>
+<h4><a name="Add_Organisation"></a>Add Organisation</h4>
+<p>As far as Whisker is concerned, data about an individual maintainer (like <i>Sam Smith</i>) is entered as an <a href="../faq.html#what-is-org">organisation</a>. By checking that <i>Sam Smith</i> isn't already described in the <code>organisations</code>, we discover that an <code>organisation</code> needs to be added. Pay particular attention to the <code>id</code> - we'll need to refer to this later when the contents are updated. For this example, we'll <a href="../faq.html#id-freedom [...]
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;...&lt;/licenses&gt;
     &lt;notices&gt;...&lt;/notices&gt;
@@ -458,9 +408,16 @@
     &lt;primary-license&gt;...&lt;/primary-license&gt;
     &lt;primary-notice&gt;...&lt;/primary-notice&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div></div><div class="section"><h4>Add Contents<a name="Add_Contents"></a></h4><p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p><div class="source"><pre>  foo--|
+    ...</pre></div></section><section>
+<h4><a name="Add_Contents"></a>Add Contents</h4>
+<p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | boo.png         &lt;- Newly added</pre></div><p>We need to add <tt>boo.png</tt> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Resources are grouped by organisation, so the <tt>by-organisation</tt> containing the new resource named <tt>boo.png</tt> needs to refer (by <tt>id</tt>) to the <tt>organisation</tt> we added earlier. After checking that <i>Sam Smith</i> doesn't distr [...]
+       | boo.png         &lt;- Newly added</pre></div>
+<p>We need to add <code>boo.png</code> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Resources are grouped by organisation, so the <code>by-organisation</code> containing the new resource named <code>boo.png</code> needs to refer (by <code>id</code>) to the <code>organisation</code> we added earlier. After checking that <i>Sam Smith</i> doesn't distribute a <code>NOTICE</code> for <c [...]
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -470,7 +427,11 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>That's about all there is to the addition of this new resource licensed from a new individual.</p><p>If <i>Sam Smith</i> had distributed a <tt>NOTICE</tt> for this resource, then (after finding that the <tt>NOTICE</tt> is not already included) a <tt>notice</tt> description would need to be added to <tt>notices</tt> above and referenced by id from the resource. Something like:</p><div class="source"><pre>    ...
+&lt;/manifest&gt;</pre></div>
+<p>That's about all there is to the addition of this new resource licensed from a new individual.</p>
+<p>If <i>Sam Smith</i> had distributed a <code>NOTICE</code> for this resource, then (after finding that the <code>NOTICE</code> is not already included) a <code>notice</code> description would need to be added to <code>notices</code> above and referenced by id from the resource. Something like:</p>
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -480,7 +441,11 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div></div></div><div class="section"><h3>And Finally<a name="And_Finally"></a></h3><p>We end up with this meta-data (<a href="./3rd-party-individual-sample.xml">open</a> as an annotated sample):</p><div class="source"><pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;/manifest&gt;</pre></div></section></section><section>
+<h3><a name="And_Finally"></a>And Finally</h3>
+<p>We end up with this meta-data (<a href="./3rd-party-individual-sample.xml">open</a> as an annotated sample):</p>
+<div class="source">
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
@@ -695,7 +660,10 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-plugin4maven/index.html">Maven build</a>) generates a <tt>LICENSE</tt> similar to:</p><div class="source"><pre>
+&lt;/manifest&gt;</pre></div>
+<p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-maven-plugin/index.html">Maven build</a>) generates a <code>LICENSE</code> similar to:</p>
+<div class="source">
+<pre>
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -879,7 +847,7 @@ Within the . directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
         from Sam Smith  http://example.org/~samsmith
             boo.png
-</pre></div></div></div>
+</pre></div></section></section>
       </div>
     </div>
     <div class="clear">
@@ -887,16 +855,15 @@ Within the . directory
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/examples/copyright-notices.html b/whisker/examples/copyright-notices.html
index 8205b5a..6082483 100644
--- a/whisker/examples/copyright-notices.html
+++ b/whisker/examples/copyright-notices.html
@@ -1,227 +1,171 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/examples/copyright-notices.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - All About Copyright Notices</title>
-    <style type="text/css" media="all">
-      @import url("../css/maven-base.css");
-      @import url("../css/maven-theme.css");
-      @import url("../css/site.css");
-    </style>
-    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; All About Copyright Notices</title>
+    <link rel="stylesheet" href="../css/maven-base.css" />
+    <link rel="stylesheet" href="../css/maven-theme.css" />
+    <link rel="stylesheet" href="../css/site.css" />
+    <link rel="stylesheet" href="../css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    All About Copyright Notices
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+All About Copyright Notices
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="../meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="../apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="../faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-            <strong>Copyright Notices</strong>
-          </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="../project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="../project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="../index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="../meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="../apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="../apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="../faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><strong>Copyright Notices</strong></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="../examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="../examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="../examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="../project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="All_About_Copyright_Notices"></a>All About Copyright Notices</h2>
+<p><a class="externalLink" href="http://creadur.apache.org/whisker"> Apache Whisker</a> is based around <a href="../meta-data.html">meta-data</a> describing the licensing qualities of documents included within <a href="../faq.html#complex-software-applications">complex software distributions</a>. Whisker just helps to maintain information more efficiently, and is <a href="../faq.html#what-whisker-is-not">no substitute</a> for solid legal work. Learn about copyright and software licensing [...]
+<p>This example has been carefully chosen to illuminate the tricky topic of <a href="../faq.html#what-copyright-notice">copyright notices</a>. Whisker means by this the copyright claims included at the start of some licenses (for example, the <a class="externalLink" href="http://opensource.org/licenses/MIT">MIT Licence</a>), corresponding to <code>copyright-notice</code> <a href="../meta-data.html#Variable_Copyright_Notices">meta data</a>. Copyright claims which are included in <a href=" [...]
+<p>If this isn't quite what you're looking for, take a look at:</p>
+<ul>
+<li><a href="./in-5-mins.html">Whisker in 5 minutes</a>, an MIT licensed project</li>
+<li>including a 3rd Party work licensed by
+<ul>
+<li>an <a href="./3rd-party-individual.html">individual</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate.html">corporation</a></li>
+<li>an <a href="./3rd-party-group.html">informal group</a></li></ul></li></ul>
+<p>or dive into sample meta-data:</p>
+<ul>
+<li><a href="./james.xml"> Apache James</a></li>
+<li><a href="./public-domain.xml"> Public Domain</a></li>
+<li><a href="./template-license.xml"> Template License</a></li>
+<li><a href="./license-family-sample.xml">License Family</a></li>
+<li>Whisker In 5 Minutes featuring the <a href="./in-5-mins-sample.xml">MIT License</a></li>
+<li>distributing work licensed from
+<ul>
+<li>an <a href="./3rd-party-individual-sample.xml"> individual maintainer</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate-sample.xml">corporation</a></li>
+<li>an informal <a href="./3rd-party-group-sample.xml">group</a></li></ul></li></ul>
+<p>If you're using an IDE then see the <a href="../meta-data.html">meta data reference</a> for a <a href="../faq.html#why-dtd">DTD</a>.</p>
+<p>If you have any questions, please try the <a href="../faq.html">FAQ</a> before asking on the <a href="../mail-lists.html">mail lists</a>.</p><section>
+<h3><a name="Licenses.2C_Claims_and_Copyright_Notices"></a>Licenses, Claims and Copyright Notices</h3><section>
+<h4><a name="What_Whisker_Means_By_a_Copyright_Notice"></a>What Whisker Means By a Copyright Notice</h4>
+<p>A copyright notice is a simple claim of ownership, typically by an author of the work. For example</p>
+<div class="source">
+<pre>        Copyright (c) YEAR A.N.AUTHOR</pre></div>
+<p><b>Do not</b> confuse a <i>copyright notice</i> with the <code>NOTICE</code> that some licenses require to be distributed. A typical <code>NOTICE</code> contains attribution information (for example <i>This products contains software developed by the Apache Software Foundation</i>) as well as a copyright notice.</p>
+<p>Many license definitions (for example, The <a class="externalLink" href="http://www.opensource.org/licenses/mit-license.php"> MIT License</a>) conventionally include a copyright notice. The contents of these copyright notices vary widely.</p>
+<p>Whisker separates <code>copyright-notice</code> from <code>license</code> to reduce duplication. (Optionally) a <code>copyright-notice</code> begins a <code>with-license</code> block, before <code>resource</code> grouped <code>by-organisation</code> sharing this <code>copyright-notice</code> and <code>license</code>.</p></section><section>
+<h4><a name="When_a_Copyright_Notice_is_Needed"></a>When a Copyright Notice is Needed</h4>
+<p>Only a few licenses use <code>copyright-notice</code> elements to contain claims. When a <code>copyright-notice</code> is used, the claim will be printed immediately before the associated license in the <code>LICENSE</code> document. This will only be correct if the original license includes this copyright at this location.</p>
+<p>When copyright claims are included in <code>NOTICE</code> documents, then include these claims instead in appropriate <code>notice</code> meta-data.</p>
+<p>When copyright claims are included within the body of a license text, then create a <a href="./license-family.html">template</a> and pass the claim as a parameter.</p></section><section>
+<h4><a name="Primary_Copyright_Notice"></a>Primary Copyright Notice</h4>
+<p>When the <a href="../faq.html#what-is-primary">primary license</a> uses copyright notices, you should add a <a href="../faq.html#what-is-primary">primary copyright notice</a>. For an example, see <a href="./in-5-mins">Whisker In 5 Minutes</a>.</p></section></section><section>
+<h3><a name="And_Now_-_On_With_the_Example"></a>And Now - On With the Example</h3>
+<p>To illustrate how and when to use copyright notices, we'll create meta data for a project that uses a license (<a class="externalLink" href="http://opensource.org/licenses/CDDL-1.0">CDDL 1.0</a>) which requires neither <code>notice</code> nor <code>copyright-notice</code>. We'll create meta-data for a project which distributes a release containing one work which requires a <code>copyright-notice</code> (MIT License) and another one which requires a <code>notice</code> (<a class="exter [...]
+<h4><a name="Definitions"></a>Definitions</h4><section>
+<h5><a name="Define_Licenses"></a>Define Licenses</h5>
+<p>Begin by adding definitions for the licenses for the works contained in the distribution:</p>
+<ul>
+<li>CDDL 1.0 (primary, <code>copyright-notice</code> <b>not</b> required, <code>notice</code> <b>not</b> required)</li>
+<li>MIT License (<code>copyright-notice</code> <b>required</b>)</li>
+<li>Apache License, Version 2 (<code>notice</code> <b>required</b>)
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
         &lt;license
@@ -790,7 +734,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 &lt;/text&gt;
         &lt;/license&gt;
     &lt;/licenses&gt;
-    ...</pre></div></li></ul></div><div class="section"><h5>Define Organisations<a name="Define_Organisations"></a></h5><p>For clarity, let's assume (for clarity) that <i>The Example Project</i> has licensed each of the works distributed. So, define only one <a href="../faq.html#what-is-org">organisation</a>:</p><div class="source"><pre>    ...
+    ...</pre></div></li></ul></section><section>
+<h5><a name="Define_Organisations"></a>Define Organisations</h5>
+<p>For clarity, let's assume (for clarity) that <i>The Example Project</i> has licensed each of the works distributed. So, define only one <a href="../faq.html#what-is-org">organisation</a>:</p>
+<div class="source">
+<pre>    ...
     &lt;/licenses&gt;
     &lt;organisations&gt;
         &lt;organisation
@@ -799,26 +747,50 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
            url='http://example.org/'
         /&gt;
     &lt;/organisations&gt;
-    ...</pre></div></div><div class="section"><h5>Define Primary License, Organisation, Notice and Copyright Notice<a name="Define_Primary_License_Organisation_Notice_and_Copyright_Notice"></a></h5><p>Add <a href="../faq.html#why-ids">references</a> to the main license (CDDL 1.0) and organisation (<i>The Example Project</i>).</p><p>The CDDL 1.0 has no <a href="../faq.html#when-notice-needed">retention clause</a> (and so no <tt>primary-notice</tt> needs to be added), and includes no copyr [...]
+    ...</pre></div></section><section>
+<h5><a name="Define_Primary_License.2C_Organisation.2C_Notice_and_Copyright_Notice"></a>Define Primary License, Organisation, Notice and Copyright Notice</h5>
+<p>Add <a href="../faq.html#why-ids">references</a> to the main license (CDDL 1.0) and organisation (<i>The Example Project</i>).</p>
+<p>The CDDL 1.0 has no <a href="../faq.html#when-notice-needed">retention clause</a> (and so no <code>primary-notice</code> needs to be added), and includes no copyright claim (and so no <code>&lt;copyright-notice</code> is needed either).</p>
+<div class="source">
+<pre>    ...
     &lt;/organisations&gt;
     &lt;primary-license id='osi:CDDL-1.0'/&gt;
     &lt;primary-notice/&gt;
     &lt;primary-organisation id='example.org'/&gt;
-    ...</pre></div></div></div><div class="section"><h4>Contents<a name="Contents"></a></h4><p>Let's assume (for clarity) that the distribution contains only three works:</p><ul><li><tt>cddl.txt</tt></li><li><tt>mit.txt</tt></li><li><tt>apache.txt</tt></li></ul><p>all in the root directory and all licensed from <i>The Example Org</i> with the licenses that their names suggest.</p><p>As noted above, the primary license (CDDL 1.0) needs neither <tt>notice</tt> nor <tt>copyright-notice</tt> [...]
+    ...</pre></div></section></section><section>
+<h4><a name="Contents"></a>Contents</h4>
+<p>Let's assume (for clarity) that the distribution contains only three works:</p>
+<ul>
+<li><code>cddl.txt</code></li>
+<li><code>mit.txt</code></li>
+<li><code>apache.txt</code></li></ul>
+<p>all in the root directory and all licensed from <i>The Example Org</i> with the licenses that their names suggest.</p>
+<p>As noted above, the primary license (CDDL 1.0) needs neither <code>notice</code> nor <code>copyright-notice</code>.</p>
+<div class="source">
+<pre>    ...
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:CDDL-1.0'&gt;
             &lt;by-organisation id='example.org'&gt;
                 &lt;resource name='cddl.txt'/&gt;
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
-        ...</pre></div><p>The MIT License usually requires a <tt>copyright-notice</tt>. Consulting the license text, we find the copyright claim is <i>Copyright (c) 2525 The Example Project</i>. This should be entered as a <tt>copyright-notice</tt> child of the <tt>with-license</tt>, so that this appears before the plain MIT text in the generated <tt>LICENSE</tt>.</p><div class="source"><pre>    ...
+        ...</pre></div>
+<p>The MIT License usually requires a <code>copyright-notice</code>. Consulting the license text, we find the copyright claim is <i>Copyright (c) 2525 The Example Project</i>. This should be entered as a <code>copyright-notice</code> child of the <code>with-license</code>, so that this appears before the plain MIT text in the generated <code>LICENSE</code>.</p>
+<div class="source">
+<pre>    ...
         &lt;with-license id='osi:mit'&gt;
             &lt;copyright-notice&gt;Copyright (c) 2525 The Example Project&lt;/copyright-notice&gt;
             &lt;by-organisation id='example.org'&gt;
                 &lt;resource name='mit.txt'/&gt;
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
-        ...</pre></div><p>In contrast, the Apache License, Version 2 has a retention clause and typically has a <tt>NOTICE</tt> which must be redistributed. Consulting the release containing <tt>apache.txt</tt>, we find that the appropriate <tt>NOTICE</tt> is as follows:</p><div class="source"><pre>Copyright (c) 2525 The Example Project http://example.org</pre></div><p>So, within <tt>notices</tt> we add a <tt>notice</tt> then reference the <tt>notice</tt> by id in the <tt>resource</tt>.< [...]
+        ...</pre></div>
+<p>In contrast, the Apache License, Version 2 has a retention clause and typically has a <code>NOTICE</code> which must be redistributed. Consulting the release containing <code>apache.txt</code>, we find that the appropriate <code>NOTICE</code> is as follows:</p>
+<div class="source">
+<pre>Copyright (c) 2525 The Example Project http://example.org</pre></div>
+<p>So, within <code>notices</code> we add a <code>notice</code> then reference the <code>notice</code> by id in the <code>resource</code>.</p>
+<div class="source">
+<pre>    &lt;notices&gt;
       &lt;notice id='example.org'&gt;
       Copyright (c) 2525 The Example Project http://example.org
       &lt;/notice&gt;
@@ -831,7 +803,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                 &lt;resource name='apache.txt' notice='example.org'/&gt;
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
-        ...</pre></div><p>Now all the contents have been described, the meta-data is complete.</p></div></div><div class="section"><h3>And Finally<a name="And_Finally"></a></h3><div class="section"><h4>The Complete Descriptor<a name="The_Complete_Descriptor"></a></h4><p>We end up with this meta-data (<a href="./copyright-notices-sample.xml">open</a> as an annotated sample):</p><div class="source"><pre>
+        ...</pre></div>
+<p>Now all the contents have been described, the meta-data is complete.</p></section></section><section>
+<h3><a name="And_Finally"></a>And Finally</h3><section>
+<h4><a name="The_Complete_Descriptor"></a>The Complete Descriptor</h4>
+<p>We end up with this meta-data (<a href="./copyright-notices-sample.xml">open</a> as an annotated sample):</p>
+<div class="source">
+<pre>
 &lt;manifest&gt;
   &lt;!-- Definitions --&gt;
   &lt;licenses&gt;
@@ -1580,7 +1558,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       &lt;/by-organisation&gt;
     &lt;/with-license&gt;
   &lt;/within&gt;
-&lt;/manifest&gt;</pre></div></div><div class="section"><h4>The Generated Documents<a name="The_Generated_Documents"></a></h4><div class="section"><h5>LICENSE<a name="LICENSE"></a></h5><p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-plugin4maven/index.html">Maven build</a>) generates a <tt>LICENSE</tt> similar to:</p><div class="source"><pre>        COMMON DEVELOPMENT AND DISTRIBU [...]
+&lt;/manifest&gt;</pre></div></section><section>
+<h4><a name="The_Generated_Documents"></a>The Generated Documents</h4><section>
+<h5><a name="LICENSE"></a>LICENSE</h5>
+<p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-maven-plugin/index.html">Maven build</a>) generates a <code>LICENSE</code> similar to:</p>
+<div class="source">
+<pre>        COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 (CDDL-1.0)
         1. Definitions.
 
         1.1. Contributor means each individual or entity that
@@ -2274,7 +2257,11 @@ Within the . directory
                     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
         from The Example Project  http://example.org/
-            mit.txt</pre></div></div><div class="section"><h5>NOTICE<a name="NOTICE"></a></h5><p>And a <tt>NOTICE</tt> similar to</p><div class="source"><pre>
+            mit.txt</pre></div></section><section>
+<h5><a name="NOTICE"></a>NOTICE</h5>
+<p>And a <code>NOTICE</code> similar to</p>
+<div class="source">
+<pre>
 
   This distribution contains third party resources requiring the following notices:
 
@@ -2287,7 +2274,7 @@ Within the . directory
 
               This product includes software developed at
               The Example Foundation (http://example.org/).
-</pre></div></div></div></div></div>
+</pre></div></section></section></section></section>
       </div>
     </div>
     <div class="clear">
@@ -2295,16 +2282,15 @@ Within the . directory
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/examples/in-5-mins.html b/whisker/examples/in-5-mins.html
index 951ceb5..186cac6 100644
--- a/whisker/examples/in-5-mins.html
+++ b/whisker/examples/in-5-mins.html
@@ -1,227 +1,151 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/examples/in-5-mins.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Whisker In 5 Minutes</title>
-    <style type="text/css" media="all">
-      @import url("../css/maven-base.css");
-      @import url("../css/maven-theme.css");
-      @import url("../css/site.css");
-    </style>
-    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Whisker In 5 Minutes</title>
+    <link rel="stylesheet" href="../css/maven-base.css" />
+    <link rel="stylesheet" href="../css/maven-theme.css" />
+    <link rel="stylesheet" href="../css/site.css" />
+    <link rel="stylesheet" href="../css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Whisker In 5 Minutes
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Whisker In 5 Minutes
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="../meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="../apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="../faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-            <strong>In 5 Minutes</strong>
-          </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="../project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="../project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="../index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="../meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="../apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="../apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="../faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><strong>In 5 Minutes</strong></li>
+     <li class="none"><a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="../examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="../examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="../examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="../project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="Whisker_In_5_Minutes"></a>Whisker In 5 Minutes</h2>
+<p><a class="externalLink" href="http://creadur.apache.org/whisker"> Apache Whisker</a> is based around <a href="../meta-data.html">meta-data</a> describing the licensing qualities of documents included within <a href="../faq.html#complex-software-applications">complex software distributions</a>. Whisker just helps to maintain information more efficiently, and is <a href="../faq.html#what-whisker-is-not">no substitute</a> for solid legal work. Learn about copyright and software licensing [...]
+<p>For this example, we'll create meta-data for a simple <a class="externalLink" href="http://opensource.org/licenses/mit-license.php/">MIT licensed</a> project. This illustrates any project where a NOTICE is not (necessarily) <a href="../faq.html#when-notice-needed">required</a>.</p>
+<p>If this isn't quite what you're looking for, take a look at other examples which</p>
+<ul>
+<li>add third party resources licensed by
+<ul>
+<li>an <a href="./3rd-party-individual.html">individual</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate.html">corporation</a></li>
+<li>an <a href="./3rd-party-group.html">informal group</a></li></ul></li>
+<li><a href="./license-family.html">parameterising a template</a> for a <a href="../faq.html#what-is-license-family">license family</a>, featuring the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a></li>
+<li>All about <a href="./copyright-notices.html">copyright notices</a></li></ul>
+<p>or dive into sample meta-data:</p>
+<ul>
+<li><a href="./james.xml"> Apache James</a></li>
+<li><a href="./public-domain.xml"> Public Domain</a></li>
+<li><a href="./template-license.xml"> Template License</a></li>
+<li><a href="./license-family-sample.xml">License Family</a></li>
+<li>distributing work licensed from
+<ul>
+<li>an <a href="./3rd-party-individual-sample.xml"> individual maintainer</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate-sample.xml">corporation</a></li>
+<li>an informal <a href="./3rd-party-group-sample.xml">group</a></li></ul></li>
+<li><a href="./copyright-notices-sample.xml">copyright notices</a></li></ul>
+<p>If you're using an IDE then see the <a href="../meta-data.html">meta data reference</a> for a <a href="../faq.html#why-dtd">DTD</a>.</p>
+<p>If you have any questions, please try the <a href="../faq.html">FAQ</a> before asking on the <a href="../mail-lists.html">mail lists</a>.</p><section>
+<h3><a name="Basic_Structure"></a>Basic Structure</h3>
+<p>Each license, notice and organisation is described once above, and then <a href="../faq.html#why-ids">referenced by id</a> below. Start with the outline.</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses/&gt;
     &lt;notices/&gt;
@@ -232,7 +156,13 @@
 
     &lt;!-- Contents --&gt;
     &lt;within dir='.'/&gt;
-&lt;/manifest&gt;</pre></div></div><div class="section"><h3>Primary Definitions<a name="Primary_Definitions"></a></h3><div class="section"><h4>Add The Primary License<a name="Add_The_Primary_License"></a></h4><p><a href="../faq.html#what-is-a-license">Licenses</a> should be entered once into the <tt>licenses</tt> section (at the top), and then <a href="../faq.html#why-ids">referenced by id</a>.</p><p>This project is MIT licensed, so a description of this license needs to be added into <t [...]
+&lt;/manifest&gt;</pre></div></section><section>
+<h3><a name="Primary_Definitions"></a>Primary Definitions</h3><section>
+<h4><a name="Add_The_Primary_License"></a>Add The Primary License</h4>
+<p><a href="../faq.html#what-is-a-license">Licenses</a> should be entered once into the <code>licenses</code> section (at the top), and then <a href="../faq.html#why-ids">referenced by id</a>.</p>
+<p>This project is MIT licensed, so a description of this license needs to be added into <code>licenses</code>. Choose a <code>name</code> suitable for <a href="../faq.html#name-freedom">display</a>, <a href="../faq.html#id-freedom">pick an id</a> and give an <a href="../faq.html#url-freedom">url</a>. Note the <code>id</code> chosen since this will be used a little later. The MIT license isn't a <a href="../faq.html#what-is-license-family">family</a>, so the <code>text</code> contains ju [...]
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;licenses&gt;
         &lt;license
             name='MIT License'
@@ -260,28 +190,48 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             &lt;/text&gt;
         &lt;/license&gt;
     &lt;/licenses&gt;
-    ...</pre></div><p>By primary license we <a href="../faq.html#what-is-primary">mean</a> the main license for the project, covering most of the original resources contributed to the distribution by the project. Reference this <a href="../faq.html#why-ids">by id</a> in <tt>primary-license</tt>. For our example, we set the <tt>id</tt> attribute to the id - <tt>osi:mit</tt> - we picked earlier. Conventionally, a <a href="../faq.html#what-copyright-notice">copyright notice</a> is positione [...]
+    ...</pre></div>
+<p>By primary license we <a href="../faq.html#what-is-primary">mean</a> the main license for the project, covering most of the original resources contributed to the distribution by the project. Reference this <a href="../faq.html#why-ids">by id</a> in <code>primary-license</code>. For our example, we set the <code>id</code> attribute to the id - <code>osi:mit</code> - we picked earlier. Conventionally, a <a href="../faq.html#what-copyright-notice">copyright notice</a> is positioned above [...]
+<div class="source">
+<pre>&lt;manifest&gt;
     ...
     &lt;primary-license id='osi:mit'&gt;
         &lt;copyright-notice&gt;Copyright (c) 3535 Someone&lt;/copyright-notice&gt;
     &lt;/primary-license&gt;
     ...
-&lt;/manifest&gt;</pre></div><p>Unlike the <a class="externalLink" href="http://opensource.org/licenses/apache-2.0">Apache License, Version 2</a> (for example), the MIT License does not have a <tt>NOTICE</tt> <a href="../faq.html#when-notice-needed">retention clause</a>. So, there is no need for a <tt>primary-notice</tt> to be defined.</p><div class="source"><pre>&lt;manifest&gt;
+&lt;/manifest&gt;</pre></div>
+<p>Unlike the <a class="externalLink" href="http://opensource.org/licenses/apache-2.0">Apache License, Version 2</a> (for example), the MIT License does not have a <code>NOTICE</code> <a href="../faq.html#when-notice-needed">retention clause</a>. So, there is no need for a <code>primary-notice</code> to be defined.</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     ...
     &lt;notices/&gt;
     ...
     &lt;primary-notice/&gt;
     ...
-&lt;/manifest&gt;</pre></div></div><div class="section"><h4>Add The Primary Organisation<a name="Add_The_Primary_Organisation"></a></h4><p><a href="../faq.html#third-party-individual">Individual maintainers</a>, <a href="../faq.html#third-party-ad-hoc">informal groups</a>, for- and non-profit <a href="../faq.html#third-party-corporation">corporations</a> are all modeled by Whisker as <tt>organisations</tt>. Read more <a href="../faq.html#what-is-org">here</a>. Let's assume that our examp [...]
+&lt;/manifest&gt;</pre></div></section><section>
+<h4><a name="Add_The_Primary_Organisation"></a>Add The Primary Organisation</h4>
+<p><a href="../faq.html#third-party-individual">Individual maintainers</a>, <a href="../faq.html#third-party-ad-hoc">informal groups</a>, for- and non-profit <a href="../faq.html#third-party-corporation">corporations</a> are all modeled by Whisker as <code>organisations</code>. Read more <a href="../faq.html#what-is-org">here</a>. Let's assume that our example project is maintained by - and licensed from - the (hypothetical) <i>Hypothetical Example Foundation</i>, whose domain is <code>e [...]
+<p>This <code>organisation</code> needs to be added into <code>organisations</code>. We fill in <a href="../faq.html#name-freedom"><code>name</code></a> and <a href="../faq.html#url-freedom"><code>url</code></a>, and <a href="../faq.html#id-freedom">pick an id</a> (which we'll need to <a href="../faq.html#why-ids">refer to</a> just a little later).</p>
+<div class="source">
+<pre>    ...
     &lt;organisations&gt;
         &lt;organisation
             id='example.org'
             name='The Hypothetical Example Foundation'
             url='http://www.example.org'/&gt;
     &lt;/organisations&gt;
-    ...</pre></div><p>Find the <tt>primary-organisation</tt> lower in the document, and set the <tt>id</tt> attribute.</p><div class="source"><pre>    ...
+    ...</pre></div>
+<p>Find the <code>primary-organisation</code> lower in the document, and set the <code>id</code> attribute.</p>
+<div class="source">
+<pre>    ...
     &lt;primary-organisation id='example.org'/&gt;
-    ...</pre></div></div></div><div class="section"><h3>Contents<a name="Contents"></a></h3><p>Meta-data links the contents of a software distribution with its licensing definitions. This allows Whisker to, for example, generate licensing document and check that every document included is expected.</p><p>Contents are <a href="../faq.html#how-contents">described by directory</a>. The resources <tt>within</tt> each directory are grouped <tt>with-license</tt> then <tt>by-organisation</tt>.  [...]
+    ...</pre></div></section></section><section>
+<h3><a name="Contents"></a>Contents</h3>
+<p>Meta-data links the contents of a software distribution with its licensing definitions. This allows Whisker to, for example, generate licensing document and check that every document included is expected.</p>
+<p>Contents are <a href="../faq.html#how-contents">described by directory</a>. The resources <code>within</code> each directory are grouped <code>with-license</code> then <code>by-organisation</code>. Directories are modeled by a <a href="../faq.html#how-dir-model">flat list</a> of <code>within</code> elements.</p>
+<p>Work through the distribution, one directory at a time. Let's say our distribution is laid out like this:</p>
+<div class="source">
+<pre>  --|- one.txt
     |- two.html
     |- three.py
     |
@@ -290,7 +240,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     |       |- seven.coffee
     |
     |-beta--|- eight.java
-</pre></div><p>The root directory of the distribution is <a href="../faq.html#how-root-dir">denoted by '.'</a>, and let's say that its contents (<tt>one.txt</tt>, <tt>two.html</tt> and <tt>three.py</tt>) are all licensed from the primary organisation (<tt>example.org</tt>) using the primary license (MIT). Whisker makes no assumptions about license or organisation, whether primary or not. Every resource is added <tt>by-organisation</tt> and <tt>with-license</tt>, referred to <a href="../f [...]
+</pre></div>
+<p>The root directory of the distribution is <a href="../faq.html#how-root-dir">denoted by '.'</a>, and let's say that its contents (<code>one.txt</code>, <code>two.html</code> and <code>three.py</code>) are all licensed from the primary organisation (<code>example.org</code>) using the primary license (MIT). Whisker makes no assumptions about license or organisation, whether primary or not. Every resource is added <code>by-organisation</code> and <code>with-license</code>, referred to < [...]
+<div class="source">
+<pre>    ...
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:mit'&gt;
             &lt;by-organisation id='example.org'&gt;
@@ -300,14 +253,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>In directory <tt>alpha</tt>, let's say that <tt>five.js</tt> and <tt>six.rb</tt> are similar (MIT licensed by <tt>example.org</tt>) to those above. We add these immediately.</p><div class="source"><pre>    ...
+&lt;/manifest&gt;</pre></div>
+<p>In directory <code>alpha</code>, let's say that <code>five.js</code> and <code>six.rb</code> are similar (MIT licensed by <code>example.org</code>) to those above. We add these immediately.</p>
+<div class="source">
+<pre>    ...
     &lt;within dir='alpha'&gt;
         &lt;with-license id='osi:mit'&gt;
             &lt;by-organisation id='example.org'&gt;
                 &lt;resource name='five.js'/&gt;
                 &lt;resource name='six.rb'/&gt;
             &lt;/by-organisation&gt;
-            ...</pre></div><p>Let's say that <tt>seven.coffee</tt> is a third party resource included within the software distribution. To illustrate how to add a third party resource sharing the primary license, let's say that <tt>seven.coffee</tt> is licensed under the primary (MIT) license from the Apache Software Foundation. After checking that details haven't already been added for <tt>apache.org</tt>, we add an <tt>organisation</tt> and <a href="../faq.html#why-ids">refer to it</a> [...]
+            ...</pre></div>
+<p>Let's say that <code>seven.coffee</code> is a third party resource included within the software distribution. To illustrate how to add a third party resource sharing the primary license, let's say that <code>seven.coffee</code> is licensed under the primary (MIT) license from the Apache Software Foundation. After checking that details haven't already been added for <code>apache.org</code>, we add an <code>organisation</code> and <a href="../faq.html#why-ids">refer to it</a> <code>by-o [...]
+<div class="source">
+<pre>    ...
     &lt;organisations&gt;
         ...
         &lt;organisation
@@ -327,7 +286,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>Finally, let's say that directory <tt>beta</tt> contains only <tt>eight.java</tt>, again from <tt>apache.org</tt> but licensed this time under the <a class="externalLink" href="http://opensource.org/licenses/apache-2.0">Apache License, Version 2</a>, which is the standard license for Apache software.</p><p>After checking that this license isn't already in <tt>licenses</tt>, we add the license details and note the id <a href="../faq.html#id-freedom">we chos [...]
+&lt;/manifest&gt;</pre></div>
+<p>Finally, let's say that directory <code>beta</code> contains only <code>eight.java</code>, again from <code>apache.org</code> but licensed this time under the <a class="externalLink" href="http://opensource.org/licenses/apache-2.0">Apache License, Version 2</a>, which is the standard license for Apache software.</p>
+<p>After checking that this license isn't already in <code>licenses</code>, we add the license details and note the id <a href="../faq.html#id-freedom">we chose</a> - in this case <code>osi:AL2</code>.</p>
+<div class="source">
+<pre>    ...
     &lt;licenses&gt;
         ...
         &lt;license
@@ -513,7 +476,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    END OF TERMS AND CONDITIONS
 &lt;/text&gt;
         &lt;/license&gt;
-        ...</pre></div><p>The <tt>beta</tt> directory in our distribution contains only the resource <tt>eight.java</tt> by <tt>apache.org</tt> licensed under the Apache License, Version 2. For this example, we will assume that no NOTICE is <a href="../faq.html#when-notice-needed">required</a>. So we're ready now to complete the meta-data.</p><div class="source"><pre>    ...
+        ...</pre></div>
+<p>The <code>beta</code> directory in our distribution contains only the resource <code>eight.java</code> by <code>apache.org</code> licensed under the Apache License, Version 2. For this example, we will assume that no NOTICE is <a href="../faq.html#when-notice-needed">required</a>. So we're ready now to complete the meta-data.</p>
+<div class="source">
+<pre>    ...
     &lt;within dir='beta'&gt;
         &lt;with-license id='osi:AL2'&gt;
             &lt;by-organisation id='apache.org'&gt;
@@ -521,7 +487,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div></div><div class="section"><h3>And Finally<a name="And_Finally"></a></h3><p>We end up with this meta-data (<a href="./in-5-mins-sample.xml">open</a> as an annotated sample):</p><div class="source"><pre>&lt;manifest&gt;
+&lt;/manifest&gt;</pre></div></section><section>
+<h3><a name="And_Finally"></a>And Finally</h3>
+<p>We end up with this meta-data (<a href="./in-5-mins-sample.xml">open</a> as an annotated sample):</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;licenses&gt;
         &lt;license name='MIT License' id='osi:mit'
             url='http://www.opensource.org/licenses/mit-license.php'&gt;
@@ -773,7 +743,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-plugin4maven/index.html">Maven build</a>) generates a <tt>LICENSE</tt> similar to:</p><div class="source"><pre>
+&lt;/manifest&gt;</pre></div>
+<p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-maven-plugin/index.html">Maven build</a>) generates a <code>LICENSE</code> similar to:</p>
+<div class="source">
+<pre>
 Copyright (c) 3535 Someone
 
 
@@ -984,7 +957,7 @@ Within the beta directory
 
                END OF TERMS AND CONDITIONS
         from Apache Software Foundation  http://www.apache.org
-            eight.java</pre></div></div></div>
+            eight.java</pre></div></section></section>
       </div>
     </div>
     <div class="clear">
@@ -992,16 +965,15 @@ Within the beta directory
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/examples/license-family.html b/whisker/examples/license-family.html
index 9b53020..f1d2234 100644
--- a/whisker/examples/license-family.html
+++ b/whisker/examples/license-family.html
@@ -1,229 +1,158 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/examples/license-family.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Parameterising a Template for a License Family</title>
-    <style type="text/css" media="all">
-      @import url("../css/maven-base.css");
-      @import url("../css/maven-theme.css");
-      @import url("../css/site.css");
-    </style>
-    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Parameterising a Template for a License Family</title>
+    <link rel="stylesheet" href="../css/maven-base.css" />
+    <link rel="stylesheet" href="../css/maven-theme.css" />
+    <link rel="stylesheet" href="../css/site.css" />
+    <link rel="stylesheet" href="../css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Parameterising a Template for a License Family
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Parameterising a Template for a License Family
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="../meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="../apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="../faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-            <strong>License Family</strong>
-          </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="../project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="../project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="../index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="../meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="../apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="../apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="../apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="../xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="../faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="../examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><strong>License Family</strong></li>
+     <li class="none"><a href="../examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="../examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="../examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="../examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="../examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="../examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="../examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="../examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="../examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="../examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="../project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="Parameterising_a_Template_for_a_License_Family"></a>Parameterising a Template for a License Family</h2>
+<p><a class="externalLink" href="http://creadur.apache.org/whisker"> Apache Whisker</a> is based around <a href="../meta-data.html">meta-data</a> describing the licensing qualities of documents included within <a href="../faq.html#complex-software-applications">complex software distributions</a>. Whisker just helps to maintain information more efficiently, and is <a href="../faq.html#what-whisker-is-not">no substitute</a> for solid legal work. Learn about copyright and software licensing [...]
+<p>For this example, we'll add the meta-data for a third party work whose license is parameterised using a <a href="../faq.html#what-is-license-family">license family</a> template, featuring the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a></p>
+<p>If this isn't quite what you're looking for, take a look at:</p>
+<ul>
+<li><a href="./in-5-mins.html">Whisker in 5 minutes</a>, an MIT licensed project</li>
+<li>including a 3rd Party work licensed by
+<ul>
+<li>an <a href="./3rd-party-individual.html">individual</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate.html">corporation</a></li>
+<li>an <a href="./3rd-party-group.html">informal group</a></li></ul></li>
+<li>All about <a href="./copyright-notices.html">copyright notices</a></li></ul>
+<p>or dive into sample meta-data:</p>
+<ul>
+<li><a href="./james.xml"> Apache James</a></li>
+<li><a href="./public-domain.xml"> Public Domain</a></li>
+<li><a href="./template-license.xml"> Template License</a></li>
+<li><a href="./license-family-sample.xml">License Family</a></li>
+<li>Whisker In 5 Minutes featuring the <a href="./in-5-mins-sample.xml">MIT License</a></li>
+<li>distributing work licensed from
+<ul>
+<li>an <a href="./3rd-party-individual-sample.xml"> individual maintainer</a></li>
+<li>a for- or non-profit <a href="./3rd-party-corporate-sample.xml">corporation</a></li>
+<li>an informal <a href="./3rd-party-group-sample.xml">group</a></li></ul></li>
+<li><a href="./copyright-notices-sample.xml">copyright notices</a></li></ul>
+<p>If you're using an IDE then see the <a href="../meta-data.html">meta data reference</a> for a <a href="../faq.html#why-dtd">DTD</a>.</p>
+<p>If you have any questions, please try the <a href="../faq.html">FAQ</a> before asking on the <a href="../mail-lists.html">mail lists</a>.</p><section>
+<h3><a name="The_Story_So_Far"></a>The Story So Far</h3>
+<p>Let's assume <code>foo</code> is a simple project, with a single original source file: <code>HelloWorld.py</code>. The source for <code>foo</code> looks something like:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | LICENSE</pre></div><div class="section"><h4>Starting Definitions<a name="Starting_Definitions"></a></h4><p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <tt>foo</tt> is structured along these lines:</p><div class="source"><pre>&lt;manifest&gt;
+       | LICENSE</pre></div><section>
+<h4><a name="Starting_Definitions"></a>Starting Definitions</h4>
+<p>Whisker describes each <a href="../faq.html#what-is-a-license">license</a>, <a href="../faq.html#what-notice">notice</a> and <a href="../faq.html#what-is-org">organisation</a> once above, and then <a href="../faq.html#why-ids">references by id</a> below. So, the meta-data for project <code>foo</code> is structured along these lines:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;...&lt;/licenses&gt;
     &lt;notices&gt;...&lt;/notices&gt;
@@ -231,7 +160,10 @@
     &lt;primary-license&gt;...&lt;/primary-license&gt;
     &lt;primary-notice&gt;...&lt;/primary-notice&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <tt>foo</tt> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <tt>licenses</tt> above, and this data is referenced by <tt>id</tt> as <tt>primary-license</tt> below:</p><div class [...]
+    ...</pre></div>
+<p>Let's say that the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a> is the <a href="../faq.html#what-is-primary">primary license</a> for the project, but <code>foo</code> opts not to <a href="../faq.html#notice-needed-for-al2">include a primary notice</a>. The text for this license is included in <code>licenses</code> above, and this data is referenced by <code>id</code> as <code>primary-license</code> below:</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
         &lt;license
@@ -423,7 +355,10 @@
     &lt;primary-license id='osi:AL2'/&gt;
     &lt;primary-notice/&gt;
     &lt;primary-organisation&gt;...&lt;/primary-organisation&gt;
-    ...</pre></div><p>Let's assume that our project <tt>foo</tt> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <tt>organisations</tt> (above) then referenced by id as the <tt>primary-organisation</tt> (below).</p><div class="source"><pre>&lt;manifest&gt;
+    ...</pre></div>
+<p>Let's assume that our project <code>foo</code> is here at Apache. So the <a href="../faq.html#what-is-primary">primary organisation</a> is the <a class="externalLink" href="http://www.apache.org/foundation">Apache Software Foundation</a>. This organisation is described once in <code>organisations</code> (above) then referenced by id as the <code>primary-organisation</code> (below).</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     ...
     &lt;organisations&gt;
         &lt;organisation
@@ -433,8 +368,15 @@
     &lt;/organisations&gt;
     ...
     &lt;primary-organisation id='apache.org'/&gt;
-    ...</pre></div></div><div class="section"><h4>Starting Contents<a name="Starting_Contents"></a></h4><p>Let's assume that the distribution for <tt>foo</tt> just contains the single source file <tt>HelloWorld.py</tt> (plus legal documentation generated by Whisker), like this:</p><div class="source"><pre>  foo--|
-       | HelloWorld.py</pre></div><p>The contents section of the meta-data should look quite a lot like:</p><div class="source"><pre>    ...
+    ...</pre></div></section><section>
+<h4><a name="Starting_Contents"></a>Starting Contents</h4>
+<p>Let's assume that the distribution for <code>foo</code> just contains the single source file <code>HelloWorld.py</code> (plus legal documentation generated by Whisker), like this:</p>
+<div class="source">
+<pre>  foo--|
+       | HelloWorld.py</pre></div>
+<p>The contents section of the meta-data should look quite a lot like:</p>
+<div class="source">
+<pre>    ...
     &lt;!-- Contents --&gt;
     &lt;within dir='.'&gt;
         &lt;with-license id='osi:AL2'&gt;
@@ -443,7 +385,12 @@
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>It is essential that the <tt>id</tt> attributes in the <tt>with-license</tt> and <tt>by-organisation</tt> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></div></div><div class="section"><h3>Adding A Third Party Work to the Distribution<a name="Adding_A_Third_Party_Work_to_the_Distribution"></a></h3><p>Let's add <tt>boo.png</tt> to the distribution, licensed with the <a class="externalLink" href=" [...]
+&lt;/manifest&gt;</pre></div>
+<p>It is essential that the <code>id</code> attributes in the <code>with-license</code> and <code>by-organisation</code> elements match the ids assigned above. This allows the details entered above to be re-used consistently.</p></section></section><section>
+<h3><a name="Adding_A_Third_Party_Work_to_the_Distribution"></a>Adding A Third Party Work to the Distribution</h3>
+<p>Let's add <code>boo.png</code> to the distribution, licensed with the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a> from the (hypothetical) <i>Example Project</i>. The license shipped is</p>
+<div class="source">
+<pre>  Copyright (c) 2000-2010 The Example Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -464,7 +411,10 @@ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</pre></div><p>Consulting the <a class="externalLink" href="http://opensource.org/licenses/index.html">open source initiative</a>, we find this corresponds to the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a> template</p><div class="source"><pre>Copyright (c) &lt;YEAR&gt;, &lt;OWNER&gt;
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</pre></div>
+<p>Consulting the <a class="externalLink" href="http://opensource.org/licenses/index.html">open source initiative</a>, we find this corresponds to the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a> template</p>
+<div class="source">
+<pre>Copyright (c) &lt;YEAR&gt;, &lt;OWNER&gt;
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -486,7 +436,10 @@ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</pre></div><p>Yes, the license is indeed part of the BSD (2 Clause) license family. Checking <tt>licenses</tt> verifies that we need to add this as a new template <tt>license</tt> with two parameters. We have a <a href="../faq.html#parameter-name-freedom">free choice</a> of <tt>parameter-name</tt> but it's conventional to reuse (where possible) standard names - in this case <tt>YEAR</tt> and <tt>OWNER</tt>. Define them within in a <tt>te [...]
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</pre></div>
+<p>Yes, the license is indeed part of the BSD (2 Clause) license family. Checking <code>licenses</code> verifies that we need to add this as a new template <code>license</code> with two parameters. We have a <a href="../faq.html#parameter-name-freedom">free choice</a> of <code>parameter-name</code> but it's conventional to reuse (where possible) standard names - in this case <code>YEAR</code> and <code>OWNER</code>. Define them within in a <code>template</code> element and then values wi [...]
+<div class="source">
+<pre>&lt;manifest&gt;
         ...
         &lt;license
             id='osi:BSD2'
@@ -523,7 +476,12 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             &lt;/text&gt;
         &lt;/license&gt;
-        ...</pre></div><p>Comparing the text of the license instance with the template (we just created), we find that <tt>YEAR</tt> should be <i>2000-2010</i> and <tt>OWNER</tt> should be <i>The Example Project</i>. We'll need to add these later as <tt>license-parameters</tt>. We note the <a href="../faq.html#id-freedom">id chosen</a> - <tt>osi:BSD2</tt> - for <a href="../faq.html#why-ids">later</a>.</p><div class="section"><h4>Add Organisation<a name="Add_Organisation"></a></h4><p>Afte [...]
+        ...</pre></div>
+<p>Comparing the text of the license instance with the template (we just created), we find that <code>YEAR</code> should be <i>2000-2010</i> and <code>OWNER</code> should be <i>The Example Project</i>. We'll need to add these later as <code>license-parameters</code>. We note the <a href="../faq.html#id-freedom">id chosen</a> - <code>osi:BSD2</code> - for <a href="../faq.html#why-ids">later</a>.</p><section>
+<h4><a name="Add_Organisation"></a>Add Organisation</h4>
+<p>After verifying that <i>The Example Project</i> isn't already described in the <code>organisations</code>, we add this new <code>organisation</code>, noting the <a href="../faq.html#id-freedom">id chosen</a> for <a href="../faq.html#why-ids">later</a>. (Read more about adding organisations <a href="../faq.html#add-org-example">here</a>.)</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;organisations&gt;
     ...
         &lt;organisation
@@ -532,14 +490,24 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            url='http://example.org/'
         /&gt;
     &lt;/organisations&gt;
-    ...</pre></div></div><div class="section"><h4>Add Contents<a name="Add_Contents"></a></h4><p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p><div class="source"><pre>  foo--|
+    ...</pre></div></section><section>
+<h4><a name="Add_Contents"></a>Add Contents</h4>
+<p>Excluding the legal documentation to be generated by Whisker, suppose that the contents of the new distribution are:</p>
+<div class="source">
+<pre>  foo--|
        | HelloWorld.py
-       | boo.png         &lt;- Newly added</pre></div><p>We need to add <tt>boo.png</tt> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Within each <tt>dir</tt>, resources contained within the directory are grouped <tt>with-license</tt>. The new resource - <tt>boo.png</tt> - is the first with the <i>BSD (2 Clause) License</i>, so we need to add a new <tt>with-license</tt> with <tt>id< [...]
+       | boo.png         &lt;- Newly added</pre></div>
+<p>We need to add <code>boo.png</code> to the <a href="../faq.html#how-contents">contents</a>, into a new group of resources within the <a href="../faq.html#how-root-dir">root directory</a>. Within each <code>dir</code>, resources contained within the directory are grouped <code>with-license</code>. The new resource - <code>boo.png</code> - is the first with the <i>BSD (2 Clause) License</i>, so we need to add a new <code>with-license</code> with <code>id</code> attribute <code>osi:BSD2< [...]
+<div class="source">
+<pre>    ...
     &lt;within dir='.'&gt;
         ...
         &lt;with-license id='osi:BSD2'&gt;
         &lt;/with-license&gt;
-        ...</pre></div><p>The <tt>license</tt> we added earlier is a template, so we need to include the parameter values as <tt>license-parameters</tt>. These will be substituted into the template when rendering the license instance text. We enter the values we noted above</p><div class="source"><pre>    ...
+        ...</pre></div>
+<p>The <code>license</code> we added earlier is a template, so we need to include the parameter values as <code>license-parameters</code>. These will be substituted into the template when rendering the license instance text. We enter the values we noted above</p>
+<div class="source">
+<pre>    ...
     &lt;within dir='.'&gt;
         ...
         &lt;with-license id='osi:BSD2'&gt;
@@ -554,7 +522,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 &lt;/parameter&gt;
             &lt;/license-parameters&gt;
         &lt;/with-license&gt;
-        ...</pre></div><p>Within each license, resources are grouped by organisation. So the <tt>by-organisation</tt> containing the new resource named <tt>boo.png</tt> needs to <a href="../faq.html#why-ids">refer</a> (by <tt>id</tt>) to the <tt>organisation</tt> we added earlier - <tt>example.org</tt>.</p><div class="source"><pre>    ...
+        ...</pre></div>
+<p>Within each license, resources are grouped by organisation. So the <code>by-organisation</code> containing the new resource named <code>boo.png</code> needs to <a href="../faq.html#why-ids">refer</a> (by <code>id</code>) to the <code>organisation</code> we added earlier - <code>example.org</code>.</p>
+<div class="source">
+<pre>    ...
     &lt;within dir='.'&gt;
         ...
         &lt;with-license id='osi:BSD2'&gt;
@@ -572,7 +543,12 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 &lt;resource name='boo.png'/&gt;
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
-    ...</pre></div><p>That's about all there is to adding <tt>boo.png</tt>, a new BSD (2 Clause) licensed resource.</p></div></div><div class="section"><h3>And Finally<a name="And_Finally"></a></h3><p>We end up with this meta-data (<a href="./license-family-sample.xml">open</a> as an annotated sample):</p><div class="source"><pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+    ...</pre></div>
+<p>That's about all there is to adding <code>boo.png</code>, a new BSD (2 Clause) licensed resource.</p></section></section><section>
+<h3><a name="And_Finally"></a>And Finally</h3>
+<p>We end up with this meta-data (<a href="./license-family-sample.xml">open</a> as an annotated sample):</p>
+<div class="source">
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;manifest&gt;
     &lt;!-- Definitions --&gt;
     &lt;licenses&gt;
@@ -834,7 +810,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div><p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-plugin4maven/index.html">Maven build</a>) generates a <tt>LICENSE</tt> similar to:</p><div class="source"><pre>
+&lt;/manifest&gt;</pre></div>
+<p>From this meta-data, Whisker (either from the <a href="../apache-whisker-cli/index.html">command line</a> or integrated into a <a href="../apache-whisker-maven-plugin/index.html">Maven build</a>) generates a <code>LICENSE</code> similar to:</p>
+<div class="source">
+<pre>
 
                                  Apache License
                            Version 2.0, January 2004
@@ -1045,7 +1024,7 @@ Within the . directory
 
         from The Example Project  http://example.org/
             boo.png
-</pre></div></div></div>
+</pre></div></section></section>
       </div>
     </div>
     <div class="clear">
@@ -1053,16 +1032,15 @@ Within the . directory
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/faq.html b/whisker/faq.html
index 747300c..0151b7f 100644
--- a/whisker/faq.html
+++ b/whisker/faq.html
@@ -1,358 +1,352 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/fml/faq.fml at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Frequently Asked Questions</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Frequently Asked Questions</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Frequently Asked Questions
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Frequently Asked Questions
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-            <strong>FAQ</strong>
-          </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><strong>FAQ</strong></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License. --><div class="section"><h2><a name="top">Frequently Asked Questions</a><a name="Frequently_Asked_Questions"></a></h2><p><b>Meta Data</b></p><ol style="list-style-type: decimal"><li><a href="#why-ids">Why Reference Licenses, Notices and Organisations by ID?</a></li><li><a href="#id-freedom">Am I Free to Pick Any ID?</a></li><li><a href="#name-freedom">Am I Free to Pick Any Name?</a></li><li><a href="#url-freedom">Am I Free to Pick Any URL?</a></li><li><a href="#param [...]
-      <p>
+<section>
+<h2><a name="Frequently_Asked_Questions"></a><a name="top">Frequently Asked Questions</a></h2>
+<p><b>Meta Data</b></p>
+<ol style="list-style-type: decimal">
+<li><a href="#why-ids">Why Reference Licenses, Notices and Organisations by ID?</a></li>
+<li><a href="#id-freedom">Am I Free to Pick Any ID?</a></li>
+<li><a href="#name-freedom">Am I Free to Pick Any Name?</a></li>
+<li><a href="#url-freedom">Am I Free to Pick Any URL?</a></li>
+<li><a href="#parameter-name-freedom">Am I Free to Pick Any Name for a Parameter?</a></li>
+<li><a href="#where-is-reference">Is a reference available?</a></li>
+<li><a href="#what-is-primary">What do you mean by 'primary'?</a></li>
+<li><a href="#primary-license-organisation-relationship">What is the relationship between the Primary License and the Primary Organsation?</a></li>
+<li><a href="#what-is-org">What do you mean by an 'organisation'?</a></li>
+<li><a href="#where-is-dtd">Does an organisation have to be a formal corporation or company?</a></li>
+<li><a href="#third-party-individual">What about third party software licensed from an individual?</a></li>
+<li><a href="#third-party-corporation">What about third party software licensed from a corporation?</a></li>
+<li><a href="#third-party-ad-hoc">What about third party software licensed by an informal group?</a></li>
+<li><a href="#organisation-verses-organization">Why organisation, not organization?</a></li>
+<li><a href="#where-is-dtd">Is a DTD available?</a></li>
+<li><a href="#why-dtd">Why only a DTD?</a></li>
+<li><a href="#ide">I prefer to use an IDE. Can it help me write the meta-data?</a></li>
+<li><a href="#how-root-dir">What represents the root directory?</a></li>
+<li><a href="#how-dir-model">How are directories modeled?</a></li>
+<li><a href="#why-dir-model">Why are directories modeled as a flat list?</a></li>
+<li><a href="#how-contents">How are the contents of a distribution represented?</a></li>
+<li><a href="#how-license-family">Are license families supported?</a></li>
+<li><a href="#why-license-family">Why use templates for license families?</a></li>
+<li><a href="#what-primary-copyright-notice">What do you mean by a primary copyright notice?</a></li>
+<li><a href="#how-primary-copyright-notice">How do I add a primary copyright notice?</a></li>
+<li><a href="#when-primary-copyright-notice">When do I need to add a primary copyright notice?</a></li>
+<li><a href="#when--copyright-notice">When do I need to add a copyright notice for a license?</a></li>
+<li><a href="#when-copyright-notice-vs-notice">Should I use a copyright-notice or a notice?</a></li>
+<li><a href="#sample-meta-data">Are any samples available?</a></li></ol>
+<p><b>Generating Licensing Documents</b></p>
+<ol style="list-style-type: decimal">
+<li><a href="#when-notice">When will a NOTICE be generated?</a></li>
+<li><a href="#when-source-links">Can Whisker Generate Source Links?</a></li></ol>
+<p><b>Licensing</b></p>
+<ol style="list-style-type: decimal">
+<li><a href="#what-whisker-is-not">Will Whisker Automagically Solve my Licensing Problems?</a></li>
+<li><a href="#what-this-documentation-is-not">Can I rely on this documentation as legal advice?</a></li>
+<li><a href="#what-is-a-license">What is a license?</a></li>
+<li><a href="#what-license">What do you mean by <code>LICENSE</code>?</a></li>
+<li><a href="#what-notice">What do you mean by <code>NOTICE</code>?</a></li>
+<li><a href="#what-copyright-notice">What is a copyright notice?</a></li>
+<li><a href="#notice-vs-copyright-notice">What is the difference between a <code>NOTICE</code> and a copyright notice?</a></li>
+<li><a href="#notice-vs-license">What is the difference between a <code>NOTICE</code> and a <code>LICENSE</code>?</a></li>
+<li><a href="#when-notice-needed">When is a <code>NOTICE</code> needed?</a></li>
+<li><a href="#notice-needed-for-al2">Do I need to add a <code>NOTICE</code> for my Apache Licensed Project?</a></li>
+<li><a href="#complex-software-applications">When is Whisker needed?</a></li>
+<li><a href="#licensor">What do you mean by licensor?</a></li>
+<li><a href="#what-is-downstream">What is a downstream consumer?</a></li>
+<li><a href="#what-is-an-open-source-license">What is an Open Source License?</a></li>
+<li><a href="#what-copyleft">What Do You Mean By Copyleft?</a></li>
+<li><a href="#what-weak-copyleft">What Do You Mean By Weak Copyleft?</a></li>
+<li><a href="#what-source-clause">What Do You Mean By Source Clause?</a></li>
+<li><a href="#what-is-license-family">What do you mean by a license family?</a></li></ol>
+<p><b>Is there an Example...</b></p>
+<ol style="list-style-type: decimal">
+<li><a href="#mit-example">Using the MIT License?</a></li>
+<li><a href="#no-notice-example">Of a Project without a NOTICE?</a></li>
+<li><a href="#add-org-example">Of Adding an Organisation?</a></li>
+<li><a href="#a3rd-party-individual-example">Of a Third Party Dependency licensed from an Individual?</a></li>
+<li><a href="#a3rd-party-corporate-example">Of a Third Party Dependency licensed from a for- or non-profit organisation?</a></li>
+<li><a href="#a3rd-party-individual-example">Of a Third Party Dependency licensed from an Informal Group?</a></li></ol>
+<p><b>Learning</b></p>
+<ol style="list-style-type: decimal">
+<li><a href="#more-resources">I'm interested in learning more about software licensing. Where should I start?</a></li></ol></section><section>
+<h2><a name="Meta_Data"></a>Meta Data</h2>
+<dl>
+<dt><a name="why-ids">Why Reference Licenses, Notices and Organisations by ID?</a></dt>
+<dd>
+      
+<p>
       <a class="externalLink" href="http://dbpedia.org/resource/Don&apos;t_repeat_yourself">DRY</a> rules.
      </p>
-      <p>
+      
+<p>
       Each license, notice and organisation should be described once, and then
-      referenced by <tt>id</tt>. For complex projects, this reduces duplication
+      referenced by <code>id</code>. For complex projects, this reduces duplication
       and eases maintenance.
      </p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="id-freedom">Am I Free to Pick Any ID?</a></dt><dd>
-      <p>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="id-freedom">Am I Free to Pick Any ID?</a></dt>
+<dd>
+      
+<p>
 IDs need to be unique (within the document)
 but otherwise you are free.
      </p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="name-freedom">Am I Free to Pick Any Name?</a></dt><dd>
-      <p>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="name-freedom">Am I Free to Pick Any Name?</a></dt>
+<dd>
+      
+<p>
       Yes, but...
      </p>
-      <p>
-Whisker adopts the convention that <tt>name</tt> attributes
-(for example, on <tt>license</tt> elements) are used
+      
+<p>
+Whisker adopts the convention that <code>name</code> attributes
+(for example, on <code>license</code> elements) are used
 for presentation, so it is strong recommended that a suitably
 human-readable title is chosen.
      </p>
-      <p>
+      
+<p>
 Where possibly, pick the standard name for this license: either the
 title within the text, or the name adopted by a standards organisation
 for example  <a class="externalLink" href="http://www.opensource.org">The Open Source Initiative</a>.
      </p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="url-freedom">Am I Free to Pick Any URL?</a></dt><dd>
-      <p>
-Whisker adopts the convention that <tt>url</tt> attributes
-(for example, on <tt>license</tt> elements) are used to present
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="url-freedom">Am I Free to Pick Any URL?</a></dt>
+<dd>
+      
+<p>
+Whisker adopts the convention that <code>url</code> attributes
+(for example, on <code>license</code> elements) are used to present
 a reference location for a reader. It is recommended that a
 standard URL is given, where possible, for example from the
 <a class="externalLink" href="http://www.opensource.org">The Open Source Initiative</a>.
       </p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="parameter-name-freedom">Am I Free to Pick Any Name for a Parameter?</a></dt><dd>
-      <p>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="parameter-name-freedom">Am I Free to Pick Any Name for a Parameter?</a></dt>
+<dd>
+      
+<p>
       Yes
      </p>
-      <p>
+      
+<p>
 Where possible, we recommend reusing the name adopted by a standards organisation,
 for example  <a class="externalLink" href="http://www.opensource.org">The Open Source Initiative</a>.
      </p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="where-is-reference">Is a reference available?</a></dt><dd>
-            <p>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="where-is-reference">Is a reference available?</a></dt>
+<dd>
+            
+<p>
             <a href="meta-data.html">Yes</a>
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-is-primary">What do you mean by 'primary'?</a></dt><dd>
-            <p>
-Whisker documentation often talks about a <i>primary license</i>,
-a <i>primary organisation</i> and so on.
-The meta-data contains elements like <tt>primary-license</tt> and
-<tt>primary-notice</tt>. Though the intended meaning might accord
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-is-primary">What do you mean by 'primary'?</a></dt>
+<dd>
+            
+<p>
+Whisker documentation often talks about a <em>primary license</em>,
+a <em>primary organisation</em> and so on.
+The meta-data contains elements like <code>primary-license</code> and
+<code>primary-notice</code>. Though the intended meaning might accord
 with intuition, a more precise description may help to deepen
 understanding of software licensing.
            </p>
-            <p>
-By <i>primary</i>, we mean the
+            
+<p>
+By <em>primary</em>, we mean the
 main license, notice or organisation associated with the project.
 Take, for example, a project here at <a class="externalLink" href="http://www.apache.org">Apache</a>.
 In this case, the primary license would be
 <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">The Apache License, Version 2</a>
-(<abbr title="The Apache License, Version 2"><tt>AL2</tt></abbr>)
+(<abbr><code>AL2</code></abbr>)
 and the primary organisation
 <a class="externalLink" href="http://www.apache.org/foundation/">The Apache Software Foundation</a>.
            </p>
-            <p>
-The <i>primary license</i> should cover most of the original content contributed
+            
+<p>
+The <em>primary license</em> should cover most of the original content contributed
 by the project to the software distributed. Apache, for example,
 <a class="externalLink" href="http://www.apache.org/legal/src-headers.html">insists</a> that
 original source is
-<abbr title="The Apache License, Version 2"><tt>AL2</tt></abbr> licensed.
-The <i>primary organisation</i> should be the legal entity
+<abbr><code>AL2</code></abbr> licensed.
+The <em>primary organisation</em> should be the legal entity
 issuing the primary license. Apache, for example, uses
 <a class="externalLink" href="http://www.apache.org/licenses/index.html#clas">contributor license agreements</a>,
 <a class="externalLink" href="http://www.apache.org/licenses/index.html#grants">grants</a> and
-<tt><abbr title="The Apache License, Version 2">AL2</abbr> Section 5</tt>
+<code><abbr>AL2</abbr> Section 5</code>
 to allow the foundation to issue open source licenses.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="primary-license-organisation-relationship">What is the relationship between the Primary License and the Primary Organsation?</a></dt><dd>
-            <p>
-The <i>primary license</i> covers most of the original content contributed
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="primary-license-organisation-relationship">What is the relationship between the Primary License and the Primary Organsation?</a></dt>
+<dd>
+            
+<p>
+The <em>primary license</em> covers most of the original content contributed
 by the project to the software distributed. Apache, for example,
 <a class="externalLink" href="http://www.apache.org/legal/src-headers.html">insists</a> that
 original source is
-<abbr title="The Apache License, Version 2"><tt>AL2</tt></abbr> licensed.
+<abbr><code>AL2</code></abbr> licensed.
            </p>
-            <p>
-The <i>primary organisation</i> should be the legal entity
-issuing the <i>primary license</i>. Apache, for example, uses
+            
+<p>
+The <em>primary organisation</em> should be the legal entity
+issuing the <em>primary license</em>. Apache, for example, uses
 <a class="externalLink" href="http://www.apache.org/licenses/index.html#clas">contributor license agreements</a>,
 <a class="externalLink" href="http://www.apache.org/licenses/index.html#grants">grants</a> and
-<tt><abbr title="The Apache License, Version 2">AL2</abbr> Section 5</tt>
+<code><abbr>AL2</abbr> Section 5</code>
 to allow the foundation to issue open source licenses. Alternatively
 (as practiced by
 <a class="externalLink" href="http://www.gnu.org/prep/maintain/html_node/Copyright-Papers.html#Copyright-Papers">GNU</a>,
 for example)
 copyright may be assigned to the organisation by its contributions.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-is-org">What do you mean by an 'organisation'?</a></dt><dd>
-            <p>
-Whisker uses <i>organisation</i> to identify and describe groups or individuals
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-is-org">What do you mean by an 'organisation'?</a></dt>
+<dd>
+            
+<p>
+Whisker uses <em>organisation</em> to identify and describe groups or individuals
 who license the third party works distributed. This includes a wide variety of
 entities, for example
            </p>
-            <ul>
+            
+<ul>
+
 <li>non-profit corporations such as
 <a class="externalLink" href="http://www.apache.org/foundation">The Apache Software Foundation</a>,
 <a class="externalLink" href="http://www.fsf.org/about/">The Free Software Foundation</a> and
 <a class="externalLink" href="http://www.gnome.org/foundation/">The GNOME Foundation</a>;
 </li>
+
 <li>
 for-profit corporations such as
 VMWare Inc., Google Inc. and IBM Corporation;
 </li>
+
 <li>
 academic institutions such as the
 <a class="externalLink" href="http://berkeley.edu/">University of California, Berkeley</a>,
@@ -360,136 +354,200 @@ the
 <a class="externalLink" href="http://web.mit.edu/">Massachusetts Institute of Technology</a> and
 <a class="externalLink" href="http://osuosl.org/">Oregon State University</a>;
 </li>
+
 <li>
 groups and collectives such as
 <a class="externalLink" href="http://www.bouncycastle.org">The Legion of the Bouncy Castle</a> and
 <a class="externalLink" href="http://www.joda.org">Joda</a>
 </li>
+
 <li>and individual maintainers.
 </li>
            </ul>
-            <p>
+            
+<p>
  To reduce duplication and increase comprehension, Whisker often
  groups results by organisation.
            </p>
-            <p>
+            
+<p>
  See <a href="#add-org-example">here</a> for examples.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="where-is-dtd">Does an organisation have to be a formal corporation or company?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="where-is-dtd">Does an organisation have to be a formal corporation or company?</a></dt>
+<dd>
+            
+<p>
             No
            </p>
-            <p>
+            
+<p>
             As far as Whisker is concerned,
             a wide variety of entities are organisations,
             as well as some individual maintainers.
            </p>
-            <p>
+            
+<p>
             Read more <a href="#what-is-org">here</a> and see comments
             on <a href="#third-party-ad-hoc">informal groups</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="third-party-individual">What about third party software licensed from an individual?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="third-party-individual">What about third party software licensed from an individual?</a></dt>
+<dd>
+            
+<p>
 As far as Whisker is concerned, each individual maintainer is an
 organisation.
            </p>
-            <p>
+            
+<p>
             See this
             <a href="./examples/3rd-party-individual.html">example</a>.
            </p>
-            <p>
+            
+<p>
             Read more <a href="#what-is-org">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="third-party-corporation">What about third party software licensed from a corporation?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="third-party-corporation">What about third party software licensed from a corporation?</a></dt>
+<dd>
+            
+<p>
 As far as Whisker is concerned, each corporation (whether non-profit or for-profit) is an
 organisation.
            </p>
-            <p>
+            
+<p>
             See this
             <a href="./examples/3rd-party-corporate.html">example</a>.
            </p>
-            <p>
+            
+<p>
             Read more <a href="#what-is-org">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="third-party-ad-hoc">What about third party software licensed by an informal group?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="third-party-ad-hoc">What about third party software licensed by an informal group?</a></dt>
+<dd>
+            
+<p>
 As far as Whisker is concerned, each group or collective is an organisation.
 You might want to check that the <a href="#licensor">licensor</a>
 has the rights required to issue the license,
 though, before adding it to your distribution.
            </p>
-            <p>
+            
+<p>
             See this
             <a href="./examples/3rd-party-group.html">example</a>.
            </p>
-            <p>
+            
+<p>
             Read more <a href="#what-is-org">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="organisation-verses-organization">Why organisation, not organization?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="organisation-verses-organization">Why organisation, not organization?</a></dt>
+<dd>
+            
+<p>
             No particular reason
            </p>
-            <p>
+            
+<p>
             Apologies to those tripped up by this choice
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="where-is-dtd">Is a DTD available?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="where-is-dtd">Is a DTD available?</a></dt>
+<dd>
+            
+<p>
             Yes, in the
             <a href="meta-data.html#Described_By_DTD">meta data reference</a>
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="why-dtd">Why only a DTD?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="why-dtd">Why only a DTD?</a></dt>
+<dd>
+            
+<p>
 The <a class="externalLink" href="http://www.xml.com/axml/target.html#dt-doctype">DTD</a> is
 aimed at IDE users and developers,
 and is not prescriptive but descriptive.
            </p>
-            <p>
+            
+<p>
 For the present, schema validation is not enforced.
 If it were, probably a language like
 <a class="externalLink" href="http://relaxng.org/">Relax NG</a> would be chosen.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="ide">I prefer to use an IDE. Can it help me write the meta-data?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="ide">I prefer to use an IDE. Can it help me write the meta-data?</a></dt>
+<dd>
+            
+<p>
             A DTD is available in the
             <a href="meta-data.html#Described_By_DTD">meta data reference</a>,
             which should be of some use.
            </p>
-            <p>
+            
+<p>
 There are currently no known plugins. If you know of a plugin please
 <a href="./mail-lists.html">let us know</a> or
 <a href="./source-repository.html">contribute a patch</a> for this documentation.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="how-root-dir">What represents the root directory?</a></dt><dd>
-            <p>
-            <tt>.</tt>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="how-root-dir">What represents the root directory?</a></dt>
+<dd>
+            
+<p>
+            <code>.</code>
            </p>
-            <p>
+            
+<p>
             As in &lt;within dir='.'&gt;
            </p>
-            <p>
+            
+<p>
 Read how directories are modeled <a href="#how-dir-model">here</a>
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="how-dir-model">How are directories modeled?</a></dt><dd>
-            <p>
- Directories are modeled by a flat list of <tt>within</tt>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="how-dir-model">How are directories modeled?</a></dt>
+<dd>
+            
+<p>
+ Directories are modeled by a flat list of <code>within</code>
  elements.
            </p>
-            <p>
+            
+<p>
 Read why <a href="#why-dir-model">here</a>
            </p>
-            <p>
+            
+<p>
 See how the root directory is modelled <a href="#how-root-dir">here</a>
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="why-dir-model">Why are directories modeled as a flat list?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="why-dir-model">Why are directories modeled as a flat list?</a></dt>
+<dd>
+            
+<p>
             Simplicity
            </p>
-            <p>
+            
+<p>
  Within a file system, the containment relationship between
  directories typically forms a natural tree. Modern file systems
  typically allow cyclic links only with special links (for example,
-  <tt>symbolic links</tt> in
+  <code>symbolic links</code> in
   <a class="externalLink" href="http://dbpedia.org/resource/Unix-like">*nix</a>).
   Including these links would allow directory containment
   to become a graph. XML element containment forms a natural
@@ -498,217 +556,301 @@ See how the root directory is modelled <a href="#how-root-dir">here</a>
   This would introduce more complexity
   and more ways to make mistakes but little gain.
            </p>
-            <p>
+            
+<p>
 Read how directories are modeled <a href="#how-dir-model">here</a>
            </p>
-            <p>
+            
+<p>
 See how the root directory is modelled <a href="#how-root-dir">here</a>
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="how-contents">How are the contents of a distribution represented?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="how-contents">How are the contents of a distribution represented?</a></dt>
+<dd>
+            
+<p>
 Resources are grouped
            </p>
-            <ul>
-                <li><tt>by-organisation</tt></li>
-                <li><tt>with-license</tt></li>
-                <li><tt>within</tt> a directory.</li>
+            
+<ul>
+                
+<li><code>by-organisation</code></li>
+                
+<li><code>with-license</code></li>
+                
+<li><code>within</code> a directory.</li>
            </ul>
-            <p>
+            
+<p>
 The directory structure is not represented by
-nesting <tt>within</tt> elements. These elements are simply listed.
+nesting <code>within</code> elements. These elements are simply listed.
            </p>
-            <p>
+            
+<p>
 See the <a href="#sample-meta-data">samples</a> for examples.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="how-license-family">Are license families supported?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="how-license-family">Are license families supported?</a></dt>
+<dd>
+            
+<p>
 Yes
            </p>
-            <p>
-Add a template <tt>license</tt> and parameterise.
+            
+<p>
+Add a template <code>license</code> and parameterise.
            </p>
-            <p>
+            
+<p>
 Read how <a href="meta-data.html#Templates_For_License_Families">here</a>.
            </p>
-            <p>
+            
+<p>
 Read the rational for templates <a href="#why-license-family">here</a>.
            </p>
-            <p>
+            
+<p>
 See this <a href="examples/license-family.html">example</a>.
            </p>
-            <p>
+            
+<p>
 Read more about license families <a href="#what-is-license-family">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="why-license-family">Why use templates for license families?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="why-license-family">Why use templates for license families?</a></dt>
+<dd>
+            
+<p>
 Templates are not strictly necessary.
-           </p><p>
-Just pasting every complete license into the <tt>text</tt> would work,
+           </p>
+<p>
+Just pasting every complete license into the <code>text</code> would work,
 though the meta-data would be less concise than using templates.
 There is some additional work involved with drawing up each template,
 so you might think that this is not a worthwhile tradeoff.
-           </p><p>
+           </p>
+<p>
 But there are reasons why using templates today may benefit a project
 tomorrow.
            </p>
-            <p>
+            
+<p>
 License families share important legal qualities. In the future, it should
 be possible to
 automate some licensing policy checks but only if licenses are
 categorised in a form which enables automated reasoning.
 Using a template for all members of a family is likely to help.
            </p>
-            <p>
+            
+<p>
 Read more about license families <a href="#what-is-license-family">here</a>.
            </p>
 
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-primary-copyright-notice">What do you mean by a primary copyright notice?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-primary-copyright-notice">What do you mean by a primary copyright notice?</a></dt>
+<dd>
+            
+<p>
 An (optional) <a href="#what-copyright-notice">copyright notice</a>,
-included in a <tt>LICENSE</tt> document but positioned above the license text
+included in a <code>LICENSE</code> document but positioned above the license text
 (rather than being part of it). For example, conventionally a copyright notice
 is positioned above the
 <a class="externalLink" href="http://opensource.org/licenses/mit-license.php/">MIT License</a> text.
            </p>
-            <p>
+            
+<p>
  Learn about copyright notices <a href="#what-copyright-notice">here</a>.
            </p>
-            <p>
- Read about the different between a <tt>NOTICE</tt>
+            
+<p>
+ Read about the different between a <code>NOTICE</code>
  and a copyright notice <a href="#notice-vs-copyright-notice">here</a>.
            </p>
-            <p>
+            
+<p>
  Read about when you need to add a primary copyright notice
  <a href="#when-primary-copyright-notice">here</a>.
            </p>
-             <p>
+             
+<p>
  Read about how you need add a primary copyright notice
  <a href="#how-primary-copyright-notice">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="how-primary-copyright-notice">How do I add a primary copyright notice?</a></dt><dd>
-            <p>
- Add a <tt>copyright-notice</tt> child to the <tt>primary-license</tt>.
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="how-primary-copyright-notice">How do I add a primary copyright notice?</a></dt>
+<dd>
+            
+<p>
+ Add a <code>copyright-notice</code> child to the <code>primary-license</code>.
  See the example <a href="./examples/in-5-mins.html">here</a>.
            </p>
-            <p>
+            
+<p>
  Learn about copyright notices <a href="#what-copyright-notice">here</a>.
            </p>
-            <p>
- Read about the different between a <tt>NOTICE</tt>
+            
+<p>
+ Read about the different between a <code>NOTICE</code>
  and a copyright notice <a href="#notice-vs-copyright-notice">here</a>.
            </p>
-            <p>
+            
+<p>
  Read about when you need to add a primary copyright notice
  <a href="#when-primary-copyright-notice">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="when-primary-copyright-notice">When do I need to add a primary copyright notice?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="when-primary-copyright-notice">When do I need to add a primary copyright notice?</a></dt>
+<dd>
+            
+<p>
 <a href="#what-is-license-family">Template licenses</a>
 (for example the
 <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD License 2 Clause</a>)
 typically includes a
 parameterised copyright notice. Licenses
-<a href="#when-notice-needed">with</a> a <tt>NOTICE</tt>
+<a href="#when-notice-needed">with</a> a <code>NOTICE</code>
 (for example the
 <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a>)
-usually include the copyright notice in the <tt>NOTICE</tt>.
-           </p><p>
+usually include the copyright notice in the <code>NOTICE</code>.
+           </p>
+<p>
 Some other licenses (for example the
 <a class="externalLink" href="http://opensource.org/licenses/mit-license.php/">MIT License</a>)
 conventionally include a copyright notice above the text:
 to use these licenses with Whisker, add a primary copyright notice
 and use the plain license text.
            </p>
-            <p>
+            
+<p>
  Learn about copyright notices <a href="#what-copyright-notice">here</a>.
            </p>
-            <p>
- Read about the different between a <tt>NOTICE</tt>
+            
+<p>
+ Read about the different between a <code>NOTICE</code>
  and a copyright notice <a href="#notice-vs-copyright-notice">here</a>.
            </p>
-            <p>
+            
+<p>
  Read about how you need add a primary copyright notice
  <a href="#how-primary-copyright-notice">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="when--copyright-notice">When do I need to add a copyright notice for a license?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="when--copyright-notice">When do I need to add a copyright notice for a license?</a></dt>
+<dd>
+            
+<p>
 <a href="#what-is-license-family">Template licenses</a>
 (for example the
 <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD License 2 Clause</a>)
 typically includes a
 parameterised copyright notice. Licenses
-<a href="#when-notice-needed">with</a> a <tt>NOTICE</tt>
+<a href="#when-notice-needed">with</a> a <code>NOTICE</code>
 (for example the
 <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a>)
-usually include the copyright notice in the <tt>NOTICE</tt>. When using these
+usually include the copyright notice in the <code>NOTICE</code>. When using these
 licenses with Whisker, to set a copyright claim use the parameter or
-<tt>notice</tt> rather than
-the <tt>copyright-notice</tt> element.
-           </p><p>
+<code>notice</code> rather than
+the <code>copyright-notice</code> element.
+           </p>
+<p>
 Some other licenses (for example the
 <a class="externalLink" href="http://opensource.org/licenses/mit-license.php/">MIT License</a>)
 conventionally include a copyright notice above the text:
 to use these licenses with Whisker, add a copyright notice
 and use the plain license text.
            </p>
-            <p>
+            
+<p>
  Learn about copyright notices <a href="#what-copyright-notice">here</a>.
            </p>
-            <p>
- Read about the different between a <tt>NOTICE</tt>
+            
+<p>
+ Read about the different between a <code>NOTICE</code>
  and a copyright notice <a href="#notice-vs-copyright-notice">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="when-copyright-notice-vs-notice">Should I use a copyright-notice or a notice?</a></dt><dd>
-            <p>
- If the copyright claim belongs in the <tt>LICENSE</tt> document then
- use a <tt>copyright-notice</tt>.
-           </p><p>
- If the copyright claim belongs in the <tt>NOTICE</tt>
- document then include it within a <tt>notice</tt>.
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="when-copyright-notice-vs-notice">Should I use a copyright-notice or a notice?</a></dt>
+<dd>
+            
+<p>
+ If the copyright claim belongs in the <code>LICENSE</code> document then
+ use a <code>copyright-notice</code>.
+           </p>
+<p>
+ If the copyright claim belongs in the <code>NOTICE</code>
+ document then include it within a <code>notice</code>.
            </p>
-            <p>
+            
+<p>
  Learn about copyright notices <a href="#what-copyright-notice">here</a>.
            </p>
-            <p>
- Read about the different between a <tt>NOTICE</tt>
+            
+<p>
+ Read about the different between a <code>NOTICE</code>
  and a copyright notice <a href="#notice-vs-copyright-notice">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="sample-meta-data">Are any samples available?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="sample-meta-data">Are any samples available?</a></dt>
+<dd>
+            
+<p>
             Yes
            </p>
-            <p>
+            
+<p>
             See
            </p>
-            <ul>
-                <li>
+            
+<ul>
+                
+<li>
 <a href="./examples/james.xml">Apache James</a>, sample meta-data
 for a complex open source application;
                </li>
-                <li>
+                
+<li>
 <a href="./examples/template-license.xml">Template License</a>, an
 annotated outline useful for new meta-data; or
                 </li>
-                 <li>simple annotated educational samples for
-                 <ul>
-                    <li>
+                 
+<li>simple annotated educational samples for
+                 
+<ul>
+                    
+<li>
 <a href="./examples/public-domain.xml">public domain</a>
                    </li>
-                    <li>
+                    
+<li>
 <a href="./examples/license-family-sample.xml">license family</a> using a template
                    </li>
-                    <li>
+                    
+<li>
 Whisker In 5 Minutes featuring the
 <a href="./examples/in-5-mins-sample.xml">MIT License</a>
                    </li>
-                    <li>
+                    
+<li>
 distributing work licensed from
-                        <ul>
-                            <li>
+                        
+<ul>
+                            
+<li>
 an <a href="./examples/3rd-party-individual-sample.xml">individual maintainer</a>
-                           </li><li>
+                           </li>
+<li>
 a for- or non-profit <a href="./examples/3rd-party-corporate-sample.xml">corporation</a>
-                           </li><li>
+                           </li>
+<li>
 an informal <a href="./examples/3rd-party-group-sample.xml">group</a>
                            </li>
 
@@ -717,205 +859,305 @@ an informal <a href="./examples/3rd-party-group-sample.xml">group</a>
                 </ul>
                 </li>
            </ul>
-        <p align="right"><a href="#top">[top]</a></p></dd></dl></div><div class="section"><h2>Generating Licensing Documents<a name="Generating_Licensing_Documents"></a></h2><dl><dt><a name="when-notice">When will a NOTICE be generated?</a></dt><dd>
-      <p>Whisker should generate a <tt>NOTICE</tt> document only when
+        
+<p align="right"><a href="#top">[top]</a></p></dd></dl></section><section>
+<h2><a name="Generating_Licensing_Documents"></a>Generating Licensing Documents</h2>
+<dl>
+<dt><a name="when-notice">When will a NOTICE be generated?</a></dt>
+<dd>
+      
+<p>Whisker should generate a <code>NOTICE</code> document only when
       <a href="#when-notice-needed">needed</a>.
       Examples include:</p>
-      <ul>
-        <li>when the primary notice is not empty; and</li>
-        <li>when at least one distributed artifact requires an attribution.</li>
+      
+<ul>
+        
+<li>when the primary notice is not empty; and</li>
+        
+<li>when at least one distributed artifact requires an attribution.</li>
      </ul>
-      <p>If you have a use case where an unnecessary <tt>NOTICE</tt> is generated,
-      or when a <tt>NOTICE</tt> isn't generated when it is needed please open an
+      
+<p>If you have a use case where an unnecessary <code>NOTICE</code> is generated,
+      or when a <code>NOTICE</code> isn't generated when it is needed please open an
       <a href="./issue-tracking.html">issue</a> or let us know
       <a href="./mail-lists.html">on list</a>.</p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="when-source-links">Can Whisker Generate Source Links?</a></dt><dd>
-            <p>
-            Yes - use the <tt>source</tt> element.
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="when-source-links">Can Whisker Generate Source Links?</a></dt>
+<dd>
+            
+<p>
+            Yes - use the <code>source</code> element.
            </p>
-            <p>
-            Learn about the <tt>source</tt> element
+            
+<p>
+            Learn about the <code>source</code> element
             <a href="./meta-data.html#Source_Links">here</a>.
            </p>
-            <p>
+            
+<p>
             Learn about source clauses <a href="#what-source-clause">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p></dd></dl></div><div class="section"><h2>Licensing<a name="Licensing"></a></h2><dl><dt><a name="what-whisker-is-not">Will Whisker Automagically Solve my Licensing Problems?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p></dd></dl></section><section>
+<h2><a name="Licensing"></a>Licensing</h2>
+<dl>
+<dt><a name="what-whisker-is-not">Will Whisker Automagically Solve my Licensing Problems?</a></dt>
+<dd>
+            
+<p>
             No
            </p>
-            <p>
+            
+<p>
 Whisker is just an efficient way to maintain licensing documentation for
 <a href="#complex-software-applications">complex applications</a>. It is no
 substitute for accurate legal legwork.
            </p>
-            <p>
+            
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-this-documentation-is-not">Can I rely on this documentation as legal advice?</a></dt><dd>
-            <p>
-            Most definitely <b>no</b>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-this-documentation-is-not">Can I rely on this documentation as legal advice?</a></dt>
+<dd>
+            
+<p>
+            Most definitely <strong>no</strong>
            </p>
-            <p>
+            
+<p>
 This documentation guides users assumed to have a practical understanding of the relevant
 laws in appropriate jurisdictions. In order to explain how Whisker can help,
 we need to agree some terms with the reader.
            </p>
-            <p>
+            
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
            </p>
-            <p>
+            
+<p>
 Intellectual property laws are complex, and vary from country to country.
 Anyone looking for legal advice should consult the best lawyer they can.
 We cannot help.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-is-a-license">What is a license?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-is-a-license">What is a license?</a></dt>
+<dd>
+            
+<p>
 In some general sense, a license is a permission. We're
 thinking in particular about copyright or patent permissions.
            </p>
-            <p>
+            
+<p>
 Whisker focuses on tracking explicit licenses, and so almost always
 when we talk about a license, we're thinking about a
 written document conditionally granting some copyright
 and patents permissions for a work.
            </p>
-            <p>
+            
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
            </p>
-            <p>
-We adopt the convention  <tt>LICENSE</tt> for the principle licensing
+            
+<p>
+We adopt the convention  <code>LICENSE</code> for the principle licensing
 document. Read more about this convention <a href="#what-license">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-license">What do you mean by <tt>LICENSE</tt>?</a></dt><dd>
-            <p>
-We adopt the convention that <tt>LICENSE</tt> means the principle licensing
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-license">What do you mean by <code>LICENSE</code>?</a></dt>
+<dd>
+            
+<p>
+We adopt the convention that <code>LICENSE</code> means the principle licensing
 document for the project.
            </p>
-           <p>
+           
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
           </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-notice">What do you mean by <tt>NOTICE</tt>?</a></dt><dd>
-            <p>
-A <tt>NOTICE</tt> is informational documentation, whose retention
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-notice">What do you mean by <code>NOTICE</code>?</a></dt>
+<dd>
+            
+<p>
+A <code>NOTICE</code> is informational documentation, whose retention
 is required by a license condition.
            </p>
-            <p>
+            
+<p>
 Some licenses (for example the
 <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a>)
-may require the retention of a document named <tt>NOTICE</tt> (or at least its contents).
-By <tt>NOTICE</tt> we mean information that <tt>MUST</tt> be preserved
-to satisfy some condition of a license. Take care not to confuse <tt>NOTICE</tt> with
+may require the retention of a document named <code>NOTICE</code> (or at least its contents).
+By <code>NOTICE</code> we mean information that <code>MUST</code> be preserved
+to satisfy some condition of a license. Take care not to confuse <code>NOTICE</code> with
 <a href="#notice-vs-copyright-notice">copyright notice</a> or
-<a href="#notice-vs-license"><tt>LICENSE</tt></a>.
+<a href="#notice-vs-license"><code>LICENSE</code></a>.
             </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-copyright-notice">What is a copyright notice?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-copyright-notice">What is a copyright notice?</a></dt>
+<dd>
+            
+<p>
 A phrase or symbol informing a reader about a underlying claim of copyright ownership.
-           </p><p>
-For example <i>&quot;Copyright (c) 2525 Apache Software Foundation&quot;</i>
-           </p><p>
+           </p>
+<p>
+For example <em>&quot;Copyright (c) 2525 Apache Software Foundation&quot;</em>
+           </p>
+<p>
 Though copyright laws differ from country to country, copyright notices
 are may well be considered important, and may be governed by statue.
            </p>
-            <p>
+            
+<p>
             Take care not to confuse copyright notice with
-<a href="#notice-vs-copyright-notice"><tt>NOTICE</tt></a>.
+<a href="#notice-vs-copyright-notice"><code>NOTICE</code></a>.
            </p>
-            <p>
+            
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
           </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="notice-vs-copyright-notice">What is the difference between a <tt>NOTICE</tt> and a copyright notice?</a></dt><dd>
-            <p>
-A <tt>NOTICE</tt> is informational documentation, whereas a copyright notice
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="notice-vs-copyright-notice">What is the difference between a <code>NOTICE</code> and a copyright notice?</a></dt>
+<dd>
+            
+<p>
+A <code>NOTICE</code> is informational documentation, whereas a copyright notice
 informs a reader about a legal claim of ownership. A license may be conditional
-on the redistribution of the contents of a <tt>NOTICE</tt> but typically
+on the redistribution of the contents of a <code>NOTICE</code> but typically
 a copyright notice is governed directly by statue.
-           </p><p>
-A <tt>NOTICE</tt> document often contains
+           </p>
+<p>
+A <code>NOTICE</code> document often contains
 copyright notices, but is not limited to just this sort of content.
            </p>
-            <p>
-Read more on <tt>NOTICE</tt> documents <a href="#what-notice">here</a>.
+            
+<p>
+Read more on <code>NOTICE</code> documents <a href="#what-notice">here</a>.
           </p>
-           <p>
+           
+<p>
 Read more on copyright notices <a href="#what-copyright-notice">here</a>.
           </p>
-           <p>
+           
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
           </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="notice-vs-license">What is the difference between a <tt>NOTICE</tt> and a <tt>LICENSE</tt>?</a></dt><dd>
-            <p>
-A <tt>NOTICE</tt> is informational documentation, whereas a <tt>LICENSE</tt>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="notice-vs-license">What is the difference between a <code>NOTICE</code> and a <code>LICENSE</code>?</a></dt>
+<dd>
+            
+<p>
+A <code>NOTICE</code> is informational documentation, whereas a <code>LICENSE</code>
 is legal documentation.
-A <tt>NOTICE</tt> may be subject to a <a href="#when-notice-needed">retention clause</a>.
+A <code>NOTICE</code> may be subject to a <a href="#when-notice-needed">retention clause</a>.
            </p>
-            <p>
-Read more on <tt>NOTICE</tt> documents <a href="#what-notice">here</a>.
+            
+<p>
+Read more on <code>NOTICE</code> documents <a href="#what-notice">here</a>.
            </p>
-           <p>
+           
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
           </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="when-notice-needed">When is a <tt>NOTICE</tt> needed?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="when-notice-needed">When is a <code>NOTICE</code> needed?</a></dt>
+<dd>
+            
+<p>
             It depends :-)
            </p>
-            <p>
-Some licenses require <tt>NOTICE</tt> documents to be retained.
+            
+<p>
+Some licenses require <code>NOTICE</code> documents to be retained.
 For example, clause 4.4 in the
 <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a>
-is a retention clause covering any <tt>NOTICE</tt> distributed with the original.
+is a retention clause covering any <code>NOTICE</code> distributed with the original.
 When creating or distributing a modified version of a project licensed with a retention clause,
-you need to ensure that the <tt>NOTICE</tt> is distributed.
+you need to ensure that the <code>NOTICE</code> is distributed.
            </p>
-            <p>
-Read more on <tt>NOTICE</tt> documents <a href="#what-notice">here</a>.
+            
+<p>
+Read more on <code>NOTICE</code> documents <a href="#what-notice">here</a>.
            </p>
-            <p>
+            
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
           </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="notice-needed-for-al2">Do I need to add a <tt>NOTICE</tt> for my Apache Licensed Project?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="notice-needed-for-al2">Do I need to add a <code>NOTICE</code> for my Apache Licensed Project?</a></dt>
+<dd>
+            
+<p>
 Not necessarily, though Apache Software Foundation projects
-MUST include a <tt>NOTICE</tt>
+MUST include a <code>NOTICE</code>
 of <a class="externalLink" href="http://www.apache.org/legal/src-headers.html#notice">standard form</a>.
            </p>
-            <p>
+            
+<p>
 The <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a>
-requires that a <tt>NOTICE</tt> is retained but if your project contains only
-original files then you could opt not to have a <tt>NOTICE</tt>. Please read
+requires that a <code>NOTICE</code> is retained but if your project contains only
+original files then you could opt not to have a <code>NOTICE</code>. Please read
 <a href="#when-notice-needed">this</a>.
            </p>
-            <p>
-It is polite to include a minimal <tt>NOTICE</tt>. Otherwise,
+            
+<p>
+It is polite to include a minimal <code>NOTICE</code>. Otherwise,
 <a href="#what-is-downstream">downstream consumers</a> may need to manually verify that no
-<tt>NOTICE</tt> exists
+<code>NOTICE</code> exists
 for the release.
            </p>
-            <p>
-Read more on <tt>NOTICE</tt> documents <a href="#what-notice">here</a>.
+            
+<p>
+Read more on <code>NOTICE</code> documents <a href="#what-notice">here</a>.
           </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="complex-software-applications">When is Whisker needed?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="complex-software-applications">When is Whisker needed?</a></dt>
+<dd>
+            
+<p>
 For projects distributing applications containing only a few third party dependencies,
-manually maintaining and verifying the <tt>LICENSE</tt> and <tt>NOTICE</tt> documents
+manually maintaining and verifying the <code>LICENSE</code> and <code>NOTICE</code> documents
 shipped is not a major burden. When releasing complex applications containing scores of
 third party dependencies from dozens of sources, producing accurate licensing documentation
 without automation takes a lot of time. This is where Whisker has the biggest value.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="licensor">What do you mean by licensor?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="licensor">What do you mean by licensor?</a></dt>
+<dd>
+            
+<p>
 The entity issuing the license.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-is-downstream">What is a downstream consumer?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-is-downstream">What is a downstream consumer?</a></dt>
+<dd>
+            
+<p>
 Software flows downstream from the source to the end user.
-Dependencies are <i>upstream</i> of a project, and software
-that relies on a project are <i>downstream consumers</i>.
+Dependencies are <em>upstream</em> of a project, and software
+that relies on a project are <em>downstream consumers</em>.
            </p>
 
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-is-an-open-source-license">What is an Open Source License?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-is-an-open-source-license">What is an Open Source License?</a></dt>
+<dd>
+            
+<p>
 An open-source license complies with the
 <a class="externalLink" href="http://opensource.org/docs/osd">Open Source Definition</a>.
 Open Source Licenses are those on this
@@ -923,11 +1165,16 @@ Open Source Licenses are those on this
 Both are maintained by the
 <a class="externalLink" href="http://www.opensource.org">Open Source Initiative</a>.
            </p>
-            <p>
+            
+<p>
  Learn more about Open Source <a class="externalLink" href="http://opensource.org/history">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-copyleft">What Do You Mean By Copyleft?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-copyleft">What Do You Mean By Copyleft?</a></dt>
+<dd>
+            
+<p>
             A reciprocal
             <a href="#what-is-an-open-source-license">open source</a>
             copyright
@@ -937,48 +1184,66 @@ Both are maintained by the
             (following <a class="externalLink" href="http://www.rosenlaw.com/oslbook.htm" target="_blank">Open Source Licensing</a>,
             Lawrence Rosen).
            </p>
-            <p>
+            
+<p>
             Read more about copyleft <a class="externalLink" href="http://www.gnu.org/copyleft/" target="_blank">here</a>.
            </p>
-            <p>
+            
+<p>
             Read more about open source licenses <a href="#more-resources">here</a>.
            </p>
-            <p>
+            
+<p>
             Learn more about Free Software <a class="externalLink" href="http://www.fsf.org/" target="_blank">here</a>.
            </p>
-            <p>
+            
+<p>
             Learn more about weak copyleft <a href="#what-weak-copyleft">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-weak-copyleft">What Do You Mean By Weak Copyleft?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-weak-copyleft">What Do You Mean By Weak Copyleft?</a></dt>
+<dd>
+            
+<p>
             A <a href="#what-copyleft">copyleft</a> license that allows some forms
             of derivative work to be distributed under more restrictive licenses
             by <a href="#what-is-downstream">downstream consumers</a>.
            </p>
-            <p>
+            
+<p>
             Read more about copyleft <a href="#what-copyleft">here</a>.
            </p>
-            <p>
+            
+<p>
             Read more about open source licenses <a href="#more-resources">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-source-clause">What Do You Mean By Source Clause?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-source-clause">What Do You Mean By Source Clause?</a></dt>
+<dd>
+            
+<p>
             Some (typically <a href="#what-weak-copyleft">weak copyleft</a>)
             <a href="#what-is-an-open-source-license">open source</a>
             licenses ask that distributors of binaries built from their sources
             facilitate <a href="#what-is-downstream">downstream consumers</a>
             in obtaining the source for the distributed binary.
             The part of the license explaining exactly
-            what this means we refer to as a <i>source clause</i>.
+            what this means we refer to as a <em>source clause</em>.
            </p>
-            <p>
+            
+<p>
             For example, the
             <a class="externalLink" href="http://www.opensource.org/licenses/CDDL-1.0" target="_blank">CDDL 1.0</a>
             contains:
            </p>
-            <blockquote>
-            <p>3.1. Availability of Source Code.</p>
-            <p>
+            
+<blockquote>
+            
+<p>3.1. Availability of Source Code.</p>
+            
+<p>
 Any Covered Software that You distribute or otherwise make available in Executable form must
 also be made available in Source Code form and that Source Code form must be distributed
 only under the terms of this License. You must include a copy of this License with every
@@ -988,36 +1253,46 @@ how they can obtain such Covered Software in Source Code form in a reasonable ma
 through a medium customarily used for software exchange.
 </p>
            </blockquote>
-            <p>
+            
+<p>
             A distributor of CDDL licensed materials should consider including
             (within the distribution) either the source, or information about how the source
             could be obtain - perhaps in the form of an URL linking to the source.
            </p>
-            <p>
+            
+<p>
             Source clauses differ. Read,
-            understand and comply with each. The term <i>source clause</i>
+            understand and comply with each. The term <em>source clause</em>
             is a useful
             <a class="externalLink" href="http://en.wiktionary.org/wiki/aide-m%C3%A9moire#English">aide memoire</a>:
 
             when a license has a source clause distributors need to remember to act to
             satisfy it.
            </p>
-            <p>
+            
+<p>
             Learn how Whisker can help <a href="#when-source-links">here</a>.
            </p>
-            <p>
+            
+<p>
             Learn about copyright and software licensing
             <a href="#more-resources">here</a>.
            </p>
-            <p>
+            
+<p>
             Read more about licenses <a href="#what-is-a-license">here</a>.
            </p>
-            <p>
+            
+<p>
             Read more about weak copyleft licenses
             <a href="#what-weak-copyleft">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="what-is-license-family">What do you mean by a license family?</a></dt><dd>
-            <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="what-is-license-family">What do you mean by a license family?</a></dt>
+<dd>
+            
+<p>
 <a href="#what-is-an-open-source-license">Open source licenses</a>
 are designed to be re-usable:
 both you and I can use the same basic text to license our works.
@@ -1025,12 +1300,14 @@ Many license texts can be reused without modification (for example,
 the <a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2</a>).
 Others require that a small number of details are changed.
            </p>
+
 <p>For example, to use the
 <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD License (2 Clause)</a>
 your name, organisation and the year of publication must be inserted. We call
-licenses of this sort a <i>license family</i> to emphasis that the text is
+licenses of this sort a <em>license family</em> to emphasis that the text is
 a template from which instances of the licenses are created by parameterisation.
 </p>
+
 <p>
 Each family shares the share legal qualities, typically differing only in details
 related
@@ -1040,51 +1317,98 @@ So, for example, even though BSD License (2 Clause) texts differ we can confiden
 state that each is an
 <a href="#what-is-an-open-source-license">Open Source License</a>.
 </p>
-            <p>
+            
+<p>
 Learn how Whisker supports license families <a href="#how-license-family">here</a>.
            </p>
-            <p>
+            
+<p>
 Read more about licenses <a href="#what-is-a-license">here</a>.
            </p>
-            <p>
+            
+<p>
 Learn about copyright and software licensing <a href="#more-resources">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p></dd></dl></div><div class="section"><h2>Is there an Example...<a name="Is_there_an_Example..."></a></h2><dl><dt><a name="mit-example">Using the MIT License?</a></dt><dd>
-    <p><a href="examples/in-5-mins.html">Yes</a></p>
-    <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="no-notice-example">Of a Project without a NOTICE?</a></dt><dd>
-            <p><a href="examples/in-5-mins.html">Yes</a></p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="add-org-example">Of Adding an Organisation?</a></dt><dd>
-            <p>Yes</p>
-            <p>Including examples focussing on</p>
-            <ul>
-                <li>
+        
+<p align="right"><a href="#top">[top]</a></p></dd></dl></section><section>
+<h2><a name="Is_there_an_Example..."></a>Is there an Example...</h2>
+<dl>
+<dt><a name="mit-example">Using the MIT License?</a></dt>
+<dd>
+    
+<p><a href="examples/in-5-mins.html">Yes</a></p>
+    
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="no-notice-example">Of a Project without a NOTICE?</a></dt>
+<dd>
+            
+<p><a href="examples/in-5-mins.html">Yes</a></p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="add-org-example">Of Adding an Organisation?</a></dt>
+<dd>
+            
+<p>Yes</p>
+            
+<p>Including examples focussing on</p>
+            
+<ul>
+                
+<li>
 <a href="examples/3rd-party-individual.html">an individual maintainer</a>
                </li>
-                <li><a href="examples/3rd-party-corporate.html">a corporation</a></li>
-                <li><a href="examples/3rd-party-group.html">an informal group</a></li>
+                
+<li><a href="examples/3rd-party-corporate.html">a corporation</a></li>
+                
+<li><a href="examples/3rd-party-group.html">an informal group</a></li>
            </ul>
-            <p>
+            
+<p>
             Read more about organisations <a href="#what-is-org">here</a>.
            </p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="a3rd-party-individual-example">Of a Third Party Dependency licensed from an Individual?</a></dt><dd>
-            <p><a href="examples/3rd-party-individual.html">Yes</a></p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="a3rd-party-corporate-example">Of a Third Party Dependency licensed from a for- or non-profit organisation?</a></dt><dd>
-            <p><a href="examples/3rd-party-corporate.html">Yes</a></p>
-        <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="a3rd-party-individual-example">Of a Third Party Dependency licensed from an Informal Group?</a></dt><dd>
-            <p><a href="examples/3rd-party-group.html">Yes</a></p>
-        <p align="right"><a href="#top">[top]</a></p></dd></dl></div><div class="section"><h2>Learning<a name="Learning"></a></h2><dl><dt><a name="more-resources">I'm interested in learning more about software licensing. Where should I start?</a></dt><dd>
-      <p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="a3rd-party-individual-example">Of a Third Party Dependency licensed from an Individual?</a></dt>
+<dd>
+            
+<p><a href="examples/3rd-party-individual.html">Yes</a></p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="a3rd-party-corporate-example">Of a Third Party Dependency licensed from a for- or non-profit organisation?</a></dt>
+<dd>
+            
+<p><a href="examples/3rd-party-corporate.html">Yes</a></p>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="a3rd-party-individual-example">Of a Third Party Dependency licensed from an Informal Group?</a></dt>
+<dd>
+            
+<p><a href="examples/3rd-party-group.html">Yes</a></p>
+        
+<p align="right"><a href="#top">[top]</a></p></dd></dl></section><section>
+<h2><a name="Learning"></a>Learning</h2>
+<dl>
+<dt><a name="more-resources">I'm interested in learning more about software licensing. Where should I start?</a></dt>
+<dd>
+      
+<p>
       Some recommended resources
      </p>
-      <ul>
-        <li><a class="externalLink" href="http://www.rosenlaw.com/oslbook.htm">Open Source Licensing</a> by Lawrence Rosen</li>
-        <li><a class="externalLink" href="http://www.softwarefreedom.org/">Software Freedom Law Center</a>
+      
+<ul>
+        
+<li><a class="externalLink" href="http://www.rosenlaw.com/oslbook.htm">Open Source Licensing</a> by Lawrence Rosen</li>
+        
+<li><a class="externalLink" href="http://www.softwarefreedom.org/">Software Freedom Law Center</a>
         <a class="externalLink" href="http://www.softwarefreedom.org/resources/">publications</a></li>
-        <li><a class="externalLink" href="http://www.ifosslr.org/">International Free and Open Source Software Law Review</a></li>
-        <li><a class="externalLink" href="http://ifosslawbook.org">The International Free and Open Source Software Law Book</a></li>
+        
+<li><a class="externalLink" href="http://www.ifosslr.org/">International Free and Open Source Software Law Review</a></li>
+        
+<li><a class="externalLink" href="http://ifosslawbook.org">The International Free and Open Source Software Law Book</a></li>
      </ul>
 
-      <p align="right"><a href="#top">[top]</a></p></dd></dl></div>
+      
+<p align="right"><a href="#top">[top]</a></p></dd></dl></section>
       </div>
     </div>
     <div class="clear">
@@ -1092,16 +1416,15 @@ Learn about copyright and software licensing <a href="#more-resources">here</a>.
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/index.html b/whisker/index.html
index 51bafbe..c23a51b 100644
--- a/whisker/index.html
+++ b/whisker/index.html
@@ -1,274 +1,187 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/index.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Introducing Apache Whisker</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Introducing Apache Whisker</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Introducing Apache Whisker
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Introducing Apache Whisker
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-            <strong>Introducing Whisker</strong>
-          </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                          <li class="expanded">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                    <ul>
-                      <li class="none">
-                          <a href="distribution-management.html" title="Distribution Management">Distribution Management</a>
-            </li>
-                      <li class="none">
-            <strong>About</strong>
-          </li>
-                      <li class="none">
-                          <a href="dependencies.html" title="Dependencies">Dependencies</a>
-            </li>
-                      <li class="none">
-                          <a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a>
-            </li>
-                      <li class="none">
-                          <a href="plugins.html" title="Project Plugins">Project Plugins</a>
-            </li>
-                      <li class="none">
-                          <a href="integration.html" title="Continuous Integration">Continuous Integration</a>
-            </li>
-                      <li class="none">
-                          <a href="license.html" title="Project License">Project License</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-management.html" title="Dependency Management">Dependency Management</a>
-            </li>
-                      <li class="none">
-                          <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
-            </li>
-                      <li class="none">
-                          <a href="team-list.html" title="Project Team">Project Team</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a>
-            </li>
-                      <li class="none">
-                          <a href="source-repository.html" title="Source Repository">Source Repository</a>
-            </li>
-                      <li class="none">
-                          <a href="plugin-management.html" title="Plugin Management">Plugin Management</a>
-            </li>
-                      <li class="none">
-                          <a href="modules.html" title="Project Modules">Project Modules</a>
-            </li>
-                      <li class="none">
-                          <a href="project-summary.html" title="Project Summary">Project Summary</a>
-            </li>
-              </ul>
-        </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><strong>Introducing Whisker</strong></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><strong>About</strong></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="What_Is_Apache_Whisker.3F"></a>What Is Apache Whisker?</h2>
+<p>Apache Whisker assists assembled applications maintain correct legal documentation.</p>
+<p>Apache Whisker is part of the <a class="externalLink" href="http://creadur.apache.org">Apache Creadur</a> language- and build-agnostic suite of tools for auditing and comprehending software distributions. Our community develops <a class="externalLink" href="http://www.opensource.org/"> open source software</a> the <a class="externalLink" href="http://www.apache.org/foundation/how-it-works.html"> Apache Way</a>.</p>
+<p>Whisker just helps to maintain information more efficiently, and is <a href="./faq.html#what-whisker-is-not">no substitute</a> for solid legal work. No part of our documentation is <a href="./faq.html#what-this-documentation-is-not">legal advice</a>, and readers are assumed to have a practical understanding of the relevant laws.</p>
+<p>Learn about copyright and software licensing <a href="../faq.html#more-resources">here</a>.</p><section>
+<h3><a name="How_Can_Whisker_Help.3F"></a>How Can Whisker Help?</h3>
+<p>Whisker can</p>
+<ul>
+<li>verify - checking meta-data quality against a distribution</li>
+<li>generate - legal documents from meta-data</li></ul>
+<p>Particular useful for complex assembled applications.</p><section>
+<h4><a name="What.27s_An_Assembled_Application.3F"></a>What's An Assembled Application?</h4>
+<p>An assembled application is composed from libraries and frameworks.</p>
+<p>Read more <a href="./faq.html#complex-software-applications">here</a>.</p></section><section>
+<h4><a name="What_Legal_Documentation.3F"></a>What Legal Documentation?</h4>
+<p>NOTICE and LICENSE are supported examples.</p></section><section>
+<h4><a name="How_Does_Whisker_Work.3F"></a>How Does Whisker Work?</h4>
+<p>Licensing <a href="./meta-data.html"> meta-data</a> describes the legal qualities of the components assembled.</p></section></section><section>
+<h3><a name="How_Can_I_Use_Whisker.3F"></a>How Can I Use Whisker?</h3>
+<ul>
+<li>From the <a href="./apache-whisker-cli/index.html"> command line</a></li>
+<li>As a <a href="./apache-whisker-maven-plugin/index.html"> plugin for Maven</a></li></ul></section><section>
+<h3><a name="Getting_Started"></a>Getting Started</h3>
+<p>Browse the <a href="./xref/index.html">source</a>, read the <a href="./apidocs/index.html">javadocs</a>, take a look</p>
+<ul>
+<li><a href="./examples/in-5-mins.html">Whisker In 5 Minutes</a></li></ul>
+<p>dive into sample meta-data</p>
+<ul>
+<li><a href="./examples/james.xml"> Apache James</a></li>
+<li><a href="./examples/public-domain.xml"> Public Domain</a></li>
+<li><a href="./examples/template-license.xml"> Template License</a></li>
+<li><a href="./examples/license-family-sample.xml">License Family</a></li>
+<li>Whisker In 5 Minutes featuring the <a href="./examples/in-5-mins-sample.xml">MIT License</a></li>
+<li>distributing work licensed from
+<ul>
+<li>an <a href="./examples/3rd-party-individual-sample.xml"> individual maintainer</a></li>
+<li>a for- or non-profit <a href="./examples/3rd-party-corporate-sample.xml">corporation</a></li>
+<li>an informal <a href="./examples/3rd-party-group-sample.xml">group</a></li></ul></li>
+<li><a href="./examples/copyright-notices-sample.xml">copyright notices</a></li></ul>
+<p>or browse the <a href="./faq.html">FAQ</a>.</p>
+<p>A warm welcome is guaranteed on our <a href="../mail-lists.html">mail lists</a>.</p><section>
+<h4><a name="More_Examples"></a>More Examples</h4>
+<ul>
+<li>Including a 3rd Party work licensed by
+<ul>
+<li>an <a href="./examples/3rd-party-individual.html">individual</a></li>
+<li>a for- or non-profit <a href="./examples/3rd-party-corporate.html">corporation</a></li>
+<li>an <a href="./examples/3rd-party-group.html">informal group</a></li></ul></li>
+<li><a href="./examples/license-family.html">Parameterising a template</a> for a <a href="./faq.html#what-is-license-family">license family</a>, featuring the <a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD (2 Clause) license</a></li>
+<li>All about <a href="./examples/copyright-notices.html">copyright notices</a></li></ul></section></section></section>
       </div>
     </div>
     <div class="clear">
@@ -276,16 +189,15 @@
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/issue-management.html b/whisker/issue-management.html
new file mode 100644
index 0000000..0bae6bb
--- /dev/null
+++ b/whisker/issue-management.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:issue-management at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Issue Management</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
+  <body class="composite">
+    <div id="banner">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Issue Management
+      </div>
+      <div class="xright">      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><strong>Issue Management</strong></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+<section>
+<h2><a name="Overview"></a>Overview</h2><a name="Overview"></a>
+<p>This project uses <a class="externalLink" href="http://www.atlassian.com/software/jira">JIRA</a>.</p></section><section>
+<h2><a name="Issue_Management"></a>Issue Management</h2><a name="Issue_Management"></a>
+<p>Issues, bugs, and feature requests should be submitted to the following issue management system for this project.</p>
+<div class="source">
+<pre><a class="externalLink" href="https://issues.apache.org/jira/browse/WHISKER">https://issues.apache.org/jira/browse/WHISKER</a></pre></div></section>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
+      of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      This is user documentation, not legal advice.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/whisker/licenses.html b/whisker/licenses.html
new file mode 100644
index 0000000..d85275c
--- /dev/null
+++ b/whisker/licenses.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:licenses at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Project Licenses</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
+  <body class="composite">
+    <div id="banner">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Project Licenses
+      </div>
+      <div class="xright">      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><strong>Licenses</strong></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+<section>
+<h2><a name="Overview"></a>Overview</h2><a name="Overview"></a>
+<p>Typically the licenses listed for the project are that of the project itself, and not of dependencies.</p></section><section>
+<h2><a name="Project_Licenses"></a>Project Licenses</h2><a name="Project_Licenses"></a><section>
+<h3><a name="Apache_License.2C_Version_2"></a>Apache License, Version 2</h3><a name="Apache_License.2C_Version_2"></a>
+<p>An OSI approved open source license.</p><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">[Original text]</a>
+<p>Copy of the license follows:</p>
+<h1>Moved Permanently</h1>
+<p>The document has moved <a href="https://www.apache.org/licenses/LICENSE-2.0.txt">here</a>.</p>
+</section></section>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
+      of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      This is user documentation, not legal advice.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/whisker/mailing-lists.html b/whisker/mailing-lists.html
new file mode 100644
index 0000000..88b7b90
--- /dev/null
+++ b/whisker/mailing-lists.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:mailing-lists at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Project Mailing Lists</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
+  <body class="composite">
+    <div id="banner">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Project Mailing Lists
+      </div>
+      <div class="xright">      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><strong>Mailing Lists</strong></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+<section>
+<h2><a name="Project_Mailing_Lists"></a>Project Mailing Lists</h2><a name="Project_Mailing_Lists"></a>
+<p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p>
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>Name</th>
+<th>Subscribe</th>
+<th>Unsubscribe</th>
+<th>Post</th>
+<th>Archive</th></tr>
+<tr class="b">
+<td>Whisker development at Apache Creadur project</td>
+<td><a href="dev-subscribe@creadur.apache.org">Subscribe</a></td>
+<td><a href="dev-unsubscribe@creadur.apache.org">Unsubscribe</a></td>
+<td><a href="dev@creadur.apache.org">Post</a></td>
+<td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/creadur-dev/">mail-archives.apache.org</a></td></tr>
+<tr class="a">
+<td>Whisker commits at Apache Creadur project</td>
+<td><a href="commits-subscribe@creadur.apache.org">Subscribe</a></td>
+<td><a href="commits-unsubscribe@creadur.apache.org">Unsubscribe</a></td>
+<td>-</td>
+<td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/creadur-commits/">mail-archives.apache.org</a></td></tr></table></section>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
+      of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      This is user documentation, not legal advice.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/whisker/meta-data.html b/whisker/meta-data.html
index b8a2ffd..18296de 100644
--- a/whisker/meta-data.html
+++ b/whisker/meta-data.html
@@ -1,227 +1,166 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from src/site/apt/meta-data.apt at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Meta Data Reference</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Meta Data Reference</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Meta Data Reference
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Meta Data Reference
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-            <strong>Meta Data</strong>
-          </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                <li class="collapsed">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                  </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><strong>Meta Data</strong></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="collapsed"><a href="project-info.html" title="Project Information">Project Information</a></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --><!--  --><!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance - [...]
+<section>
+<h2><a name="Apache_Whisker_Meta-Data_Model"></a>Apache Whisker Meta-Data Model</h2>
+<p>Jump into</p>
+<ul>
+<li><a href="#Breakdown">Breakdown</a></li>
+<li><a href="#Some_Objects_Modeled">Some Objects Modeled</a>
+<ul>
+<li><a href="#Section_I_-_Licenses.2C_Notices_and_Organisations">Section I - Licenses, Notices and Organisations</a></li>
+<li><a href="#Section_II_-_Primary_Details">Section II - Primary Details</a></li>
+<li><a href="#Section_III_-_Contents">Section III - Contents</a></li></ul></li>
+<li><a href="#Described_By_DTD">Described By DTD</a></li>
+<li><a href="#Some_More_Advanced_Features_Explained">Some More Advanced Features Explained</a>
+<ul>
+<li><a href="#Public_Domain">Public Domain</a></li>
+<li><a href="#Variable_Copyright_Notices">Variable Copyright Notices</a></li>
+<li><a href="#Templates_For_License_Families">Templates For License Families</a></li>
+<li><a href="#Source_Links">Source Links</a></li></ul></li>
+<li><a href="#A_Sample">A Sample</a></li></ul>
+<p>or read on.</p><section>
+<h3><a name="Breakdown"></a>Breakdown</h3>
+<p>The meta data relates licensing information about the contents of an assembled release efficiently. It break down into three sections:</p>
+<ol style="list-style-type: upper-roman">
+<li>Licenses, notices and organisations each described here once (then reused);</li>
+<li>Primary license, notice and organisation for the application released; and</li>
+<li>Contents of each directory, grouped by organisation and license.</li></ol></section><section>
+<h3><a name="Some_Objects_Modeled"></a>Some Objects Modeled</h3><section>
+<h4><a name="Section_I_-_Licenses.2C_Notices_and_Organisations"></a><a name="Section_I">Section I</a> - Licenses, Notices and Organisations</h4><figure><img src="meta-data-section1.png" alt="" /><figcaption>Section I</figcaption></figure>
+<p>License, notice and organisations are define independently. Each can then be efficiently referenced in many places by simple <code>id</code>. Each <code>id</code> must be a unique <code>ID</code> (in xml terms). Adopting a regular naming convention is recommended. Some typical conventions:</p>
+<ul>
+<li>use the domain name as the <code>id</code> for an organisation;</li>
+<li>use the <a class="externalLink" href="http://www.opensource.org"> Open Source Initiative</a> code as the <code>id</code> for an open source license</li></ul>
+<p>Note that <code>organisation</code> includes any entity attributed as creator. Including (for example)</p>
+<ul>
+<li>the name of an author;</li>
+<li>a pseudonym;</li>
+<li>a corporation;</li>
+<li>a development community;</li>
+<li>the Apache Software Foundation.</li></ul></section><section>
+<h4><a name="Section_II_-_Primary_Details"></a><a name="Section_II">Section II</a> - Primary Details</h4>
+<p>The primary license, notice and organisation associated with the work reference data in <a href="#Section_I">Section I</a> by <code>id</code>. This is the collective copyright for the act of composition. The components aggregated in the distribution are detailed in <a href="#Section_III">Section III</a>.</p></section><section>
+<h4><a name="Section_III_-_Contents"></a><a name="Section_III">Section III</a> - Contents</h4>
+<p>This final section groups resources contained in each directory by organisation and license.</p><figure><img src="meta-data-section3.png" alt="" /><figcaption>Section III</figcaption></figure>
+<p>The deep nesting groups the resources contained in each directory by license and organisation to reduce duplication. Licenses, notices and organisations are linked by <code>id</code> to the definitions in <a href="#Section_I"> Section I</a>.</p>
+<p>Directories are modeled using a flat structure without nesting. Paths are relative to the root directory of the distribution (indicated by '.') and separated by <code>//</code>.</p>
+<div class="source">
+<pre>
     &lt;within dir='.'&gt;
         &lt;with-license ...
     &lt;/within&gt;
@@ -234,7 +173,11 @@
     &lt;within dir='WEB-INF/lib'&gt;
         &lt;with-license ...
     &lt;/within&gt;
-</pre></div></div></div><div class="section"><h3>Described By DTD<a name="Described_By_DTD"></a></h3><p>Useful for visual editors.</p><div class="source"><pre>&lt;!DOCTYPE manifest [
+</pre></div></section></section><section>
+<h3><a name="Described_By_DTD"></a>Described By DTD</h3>
+<p>Useful for visual editors.</p>
+<div class="source">
+<pre>&lt;!DOCTYPE manifest [
 
 &lt;!ELEMENT manifest (licenses, notices, organisations,
     primary-license, primary-notice?, primary-organisation?, within*)&gt;
@@ -310,7 +253,13 @@
 &lt;!ATTLIST resource sha1 CDATA #IMPLIED&gt;
 &lt;!ATTLIST resource notice IDREF #IMPLIED&gt;
 &lt;!ATTLIST resource source CDATA #IMPLIED&gt;
-]&gt;</pre></div></div><div class="section"><h3>Some More Advanced Features Explained<a name="Some_More_Advanced_Features_Explained"></a></h3><div class="section"><h4>Public Domain<a name="Public_Domain"></a></h4><p>Some contemporary laws make it surprisingly difficult for an author to place a work in the public domain. See <tt><a class="externalLink" href="http://creativecommons.org"> creativecommons.org</a></tt> for <a class="externalLink" href="http://creativecommons.org/about/cc0"> m [...]
+]&gt;</pre></div></section><section>
+<h3><a name="Some_More_Advanced_Features_Explained"></a>Some More Advanced Features Explained</h3><section>
+<h4><a name="Public_Domain"></a>Public Domain</h4>
+<p>Some contemporary laws make it surprisingly difficult for an author to place a work in the public domain. See <code><a class="externalLink" href="http://creativecommons.org"> creativecommons.org</a></code> for <a class="externalLink" href="http://creativecommons.org/about/cc0"> more</a> <a class="externalLink" href="http://creativecommons.org/weblog/entry/23830"> explanation</a>.</p>
+<p>Whisker supports works in the public domain through <code>public-domain</code> blocks <code>within</code> a directory. A <code>resource</code> in the public domain should be grouped <code>by-organisation</code> within the <code>public-domain</code> block.</p>
+<div class="source">
+<pre>
     &lt;within dir='.'&gt;
         &lt;public-domain&gt;
             &lt;by-organisation id='An Author'&gt;
@@ -318,7 +267,11 @@
             &lt;/by-organisation&gt;
         &lt;/public-domain&gt;
     &lt;/within&gt;
-</pre></div><div class="section"><h5>A Public Domain Example<a name="A_Public_Domain_Example"></a></h5><p>This simple example illustrates how <i>Guide to the Lakes</i> by William Wordsworth (now in the public domain) may be indicated. Source is <a href="./examples/public-domain.xml">here</a>.</p><div class="source"><pre>&lt;manifest&gt;
+</pre></div><section>
+<h5><a name="A_Public_Domain_Example"></a>A Public Domain Example</h5>
+<p>This simple example illustrates how <i>Guide to the Lakes</i> by William Wordsworth (now in the public domain) may be indicated. Source is <a href="./examples/public-domain.xml">here</a>.</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;licenses&gt;
         &lt;license id='LICENSE' name='A License'&gt;
             &lt;text&gt;The words of the license&lt;/text&gt;
@@ -357,7 +310,16 @@
         &lt;/public-domain&gt;
     &lt;/within&gt;
 &lt;/manifest&gt;
-</pre></div></div></div><div class="section"><h4>Variable Copyright Notices<a name="Variable_Copyright_Notices"></a></h4><p>A copyright notice is a simple claim of ownership, typically by an author of the work. For example</p><div class="source"><pre>        Copyright (c) YEAR A.N.AUTHOR</pre></div><p><b>Do not</b> confuse a <i>copyright notice</i> with the <tt>NOTICE</tt> that some licenses require to be distributed. A typical <tt>NOTICE</tt> contains attribution information (for exampl [...]
+</pre></div></section></section><section>
+<h4><a name="Variable_Copyright_Notices"></a>Variable Copyright Notices</h4>
+<p>A copyright notice is a simple claim of ownership, typically by an author of the work. For example</p>
+<div class="source">
+<pre>        Copyright (c) YEAR A.N.AUTHOR</pre></div>
+<p><b>Do not</b> confuse a <i>copyright notice</i> with the <code>NOTICE</code> that some licenses require to be distributed. A typical <code>NOTICE</code> contains attribution information (for example <i>This products contains software developed by the Apache Software Foundation</i>) as well as a copyright notice.</p>
+<p>Many license definitions (for example, The <a class="externalLink" href="http://www.opensource.org/licenses/mit-license.php"> MIT License</a>) conventionally include a copyright notice. The contents of these copyright notices vary widely.</p>
+<p>Whisker separates <code>copyright-notice</code> from <code>license</code> to reduce duplication. (Optionally) a <code>copyright-notice</code> begins a <code>with-license</code> block, before <code>resource</code> grouped <code>by-organisation</code> sharing this <code>copyright-notice</code> and <code>license</code>.</p>
+<div class="source">
+<pre>    &lt;with-license id='MIT'&gt;
         &lt;copyright-notice&gt;
 Copyright (c) YEAR A.N.AUTHOR
 All rights reserved.
@@ -365,7 +327,11 @@ All rights reserved.
         &lt;by-organisation id='example.org'&gt;
                 &lt;resource name='document.txt'/&gt;
                 ...
-</pre></div><div class="section"><h5>An Example Separation Into License and Notice<a name="An_Example_Separation_Into_License_and_Notice"></a></h5><p>Here is an example instance of the <a class="externalLink" href="http://www.opensource.org/licenses/mit-license.php"> MIT License</a></p><div class="source"><pre>Copyright (c) YEAR-YEAR A.N.AUTHOR
+</pre></div><section>
+<h5><a name="An_Example_Separation_Into_License_and_Notice"></a>An Example Separation Into License and Notice</h5>
+<p>Here is an example instance of the <a class="externalLink" href="http://www.opensource.org/licenses/mit-license.php"> MIT License</a></p>
+<div class="source">
+<pre>Copyright (c) YEAR-YEAR A.N.AUTHOR
 All rights reserved.
 
 Permission is hereby granted, free  of charge, to any person obtaining
@@ -385,7 +351,10 @@ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</pre></div><p>To allow the <tt>license</tt> to be reused, add the <tt>text</tt> excluding the copyright notice.</p><div class="source"><pre>        &lt;license
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</pre></div>
+<p>To allow the <code>license</code> to be reused, add the <code>text</code> excluding the copyright notice.</p>
+<div class="source">
+<pre>        &lt;license
             name='MIT License'
             id='MIT'
             url='http://www.opensource.org/licenses/mit-license.php'&gt;
@@ -409,7 +378,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             &lt;/text&gt;
-        &lt;/license&gt;</pre></div><p>Add the appropriate <tt>copyright-notice</tt> applying to the <tt>resource</tt>.</p><div class="source"><pre>
+        &lt;/license&gt;</pre></div>
+<p>Add the appropriate <code>copyright-notice</code> applying to the <code>resource</code>.</p>
+<div class="source">
+<pre>
         &lt;with-license id='MIT'&gt;
         &lt;copyright-notice&gt;
 Copyright (c) YEAR-YEAR A.N.AUTHOR
@@ -417,17 +389,29 @@ All rights reserved.
         &lt;/copyright-notice&gt;
             &lt;by-organisation id='example.org'&gt;
                 &lt;resource name='mit-licensed-document-by-A-N-Author.txt'/&gt;
-                ...</pre></div></div></div><div class="section"><h4>Templates For License Families<a name="Templates_For_License_Families"></a></h4><p>Some familiar open source licenses (for example, the <a class="externalLink" href="http://www.opensource.org/licenses/BSD-3-Clause">BSD 3-Clause License</a>) are better understood as families of licenses. Each family is based on a parameterised template. When the license is used, an appropriate value is substituted for each parameter.</p>< [...]
+                ...</pre></div></section></section><section>
+<h4><a name="Templates_For_License_Families"></a>Templates For License Families</h4>
+<p>Some familiar open source licenses (for example, the <a class="externalLink" href="http://www.opensource.org/licenses/BSD-3-Clause">BSD 3-Clause License</a>) are better understood as families of licenses. Each family is based on a parameterised template. When the license is used, an appropriate value is substituted for each parameter.</p>
+<p>Whisker supports template licenses with parameter substitution. Parameter names are defined by <code>parameter-name</code> elements within a <code>template</code> block.</p>
+<div class="source">
+<pre>        &lt;license ...
             &lt;template&gt;
                 &lt;parameter-name&gt;foo&lt;/parameter-name&gt;
                 ...
             &lt;/template&gt;
-            ...</pre></div><p>Each <tt>${parameter name}</tt> within the license <tt>text</tt> will be substituted by the <tt>value</tt> with matching <tt>name</tt> within a <tt>parameter</tt> in a <tt>license-parameters</tt> block. When referring to a template license, this block is required. All parameter names defined must have exactly one value specified.</p><div class="source"><pre>    &lt;license-parameters&gt;
+            ...</pre></div>
+<p>Each <code>${parameter name}</code> within the license <code>text</code> will be substituted by the <code>value</code> with matching <code>name</code> within a <code>parameter</code> in a <code>license-parameters</code> block. When referring to a template license, this block is required. All parameter names defined must have exactly one value specified.</p>
+<div class="source">
+<pre>    &lt;license-parameters&gt;
       &lt;parameter&gt;
         &lt;name&gt;foo&lt;/name&gt;
         &lt;value&gt;bar&lt;/value&gt;
       &lt;/parameter&gt;
-      ...</pre></div><div class="section"><h5>A Template Example<a name="A_Template_Example"></a></h5><p>This simple template example features a <tt>Hello, World</tt> license. Source is <a href="./examples/template-license.xml">here</a>.</p><div class="source"><pre>&lt;manifest&gt;
+      ...</pre></div><section>
+<h5><a name="A_Template_Example"></a>A Template Example</h5>
+<p>This simple template example features a <code>Hello, World</code> license. Source is <a href="./examples/template-license.xml">here</a>.</p>
+<div class="source">
+<pre>&lt;manifest&gt;
     &lt;licenses&gt;
         &lt;!-- A template license --&gt;
         &lt;license id='TL1' name='A Template License'&gt;
@@ -474,7 +458,22 @@ All rights reserved.
                                                         --&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div></div></div><div class="section"><h4>Source Links<a name="Source_Links"></a></h4><div class="section"><h5>Background<a name="Background"></a></h5><p>Some <a href="./faq.html#what-weak-copyleft">weak copyleft</a> licenses contain a <a href="./faq.html#what-source-clause">source clause</a> (for example, the <a class="externalLink" href="http://www.opensource.org/licenses/CDDL-1.0"> CDDL 1.0</a>). A good way to satisfy a source clause is to include the source wi [...]
+&lt;/manifest&gt;</pre></div></section></section><section>
+<h4><a name="Source_Links"></a>Source Links</h4><section>
+<h5><a name="Background"></a>Background</h5>
+<p>Some <a href="./faq.html#what-weak-copyleft">weak copyleft</a> licenses contain a <a href="./faq.html#what-source-clause">source clause</a> (for example, the <a class="externalLink" href="http://www.opensource.org/licenses/CDDL-1.0"> CDDL 1.0</a>). A good way to satisfy a source clause is to include the source within the distribution. An alternative approach (which is advantageous when size is important) is to include a URL linking to the source within the <code>NOTICE</code> or <code [...]
+<h5><a name="Support_For_Source_URLs"></a>Support For Source URLs</h5>
+<p>Whisker supports source links for a <code>resource</code> through the optional <code>source</code> attribute. The primary motivation for this is to support weak copyleft licenses, though many people like the idea of crediting creators by including a link.</p>
+<p>Including a source URL generates an appropriate entry in the NOTICE.</p></section><section>
+<h5><a name="Learn_More"></a>Learn More</h5>
+<p>Learn more about source clauses <a href="./faq.html#what-source-clause">here</a>.</p>
+<p>Learn about copyright and software licensing <a href="./faq.html#more-resources">here</a>.</p>
+<p>Read more about licenses <a href="./faq.html#what-is-a-license">here</a>.</p>
+<p>Read more about weak copyleft licenses <a href="./faq.html#what-weak-copyleft">here</a>.</p></section></section></section><section>
+<h3><a name="A_Sample"></a>A Sample</h3>
+<p>Describes components assembled into the <a class="externalLink" href="http://james.apache.org">Apache James</a> <a class="externalLink" href="http://james.apache.org/server">mail server</a>. Find the source <a href="./examples/james.xml">here</a>.</p>
+<div class="source">
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;manifest&gt;
     &lt;licenses&gt;
         &lt;license
@@ -1868,7 +1867,7 @@ All rights reserved.
             &lt;/by-organisation&gt;
         &lt;/with-license&gt;
     &lt;/within&gt;
-&lt;/manifest&gt;</pre></div></div></div>
+&lt;/manifest&gt;</pre></div></section></section>
       </div>
     </div>
     <div class="clear">
@@ -1876,16 +1875,15 @@ All rights reserved.
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/modules.html b/whisker/modules.html
index 5928397..f78662e 100644
--- a/whisker/modules.html
+++ b/whisker/modules.html
@@ -1,274 +1,164 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:modules at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Project Modules</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Project Modules</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Project Modules
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Project Modules
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                          <li class="expanded">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                    <ul>
-                      <li class="none">
-                          <a href="distribution-management.html" title="Distribution Management">Distribution Management</a>
-            </li>
-                      <li class="none">
-                          <a href="index.html" title="About">About</a>
-            </li>
-                      <li class="none">
-                          <a href="dependencies.html" title="Dependencies">Dependencies</a>
-            </li>
-                      <li class="none">
-                          <a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a>
-            </li>
-                      <li class="none">
-                          <a href="plugins.html" title="Project Plugins">Project Plugins</a>
-            </li>
-                      <li class="none">
-                          <a href="integration.html" title="Continuous Integration">Continuous Integration</a>
-            </li>
-                      <li class="none">
-                          <a href="license.html" title="Project License">Project License</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-management.html" title="Dependency Management">Dependency Management</a>
-            </li>
-                      <li class="none">
-                          <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
-            </li>
-                      <li class="none">
-                          <a href="team-list.html" title="Project Team">Project Team</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a>
-            </li>
-                      <li class="none">
-                          <a href="source-repository.html" title="Source Repository">Source Repository</a>
-            </li>
-                      <li class="none">
-                          <a href="plugin-management.html" title="Plugin Management">Plugin Management</a>
-            </li>
-                      <li class="none">
-            <strong>Project Modules</strong>
-          </li>
-                      <li class="none">
-                          <a href="project-summary.html" title="Project Summary">Project Summary</a>
-            </li>
-              </ul>
-        </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><strong>Project Modules</strong></li>
+       <li class="none"><a href="plugin-management.html" title="Plugin Management">Plugin Management</a></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Project Modules<a name="Project_Modules"></a></h2><a name="Project_Modules"></a><p>This project has declared the following modules:</p><table border="0" class="bodyTable"><tr class="a"><th>Name</th><th>Description</th></tr><tr class="b"><td><a href="apache-whisker-model/index.html">Apache Whisker::Model</a></td><td>Models licensing meta-data.</td></tr><tr class="a"><td><a href="apache-whisker-scan/index.html">Apache Whisker::Scan</a></td><td>Scans directo [...]
+<section>
+<h2><a name="Project_Modules"></a>Project Modules</h2><a name="Project_Modules"></a>
+<p>This project has declared the following modules:</p>
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>Name</th>
+<th>Description</th></tr>
+<tr class="b">
+<td><a href="./apache-whisker-model/index.html">Apache Whisker::Model</a></td>
+<td>Models licensing meta-data.</td></tr>
+<tr class="a">
+<td><a href="./apache-whisker-scan/index.html">Apache Whisker::Scan</a></td>
+<td>Scans directories for resources</td></tr>
+<tr class="b">
+<td><a href="./apache-whisker-xml/index.html">Apache Whisker::XML</a></td>
+<td>Reads model from xml.</td></tr>
+<tr class="a">
+<td><a href="./apache-whisker-app/index.html">Apache Whisker::App</a></td>
+<td>Whisker core application.</td></tr>
+<tr class="b">
+<td><a href="./apache-whisker-velocity/index.html">Apache Whisker::Output(velocity)</a></td>
+<td>Outputs results using velocity.</td></tr>
+<tr class="a">
+<td><a href="./apache-whisker-cli/index.html">Apache Whisker::Command Line Interface</a></td>
+<td>Command line interface for Apache Whisker.</td></tr>
+<tr class="b">
+<td><a href="./apache-whisker-maven-plugin/index.html">Apache Whisker::Maven Plugin</a></td>
+<td>Apache Whisker Maven Plugin.</td></tr></table></section>
       </div>
     </div>
     <div class="clear">
@@ -276,16 +166,15 @@
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/plugin-management.html b/whisker/plugin-management.html
index 4b6d4b7..ac1b14c 100644
--- a/whisker/plugin-management.html
+++ b/whisker/plugin-management.html
@@ -1,274 +1,271 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:plugin-management at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Project Plugin Management</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Project Plugin Management</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Project Plugin Management
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Project Plugin Management
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
-            </li>
-                  <li class="none">
-                          <a href="apidocs/index.html" title="Javadocs">Javadocs</a>
-            </li>
-                  <li class="none">
-                          <a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a>
-            </li>
-                  <li class="none">
-                          <a href="faq.html" title="FAQ">FAQ</a>
-            </li>
-          </ul>
-                       <h5>Examples</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family.html" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Sample Meta Data</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="examples/james.xml" title="Apache James">Apache James</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/public-domain.xml" title="Public Domain">Public Domain</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/template-license.xml" title="Template License">Template License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/license-family-sample.xml" title="License Family">License Family</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a>
-            </li>
-                  <li class="none">
-                          <a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a>
-            </li>
-          </ul>
-                       <h5>Apache Creadur ™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a>
-            </li>
-                  <li class="none">
-                          <a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a>
-            </li>
-          </ul>
-                       <h5>The Apache Software Foundation</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a>
-            </li>
-                  <li class="none">
-                          <a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a>
-            </li>
-                  <li class="none">
-                          <a href="http://people.apache.org" class="externalLink" title="The people">The people</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a>
-            </li>
-                  <li class="none">
-                          <a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a>
-            </li>
-          </ul>
-                       <h5>Contribute</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a>
-            </li>
-          </ul>
-                       <h5>Committer Info</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a>
-            </li>
-                  <li class="none">
-                          <a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a>
-            </li>
-                  <li class="none">
-                          <a href="http://community.apache.org/" class="externalLink" title="Community">Community</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a>
-            </li>
-          </ul>
-                       <h5>Project Documentation</h5>
-                  <ul>
-                                                                                                                                                                                                                                                                                                                                          <li class="expanded">
-                          <a href="project-info.html" title="Project Information">Project Information</a>
-                    <ul>
-                      <li class="none">
-                          <a href="distribution-management.html" title="Distribution Management">Distribution Management</a>
-            </li>
-                      <li class="none">
-                          <a href="index.html" title="About">About</a>
-            </li>
-                      <li class="none">
-                          <a href="dependencies.html" title="Dependencies">Dependencies</a>
-            </li>
-                      <li class="none">
-                          <a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a>
-            </li>
-                      <li class="none">
-                          <a href="plugins.html" title="Project Plugins">Project Plugins</a>
-            </li>
-                      <li class="none">
-                          <a href="integration.html" title="Continuous Integration">Continuous Integration</a>
-            </li>
-                      <li class="none">
-                          <a href="license.html" title="Project License">Project License</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-management.html" title="Dependency Management">Dependency Management</a>
-            </li>
-                      <li class="none">
-                          <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
-            </li>
-                      <li class="none">
-                          <a href="team-list.html" title="Project Team">Project Team</a>
-            </li>
-                      <li class="none">
-                          <a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a>
-            </li>
-                      <li class="none">
-                          <a href="source-repository.html" title="Source Repository">Source Repository</a>
-            </li>
-                      <li class="none">
-            <strong>Plugin Management</strong>
-          </li>
-                      <li class="none">
-                          <a href="modules.html" title="Project Modules">Project Modules</a>
-            </li>
-                      <li class="none">
-                          <a href="project-summary.html" title="Project Summary">Project Summary</a>
-            </li>
-              </ul>
-        </li>
-                                                                                                                                                              <li class="collapsed">
-                          <a href="project-reports.html" title="Project Reports">Project Reports</a>
-                  </li>
-          </ul>
-                                                                                                                               <a href="http://maven.apache.org/" title="Maven" class="poweredBy">
-        <img class="poweredBy"  alt="Maven" src="http://maven.apache.org/images/logos/maven-feather.png"     />
+       <h5>Apache Whisker&trade;</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="Introducing Whisker">Introducing Whisker</a></li>
+     <li class="none"><a href="meta-data.html" title="Meta Data">Meta Data</a></li>
+     <li class="none"><a href="apache-whisker-maven-plugin/index.html" title="Maven Plugin">Maven Plugin</a></li>
+     <li class="none"><a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a></li>
+     <li class="none"><a href="apidocs/index.html" title="Javadocs">Javadocs</a></li>
+     <li class="none"><a href="xref/index.html" title="Source Cross-ref">Source Cross-ref</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+    </ul>
+       <h5>Examples</h5>
+    <ul>
+     <li class="none"><a href="examples/in-5-mins.html" title="In 5 Minutes">In 5 Minutes</a></li>
+     <li class="none"><a href="examples/3rd-party-individual.html" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate.html" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group.html" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/license-family.html" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/copyright-notices.html" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Sample Meta Data</h5>
+    <ul>
+     <li class="none"><a href="examples/james.xml" title="Apache James">Apache James</a></li>
+     <li class="none"><a href="examples/public-domain.xml" title="Public Domain">Public Domain</a></li>
+     <li class="none"><a href="examples/template-license.xml" title="Template License">Template License</a></li>
+     <li class="none"><a href="examples/license-family-sample.xml" title="License Family">License Family</a></li>
+     <li class="none"><a href="examples/3rd-party-individual-sample.xml" title="3rd Party (Individual)">3rd Party (Individual)</a></li>
+     <li class="none"><a href="examples/3rd-party-corporate-sample.xml" title="3rd Party (Corporate)">3rd Party (Corporate)</a></li>
+     <li class="none"><a href="examples/3rd-party-group-sample.xml" title="3rd Party (Group)">3rd Party (Group)</a></li>
+     <li class="none"><a href="examples/in-5-mins-sample.xml" title="MIT License">MIT License</a></li>
+     <li class="none"><a href="examples/copyright-notices-sample.xml" title="Copyright Notices">Copyright Notices</a></li>
+    </ul>
+       <h5>Apache Creadur &trade;</h5>
+    <ul>
+     <li class="none"><a href="http://creadur.apache.org" class="externalLink" title="Creadur Project Home">Creadur Project Home</a></li>
+     <li class="none"><a href="http://creadur.apache.org/rat" class="externalLink" title="Apache Rat">Apache Rat</a></li>
+     <li class="none"><a href="http://creadur.apache.org/tentacles" class="externalLink" title="Apache Tentacles">Apache Tentacles</a></li>
+     <li class="none"><a href="http://www.apache.org/security/" class="externalLink" title="Security">Security</a></li>
+     <li class="none"><a href="http://www.apache.org/licenses/" class="externalLink" title="License">License</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">Sponsorship</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/thanks.html" class="externalLink" title="Thanks">Thanks</a></li>
+    </ul>
+       <h5>The Apache Software Foundation</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation" class="externalLink" title="About the Foundation">About the Foundation</a></li>
+     <li class="none"><a href="http://projects.apache.org" class="externalLink" title="The projects">The projects</a></li>
+     <li class="none"><a href="http://people.apache.org" class="externalLink" title="The people">The people</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink" title="How we work">How we work</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/how-it-works.html#history" class="externalLink" title="Our history">Our history</a></li>
+     <li class="none"><a href="http://blogs.apache.org/foundation/" class="externalLink" title="News">News</a></li>
+    </ul>
+       <h5>Contribute</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/foundation/getinvolved.html" class="externalLink" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Committer Info</h5>
+    <ul>
+     <li class="none"><a href="http://www.apache.org/dev/committers.html" class="externalLink" title="Committers' FAQ">Committers' FAQ</a></li>
+     <li class="none"><a href="http://www.apache.org/dev/new-committers-guide.html" class="externalLink" title="New Committers Guide">New Committers Guide</a></li>
+     <li class="none"><a href="http://planet.apache.org/committers/" class="externalLink" title="Plant Apache">Plant Apache</a></li>
+     <li class="none"><a href="http://community.apache.org/" class="externalLink" title="Community">Community</a></li>
+     <li class="none"><a href="http://www.apache.org/legal/" class="externalLink" title="Legal">Legal</a></li>
+     <li class="none"><a href="http://www.apache.org/foundation/marks/" class="externalLink" title="Branding">Branding</a></li>
+     <li class="none"><a href="http://www.apache.org/press/" class="externalLink" title="Media Relations">Media Relations</a></li>
+    </ul>
+       <h5>Project Documentation</h5>
+    <ul>
+     <li class="expanded"><a href="project-info.html" title="Project Information">Project Information</a>
+      <ul>
+       <li class="none"><a href="ci-management.html" title="CI Management">CI Management</a></li>
+       <li class="none"><a href="dependency-convergence.html" title="Dependency Convergence">Dependency Convergence</a></li>
+       <li class="none"><a href="dependency-info.html" title="Dependency Information">Dependency Information</a></li>
+       <li class="none"><a href="dependency-management.html" title="Dependency Management">Dependency Management</a></li>
+       <li class="none"><a href="distribution-management.html" title="Distribution Management">Distribution Management</a></li>
+       <li class="none"><a href="index.html" title="About">About</a></li>
+       <li class="none"><a href="issue-management.html" title="Issue Management">Issue Management</a></li>
+       <li class="none"><a href="licenses.html" title="Licenses">Licenses</a></li>
+       <li class="none"><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+       <li class="none"><a href="modules.html" title="Project Modules">Project Modules</a></li>
+       <li class="none"><strong>Plugin Management</strong></li>
+       <li class="none"><a href="plugins.html" title="Plugins">Plugins</a></li>
+       <li class="none"><a href="scm.html" title="Source Code Management">Source Code Management</a></li>
+       <li class="none"><a href="summary.html" title="Summary">Summary</a></li>
+      </ul></li>
+    </ul>
+      <a href="https://maven.apache.org/" title="Maven" class="poweredBy">
+        <img class="poweredBy"  alt="Maven" src="https://maven.apache.org/images/logos/maven-feather.png"     />
       </a>
-                       
-            
-            </div>
+      </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Project Plugin Management<a name="Project_Plugin_Management"></a></h2><a name="Project_Plugin_Management"></a><table border="0" class="bodyTable"><tr class="a"><th>GroupId</th><th>ArtifactId</th><th>Version</th></tr><tr class="b"><td>org.apache.maven.plugins</td><td><a class="externalLink" href="http://maven.apache.org/plugins/maven-antrun-plugin/">maven-antrun-plugin</a></td><td>1.6</td></tr><tr class="a"><td>org.apache.maven.plugins</td><td><a class="ex [...]
+<section>
+<h2><a name="Project_Plugin_Management"></a>Project Plugin Management</h2><a name="Project_Plugin_Management"></a>
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>GroupId</th>
+<th>ArtifactId</th>
+<th>Version</th></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/plugins/maven-antrun-plugin/">maven-antrun-plugin</a></td>
+<td>1.8</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-assembly-plugin/">maven-assembly-plugin</a></td>
+<td>3.2.0</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-clean-plugin/">maven-clean-plugin</a></td>
+<td>3.1.0</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-compiler-plugin/">maven-compiler-plugin</a></td>
+<td>3.8.1</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-dependency-plugin/">maven-dependency-plugin</a></td>
+<td>3.1.1</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/plugins/maven-deploy-plugin/">maven-deploy-plugin</a></td>
+<td>2.8.2</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/plugins/maven-docck-plugin/">maven-docck-plugin</a></td>
+<td>1.1</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-ear-plugin/">maven-ear-plugin</a></td>
+<td>3.0.1</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/enforcer/maven-enforcer-plugin">maven-enforcer-plugin</a></td>
+<td>1.4.1</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/surefire/maven-failsafe-plugin/">maven-failsafe-plugin</a></td>
+<td>2.22.0</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/plugins/maven-gpg-plugin/">maven-gpg-plugin</a></td>
+<td>1.6</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-help-plugin/">maven-help-plugin</a></td>
+<td>3.2.0</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/plugins/maven-install-plugin/">maven-install-plugin</a></td>
+<td>2.5.2</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-invoker-plugin/">maven-invoker-plugin</a></td>
+<td>3.2.1</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-jar-plugin/">maven-jar-plugin</a></td>
+<td>3.2.0</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-javadoc-plugin/">maven-javadoc-plugin</a></td>
+<td>3.0.1</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugin-tools/maven-plugin-plugin">maven-plugin-plugin</a></td>
+<td>3.5.2</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-project-info-reports-plugin/">maven-project-info-reports-plugin</a></td>
+<td>3.0.0</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/maven-release/maven-release-plugin/">maven-release-plugin</a></td>
+<td>3.0.0-M1</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-remote-resources-plugin/">maven-remote-resources-plugin</a></td>
+<td>1.7.0</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-resources-plugin/">maven-resources-plugin</a></td>
+<td>3.1.0</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/scm/maven-scm-plugin/">maven-scm-plugin</a></td>
+<td>1.9.5</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin">maven-scm-publish-plugin</a></td>
+<td>1.1</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="http://maven.apache.org/plugins/maven-shade-plugin/">maven-shade-plugin</a></td>
+<td>2.2</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-site-plugin/">maven-site-plugin</a></td>
+<td>3.9.1</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-source-plugin/">maven-source-plugin</a></td>
+<td>3.2.1</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/surefire/maven-surefire-plugin/">maven-surefire-plugin</a></td>
+<td>2.22.0</td></tr>
+<tr class="a">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/surefire/maven-surefire-report-plugin/">maven-surefire-report-plugin</a></td>
+<td>2.22.0</td></tr>
+<tr class="b">
+<td>org.apache.maven.plugins</td>
+<td><a class="externalLink" href="https://maven.apache.org/plugins/maven-war-plugin/">maven-war-plugin</a></td>
+<td>3.2.2</td></tr>
+<tr class="a">
+<td>org.apache.rat</td>
+<td><a class="externalLink" href="http://creadur.apache.org/rat/apache-rat-plugin/">apache-rat-plugin</a></td>
+<td>0.12</td></tr>
+<tr class="b">
+<td>org.codehaus.mojo</td>
+<td><a class="externalLink" href="http://www.mojohaus.org/clirr-maven-plugin/clirr-maven-plugin">clirr-maven-plugin</a></td>
+<td>2.8</td></tr>
+<tr class="a">
+<td>org.codehaus.mojo</td>
+<td><a class="externalLink" href="http://mojo.codehaus.org/cobertura-maven-plugin/">cobertura-maven-plugin</a></td>
+<td>2.5.1</td></tr></table></section>
       </div>
     </div>
     <div class="clear">
@@ -276,16 +273,15 @@
     </div>
     <div id="footer">
       <div class="xright">
-              <?xml version="1.0" encoding="UTF-8"?>
-<footer>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
       Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
       of The Apache Software Foundation.
       All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-      This is user documentation, not legal advice.</footer>
-            </div>
+      This is user documentation, not legal advice.
+      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/whisker/plugins.html b/whisker/plugins.html
index ff66250..a89dd27 100644
--- a/whisker/plugins.html
+++ b/whisker/plugins.html
@@ -1,274 +1,185 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jul 31, 2013 -->
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.9.2 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.0.0:plugins at 2021-05-18
+
+ | Rendered using Apache Maven Default Skin
+-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Apache Whisker™ - Project Build Plugins</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130731" />
-    <meta http-equiv="Content-Language" content="en" />
-                                                    
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Mate+SC"/>
-                      
-        </head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" />
+    <title>Apache Whisker&trade; &#x2013; Project Plugins</title>
+    <link rel="stylesheet" href="./css/maven-base.css" />
+    <link rel="stylesheet" href="./css/maven-theme.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />
+  </head>
   <body class="composite">
     <div id="banner">
-                    <div id="bannerLeft">
-                Apache Whisker
-                </div>
-                              <a href="http://www.apache.org/" id="bannerRight">
-                                        <img src="http://www.apache.org/images/asf_logo_wide.jpg" alt="The Apache Software Foundation" title="The Apache Software Foundation" />
-                </a>
-            <div class="clear">
+<div id="bannerLeft">Apache Whisker
+</div>
+<a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide.jpg"  alt="The Apache Software Foundation" title="The Apache Software Foundation"/></a>      <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
-            
-            
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2013-07-31</span>
-                  &nbsp;| <span id="projectVersion">Version: 0.1-SNAPSHOT</span>
-                          |                           <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a>
-        &gt;
-                          <a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a>
-        &gt;
-                          <a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a>
-        &gt;
-    Project Build Plugins
-              </div>
-            <div class="xright">        
-            
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2021-05-18</span>
+          &#xA0;| <span id="projectVersion">Version: 0.2-SNAPSHOT</span>
+          | <a href="http://www.apache.org/" class="externalLink" title="Apache">Apache</a> &gt;
+<a href="http://creadur.apache.org/" class="externalLink" title="Creadur">Creadur</a> &gt;
+<a href="http://creadur.apache.org/whisker/" class="externalLink" title="Whisker">Whisker</a> &gt;
+Project Plugins
       </div>
+      <div class="xright">      </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-            
-                                <h5>Apache Whisker™</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="index.html" title="Introducing Whisker">Introducing Whisker</a>
-            </li>
-                  <li class="none">
-                          <a href="meta-data.html" title="Meta Data">Meta Data</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-plugin4maven/index.html" title="Maven Plugin">Maven Plugin</a>
-            </li>
-                  <li class="none">
-                          <a href="apache-whisker-cli/index.html" title="Command Line">Command Line</a>
... 1206 lines suppressed ...