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:29 UTC

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/content-distribution.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/content-distribution.html b/documentation/bundles/content-distribution.html
index d313f0a..3c866d5 100644
--- a/documentation/bundles/content-distribution.html
+++ b/documentation/bundles/content-distribution.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Content Distribution (org.apache.sling.distribution)</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>
                 Content Distribution (org.apache.sling.distribution)
             </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/content-loading-jcr-contentloader.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/content-loading-jcr-contentloader.html b/documentation/bundles/content-loading-jcr-contentloader.html
index 3dbd784..f57b394 100644
--- a/documentation/bundles/content-loading-jcr-contentloader.html
+++ b/documentation/bundles/content-loading-jcr-contentloader.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Content Loading and Nodetype Support (jcr.contentloader)</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>
                 Content Loading and Nodetype Support (jcr.contentloader)
             </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>Apache Sling provides support for initial content loading into a repository and for registering node types. The <code>sling-jcr-contentloader</code> bundle provides loading of content from a bundle into the repository and the <code>sling-jcr-base</code> bundle provides node type registration.</p>
 <h2><a href="#initial-content-loading" name="initial-content-loading">Initial Content Loading</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html b/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
index 121ef80..d58bccd 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Context-Aware Configuration - Default Implementation</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;<a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</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;<a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling Context-Aware Configuration - Default Implementation
             </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/context-aware-configuration/context-aware-configuration-override.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html b/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
index f0aeb1c..a33c116 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Context-Aware Configuration - Override</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;<a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</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;<a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling Context-Aware Configuration - Override
             </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/context-aware-configuration/context-aware-configuration-spi.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html b/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
index f385793..de89d6c 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Context-Aware Configuration - SPI</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;<a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</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;<a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling Context-Aware Configuration - SPI
             </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/context-aware-configuration/context-aware-configuration.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration.html b/documentation/bundles/context-aware-configuration/context-aware-configuration.html
index 7f8027f..6c3bc41 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Context-Aware 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;<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>
                 Apache Sling Context-Aware 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"><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/datasource-providers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/datasource-providers.html b/documentation/bundles/datasource-providers.html
index c9dd368..97bc679 100644
--- a/documentation/bundles/datasource-providers.html
+++ b/documentation/bundles/datasource-providers.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: DataSource Provider</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>
                 DataSource Provider
             </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>DataSource provider bundle supports creation of <code>DataSource</code> instance and registering them with the OSGi service registry. Application using the DataSource just obtains it from OSGi while an administrator can configure the DataSource via Felix WebConsole configuration UI.</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/discovery-api-and-impl.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/discovery-api-and-impl.html b/documentation/bundles/discovery-api-and-impl.html
index ed30b63..6ab2e84 100644
--- a/documentation/bundles/discovery-api-and-impl.html
+++ b/documentation/bundles/discovery-api-and-impl.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Discovery API and its implementations</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>
                 Discovery API and its implementations
             </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>In many situations a particular Sling-based deployment consists of several Sling instances: typically a number of instances would form a <code>cluster</code> that share a common content repository - in other situations, or additionally, instances might be loosely coupled, each with their own repository.</p>
 <p>The <code>discovery-api</code> bundle introduces an abstraction for such scenarios called <code>topology</code>. It provides access to the current topology, allows to be informed of any changes in the topology (such as joining or leaving instances) and contains a simple property exchange mechanism, e.g. to allow building communication services on top of it.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/dynamic-includes.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/dynamic-includes.html b/documentation/bundles/dynamic-includes.html
index 91c2802..f506e19 100644
--- a/documentation/bundles/dynamic-includes.html
+++ b/documentation/bundles/dynamic-includes.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Dynamic Include</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>
                 Apache Sling Dynamic Include
             </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>Notice: Licensed to the Apache Software Foundation (ASF) under one  or more contributor license agreements. See the NOTICE file  distributed with this work for additional information  regarding copyright ownership. The ASF licenses this file  to you under the Apache License, Version 2.0 (the  "License"); you may not use this file except in compliance  with the License. You may obtain a copy of the License at  .  http://www.apache.org/licenses/LICENSE-2.0  .  Unless required by applicable law or agreed to in writing,  software distributed under the License is distributed on an  "AS IS" BASIS, WITHOUT WARRANTIES OR 
 CONDITIONS OF ANY  KIND, either express or implied. See the License for the  specific language governing permissions and limitations  under the License.</p>
 <h1><a href="#sling-dynamic-include-org-apache-sling-dynamic-include-" name="sling-dynamic-include-org-apache-sling-dynamic-include-">Sling Dynamic Include (org.apache.sling.dynamic-include)</a></h1>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/file-installer-provider.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/file-installer-provider.html b/documentation/bundles/file-installer-provider.html
index f5c1277..98ae607 100644
--- a/documentation/bundles/file-installer-provider.html
+++ b/documentation/bundles/file-installer-provider.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: File Installer Provider</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>
                 File Installer Provider
             </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 file installer provider scans configured directories and provides the found artifacts (files) to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>. The functionality is very similar to Apache Felix FileInstall, with the major difference that this service implements just the task of scanning a file directory. All the management logic is implemented in the OSGi installer and support of various artifact types like bundles, configurations or custom formats is implemented by plugins for the OSGi installer.</p>
 <h2><a href="#setup" name="setup">Setup</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/internationalization-support-i18n.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/internationalization-support-i18n.html b/documentation/bundles/internationalization-support-i18n.html
index 5b4b0df..c5a4313 100644
--- a/documentation/bundles/internationalization-support-i18n.html
+++ b/documentation/bundles/internationalization-support-i18n.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Internationalization Support (i18n)</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>
                 Internationalization Support (i18n)
             </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>Internationalization support in Sling consists of four methods in the <code>SlingHttpServletRequest</code> interface:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/jcr-installer-provider.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/jcr-installer-provider.html b/documentation/bundles/jcr-installer-provider.html
index c970f78..476c6c1 100644
--- a/documentation/bundles/jcr-installer-provider.html
+++ b/documentation/bundles/jcr-installer-provider.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: JCR Installer Provider</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>
                 JCR Installer Provider
             </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 JCR installer provider scans the JCR repository for artifacts and provides them to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>.</p>
 <h2><a href="#configuration-and-scanning" name="configuration-and-scanning">Configuration and Scanning</a></h2>