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

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/repository-initialization.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/repository-initialization.html b/documentation/bundles/repository-initialization.html
index 948397b..031c148 100644
--- a/documentation/bundles/repository-initialization.html
+++ b/documentation/bundles/repository-initialization.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache 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/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>
                 
             </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 <code>SlingRepositoryInitializer</code> mechanism allows for running code before the <code>SlingRepository</code> service is registered.</p>
 <p>This is useful for initialization and content migration purposes.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/request-analysis.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/request-analysis.html b/documentation/bundles/request-analysis.html
index 0b62128..edfaf45 100644
--- a/documentation/bundles/request-analysis.html
+++ b/documentation/bundles/request-analysis.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Request Processing Analyzer (reqanalyzer)</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>
                 Request Processing Analyzer (reqanalyzer)
             </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/resource-access-security.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/resource-access-security.html b/documentation/bundles/resource-access-security.html
index 81ec76f..4fb33e6 100644
--- a/documentation/bundles/resource-access-security.html
+++ b/documentation/bundles/resource-access-security.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Resource Access Security</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>
                 Resource Access Security
             </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>
 <h2><a href="#summary" name="summary">Summary</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/resource-editor.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/resource-editor.html b/documentation/bundles/resource-editor.html
index 810ca1f..9441e88 100644
--- a/documentation/bundles/resource-editor.html
+++ b/documentation/bundles/resource-editor.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: The Apache Sling Resource Editor</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>
                 The Apache Sling Resource Editor
             </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>
 <p><img src="http://sling.apache.org/documentation/bundles/resource-editor-screenshot.png" alt="alt text" /></p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/resource-merger.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/resource-merger.html b/documentation/bundles/resource-merger.html
index 9f09161..ed47628 100644
--- a/documentation/bundles/resource-merger.html
+++ b/documentation/bundles/resource-merger.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Resource Merger (org.apache.sling.resourcemerger)</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>
                 Resource Merger (org.apache.sling.resourcemerger)
             </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/scheduler-service-commons-scheduler.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scheduler-service-commons-scheduler.html b/documentation/bundles/scheduler-service-commons-scheduler.html
index 1de25f2..e294c7a 100644
--- a/documentation/bundles/scheduler-service-commons-scheduler.html
+++ b/documentation/bundles/scheduler-service-commons-scheduler.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Scheduler Service (commons scheduler)</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>
                 Scheduler Service (commons scheduler)
             </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 scheduler is a service for scheduling other services/jobs (it uses the open source Quartz library). The scheduler can be used in two ways, by registering the job through the scheduler API and by leveraging the whiteboard pattern that is supported by the scheduler. In most cases the whiteboard pattern is preferred</p>
 <div class="note">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/scripting.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting.html b/documentation/bundles/scripting.html
index 7cbe103..1583035 100644
--- a/documentation/bundles/scripting.html
+++ b/documentation/bundles/scripting.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Scripting</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 Scripting
             </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/scripting/scripting-htl.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting/scripting-htl.html b/documentation/bundles/scripting/scripting-htl.html
index 8166ff9..962715d 100644
--- a/documentation/bundles/scripting/scripting-htl.html
+++ b/documentation/bundles/scripting/scripting-htl.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: HTL Scripting Engine</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/scripting.html">Sling Scripting</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/scripting.html">Sling Scripting</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 HTL Scripting Engine
             </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 HTL Scripting Engine, <a href="https://issues.apache.org/jira/browse/SLING-6028">formerly known as Sightly</a>, is the reference implementation of the <a href="https://github.com/Adobe-Marketing-Cloud/htl-spec">HTML Template Language</a>.</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/scripting/scripting-jsp.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting/scripting-jsp.html b/documentation/bundles/scripting/scripting-jsp.html
index 38372bc..939816c 100644
--- a/documentation/bundles/scripting/scripting-jsp.html
+++ b/documentation/bundles/scripting/scripting-jsp.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: JSP Scripting Engine</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/scripting.html">Sling Scripting</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/scripting.html">Sling Scripting</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 JSP Scripting Engine
             </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 JSP Scripting Engine is implemented by the <a href="https://github.com/apache/sling/tree/trunk/bundles/scripting/jsp"><code>org.apache.sling.scripting.jsp</code></a>  bundle, based on the Jasper 2 JSP engine.</p>
 <p>On top of that Apache Sling also provides its own JSP Taglib, implemented by the  <a href="https://github.com/apache/sling/tree/trunk/bundles/scripting/jsp-taglib"><code>org.apache.sling.scripting.jsp.taglib</code></a> bundle.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/scripting/scripting-thymeleaf.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting/scripting-thymeleaf.html b/documentation/bundles/scripting/scripting-thymeleaf.html
index af620fb..670d816 100644
--- a/documentation/bundles/scripting/scripting-thymeleaf.html
+++ b/documentation/bundles/scripting/scripting-thymeleaf.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Scripting Thymeleaf</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/scripting.html">Sling Scripting</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/scripting.html">Sling Scripting</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling Scripting Thymeleaf
             </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 Scripting Thymeleaf is the scripting engine for <a href="http://www.thymeleaf.org"><em>Thymeleaf</em></a> (3.0) templates.</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/servlet-helpers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/servlet-helpers.html b/documentation/bundles/servlet-helpers.html
index 8dd1515..49073c2 100644
--- a/documentation/bundles/servlet-helpers.html
+++ b/documentation/bundles/servlet-helpers.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Servlet Helpers</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 Servlet Helpers
             </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 Servlet Helpers bundle provides mock implementations of the <code>SlingHttpServletRequest</code>, <code>SlingHttpServletResponse</code> and related classes.</p>
 <p>Those mock implementations are meant to be used in tests and also with services like the <code>SlingRequestProcessor</code> when making requests to that service outside of an HTTP request processing context.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-health-check-tool.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-health-check-tool.html b/documentation/bundles/sling-health-check-tool.html
index 3e444ba..56fafed 100644
--- a/documentation/bundles/sling-health-check-tool.html
+++ b/documentation/bundles/sling-health-check-tool.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Health Check Tools</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 Health Check Tools
             </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>Based on simple <code>HealthCheck</code> OSGi services, the Sling Health Check Tools ("hc" in short form) are used to check the health of live Sling systems, based on inputs like JMX MBean attribute values, OSGi framework information, Sling requests status, etc.</p>
 <p>Health checks are easily extensible either by configuring the supplied default <code>HealthCheck</code> services, or by implementing your own <code>HealthCheck</code> services to cater for project specific requirements.</p>