Apache Archiva Main site deployment
diff --git a/ci-management.html b/ci-management.html
index ebdc695..047b8b6 100644
--- a/ci-management.html
+++ b/ci-management.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/css/site.css b/css/site.css
index cabfde4..360ad0f 100644
--- a/css/site.css
+++ b/css/site.css
@@ -20,6 +20,47 @@
* under the License.
*/
+/** start of asciidoc specific styles **/
+@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";
+
+.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
+table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
+.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
+table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
+.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
+.admonitionblock>table td.icon{text-align:center;width:80px}
+.admonitionblock>table td.icon img{max-width:none}
+.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
+.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
+.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
+.exampleblock>.content>:first-child{margin-top:0}
+.exampleblock>.content>:last-child{margin-bottom:0}
+.sidebarblock{border-style:solid;border-width:1px;border-color:#dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;-webkit-border-radius:4px;border-radius:4px}
+.sidebarblock>:first-child{margin-top:0}
+.sidebarblock>:last-child{margin-bottom:0}
+.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
+.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
+
+span.icon>.fa{cursor:default}
+a span.icon>.fa{cursor:inherit}
+.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
+.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
+.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
+.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
+.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
+.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value] *{color:#fff!important}
+.conum[data-value]+b{display:none}
+.conum[data-value]::after{content:attr(data-value)}
+
+code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
+
+/** end of asciidoc specific styles **/
+
+
a.externalLink[href^="http"] {
background: url('../images/external-link-12x12.png') right center no-repeat;
padding-right: 18px;
diff --git a/developers/building.html b/developers/building.html
index bff59a7..9c7a7a6 100644
--- a/developers/building.html
+++ b/developers/building.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -163,7 +166,7 @@
sh ./jetty.sh # use sh ./jetty-debug.sh if you want to attach a debugger</pre></div>
<p>Hit your browser: <a class="externalLink" href="http://localhost:9091/archiva/index.html">http://localhost:9091/archiva/index.html</a></p></div>
<div class="section">
-<h2><a name="Running_the_selenium_tests_.28Web_UI_tests.29_locally"></a>Running the selenium tests (Web UI tests) locally</h2>
+<h2><a name="Running_the_selenium_tests_Web_UI_tests_locally"></a>Running the selenium tests (Web UI tests) locally</h2>
<p>The selenium tests use docker containers for the selenium and browser installation. To run the tests locally you should have docker installed on your developer machine. The docker container can be built locally or pulled from the apachearchiva Dockerhub repository. To start the docker container, run the following script:</p>
<div class="source"><pre class="prettyprint"> ./src/ci/scripts/container_webtest.sh start</pre></div>
<p>The UI tests can be run with:</p>
diff --git a/developers/how-we-do-things.html b/developers/how-we-do-things.html
index 8aaf88d..64eedf1 100644
--- a/developers/how-we-do-things.html
+++ b/developers/how-we-do-things.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/developers/publishing-site.html b/developers/publishing-site.html
index 35eefbb..c8c9926 100644
--- a/developers/publishing-site.html
+++ b/developers/publishing-site.html
@@ -8,12 +8,15 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="Content-Language" content="en" />
- <title>Archiva – Archiva Sites Publishing</title>
+ <title>Archiva – </title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -126,74 +129,235 @@
<ul class="breadcrumb">
<li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
<li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
- <li class="active ">Archiva Sites Publishing</li>
+ <li class="active "></li>
<li id="publishDate" class="pull-right">Last Published: 30 Nov 2019</li>
</ul>
</div>
<div id="bodyColumn" >
-<div class="section">
-<h2><a name="Publishing_the_Archiva_Site"></a>Publishing the Archiva Site</h2>
-<p>The Archiva site, documentation and reference documentation are now published to <tt>http://archiva.apache.org/</tt> using the <a class="externalLink" href="http://www.apache.org/dev/project-site.html#svnpubsub"> ASF's svnpubsub</a> service.</p>
-<p>The files published to the site are all stored under the Subversion repository at <a class="externalLink" href="http://svn.apache.org/repos/asf/archiva/site-content/">http://svn.apache.org/repos/asf/archiva/site-content/</a>.</p>
-<p>This mostly operates like a normal site deployment, though there are some specific customisations and special instructions for the reference library. The processes follow those described for the <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/">Maven SCM Publish Plugin</a> for <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/examples/one-module-configuration.html"> Single module projects</a> and <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/examples/multi-module-configuration.html"> Multi-module projects</a> as applicable.</p>
-<p>Each site checks out the production site data into the <tt>site-publish</tt> directory of the current project, to avoid being cleaned as part of the build. It is ignored by <tt>svn</tt> operations, but you should ensure that the checkout is clean if you ever cancel or have a failure during a publish operation. You can check it is clean by ensuring there is no data from <tt>git status</tt> in that directory, or by removing it and having it get checked out again.</p>
-<div class="section">
-<h3><a name="Editing_and_Publishing_the_Main_Site"></a>Editing and Publishing the Main Site</h3>
-<p>The site displayed at the root of <a class="externalLink" href="http://archiva.apache.org">http://archiva.apache.org</a> (where you are reading this) has its source code in Git at <a class="externalLink" href="https://gitbox.apache.org/repos/asf/archiva-site.git">https://gitbox.apache.org/repos/asf/archiva-site.git</a>.</p>
-<p>To edit and publish the site, do the following:</p>
-<ol style="list-style-type: decimal">
-<li>Checkout the source code from Git (if you follow the instructions in <a href="./building.html"> Building Archiva</a>, you know how to have it.</li>
-<li>Make edits and check them using <tt>mvn site</tt> or <tt>mvn site:run</tt> until satisfied.</li>
-<li>Commit your changes (making sure your working copy is completely up to date first)</li>
-<li>Publish the site:
-<div>
-<pre>mvn site-deploy</pre></div></li></ol>
-<p>This site deployment can be done at any time, and is not tied to releases.</p>
-<p>Note that since the main site also contains the (large!) <tt>docs</tt> and <tt>ref</tt> directories in the <tt>site-publish</tt> directory, there is a special <tt>setup-checkout</tt> profile in place to get the initial checkout without those directories. This will normally be activated whenever the <tt>site-publish</tt> directory is missing - if you happen to have active profiles from your <tt>settings.xml</tt> you may need to enable it explicitly whenever you do a deployment and that checkout is missing: <tt>mvn site-deploy -Psetup-checkout</tt> </p></div>
-<div class="section">
-<h3><a name="Editing_and_Publishing_the_Archiva_Documentation"></a>Editing and Publishing the Archiva Documentation</h3>
-<p>The documentation displayed under the subdirectories of <a class="externalLink" href="http://archiva.apache.org/docs/">http://archiva.apache.org/docs/</a> has its source code in Git at <a class="externalLink" href="https://gitbox.apache.org/repos/asf/archiva.git">https://gitbox.apache.org/repos/asf/archiva.git</a> directory archiva-docs, which is part of the main project checkout.</p>
-<p>The instructions for managing the documentation is the same as for the main site, being published from the directory using:</p>
-<div>
-<pre>mvn site-deploy</pre></div>
-<p>However, in this case it is typically done as part of a release process - see <a href="./releasing.html"> Releasing Archiva</a> for instructions on doing this.</p>
-<p>The documentation remains versioned based on the release it is related to. To best manage this with svnpubsub, the site is always published into a directory <tt>docs/latest</tt>, only requiring a small number of modifications to be made. Then, as part of the release instructions, the <tt>latest</tt> directory is copied to the versioned location - for example, <tt>http://svn.apache.org/repos/asf/archiva/site-content/docs/1.4-M4</tt>.</p>
-<p>For <tt>site:stage</tt> to apply correctly without needing a full checkout, a workaround is applied by setting the <tt>distributionManagement/site/url</tt> element to match that of the parent site. The value is then overridden with the correct value in the <tt>maven-scm-publish-plugin</tt> configuration. This avoids the Site plugin attempting to relativize links incorrectly.</p></div>
-<div class="section">
-<h3><a name="Editing_and_Publishing_the_Reference_Documentation"></a>Editing and Publishing the Reference Documentation</h3>
-<p>The reference documentation, including JavaDocs and source cross-reference, is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/ref">http://archiva.apache.org/ref</a>. At this time, only the latest reference documents are retained. They require quite a lot of space, and historical information is of less relevance to Archiva developers or users.</p>
-<p>To publish the latest reference documents, you need to run:</p>
-<div>
-<pre>cd archiva-modules
-mvn site site:stage scm-publish:publish-scm
-or
-sh ./deploySite.sh</pre></div>
-<p>This will likely cause a very large commit, and should be done infrequently. Once per release is likely to be adequate.</p></div>
-<div class="section">
-<h3><a name="Publishing_Redback_site"></a>Publishing Redback site</h3>
-<p>The redback is stored under the Subversion repository at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/redback/redback-site/trunk">https://svn.apache.org/repos/asf/archiva/redback/redback-site/trunk</a>.</p>
-<p>It's displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback">http://archiva.apache.org/redback</a>.</p>
-<p>To publish documentation, you need to run:</p>
-<div>
-<pre>mvn site-deploy</pre></div></div>
-<div class="section">
-<h3><a name="Publishing_Redback_Core_reference"></a>Publishing Redback Core reference</h3>
-<p>The Redback core reference is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback/core">http://archiva.apache.org/redback/core</a>.</p>
-<p>It contains javadoc for Redback core.</p>
-<p>To publish documentation, you need to run:</p>
-<div>
-<pre>mvn clean site-deploy scm-publish:publish-scm
-or
-sh ./deploySite.sh</pre></div></div>
-<div class="section">
-<h3><a name="Publishing_Redback_Components_reference"></a>Publishing Redback Components reference</h3>
-<p>The Redback components reference is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback/components">http://archiva.apache.org/redback/components</a>.</p>
-<p>It contains javadoc for Redback components.</p>
-<p>To publish documentation, you need to run:</p>
-<div>
-<pre>mvn clean site-deploy scm-publish:publish-scm
-or
-sh ./deploySite.sh</pre></div></div></div>
+<h1>Archiva Site Publishing</h1>
+<div id="toc" class="toc">
+<div id="toctitle">Table of Contents</div>
+<ul class="sectlevel1">
+<li><a href="#general_information_about_the_site_publish_process">General information about the site publish process</a></li>
+<li><a href="#where_is_site_content_generated">Where is site content generated?</a></li>
+<li><a href="#tasks_for_publishing">Tasks for publishing</a>
+<ul class="sectlevel2">
+<li><a href="#using_the_script_linuxbash">Using the script (Linux/Bash)</a></li>
+<li><a href="#run_the_process_manually">Run the process manually</a></li>
+</ul>
+</li>
+<li><a href="#information_about_maven_script_configuration">Information about Maven / Script configuration</a></li>
+<li><a href="#information_about_site_generation">Information about site generation</a></li>
+</ul>
+</div>
+<div class="sect1">
+<h2 id="general_information_about_the_site_publish_process">General information about the site publish process</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The archiva site is built from multiple different more or less independent modules. The build process
+uses <code>maven-site-plugin</code> for generating the static HTML pages and stylesheets and <code>scm-publish-plugin</code> for
+publishing the results to the repository.</p>
+</div>
+<div class="paragraph">
+<p>The generated HTML pages are stored at a git repository:
+<a href="https://gitbox.apache.org/repos/asf?p=archiva-web-content.git"><code>archiva-web-content.git</code></a>.</p>
+</div>
+<div class="paragraph">
+<p>The git repository contains a <code>.asf.yaml</code> file that defines the branch <code>asf-staging</code> as staging branch. The
+master branch is used by git-pub-sub to publish the official archiva site at <a href="https://archiva.apache.org" class="bare">https://archiva.apache.org</a> .</p>
+</div>
+<div class="paragraph">
+<p>If you push something to the <code>asf-staging</code> branch you can see the changes immediately at <a href="https://archiva.staged.apache.org" class="bare">https://archiva.staged.apache.org</a></p>
+</div>
+<div class="paragraph">
+<p>The maven site report and publishing plugins are configured to deploy the the asf-staging branch. That means the
+overall publishing process is the following:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Generate the site content for a module by using the scripts / maven</p>
+</li>
+<li>
+<p>Use the maven publish plugin to push the generated pages to the asf-staging branch of archiva-web-content.git</p>
+</li>
+<li>
+<p>Check the generated content at <a href="https://archiva.staged.apache.org/" class="bare">https://archiva.staged.apache.org/</a></p>
+</li>
+<li>
+<p>If the result is fine, release the new content by merging the content from <code>asf-staging</code> to the <code>master</code> branch</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For all modules there exists a script that runs all the steps (apart from the check on the staged site). Currently
+the script runs only on Linux / Bash. For details see below.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="where_is_site_content_generated">Where is site content generated?</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The Archiva site is generated from the following components:</p>
+</div>
+<table class="table table-striped bodyTable frame-all grid-all bodyTable" style="width:100%"><colgroup><col style="width: 16.6666%;" /><col style="width: 16.6666%;" /><col style="width: 16.6666%;" /><col style="width: 16.6666%;" /><col style="width: 16.6666%;" /><col style="width: 16.667%;" /><tr class="a"><th class="halign-left valign-top">Component</th><th class="halign-left valign-top">Content</th><th class="halign-left valign-top">Git Repository</th><th class="halign-left valign-top">Path inside Repo</th><th class="halign-left valign-top">Publish Path</th><th class="halign-left valign-top">Skript</th></tr><tr class="b"><td class="halign-left valign-top">Archiva Site</td><td class="halign-left valign-top">Main Pages, like index.html. General information.</td><td class="halign-left valign-top"><a href="https://gitbox.apache.org/repos/asf?p=archiva-site.git"><code>archiva-site.git</code></a></td><td class="halign-left valign-top">/</td><td class="halign-left valign-top">/</td><td class="halign-left valign-top"><code>deploySite.sh</code></td></tr><tr class="a"><td class="halign-left valign-top">Archiva Documentation</td><td class="halign-left valign-top">Archiva User Documentation. Archiva Configuration.</td><td class="halign-left valign-top"><a href="https://gitbox.apache.org/repos/asf?p=archiva.git"><code>archiva.git</code></a></td><td class="halign-left valign-top">/archiva-docs</td><td class="halign-left valign-top">/docs/${project.version}</td><td class="halign-left valign-top"><code>archiva-docs/deploySite.sh</code></td></tr><tr class="b"><td class="halign-left valign-top">Archiva Reference Documentation</td><td class="halign-left valign-top">Developer documentation for Archiva, API Javadoc pages. Information for each maven module.</td><td class="halign-left valign-top"><a href="https://gitbox.apache.org/repos/asf?p=archiva.git"><code>archiva.git</code></a></td><td class="halign-left valign-top">/archiva-modules</td><td class="halign-left valign-top">/ref/${project.version}</td><td class="halign-left valign-top"><code>archiva-modules/deploySite.sh</code></td></tr><tr class="a"><td class="halign-left valign-top">Redback Site</td><td class="halign-left valign-top">Pages for Redback. General information about redback.</td><td class="halign-left valign-top"><a href="https://gitbox.apache.org/repos/asf?p=archiva-redback-site.git"><code>archiva-redback-site.git</code></a></td><td class="halign-left valign-top">/</td><td class="halign-left valign-top">/redback</td><td class="halign-left valign-top"><code>deploySite.sh</code></td></tr><tr class="b"><td class="halign-left valign-top">Redback Reference Documentation</td><td class="halign-left valign-top">Developer documentation for Redback, API Javadoc pages. Information for each maven module.</td><td class="halign-left valign-top"><a href="https://gitbox.apache.org/repos/asf?p=archiva-redback-core.git"><code>archiva-redback-core.git</code></a></td><td class="halign-left valign-top">/</td><td class="halign-left valign-top">/core/${project.version}</td><td class="halign-left valign-top"><code>deploySite.sh</code></td></tr><tr class="a"><td class="halign-left valign-top">Archiva Component Documentation</td><td class="halign-left valign-top">Information about the Archiva Components</td><td class="halign-left valign-top"><a href="https://gitbox.apache.org/repos/asf?p=archiva-components.git"><code>archiva-components.git</code></a></td><td class="halign-left valign-top">/</td><td class="halign-left valign-top">/components</td><td class="halign-left valign-top"><code>deploySite.sh</code></td></tr></colgroup></table>
+</div>
+</div>
+<div class="sect1">
+<h2 id="tasks_for_publishing">Tasks for publishing</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="using_the_script_linuxbash">Using the script (Linux/Bash)</h3>
+<div class="paragraph">
+<p>The easiest way is always to use the script <code>deploySite.sh</code> in the directory of the corresponding repository.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>cd <path inside repo for component>
+./deploySite.sh
+...
+...
+*****************************************
+>>>> Finished the site stage process <<<<
+> You can check the content in the folder target/staging or by opening the following url
+> file:///archiva/archiva-modules/target/staging/ref/3.0.0-SNAPSHOT/index.html
+>
+> If everything is fine enter yes. After that the publish process will be started.
+Do you want to publish (yes/no)? yes</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>When this output is shown you can check the staging output for this component only on the given path.</p>
+</div>
+<div class="paragraph">
+<p>If you enter <code>y</code> or <code>yes</code> here, the content will be pushed to the <code>asf-staging</code>-branch at <code>archiva-web-content.git</code>
+If you enter any other key, the process will be aborted.</p>
+</div>
+<div class="paragraph">
+<p>After the page was pushed to the <code>asf-staging</code>-branch, you can check the result at <a href="https://archiva.staged.apache.org/" class="bare">https://archiva.staged.apache.org/</a></p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>If you would like to check the page with a local clone of archiva-web-content.git you can run the script with:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>./deploySite.sh -DsiteRepositoryUrl=scm:git:file:///${path-to-your-local-archiva}/archiva-web-content.git</pre>
+</div>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>If the result on the staged URL is fine you have to merge the branch to the master branch:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre># git clone https://gitbox.apache.org/repos/asf/archiva-web-content.git
+cd archiva-web-content
+git checkout master
+git merge --ff-only asf-staging
+git push</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="run_the_process_manually">Run the process manually</h3>
+<div class="sect3">
+<h4 id="generating_site_pages_for_a_component">Generating Site Pages for a component</h4>
+<div class="paragraph">
+<p>The script basically runs</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>mvn clean site
+mvn site:stage</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The pom.xml has a plugin definition to checkout the repository as sparse checkout to a local directory <code>.site-content</code>
+The patterns for the sparse checkout are stored in the file <code>git-sparse-checkout-pattern</code></p>
+</div>
+<div class="paragraph">
+<p>The content of the module and all submodules is put to the directory <code>target/staging/${Component Path}</code></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="publishing_to_the_staging_branch">Publishing to the staging branch</h4>
+<div class="paragraph">
+<p>This is the part that is run, when you answer <code>y</code> or <code>yes</code> for publishing.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>mvn scm-publish:publish-scm</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This checks the differences in .site-content and pushes the differences to the <code>asf-staging</code> branch.</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="information_about_maven_script_configuration">Information about Maven / Script configuration</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>There are some properties in the pom.xml that are used by the deploySite.sh. You should always make sure, that
+these properties are set to the corresponding values for the given module:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><scmPubCheckoutDirectory>.site-content</scmPubCheckoutDirectory>: The directory for the sparse checkout</p>
+</li>
+<li>
+<p><scmPublishBranch>asf-staging</scmPublishBranch>: The staging branch</p>
+</li>
+<li>
+<p><scmPublishPath>/</scmPublishPath>: The path relative to the base URL where the content is placed</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The helper script <code>checkoutSite.sh</code> is used for running the sparse checkout of the content.</p>
+</div>
+<div class="paragraph">
+<p>For multi-module projects the CSS (site.css) is always relative to the module directory. Therefore, we have
+a link to the stylesheet at <code>/css/site.css</code> in <code>site.xml</code></p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="information_about_site_generation">Information about site generation</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Most content is written in apt and xdoc. New documentation can/should be written in asciidoc. Asciidoc needs some css modification
+to get the styles right. So please check the generated content before publishing it.</p>
+</div>
+<div class="paragraph">
+<p>For multi-module builds you should add the central <code>/css/site.css</code> to the <code><head></code>-Section in <code>site.xml</code>. Because submodules
+include only their own site.css and not the parent stylesheets. This can be done with:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre><head>
+ ...
+ <![CDATA[ <link rel="stylesheet" href="/css/site.css" type="text/css" >]]>
+ ...
+</head></pre>
+</div>
+</div>
+</div>
+</div>
</div>
</div>
<hr/>
diff --git a/developers/releasing.html b/developers/releasing.html
index 72f3097..f08a59f 100644
--- a/developers/releasing.html
+++ b/developers/releasing.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/download.html b/download.html
index 160fede..3c1afa5 100644
--- a/download.html
+++ b/download.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/errors/404.html b/errors/404.html
index 8a8bbf8..4d2e6bb 100644
--- a/errors/404.html
+++ b/errors/404.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/get-involved.html b/get-involved.html
index 1562fed..638e719 100644
--- a/get-involved.html
+++ b/get-involved.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/index.html b/index.html
index 0eecb08..b0ca759 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -299,7 +302,7 @@
</div>
<div class="section">
-<h2><a name="Apache_Archiva.C2.99:_The_Build_Artifact_Repository_Manager"></a>Apache Archiva™: The Build Artifact Repository Manager</h2>
+<h2><a name="Apache_Archiva:_The_Build_Artifact_Repository_Manager"></a>Apache Archiva™: The Build Artifact Repository Manager</h2>
<p>
Apache Archiva™ is an extensible repository management software that
@@ -429,7 +432,7 @@
</p>
</div>
<div class="section">
-<h4><a name="Browsing.2FUploading.2FSearching"></a>Browsing/Uploading/Searching</h4>
+<h4><a name="BrowsingUploadingSearching"></a>Browsing/Uploading/Searching</h4>
<p align="center">
<iframe width="420" height="315" src="https://www.youtube.com/embed/y4DoLCfYR-A" frameborder="0" allowfullscreen=""></iframe>
@@ -508,7 +511,7 @@
<div style="clear: left">
</div>
<div class="section">
-<h3><a name="Articles.2C_Presentations_and_Tutorials"></a>Articles, Presentations and Tutorials</h3>
+<h3><a name="Articles_Presentations_and_Tutorials"></a>Articles, Presentations and Tutorials</h3>
<ul>
diff --git a/issue-management.html b/issue-management.html
index 6bfc43f..7eabfcb 100644
--- a/issue-management.html
+++ b/issue-management.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/jsui/generics-js.html b/jsui/generics-js.html
index 3901d89..6ce2b7d 100644
--- a/jsui/generics-js.html
+++ b/jsui/generics-js.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/jsui/i18n.html b/jsui/i18n.html
index bcb7ae3..44dd557 100644
--- a/jsui/i18n.html
+++ b/jsui/i18n.html
@@ -15,7 +15,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/jsui/index.html b/jsui/index.html
index 784dfa4..c9ba9c4 100644
--- a/jsui/index.html
+++ b/jsui/index.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -151,7 +154,7 @@
<li><a href="#Sources_organisation">Sources organisation</a></li>
<li><a href="#js_directory">js directory</a></li>
<li><a href="#Start_page">Start page</a></li>
-<li><a href="#Grid.2Fedit_model">Grid/edit model</a></li></ul></li></ul>
+<li><a href="#Gridedit_model">Grid/edit model</a></li></ul></li></ul>
<div class="section">
@@ -305,7 +308,7 @@
<div class="section">
-<h3><a name="Grid.2Fedit_model"></a>Grid/edit model</h3>
+<h3><a name="Gridedit_model"></a>Grid/edit model</h3>
<p>We use a tab/pill models to display grid of datas and edit/add form:
</p>
diff --git a/jsui/knockout-binding.html b/jsui/knockout-binding.html
index 9855e0d..a049a62 100644
--- a/jsui/knockout-binding.html
+++ b/jsui/knockout-binding.html
@@ -15,7 +15,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -142,7 +145,7 @@
<li><a href="#Javascript_Beans">Javascript Beans</a></li>
<li><a href="#View_Model">View Model</a>
<ul>
-<li><a href="#First_you_must_insert_your_template_in_the_.23main-content_div">First you must insert your template in the #main-content div</a></li>
+<li><a href="#First_you_must_insert_your_template_in_the_main-content_div">First you must insert your template in the #main-content div</a></li>
<li><a href="#You_can_now_create_your_view_model.">You can now create your view model.</a></li>
<li><a href="#Grid_binding">Grid binding</a></li></ul></li>
<li><a href="#View_definition">View definition</a>
@@ -188,7 +191,7 @@
<div class="section">
<h3><a name="View_Model"></a>View Model</h3>
<div class="section">
-<h4><a name="First_you_must_insert_your_template_in_the_.23main-content_div"></a>First you must insert your template in the #main-content div</h4>
+<h4><a name="First_you_must_insert_your_template_in_the_main-content_div"></a>First you must insert your template in the #main-content div</h4>
<div class="source"><pre class="prettyprint">// it's a jquery template as we do some i18n transformations
$("#main-content").html($("#repositoriesMain").tmpl());</pre></div></div>
<div class="section">
diff --git a/jsui/rest.html b/jsui/rest.html
index 25e50be..63f24f6 100644
--- a/jsui/rest.html
+++ b/jsui/rest.html
@@ -15,7 +15,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -149,7 +152,7 @@
<ul>
<li><a href="#Beans">Beans</a></li>
<li><a href="#JAXRS_annotations">JAXRS annotations</a></li></ul></li>
-<li><a href="#CXF.2FSpring_configuration">CXF/Spring configuration</a></li>
+<li><a href="#CXFSpring_configuration">CXF/Spring configuration</a></li>
<li><a href="#Redback_security_annotation">Redback security annotation</a></li></ul></li></ul></li></ul>
<div class="section">
<h3><a name="Steps_to_expose_your_class_as_a_REST_Service."></a>Steps to expose your class as a REST Service.</h3>
@@ -199,7 +202,7 @@
ManagedRepository addManagedRepository( ManagedRepository managedRepository )
throws ArchivaRestServiceException;</pre></div></div></div>
<div class="section">
-<h4><a name="CXF.2FSpring_configuration"></a>CXF/Spring configuration</h4>
+<h4><a name="CXFSpring_configuration"></a>CXF/Spring configuration</h4>
<p>REST services implementations are marked with the Spring annotation @Service</p>
<div class="source"><pre class="prettyprint">package org.apache.archiva.rest.services;
......
diff --git a/jsui/template-loading.html b/jsui/template-loading.html
index 2c8d622..4d065e7 100644
--- a/jsui/template-loading.html
+++ b/jsui/template-loading.html
@@ -15,7 +15,10 @@
<link rel="stylesheet" href="../css/site.css" />
<link rel="stylesheet" href="../css/print.css" media="print" />
<script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -134,7 +137,7 @@
</div>
<div id="bodyColumn" >
<div class="section">
-<h2><a name="Html.2FJavascript_templates_loading"></a>Html/Javascript templates loading</h2>
+<h2><a name="HtmlJavascript_templates_loading"></a>Html/Javascript templates loading</h2>
<p>Templates are loaded on application loaded and added in the hidden div <b>#html-fragments</b>.</p>
<p>They are loaded using requirejs and the text plugin.</p>
<p>archiva templates are loaded as it <tt>NOTE: the no cache is activated only on dev mode</tt></p>
diff --git a/known-issues.html b/known-issues.html
index 361c427..b6ccbeb 100644
--- a/known-issues.html
+++ b/known-issues.html
@@ -14,7 +14,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/licenses.html b/licenses.html
index 7be24d6..30b32e5 100644
--- a/licenses.html
+++ b/licenses.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
@@ -137,7 +140,7 @@
<div class="section">
<h2><a name="Project_Licenses"></a>Project Licenses</h2><a name="Project_Licenses"></a>
<div class="section">
-<h3><a name="The_Apache_Software_License.2C_Version_2.0"></a>The Apache Software License, Version 2.0</h3><a name="The_Apache_Software_License.2C_Version_2.0"></a>
+<h3><a name="The_Apache_Software_License_Version_2.0"></a>The Apache Software License, Version 2.0</h3><a name="The_Apache_Software_License.2C_Version_2.0"></a>
<div class="source"><pre class="prettyprint">
Apache License
Version 2.0, January 2004
diff --git a/mailing-lists.html b/mailing-lists.html
index dbc748c..0a6f77a 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/privacy-policy.html b/privacy-policy.html
index d587aa0..1095ad8 100644
--- a/privacy-policy.html
+++ b/privacy-policy.html
@@ -15,7 +15,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/project-info.html b/project-info.html
index 1d63d7c..13562cb 100644
--- a/project-info.html
+++ b/project-info.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/scm.html b/scm.html
index aac795a..6b5a53a 100644
--- a/scm.html
+++ b/scm.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/security.html b/security.html
index 3ca3564..da03a18 100644
--- a/security.html
+++ b/security.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/team.html b/team.html
index 9d14350..d2a3faf 100644
--- a/team.html
+++ b/team.html
@@ -13,7 +13,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
diff --git a/versions.html b/versions.html
index 33c90e7..da909dc 100644
--- a/versions.html
+++ b/versions.html
@@ -15,7 +15,10 @@
<link rel="stylesheet" href="./css/site.css" />
<link rel="stylesheet" href="./css/print.css" media="print" />
<script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-<!-- Google Analytics -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+
+
+ <!-- Google Analytics -->
<script src='//www.google-analytics.com/analytics.js'></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
