You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2017/09/28 17:16:25 UTC

[10/15] sling-site git commit: Adapt for sling.apache.org

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/subsystem-installer-factory.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/subsystem-installer-factory.html b/documentation/bundles/subsystem-installer-factory.html
index 5580885..d850d1e 100644
--- a/documentation/bundles/subsystem-installer-factory.html
+++ b/documentation/bundles/subsystem-installer-factory.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Subsystems Installer Factory</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Subsystems Installer Factory
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>The subsystems installer factory provides support for subsystems to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>. The provisioning of artifacts is handled by installer providers like the file installer or the JCR installer.</p>
 <h2><a href="#subsystems" name="subsystems">Subsystems</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/validation.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/validation.html b/documentation/bundles/validation.html
index 7b43d6c..bd151e9 100644
--- a/documentation/bundles/validation.html
+++ b/documentation/bundles/validation.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Validation</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling Validation
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
 </p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/web-console-extensions.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/web-console-extensions.html b/documentation/bundles/web-console-extensions.html
index 3bb3cc3..87110ac 100644
--- a/documentation/bundles/web-console-extensions.html
+++ b/documentation/bundles/web-console-extensions.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Web Console Extensions</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Web Console Extensions
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>The Apache Sling project provides two extensions to the <a href="http://felix.apache.org/site/apache-felix-web-console.html">Apache Felix Web Console</a> (in addition to a number of plugins, of course):</p>
 <p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/xml-support.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/xml-support.html b/documentation/bundles/xml-support.html
index 536f701..4d1fec1 100644
--- a/documentation/bundles/xml-support.html
+++ b/documentation/bundles/xml-support.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: XML support</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/bundles.html">Bundles</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 XML support
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Out of the box, Sling provides no special bundles for XML. However, Sling supports multiple mechanisms and libraries. The ones we have validated with integration tests are:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/configuration.html
----------------------------------------------------------------------
diff --git a/documentation/configuration.html b/documentation/configuration.html
index 3f4a778..3b534ee 100644
--- a/documentation/configuration.html
+++ b/documentation/configuration.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Configuration</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Configuration
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#introduction" name="introduction">Introduction</a></h2>
 <p>Configuration in Sling is aligned with respective support by the OSGi specification:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development.html
----------------------------------------------------------------------
diff --git a/documentation/development.html b/documentation/development.html
index 4cf168d..09be512 100644
--- a/documentation/development.html
+++ b/documentation/development.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Development</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Development
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Welcome to the wonderful world of extending Sling. Refer to these pages to find out how we envision the extension of Sling and how to do it.</p>
 <h2><a href="#using-sling-as-your-development-framework" name="using-sling-as-your-development-framework">Using Sling as your Development Framework</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/client-request-logging.html
----------------------------------------------------------------------
diff --git a/documentation/development/client-request-logging.html b/documentation/development/client-request-logging.html
index a3a3aa1..c161bd8 100644
--- a/documentation/development/client-request-logging.html
+++ b/documentation/development/client-request-logging.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Client Request Logging</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Client Request Logging
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Sling provides extensive support to log various information at the before and after processing client requests. Out of the box, there are two loggers configured to write traditional <code>access.log</code> and <code>request.log</code> files. In addition more logging can be configured by providing OSGi Configuration Admin configuration.</p>
 <h2><a href="#traditional-access-log-and-request-log-files" name="traditional-access-log-and-request-log-files">Traditional access.log and request.log Files</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/dependency-management.html
----------------------------------------------------------------------
diff --git a/documentation/development/dependency-management.html b/documentation/development/dependency-management.html
index 3c0186d..7316a97 100644
--- a/documentation/development/dependency-management.html
+++ b/documentation/development/dependency-management.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Dependency Management</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Dependency Management
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This page is about how we do and don't do dependency management in the Sling project.</p>
 <p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/embedding-sling.html
----------------------------------------------------------------------
diff --git a/documentation/development/embedding-sling.html b/documentation/development/embedding-sling.html
index bed4b11..0c1ae82 100644
--- a/documentation/development/embedding-sling.html
+++ b/documentation/development/embedding-sling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Embedding Sling</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Embedding Sling
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>The Sling Launchpad Launcher can be used to embed the OSGi Framework startup in your own Java application. This functionality is implemented in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/base">Sling Launchpad Base project</a>. This project has the following features:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/getting-and-building-sling.html
----------------------------------------------------------------------
diff --git a/documentation/development/getting-and-building-sling.html b/documentation/development/getting-and-building-sling.html
index 0e24ab1..8970034 100644
--- a/documentation/development/getting-and-building-sling.html
+++ b/documentation/development/getting-and-building-sling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Getting and Building Sling</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Getting and Building Sling
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>A quick guide for getting the Sling source, then building and running the resulting Sling instance; either without or with Eclipse.</p>
 <p>Note that you don't <em>have</em> to build Sling yourself, if you don't need the bleeding-edge stuff you can get prebuilt binaries from the <a href="/downloads.cgi">Downloads</a> page. But those, especially the launchpad runnable jar, are not released often and can be outdated. In case of doubt, build it yourself as shown below or ask on the Sling users mailing list.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/hamcrest.html
----------------------------------------------------------------------
diff --git a/documentation/development/hamcrest.html b/documentation/development/hamcrest.html
index c221fec..1ae51f5 100644
--- a/documentation/development/hamcrest.html
+++ b/documentation/development/hamcrest.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Hamcrest Integration</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Hamcrest Integration
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Deeper integration with the <a href="http://hamcrest.org/">Hamcrest matcher library</a>.</p>
 <h2><a href="#maven-dependency" name="maven-dependency">Maven Dependency</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/htl-maven-plugin.html
----------------------------------------------------------------------
diff --git a/documentation/development/htl-maven-plugin.html b/documentation/development/htl-maven-plugin.html
index 8fbadaf..35ff697 100644
--- a/documentation/development/htl-maven-plugin.html
+++ b/documentation/development/htl-maven-plugin.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: HTL Maven Plugin</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 HTL Maven Plugin
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>See <a href="http://sling.apache.org/components/htl-maven-plugin/">Apache Sling HTL Maven Plugin documentation</a>.</p></section></div></div>
 <div class="footer">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/ide-tooling.html
----------------------------------------------------------------------
diff --git a/documentation/development/ide-tooling.html b/documentation/development/ide-tooling.html
index 1634a49..5e369f0 100644
--- a/documentation/development/ide-tooling.html
+++ b/documentation/development/ide-tooling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling IDE tooling for Eclipse User Guide</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling IDE tooling for Eclipse User Guide
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
 </p>