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

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

Repository: sling-site
Updated Branches:
  refs/heads/asf-site d17058147 -> 813651306


http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/sitemap.xml
----------------------------------------------------------------------
diff --git a/sitemap.xml b/sitemap.xml
index 9ce572c..7dc7686 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: null</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,167 +67,167 @@
                 <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">
             <breadcrumbs/><h1>
                 null
-            </h1><tableOfContents/><div class="sitemap"><section class="wrap"><ul><li><a href="/ng/index.html">Apache Sling - Bringing Back the Fun!</a></li>
-                        <li><a href="/ng/contributing.html">Contributing</a></li>
-                        <li><a href="/ng/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">Accessing File System Resources (org.apache.sling.fsresource)</a></li>
-                        <li><a href="/ng/documentation/bundles/apache-sling-commons-thread-pool.html">Apache Sling Commons Thread Pool</a></li>
-                        <li><a href="/ng/documentation/bundles/apache-sling-eventing-and-job-handling.html">Apache Sling Eventing and Job Handling</a></li>
-                        <li><a href="/ng/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></li>
-                        <li><a href="/ng/documentation/bundles/caching-services.html">Sling Caching Services</a></li>
-                        <li><a href="/ng/documentation/bundles/commons-html-utilities.html">Commons HTML Utilities (org.apache.sling.commons.html)</a></li>
-                        <li><a href="/ng/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a></li>
-                        <li><a href="/ng/documentation/bundles/content-distribution.html">Content Distribution (org.apache.sling.distribution)</a></li>
-                        <li><a href="/ng/documentation/bundles/content-loading-jcr-contentloader.html">Content Loading and Nodetype Support (jcr.contentloader)</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html">Apache Sling Context-Aware Configuration - Default Implementation</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Apache Sling Context-Aware Configuration - Override</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">Apache Sling Context-Aware Configuration - SPI</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a></li>
-                        <li><a href="/ng/documentation/bundles/datasource-providers.html">DataSource Provider</a></li>
-                        <li><a href="/ng/documentation/bundles/discovery-api-and-impl.html">Discovery API and its implementations</a></li>
-                        <li><a href="/ng/documentation/bundles/dynamic-includes.html">Apache Sling Dynamic Include</a></li>
-                        <li><a href="/ng/documentation/bundles/file-installer-provider.html">File Installer Provider</a></li>
-                        <li><a href="/ng/documentation/bundles/internationalization-support-i18n.html">Internationalization Support (i18n)</a></li>
-                        <li><a href="/ng/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a></li>
-                        <li><a href="/ng/documentation/bundles/log-tracers.html">Log Tracer</a></li>
-                        <li><a href="/ng/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html">Managing permissions (jackrabbit.accessmanager)</a></li>
-                        <li><a href="/ng/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html">Managing users and groups (jackrabbit.usermanager)</a></li>
-                        <li><a href="/ng/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html">Manipulating Content - The SlingPostServlet (servlets.post)</a></li>
-                        <li><a href="/ng/documentation/bundles/metrics.html">Sling Metrics</a></li>
-                        <li><a href="/ng/documentation/bundles/mime-type-support-commons-mime.html">MIME Type Support (commons.mime and commons.contentdetection)</a></li>
-                        <li><a href="/ng/documentation/bundles/models.html">Sling Models</a></li>
-                        <li><a href="/ng/documentation/bundles/nosql-resource-providers.html">NoSQL Resource Providers (org.apache.sling.nosql)</a></li>
-                        <li><a href="/ng/documentation/bundles/org-apache-sling-junit-bundles.html">JUnit server-side testing support bundles</a></li>
-                        <li><a href="/ng/documentation/bundles/osgi-installer.html">OSGi Installer</a></li>
-                        <li><a href="/ng/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html">Output Rewriting Pipelines (org.apache.sling.rewriter)</a></li>
-                        <li><a href="/ng/documentation/bundles/rendering-content-default-get-servlets.html">Rendering Content - Default GET Servlets</a></li>
-                        <li><a href="/ng/documentation/bundles/repository-initialization.html"></a></li>
-                        <li><a href="/ng/documentation/bundles/request-analysis.html">Request Processing Analyzer (reqanalyzer)</a></li>
-                        <li><a href="/ng/documentation/bundles/resource-access-security.html">Resource Access Security</a></li>
-                        <li><a href="/ng/documentation/bundles/resource-editor.html">The Apache Sling Resource Editor</a></li>
-                        <li><a href="/ng/documentation/bundles/resource-merger.html">Resource Merger (org.apache.sling.resourcemerger)</a></li>
-                        <li><a href="/ng/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service (commons scheduler)</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting/scripting-htl.html">HTL Scripting Engine</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting/scripting-jsp.html">JSP Scripting Engine</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting/scripting-thymeleaf.html">Sling Scripting Thymeleaf</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting.html">Sling Scripting</a></li>
-                        <li><a href="/ng/documentation/bundles/servlet-helpers.html">Sling Servlet Helpers</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-health-check-tool.html">Sling Health Check Tools</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-oak-restrictions.html">Sling Oak Restrictions</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-pipes.html">Sling Pipes</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/basic-ideas.html">Basic Ideas</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/examples.html">Examples</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/hierarchy-operators.html">Hierarchy operators</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/methods.html">Method list</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/modifiers.html">Modifiers</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/operators.html">Operators</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/selectors.html">Selectors</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/vs-jcr.html">Sling Query vs JCR</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query.html">Sling Query</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings and Run Modes (org.apache.sling.settings)</a></li>
-                        <li><a href="/ng/documentation/bundles/subsystem-installer-factory.html">Subsystems Installer Factory</a></li>
-                        <li><a href="/ng/documentation/bundles/validation.html">Sling Validation</a></li>
-                        <li><a href="/ng/documentation/bundles/web-console-extensions.html">Web Console Extensions</a></li>
-                        <li><a href="/ng/documentation/bundles/xml-support.html">XML support</a></li>
-                        <li><a href="/ng/documentation/bundles.html">Bundles</a></li>
-                        <li><a href="/ng/documentation/configuration.html">Configuration</a></li>
-                        <li><a href="/ng/documentation/development/client-request-logging.html">Client Request Logging</a></li>
-                        <li><a href="/ng/documentation/development/dependency-management.html">Dependency Management</a></li>
-                        <li><a href="/ng/documentation/development/embedding-sling.html">Embedding Sling</a></li>
-                        <li><a href="/ng/documentation/development/getting-and-building-sling.html">Getting and Building Sling</a></li>
-                        <li><a href="/ng/documentation/development/hamcrest.html">Hamcrest Integration</a></li>
-                        <li><a href="/ng/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></li>
-                        <li><a href="/ng/documentation/development/ide-tooling/ide-tooling-incremental-build.html">Incremental Builds in Sling IDE tooling for Eclipse</a></li>
-                        <li><a href="/ng/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a></li>
-                        <li><a href="/ng/documentation/development/issue-tracker.html">Issue Tracker</a></li>
-                        <li><a href="/ng/documentation/development/jcr-mock.html">JCR Mocks</a></li>
-                        <li><a href="/ng/documentation/development/jspc.html">HTL Maven Plugin</a></li>
-                        <li><a href="/ng/documentation/development/jsr-305.html">Leveraging JSR-305 null annotations to prevent NullPointerExceptions</a></li>
-                        <li><a href="/ng/documentation/development/logging.html">Logging</a></li>
-                        <li><a href="/ng/documentation/development/maven-archetypes.html">Maven Archetypes</a></li>
-                        <li><a href="/ng/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></li>
-                        <li><a href="/ng/documentation/development/maven-usage.html">Maven Usage</a></li>
-                        <li><a href="/ng/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></li>
-                        <li><a href="/ng/documentation/development/monitoring-requests.html">Monitoring Requests</a></li>
-                        <li><a href="/ng/documentation/development/osgi-mock.html">OSGi Mocks</a></li>
-                        <li><a href="/ng/documentation/development/release-management.html">Release Management</a></li>
-                        <li><a href="/ng/documentation/development/repository-based-development.html">Repository Based Development</a></li>
-                        <li><a href="/ng/documentation/development/resourceresolver-mock.html">Resource Resolver Mock</a></li>
-                        <li><a href="/ng/documentation/development/sling-mock.html">Sling Mocks</a></li>
-                        <li><a href="/ng/documentation/development/sling-testing-tools.html">Sling Testing Tools</a></li>
-                        <li><a href="/ng/documentation/development/sling.html">Maven Sling Plugin</a></li>
-                        <li><a href="/ng/documentation/development/slingstart.html">The Apache Sling Provisioning Model and Apache SlingStart</a></li>
-                        <li><a href="/ng/documentation/development/version-policy.html">Version Policy</a></li>
-                        <li><a href="/ng/documentation/development.html">Development</a></li>
-                        <li><a href="/ng/documentation/getting-started/discover-sling-in-15-minutes.html">Discover Sling in 15 minutes</a></li>
-                        <li><a href="/ng/documentation/getting-started.html">Getting Started</a></li>
-                        <li><a href="/ng/documentation/legacy/logging.html">Logging</a></li>
-                        <li><a href="/ng/documentation/pax-exam-utils.html">Sling Pax Exam Utilities</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/adapters.html">Adapters</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/architecture.html">Architecture</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-actors.html">Authentication - Actors</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html">Form Based AuthenticationHandler</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html">OpenID AuthenticationHandler</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-framework.html">Authentication - Framework</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-tasks.html">Authentication - Tasks</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/default-mapping-and-rendering.html">Default Mapping and Rendering</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/dispatching-requests.html">Dispatching Requests</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/errorhandling.html">Errorhandling</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/featureflags.html">Feature Flags</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/filters.html">Servlet Filter Support</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/request-listeners.html">Request Listeners</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/request-parameters.html">Request Parameter Handling in Sling</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/resources.html">Resources</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/service-authentication.html">Service Authentication</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/servlets.html">Servlets and Scripts</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/sling-api-crud-support.html">Sling API CRUD Support</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/sling-properties.html">Well-known Sling Properties</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/url-decomposition.html">URL decomposition</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/url-to-script-resolution.html">URL to Script Resolution</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or Decorate Resources</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/46-line-blog.html">46 Line Blog</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html">Getting Resources and Properties in Sling</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html">How to Manage Jobs in Sling</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/jackrabbit-persistence.html">Jackrabbit Persistence</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li>
-                        <li><a href="/ng/documentation.html">Documentation</a></li>
-                        <li><a href="/ng/guides.html">Guides (retired)</a></li>
-                        <li><a href="/ng/javadoc-io.html">Sling API docs at javadoc.io</a></li>
-                        <li><a href="/ng/links.html">Links</a></li>
-                        <li><a href="/ng/media.html">Media</a></li>
-                        <li><a href="/ng/news/sling-ide-tooling-11-released.html">Apache Sling IDE Tooling 1.1 released</a></li>
-                        <li><a href="/ng/news/sling-launchpad-8-released.html">Apache Sling Launchpad 8 released</a></li>
-                        <li><a href="/ng/news/sling-launchpad-9-released.html">Apache Sling Launchpad 9 released</a></li>
-                        <li><a href="/ng/news.html">News</a></li>
-                        <li><a href="/ng/old-stuff/assembly.html">Assembly</a></li>
-                        <li><a href="/ng/old-stuff/launch-sling.html">Launch Sling</a></li>
-                        <li><a href="/ng/old-stuff/request-processing.html">Request Processing</a></li>
-                        <li><a href="/ng/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes</a></li>
-                        <li><a href="/ng/old-stuff/scriptengineintegration/groovy-support.html">Groovy Support</a></li>
-                        <li><a href="/ng/old-stuff/scriptengineintegration/xslt-processing-pipeline.html">XSLT Processing Pipeline</a></li>
-                        <li><a href="/ng/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a></li>
-                        <li><a href="/ng/old-stuff/servlet-resolution.html">Servlet Resolution</a></li>
-                        <li><a href="/ng/old-stuff/sling-api.html">Sling API</a></li>
-                        <li><a href="/ng/old-stuff.html">Old Stuff</a></li>
-                        <li><a href="/ng/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></li>
-                        <li><a href="/ng/project-information/project-license.html">Project License</a></li>
-                        <li><a href="/ng/project-information/project-team.html">Project Team</a></li>
-                        <li><a href="/ng/project-information/security.html">Security</a></li>
-                        <li><a href="/ng/project-information.html">Project Information</a></li>
-                        <li><a href="/ng/site-conversion.html">Site conversion in progress - excuse our mess...</a></li>
-                        <li><a href="/ng/sitemap.html">Sitemap</a></li>
-                        <li><a href="/ng/downloads.html">Downloads</a></li>
+            </h1><tableOfContents/><div class="sitemap"><section class="wrap"><ul><li><a href="/contributing.html">Contributing</a></li>
+                        <li><a href="/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">Accessing File System Resources (org.apache.sling.fsresource)</a></li>
+                        <li><a href="/documentation/bundles/apache-sling-commons-thread-pool.html">Apache Sling Commons Thread Pool</a></li>
+                        <li><a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Apache Sling Eventing and Job Handling</a></li>
+                        <li><a href="/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></li>
+                        <li><a href="/documentation/bundles/caching-services.html">Sling Caching Services</a></li>
+                        <li><a href="/documentation/bundles/commons-html-utilities.html">Commons HTML Utilities (org.apache.sling.commons.html)</a></li>
+                        <li><a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a></li>
+                        <li><a href="/documentation/bundles/content-distribution.html">Content Distribution (org.apache.sling.distribution)</a></li>
+                        <li><a href="/documentation/bundles/content-loading-jcr-contentloader.html">Content Loading and Nodetype Support (jcr.contentloader)</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html">Apache Sling Context-Aware Configuration - Default Implementation</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Apache Sling Context-Aware Configuration - Override</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">Apache Sling Context-Aware Configuration - SPI</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a></li>
+                        <li><a href="/documentation/bundles/datasource-providers.html">DataSource Provider</a></li>
+                        <li><a href="/documentation/bundles/discovery-api-and-impl.html">Discovery API and its implementations</a></li>
+                        <li><a href="/documentation/bundles/dynamic-includes.html">Apache Sling Dynamic Include</a></li>
+                        <li><a href="/documentation/bundles/file-installer-provider.html">File Installer Provider</a></li>
+                        <li><a href="/documentation/bundles/internationalization-support-i18n.html">Internationalization Support (i18n)</a></li>
+                        <li><a href="/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a></li>
+                        <li><a href="/documentation/bundles/log-tracers.html">Log Tracer</a></li>
+                        <li><a href="/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html">Managing permissions (jackrabbit.accessmanager)</a></li>
+                        <li><a href="/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html">Managing users and groups (jackrabbit.usermanager)</a></li>
+                        <li><a href="/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html">Manipulating Content - The SlingPostServlet (servlets.post)</a></li>
+                        <li><a href="/documentation/bundles/metrics.html">Sling Metrics</a></li>
+                        <li><a href="/documentation/bundles/mime-type-support-commons-mime.html">MIME Type Support (commons.mime and commons.contentdetection)</a></li>
+                        <li><a href="/documentation/bundles/models.html">Sling Models</a></li>
+                        <li><a href="/documentation/bundles/nosql-resource-providers.html">NoSQL Resource Providers (org.apache.sling.nosql)</a></li>
+                        <li><a href="/documentation/bundles/org-apache-sling-junit-bundles.html">JUnit server-side testing support bundles</a></li>
+                        <li><a href="/documentation/bundles/osgi-installer.html">OSGi Installer</a></li>
+                        <li><a href="/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html">Output Rewriting Pipelines (org.apache.sling.rewriter)</a></li>
+                        <li><a href="/documentation/bundles/rendering-content-default-get-servlets.html">Rendering Content - Default GET Servlets</a></li>
+                        <li><a href="/documentation/bundles/repository-initialization.html"></a></li>
+                        <li><a href="/documentation/bundles/request-analysis.html">Request Processing Analyzer (reqanalyzer)</a></li>
+                        <li><a href="/documentation/bundles/resource-access-security.html">Resource Access Security</a></li>
+                        <li><a href="/documentation/bundles/resource-editor.html">The Apache Sling Resource Editor</a></li>
+                        <li><a href="/documentation/bundles/resource-merger.html">Resource Merger (org.apache.sling.resourcemerger)</a></li>
+                        <li><a href="/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service (commons scheduler)</a></li>
+                        <li><a href="/documentation/bundles/scripting/scripting-htl.html">HTL Scripting Engine</a></li>
+                        <li><a href="/documentation/bundles/scripting/scripting-jsp.html">JSP Scripting Engine</a></li>
+                        <li><a href="/documentation/bundles/scripting/scripting-thymeleaf.html">Sling Scripting Thymeleaf</a></li>
+                        <li><a href="/documentation/bundles/scripting.html">Sling Scripting</a></li>
+                        <li><a href="/documentation/bundles/servlet-helpers.html">Sling Servlet Helpers</a></li>
+                        <li><a href="/documentation/bundles/sling-health-check-tool.html">Sling Health Check Tools</a></li>
+                        <li><a href="/documentation/bundles/sling-oak-restrictions.html">Sling Oak Restrictions</a></li>
+                        <li><a href="/documentation/bundles/sling-pipes.html">Sling Pipes</a></li>
+                        <li><a href="/documentation/bundles/sling-query/basic-ideas.html">Basic Ideas</a></li>
+                        <li><a href="/documentation/bundles/sling-query/examples.html">Examples</a></li>
+                        <li><a href="/documentation/bundles/sling-query/hierarchy-operators.html">Hierarchy operators</a></li>
+                        <li><a href="/documentation/bundles/sling-query/methods.html">Method list</a></li>
+                        <li><a href="/documentation/bundles/sling-query/modifiers.html">Modifiers</a></li>
+                        <li><a href="/documentation/bundles/sling-query/operators.html">Operators</a></li>
+                        <li><a href="/documentation/bundles/sling-query/selectors.html">Selectors</a></li>
+                        <li><a href="/documentation/bundles/sling-query/vs-jcr.html">Sling Query vs JCR</a></li>
+                        <li><a href="/documentation/bundles/sling-query.html">Sling Query</a></li>
+                        <li><a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings and Run Modes (org.apache.sling.settings)</a></li>
+                        <li><a href="/documentation/bundles/subsystem-installer-factory.html">Subsystems Installer Factory</a></li>
+                        <li><a href="/documentation/bundles/validation.html">Sling Validation</a></li>
+                        <li><a href="/documentation/bundles/web-console-extensions.html">Web Console Extensions</a></li>
+                        <li><a href="/documentation/bundles/xml-support.html">XML support</a></li>
+                        <li><a href="/documentation/bundles.html">Bundles</a></li>
+                        <li><a href="/documentation/configuration.html">Configuration</a></li>
+                        <li><a href="/documentation/development/client-request-logging.html">Client Request Logging</a></li>
+                        <li><a href="/documentation/development/dependency-management.html">Dependency Management</a></li>
+                        <li><a href="/documentation/development/embedding-sling.html">Embedding Sling</a></li>
+                        <li><a href="/documentation/development/getting-and-building-sling.html">Getting and Building Sling</a></li>
+                        <li><a href="/documentation/development/hamcrest.html">Hamcrest Integration</a></li>
+                        <li><a href="/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></li>
+                        <li><a href="/documentation/development/ide-tooling/ide-tooling-incremental-build.html">Incremental Builds in Sling IDE tooling for Eclipse</a></li>
+                        <li><a href="/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a></li>
+                        <li><a href="/documentation/development/issue-tracker.html">Issue Tracker</a></li>
+                        <li><a href="/documentation/development/jcr-mock.html">JCR Mocks</a></li>
+                        <li><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></li>
+                        <li><a href="/documentation/development/jsr-305.html">Leveraging JSR-305 null annotations to prevent NullPointerExceptions</a></li>
+                        <li><a href="/documentation/development/logging.html">Logging</a></li>
+                        <li><a href="/documentation/development/maven-archetypes.html">Maven Archetypes</a></li>
+                        <li><a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></li>
+                        <li><a href="/documentation/development/maven-usage.html">Maven Usage</a></li>
+                        <li><a href="/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></li>
+                        <li><a href="/documentation/development/monitoring-requests.html">Monitoring Requests</a></li>
+                        <li><a href="/documentation/development/osgi-mock.html">OSGi Mocks</a></li>
+                        <li><a href="/documentation/development/release-management.html">Release Management</a></li>
+                        <li><a href="/documentation/development/repository-based-development.html">Repository Based Development</a></li>
+                        <li><a href="/documentation/development/resourceresolver-mock.html">Resource Resolver Mock</a></li>
+                        <li><a href="/documentation/development/sling-mock.html">Sling Mocks</a></li>
+                        <li><a href="/documentation/development/sling-testing-tools.html">Sling Testing Tools</a></li>
+                        <li><a href="/documentation/development/sling.html">Maven Sling Plugin</a></li>
+                        <li><a href="/documentation/development/slingstart.html">The Apache Sling Provisioning Model and Apache SlingStart</a></li>
+                        <li><a href="/documentation/development/version-policy.html">Version Policy</a></li>
+                        <li><a href="/documentation/development.html">Development</a></li>
+                        <li><a href="/documentation/getting-started/discover-sling-in-15-minutes.html">Discover Sling in 15 minutes</a></li>
+                        <li><a href="/documentation/getting-started.html">Getting Started</a></li>
+                        <li><a href="/documentation/legacy/logging.html">Logging</a></li>
+                        <li><a href="/documentation/pax-exam-utils.html">Sling Pax Exam Utilities</a></li>
+                        <li><a href="/documentation/the-sling-engine/adapters.html">Adapters</a></li>
+                        <li><a href="/documentation/the-sling-engine/architecture.html">Architecture</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-actors.html">Authentication - Actors</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html">Form Based AuthenticationHandler</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html">OpenID AuthenticationHandler</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-framework.html">Authentication - Framework</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-tasks.html">Authentication - Tasks</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication.html">Authentication</a></li>
+                        <li><a href="/documentation/the-sling-engine/default-mapping-and-rendering.html">Default Mapping and Rendering</a></li>
+                        <li><a href="/documentation/the-sling-engine/dispatching-requests.html">Dispatching Requests</a></li>
+                        <li><a href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a></li>
+                        <li><a href="/documentation/the-sling-engine/featureflags.html">Feature Flags</a></li>
+                        <li><a href="/documentation/the-sling-engine/filters.html">Servlet Filter Support</a></li>
+                        <li><a href="/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a></li>
+                        <li><a href="/documentation/the-sling-engine/request-listeners.html">Request Listeners</a></li>
+                        <li><a href="/documentation/the-sling-engine/request-parameters.html">Request Parameter Handling in Sling</a></li>
+                        <li><a href="/documentation/the-sling-engine/resources.html">Resources</a></li>
+                        <li><a href="/documentation/the-sling-engine/service-authentication.html">Service Authentication</a></li>
+                        <li><a href="/documentation/the-sling-engine/servlets.html">Servlets and Scripts</a></li>
+                        <li><a href="/documentation/the-sling-engine/sling-api-crud-support.html">Sling API CRUD Support</a></li>
+                        <li><a href="/documentation/the-sling-engine/sling-properties.html">Well-known Sling Properties</a></li>
+                        <li><a href="/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a></li>
+                        <li><a href="/documentation/the-sling-engine/url-decomposition.html">URL decomposition</a></li>
+                        <li><a href="/documentation/the-sling-engine/url-to-script-resolution.html">URL to Script Resolution</a></li>
+                        <li><a href="/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or Decorate Resources</a></li>
+                        <li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/46-line-blog.html">46 Line Blog</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html">Getting Resources and Properties in Sling</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html">How to Manage Jobs in Sling</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/jackrabbit-persistence.html">Jackrabbit Persistence</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></li>
+                        <li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li>
+                        <li><a href="/documentation.html">Documentation</a></li>
+                        <li><a href="/guides.html">Guides (retired)</a></li>
+                        <li><a href="/index.html">Apache Sling - Bringing Back the Fun!</a></li>
+                        <li><a href="/javadoc-io.html">Sling API docs at javadoc.io</a></li>
+                        <li><a href="/links.html">Links</a></li>
+                        <li><a href="/media.html">Media</a></li>
+                        <li><a href="/news/sling-ide-tooling-11-released.html">Apache Sling IDE Tooling 1.1 released</a></li>
+                        <li><a href="/news/sling-launchpad-8-released.html">Apache Sling Launchpad 8 released</a></li>
+                        <li><a href="/news/sling-launchpad-9-released.html">Apache Sling Launchpad 9 released</a></li>
+                        <li><a href="/news.html">News</a></li>
+                        <li><a href="/old-stuff/assembly.html">Assembly</a></li>
+                        <li><a href="/old-stuff/launch-sling.html">Launch Sling</a></li>
+                        <li><a href="/old-stuff/request-processing.html">Request Processing</a></li>
+                        <li><a href="/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes</a></li>
+                        <li><a href="/old-stuff/scriptengineintegration/groovy-support.html">Groovy Support</a></li>
+                        <li><a href="/old-stuff/scriptengineintegration/xslt-processing-pipeline.html">XSLT Processing Pipeline</a></li>
+                        <li><a href="/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a></li>
+                        <li><a href="/old-stuff/servlet-resolution.html">Servlet Resolution</a></li>
+                        <li><a href="/old-stuff/sling-api.html">Sling API</a></li>
+                        <li><a href="/old-stuff.html">Old Stuff</a></li>
+                        <li><a href="/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></li>
+                        <li><a href="/project-information/project-license.html">Project License</a></li>
+                        <li><a href="/project-information/project-team.html">Project Team</a></li>
+                        <li><a href="/project-information/security.html">Security</a></li>
+                        <li><a href="/project-information.html">Project Information</a></li>
+                        <li><a href="/site-conversion.html">Site conversion in progress - excuse our mess...</a></li>
+                        <li><a href="/sitemap.html">Sitemap</a></li>
+                        <li><a href="/downloads.html">Downloads</a></li>
                     </ul></section></div>
 <div class="footer">
                 <div class="trademarkFooter">


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

Posted by bd...@apache.org.
Adapt for sling.apache.org


Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/81365130
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/81365130
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/81365130

Branch: refs/heads/asf-site
Commit: 81365130696caa6cf36185c3c8ab107f47f6aacf
Parents: d170581
Author: Bertrand Delacretaz <bd...@apache.org>
Authored: Thu Sep 28 19:15:57 2017 +0200
Committer: Bertrand Delacretaz <bd...@apache.org>
Committed: Thu Sep 28 19:15:57 2017 +0200

----------------------------------------------------------------------
 archive.html                                    |  50 +--
 contributing.html                               |  52 +--
 documentation.html                              |  52 +--
 documentation/bundles.html                      |  52 +--
 ...esystem-resources-extensions-fsresource.html |  52 +--
 .../apache-sling-commons-thread-pool.html       |  52 +--
 .../apache-sling-eventing-and-job-handling.html |  52 +--
 ...dle-resources-extensions-bundleresource.html |  52 +--
 documentation/bundles/caching-services.html     |  52 +--
 .../bundles/commons-html-utilities.html         |  52 +--
 .../configuration-installer-factory.html        |  52 +--
 documentation/bundles/content-distribution.html |  52 +--
 .../content-loading-jcr-contentloader.html      |  52 +--
 ...re-configuration-default-implementation.html |  52 +--
 .../context-aware-configuration-override.html   |  52 +--
 .../context-aware-configuration-spi.html        |  52 +--
 .../context-aware-configuration.html            |  52 +--
 documentation/bundles/datasource-providers.html |  52 +--
 .../bundles/discovery-api-and-impl.html         |  52 +--
 documentation/bundles/dynamic-includes.html     |  52 +--
 .../bundles/file-installer-provider.html        |  52 +--
 .../internationalization-support-i18n.html      |  52 +--
 .../bundles/jcr-installer-provider.html         |  52 +--
 documentation/bundles/log-tracers.html          |  52 +--
 ...ng-permissions-jackrabbit-accessmanager.html |  52 +--
 ...users-and-groups-jackrabbit-usermanager.html |  52 +--
 ...tent-the-slingpostservlet-servlets-post.html |  52 +--
 documentation/bundles/metrics.html              |  52 +--
 .../bundles/mime-type-support-commons-mime.html |  52 +--
 documentation/bundles/models.html               |  52 +--
 .../bundles/nosql-resource-providers.html       |  52 +--
 .../bundles/org-apache-sling-junit-bundles.html |  52 +--
 documentation/bundles/osgi-installer.html       |  52 +--
 ...ing-pipelines-org-apache-sling-rewriter.html |  52 +--
 .../rendering-content-default-get-servlets.html |  52 +--
 .../bundles/repository-initialization.html      |  52 +--
 documentation/bundles/request-analysis.html     |  52 +--
 .../bundles/resource-access-security.html       |  52 +--
 documentation/bundles/resource-editor.html      |  52 +--
 documentation/bundles/resource-merger.html      |  52 +--
 .../scheduler-service-commons-scheduler.html    |  52 +--
 documentation/bundles/scripting.html            |  52 +--
 .../bundles/scripting/scripting-htl.html        |  52 +--
 .../bundles/scripting/scripting-jsp.html        |  52 +--
 .../bundles/scripting/scripting-thymeleaf.html  |  52 +--
 documentation/bundles/servlet-helpers.html      |  52 +--
 .../bundles/sling-health-check-tool.html        |  52 +--
 .../bundles/sling-oak-restrictions.html         |  52 +--
 documentation/bundles/sling-pipes.html          |  52 +--
 documentation/bundles/sling-query.html          |  52 +--
 .../bundles/sling-query/basic-ideas.html        |  52 +--
 documentation/bundles/sling-query/examples.html |  52 +--
 .../sling-query/hierarchy-operators.html        |  52 +--
 documentation/bundles/sling-query/methods.html  |  52 +--
 .../bundles/sling-query/modifiers.html          |  52 +--
 .../bundles/sling-query/operators.html          |  52 +--
 .../bundles/sling-query/selectors.html          |  52 +--
 documentation/bundles/sling-query/vs-jcr.html   |  52 +--
 ...ling-settings-org-apache-sling-settings.html |  52 +--
 .../bundles/subsystem-installer-factory.html    |  52 +--
 documentation/bundles/validation.html           |  52 +--
 .../bundles/web-console-extensions.html         |  52 +--
 documentation/bundles/xml-support.html          |  52 +--
 documentation/configuration.html                |  52 +--
 documentation/development.html                  |  52 +--
 .../development/client-request-logging.html     |  52 +--
 .../development/dependency-management.html      |  52 +--
 documentation/development/embedding-sling.html  |  52 +--
 .../development/getting-and-building-sling.html |  52 +--
 documentation/development/hamcrest.html         |  52 +--
 documentation/development/htl-maven-plugin.html |  52 +--
 documentation/development/ide-tooling.html      |  52 +--
 .../ide-tooling-incremental-build.html          |  52 +--
 documentation/development/issue-tracker.html    |  52 +--
 documentation/development/jcr-mock.html         |  52 +--
 documentation/development/jspc.html             |  52 +--
 documentation/development/jsr-305.html          |  52 +--
 documentation/development/logging.html          |  52 +--
 documentation/development/maven-archetypes.html |  52 +--
 .../development/maven-launchpad-plugin.html     |  52 +--
 documentation/development/maven-usage.html      |  52 +--
 .../development/maventipsandtricks.html         |  52 +--
 .../development/monitoring-requests.html        |  52 +--
 documentation/development/osgi-mock.html        |  52 +--
 .../development/release-management.html         |  52 +--
 .../repository-based-development.html           |  52 +--
 .../development/resourceresolver-mock.html      |  52 +--
 documentation/development/sling-mock.html       |  52 +--
 .../development/sling-testing-tools.html        |  52 +--
 documentation/development/sling.html            |  52 +--
 documentation/development/slingstart.html       |  52 +--
 documentation/development/version-policy.html   |  52 +--
 documentation/getting-started.html              |  52 +--
 .../discover-sling-in-15-minutes.html           |  52 +--
 documentation/legacy/logging.html               |  52 +--
 documentation/pax-exam-utils.html               |  52 +--
 documentation/the-sling-engine.html             |  52 +--
 documentation/the-sling-engine/adapters.html    |  52 +--
 .../the-sling-engine/architecture.html          |  52 +--
 .../the-sling-engine/authentication.html        |  52 +--
 .../authentication/authentication-actors.html   |  52 +--
 .../authentication-authenticationhandler.html   |  52 +--
 .../form-based-authenticationhandler.html       |  52 +--
 .../openid-authenticationhandler.html           |  52 +--
 .../authentication-framework.html               |  52 +--
 .../authentication/authentication-tasks.html    |  52 +--
 .../default-mapping-and-rendering.html          |  52 +--
 .../the-sling-engine/dispatching-requests.html  |  52 +--
 .../the-sling-engine/errorhandling.html         |  52 +--
 .../the-sling-engine/featureflags.html          |  52 +--
 documentation/the-sling-engine/filters.html     |  52 +--
 .../mappings-for-resource-resolution.html       |  52 +--
 .../the-sling-engine/request-listeners.html     |  52 +--
 .../the-sling-engine/request-parameters.html    |  52 +--
 documentation/the-sling-engine/resources.html   |  52 +--
 .../service-authentication.html                 |  52 +--
 documentation/the-sling-engine/servlets.html    |  52 +--
 .../sling-api-crud-support.html                 |  52 +--
 .../the-sling-engine/sling-properties.html      |  52 +--
 .../the-sling-engine/the-sling-launchpad.html   |  52 +--
 .../the-sling-engine/url-decomposition.html     |  52 +--
 .../url-to-script-resolution.html               |  52 +--
 .../wrap-or-decorate-resources.html             |  52 +--
 documentation/tutorials-how-tos.html            |  52 +--
 .../tutorials-how-tos/46-line-blog.html         |  52 +--
 ...tting-resources-and-properties-in-sling.html |  52 +--
 .../how-to-manage-events-in-sling.html          |  52 +--
 .../installing-and-upgrading-bundles.html       |  52 +--
 .../jackrabbit-persistence.html                 |  52 +--
 .../testing-sling-based-applications.html       |  52 +--
 downloads.html                                  |  50 +--
 feed.xml                                        |   6 +-
 guides.html                                     |  52 +--
 index.html                                      |  52 +--
 javadoc-io.html                                 |  52 +--
 links.html                                      |  52 +--
 media.html                                      |  52 +--
 news.html                                       |  52 +--
 news/sling-ide-tooling-11-released.html         |  52 +--
 news/sling-launchpad-8-released.html            |  52 +--
 news/sling-launchpad-9-released.html            |  52 +--
 old-stuff.html                                  |  52 +--
 old-stuff/assembly.html                         |  52 +--
 old-stuff/launch-sling.html                     |  52 +--
 old-stuff/request-processing.html               |  52 +--
 .../run-modes-org-apache-sling-runmode.html     |  52 +--
 old-stuff/scriptengineintegration.html          |  52 +--
 .../scriptengineintegration/groovy-support.html |  52 +--
 .../xslt-processing-pipeline.html               |  52 +--
 old-stuff/servlet-resolution.html               |  52 +--
 old-stuff/sling-api.html                        |  52 +--
 project-information.html                        |  52 +--
 ...che-sling-community-roles-and-processes.html |  52 +--
 project-information/project-license.html        |  52 +--
 project-information/project-team.html           |  52 +--
 project-information/security.html               |  52 +--
 site-conversion.html                            |  52 +--
 sitemap.html                                    | 362 +++++++++----------
 sitemap.xml                                     | 362 +++++++++----------
 159 files changed, 4419 insertions(+), 4419 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/archive.html
----------------------------------------------------------------------
diff --git a/archive.html b/archive.html
index f766698..09e844c 100644
--- a/archive.html
+++ b/archive.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: null</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,7 +67,7 @@
                 <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">
             <breadcrumbs/><h1>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/contributing.html
----------------------------------------------------------------------
diff --git a/contributing.html b/contributing.html
index 63014da..feb2019 100644
--- a/contributing.html
+++ b/contributing.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Contributing</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Contributing
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>See <a href="/project-information.html">Project Information</a> for details about the tools mentioned below.</p>
 <p>Apache Sling is a volunteer effort, so there is always plenty of work that needs to be accomplished. If you want to help support Sling, this page is intended as a starting point for specific contribution ideas. To further understand how the Sling community operates, refer to the Community Roles and Processes document and/or join the mailing lists.</p>

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html b/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
index 8a0c686..0b24f08 100644
--- a/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
+++ b/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Accessing File System Resources (org.apache.sling.fsresource)</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>
                 Accessing File System Resources (org.apache.sling.fsresource)
             </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/apache-sling-commons-thread-pool.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/apache-sling-commons-thread-pool.html b/documentation/bundles/apache-sling-commons-thread-pool.html
index f47ea15..67f5cd0 100644
--- a/documentation/bundles/apache-sling-commons-thread-pool.html
+++ b/documentation/bundles/apache-sling-commons-thread-pool.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Commons Thread Pool</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 Commons Thread Pool
             </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 Commons Thread Pool bundle provides a thread pool services. All thread pools are managed by the <code>org.apache.sling.commons.threads.ThreadPoolManager</code>. This service can be used to get a thread pool.</p>
 <p>Thread pools are managed by name - there is a default thread pool and custom thread pools can be generated on demand using a unique name.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/apache-sling-eventing-and-job-handling.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/apache-sling-eventing-and-job-handling.html b/documentation/bundles/apache-sling-eventing-and-job-handling.html
index 8751aa0..07535a0 100644
--- a/documentation/bundles/apache-sling-eventing-and-job-handling.html
+++ b/documentation/bundles/apache-sling-eventing-and-job-handling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Eventing and Job Handling</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 Eventing and Job Handling
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#overview" name="overview">Overview</a></h2>
 <p>The Apache Sling Event Support bundle adds additional features to the OSGi Event Admin and for distributed event processing.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/bundle-resources-extensions-bundleresource.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/bundle-resources-extensions-bundleresource.html b/documentation/bundles/bundle-resources-extensions-bundleresource.html
index 2003efc..a168017 100644
--- a/documentation/bundles/bundle-resources-extensions-bundleresource.html
+++ b/documentation/bundles/bundle-resources-extensions-bundleresource.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Bundle Resources (extensions.bundleresource)</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>
                 Bundle Resources (extensions.bundleresource)
             </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/caching-services.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/caching-services.html b/documentation/bundles/caching-services.html
index 0361262..231e973 100644
--- a/documentation/bundles/caching-services.html
+++ b/documentation/bundles/caching-services.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Caching Services</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 Caching Services
             </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>Caching services are available as a contribution at <a href="https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/cache">https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/cache</a></p>
 <p>Both EhCache and Infinispan implementations are provided, with good unit and integration tests coverage.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/commons-html-utilities.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/commons-html-utilities.html b/documentation/bundles/commons-html-utilities.html
index 19d61a8..56c355a 100644
--- a/documentation/bundles/commons-html-utilities.html
+++ b/documentation/bundles/commons-html-utilities.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Commons HTML Utilities (org.apache.sling.commons.html)</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>
                 Commons HTML Utilities (org.apache.sling.commons.html)
             </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 Commons HTML Utilities bundle provides an HTML parser which can be used to parse HTML and either generate a DOM or SAX events out of the HTML. Therefore the parser transforms the HTML into proper XHTML.</p></section></div></div>
 <div class="footer">

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


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

Posted by bd...@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>


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/tutorials-how-tos.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos.html b/documentation/tutorials-how-tos.html
index 0168ced..2a99b4d 100644
--- a/documentation/tutorials-how-tos.html
+++ b/documentation/tutorials-how-tos.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Tutorials & How-Tos</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Tutorials &amp; How-Tos
             </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"><ul>
   <li><a href="tutorials-how-tos/46-line-blog.html">46 Line Blog</a></li>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/tutorials-how-tos/46-line-blog.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos/46-line-blog.html b/documentation/tutorials-how-tos/46-line-blog.html
index 87b8b69..21273df 100644
--- a/documentation/tutorials-how-tos/46-line-blog.html
+++ b/documentation/tutorials-how-tos/46-line-blog.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: 46 Line Blog</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 46 Line Blog
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This tutorial is based on the first <em>Sling Gems</em> on dev.day.com: The <a href="http://dev.day.com/microsling/content/blogs/main/sling-46-lines-blog.html">Sling gems: a blog in 46 lines of code</a>. It has slightly been adapted to fit here.</p>
 <p>In this tutorial, the SlingPostServlet and the sling.js library are brought together using 46 (no kidding: <em>fourty-six</em>) lines of code to create a simple blog (or let's say <em>bloggish</em>) application.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html b/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
index 177a183..90e71fa 100644
--- a/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
+++ b/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Getting Resources and Properties in 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/tutorials-how-tos.html">Tutorials &amp; How-Tos</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Getting Resources and Properties in Sling
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>The Resource is one of the central parts of Sling. Extending from JCR's Everything is Content, Sling assumes Everthing is a Resource. Thus Sling is maintaining a virtual tree of resources, which is a merger of the actual contents in the JCR Repository and resources provided by so called resource providers. By doing this Sling fits very well in the paradigm of the REST architecture.</p>
 <p>In this article we will explore a few ways to programmatically map a resource path (String) to a resource object (Resource) and its properties in Sling, from within an OSGI service, a servlet and a JSP.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html b/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
index e603df9..c0bad05 100644
--- a/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
+++ b/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: How to Manage Jobs in 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/tutorials-how-tos.html">Tutorials &amp; How-Tos</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 How to Manage Jobs in Sling
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Apache Sling supports the execution of jobs with the guarantee of processing the job at least once. This can be seen as an extensions of the OSGi event admin, although jobs are not started or processed by OSGi events leveraging the OSGi event admin.</p>
 <p>For more details please refer to the following resources:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html b/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
index cb069f6..09dbf8f 100644
--- a/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
+++ b/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Installing and Upgrading Bundles</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Installing and Upgrading Bundles
             </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"><div class="note">
 We recommend to use the Apache Felix Web Console. The documentation below describes the old Sling Management Console, which isn't in use any more. Please refer to the documentation of the <a href="http://felix.apache.org/site/apache-felix-web-console.html">Apache Felix Web Console</a>.

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/tutorials-how-tos/jackrabbit-persistence.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos/jackrabbit-persistence.html b/documentation/tutorials-how-tos/jackrabbit-persistence.html
index 1e4f96e..d91f4f4 100644
--- a/documentation/tutorials-how-tos/jackrabbit-persistence.html
+++ b/documentation/tutorials-how-tos/jackrabbit-persistence.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Jackrabbit Persistence</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Jackrabbit Persistence
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Out-of-the-box the embedded Jackrabbit repository used by Sling (the Embedded Jackrabbit Repository bundle) uses Derby to persist the JCR nodes and properties. For some applications or environments it may be required or required to replace Derby with another backing store such as PostgreSQL or Oracle.</p>
 <p>This page is based on the journey of Tony Giaccone to get Sling running with a PostgreSQL based Jackrabbit instance.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/tutorials-how-tos/testing-sling-based-applications.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos/testing-sling-based-applications.html b/documentation/tutorials-how-tos/testing-sling-based-applications.html
index 054647a..5b9802f 100644
--- a/documentation/tutorials-how-tos/testing-sling-based-applications.html
+++ b/documentation/tutorials-how-tos/testing-sling-based-applications.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Testing Sling-based applications</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</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/tutorials-how-tos.html">Tutorials &amp; How-Tos</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Testing Sling-based applications
             </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>Automated testing of OSGi components and services can be challenging, as many of them depend on other services that must be present or simulated for testing.</p>
 <p>This page describes the various approaches that we use to test Sling itself, and introduces a number of tools that can help testing OSGi and HTTP-based applications.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/downloads.html
----------------------------------------------------------------------
diff --git a/downloads.html b/downloads.html
index 108b4cf..da49909 100644
--- a/downloads.html
+++ b/downloads.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Downloads</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,7 +67,7 @@
                 <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">
             <breadcrumbs/><h1>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index d8d884c..55b7f81 100644
--- a/feed.xml
+++ b/feed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title>Apache Sling</title>
-    <link href="http://sling.apache.org/ng/"/>
-    <link rel="self" type="application/atom+xml" href="http://sling.apache.org/ng/feed.xml"/>
+    <link href="http://sling.apache.org/"/>
+    <link rel="self" type="application/atom+xml" href="http://sling.apache.org/feed.xml"/>
     <subtitle>Work in progress...</subtitle>
-    <updated>2017-09-27T14:23:04Z</updated>
+    <updated>2017-09-28T19:15:06Z</updated>
     <id>tag:localhost,2017:09</id>
     
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/guides.html
----------------------------------------------------------------------
diff --git a/guides.html b/guides.html
index 1b7ccf5..caf279f 100644
--- a/guides.html
+++ b/guides.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Guides (retired)</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Guides (retired)
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This page used to contain a list of mostly obsolete links, it has been retired in June 2017.</p></section></div></div>
 <div class="footer">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index d364f73..aa640f2 100644
--- a/index.html
+++ b/index.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling - Bringing Back the Fun!</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling - Bringing Back the Fun!
             </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><strong>Apache Sling&trade;</strong> is an innovative web framework that is intended to bring back the fun to web development.</p>
 <p>Discussions about Sling happen on our mailing lists, see the <a href="/project-information.html">Project Information</a>  page for more info.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/javadoc-io.html
----------------------------------------------------------------------
diff --git a/javadoc-io.html b/javadoc-io.html
index aa25dfb..3c28563 100644
--- a/javadoc-io.html
+++ b/javadoc-io.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling API docs at javadoc.io</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling API docs at javadoc.io
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p><a href="http://www.javadoc.io/">javadocs.io</a> provides archived javadocs for all Sling modules (and actually for all open source software hosted at Maven Central).</p>
 <p>To get the javadocs of a particular module use an URL like <code>http://javadoc.io/doc/{org}/{artifact}/{version}</code>, like for example <a href="http://www.javadoc.io/doc/org.apache.sling/org.apache.sling.api/2.9.0">http://www.javadoc.io/doc/org.apache.sling/org.apache.sling.api/2.9.0</a></p></section></div></div>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/links.html
----------------------------------------------------------------------
diff --git a/links.html b/links.html
index 305593f..05ba200 100644
--- a/links.html
+++ b/links.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Links</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Links
             </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>Here are some links to other resources</p>
 <h2><a href="#articles" name="articles">Articles</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/media.html
----------------------------------------------------------------------
diff --git a/media.html b/media.html
index b6d9b4b..bf49adb 100644
--- a/media.html
+++ b/media.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Media</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Media
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This page holds all media required for the Apache Sling website. The media are attachments and can be addressed using the following URL: http://cwiki.apache.org/SLINGxSITE/media.data/ (followed by the actual name of the attachment).</p>
 <p>Currently, some of these attachments are used by the overall site template (only visible/editable by Confluence administrators).</p>


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/log-tracers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/log-tracers.html b/documentation/bundles/log-tracers.html
index f7d243c..a0d72a5 100644
--- a/documentation/bundles/log-tracers.html
+++ b/documentation/bundles/log-tracers.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Log Tracer</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>
                 Log Tracer
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p><a href="https://issues.apache.org/jira/browse/SLING-4739">Log Tracer</a> provides support for enabling the logs for specific category at specific level and only for specific request. It provides a very fine level of control via config provided as part of HTTP request around how the logging should be performed for given category.</p>
 <p>This is specially useful for those parts of the system which are involved in every request. For such parts enabling the log at global level would flood the logs and create lots of noise. Using Tracer one can enable log for that request which is required to be probed.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html b/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
index 9daf651..5e8756b 100644
--- a/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
+++ b/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Managing permissions (jackrabbit.accessmanager)</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>
                 Managing permissions (jackrabbit.accessmanager)
             </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>jackrabbit-accessmanager</code> bundle delivers a REST interface to manipulate users permissions in the JCR. After installing the <code>jackrabbit-accessmanager</code> bundle the REST services are exposed under the path of the node where you will manipulate the permissions for a user with a specific selector like <code>modifyAce</code>, <code>acl</code> and <code>deleteAce</code>. <!-- TODO reactivate TOC once JBake moves to flexmark-java -->
 </p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html b/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
index 5f01407..dc3452d 100644
--- a/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
+++ b/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Managing users and groups (jackrabbit.usermanager)</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>
                 Managing users and groups (jackrabbit.usermanager)
             </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>jackrabbit-usermanager</code> bundle delivers a REST interface to create, update and delete users and groups in the JCR. After installing the <code>jackrabbit-usermanager</code> bundle all REST services are exposed under the path <code>/system/userManager</code>. Its interface for modifing/creating authorizables is similar to the <a href="/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html">SlingPostServlet</a>.</p>
 <p>For getting information about existing authorizables it provides all authorizables as Sling resources through its <code>AuthorizableResourceProvider</code> below <code>/system/userManager/user</code> and <code>/system/userManager/group</code>. Those resources can be exposed via the <a href="/documentation/bundles/rendering-content-default-get-servlets.html">Default GET Servlet</a>.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
index 9e5d3db..e2c1d12 100644
--- a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
+++ b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Manipulating Content - The SlingPostServlet (servlets.post)</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>
                 Manipulating Content - The SlingPostServlet (servlets.post)
             </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/metrics.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/metrics.html b/documentation/bundles/metrics.html
index 96147c3..9b760b5 100644
--- a/documentation/bundles/metrics.html
+++ b/documentation/bundles/metrics.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Metrics</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 Metrics
             </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 Metrics bundle provides integration with <a href="http://metrics.dropwizard.io/">Dropwizard Metrics</a> library which provides a toolkit to capture runtime performance statistics in your application. </p>
 <h2><a href="#features" name="features">Features</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/mime-type-support-commons-mime.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/mime-type-support-commons-mime.html b/documentation/bundles/mime-type-support-commons-mime.html
index b07cb99..c3da0bc 100644
--- a/documentation/bundles/mime-type-support-commons-mime.html
+++ b/documentation/bundles/mime-type-support-commons-mime.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: MIME Type Support (commons.mime and commons.contentdetection)</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>
                 MIME Type Support (commons.mime and commons.contentdetection)
             </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>Support for MIME type mappings is generally a problematic issue. On the one hand applications have to take care to stay up to date with their mappings on the other hands in web applications it is tedious to maintain the mappings. Apache Sling takes a very user and deployment friendly approadch to this problem which is described in detail on this page.</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/models.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/models.html b/documentation/bundles/models.html
index 47bfb13..edc82c8 100644
--- a/documentation/bundles/models.html
+++ b/documentation/bundles/models.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Models</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 Models
             </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/nosql-resource-providers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/nosql-resource-providers.html b/documentation/bundles/nosql-resource-providers.html
index 4d269d5..c454e31 100644
--- a/documentation/bundles/nosql-resource-providers.html
+++ b/documentation/bundles/nosql-resource-providers.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: NoSQL Resource Providers (org.apache.sling.nosql)</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>
                 NoSQL Resource Providers (org.apache.sling.nosql)
             </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/org-apache-sling-junit-bundles.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/org-apache-sling-junit-bundles.html b/documentation/bundles/org-apache-sling-junit-bundles.html
index daaab90..fee20bb 100644
--- a/documentation/bundles/org-apache-sling-junit-bundles.html
+++ b/documentation/bundles/org-apache-sling-junit-bundles.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: JUnit server-side testing support bundles</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>
                 JUnit server-side testing support bundles
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This is an overview of the Sling bundles that provide support for server-side JUnit tests. </p>
 <p>The Maven modules below <a href="https://svn.apache.org/repos/asf/sling/trunk/testing/samples"><code>testing/samples</code></a> provide different examples including HTTP-based and server-side teleported tests in a bundle module, running against a full Sling instance setup in the same Maven module.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/osgi-installer.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/osgi-installer.html b/documentation/bundles/osgi-installer.html
index db0c16f..5b610d8 100644
--- a/documentation/bundles/osgi-installer.html
+++ b/documentation/bundles/osgi-installer.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: OSGi Installer</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>
                 OSGi Installer
             </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"><h1><a href="#overview" name="overview">Overview</a></h1>
 <p>The OSGi installer is a central service for handling installs, updates and uninstall of "artifacts". By default, the installer supports bundles and has an extension for handling configurations for the OSGi configuration admin.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html b/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
index 5862195..aba5696 100644
--- a/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
+++ b/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Output Rewriting Pipelines (org.apache.sling.rewriter)</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>
                 Output Rewriting Pipelines (org.apache.sling.rewriter)
             </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 Rewriter is a module for rewriting the output generated by a usual Sling rendering process. Some possible use cases include rewriting or checking all links in an HTML page, manipulating the HTML page, or using the generated output as the base for further transformation. An example of further transformation is to use XSLT to transform rendered XML to some output format like HTML or XSL:FO for generating PDF.</p>
 <p>For supporting these use cases, the rewriter uses the concept for a processor. The processor is a component that is injected through a servlet filter into the response. By implementing the <em>Processor</em> interface one is able to rewrite the whole response in one go. A more convenient way of processing the output is by using a so called pipeline; the Apache Sling rewriter basically uses the same concept as the famous Apache Cocoon: an XML based pipeline for further post processing of the output. The pipeline is based on SAX events.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/rendering-content-default-get-servlets.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/rendering-content-default-get-servlets.html b/documentation/bundles/rendering-content-default-get-servlets.html
index 3e8461b..438f04d 100644
--- a/documentation/bundles/rendering-content-default-get-servlets.html
+++ b/documentation/bundles/rendering-content-default-get-servlets.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Rendering Content - Default GET Servlets</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>
                 Rendering Content - Default GET Servlets
             </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>


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

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/resourceresolver-mock.html
----------------------------------------------------------------------
diff --git a/documentation/development/resourceresolver-mock.html b/documentation/development/resourceresolver-mock.html
index 0936035..303e578 100644
--- a/documentation/development/resourceresolver-mock.html
+++ b/documentation/development/resourceresolver-mock.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Resource Resolver Mock</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Resource Resolver Mock
             </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>Mock for the resource resolver / factory for easier testing. It uses an in-memory map for storing the resource data, and supports reading, writing and a certain level of transaction and eventing support.</p>
 <p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/sling-testing-tools.html
----------------------------------------------------------------------
diff --git a/documentation/development/sling-testing-tools.html b/documentation/development/sling-testing-tools.html
index a4d246d..ca7a726 100644
--- a/documentation/development/sling-testing-tools.html
+++ b/documentation/development/sling-testing-tools.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Testing 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/development.html">Development</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development/sling.html">Maven Sling Plugin</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development/sling.html">Maven Sling Plugin</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling Testing 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"><div class="warning">
 While this information is still valid, we recommend using the tools and techniques described

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

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/getting-started.html
----------------------------------------------------------------------
diff --git a/documentation/getting-started.html b/documentation/getting-started.html
index 9fbf8f2..45a6012 100644
--- a/documentation/getting-started.html
+++ b/documentation/getting-started.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Getting Started</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Getting Started
             </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>We're on the way to update the documentation to make it more easy to get in touch with Sling. At the moment we can give you the following starting points:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/getting-started/discover-sling-in-15-minutes.html
----------------------------------------------------------------------
diff --git a/documentation/getting-started/discover-sling-in-15-minutes.html b/documentation/getting-started/discover-sling-in-15-minutes.html
index 47153b8..a926092 100644
--- a/documentation/getting-started/discover-sling-in-15-minutes.html
+++ b/documentation/getting-started/discover-sling-in-15-minutes.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Discover Sling in 15 minutes</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/getting-started.html">Getting Started</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/getting-started.html">Getting Started</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Discover Sling in 15 minutes
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>The Sling Launchpad is a ready-to-run Sling configuration, providing an embedded JCR content repository and web server, a selection of Sling components, documentation and examples. The Launchpad makes it easy to get started with Sling and to develop script-based applications.</p>
 <p>This page will help you get started with the Launchpad. Fifteen minutes should be enough to get an overview of what Sling does.</p>

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/pax-exam-utils.html
----------------------------------------------------------------------
diff --git a/documentation/pax-exam-utils.html b/documentation/pax-exam-utils.html
index 2605de2..e0171bb 100644
--- a/documentation/pax-exam-utils.html
+++ b/documentation/pax-exam-utils.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Pax Exam Utilities</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling Pax Exam Utilities
             </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>Utilities to help testing Sling components with Pax Exam are available at <a href="https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util">https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</a></p>
 <p>The focus is on making it easier to test Sling components against a full Sling launchpad, with minimal boilerplate code.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine.html b/documentation/the-sling-engine.html
index dd8f2dc..a461e05 100644
--- a/documentation/the-sling-engine.html
+++ b/documentation/the-sling-engine.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: The Sling 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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 The Sling 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"><h2><a href="#general" name="general">General</a></h2>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/adapters.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/adapters.html b/documentation/the-sling-engine/adapters.html
index 0560e4b..d91b815 100644
--- a/documentation/the-sling-engine/adapters.html
+++ b/documentation/the-sling-engine/adapters.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Adapters</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Adapters
             </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>


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/filters.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/filters.html b/documentation/the-sling-engine/filters.html
index 90e893d..a674ccd 100644
--- a/documentation/the-sling-engine/filters.html
+++ b/documentation/the-sling-engine/filters.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Servlet Filter Support</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Servlet Filter Support
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Sling supports filter processing by applying filter chains to the requests before actually dispatching to the servlet or script for processing. Filters to be used in such filter processing are plain OSGi services of type <code>javax.servlet.Filter</code> which of course means that the services implement this interface.</p>
 <div class="note">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/mappings-for-resource-resolution.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/mappings-for-resource-resolution.html b/documentation/the-sling-engine/mappings-for-resource-resolution.html
index 7a20f9a..0750392 100644
--- a/documentation/the-sling-engine/mappings-for-resource-resolution.html
+++ b/documentation/the-sling-engine/mappings-for-resource-resolution.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Mappings for Resource Resolution</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Mappings for Resource Resolution
             </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/the-sling-engine/request-listeners.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/request-listeners.html b/documentation/the-sling-engine/request-listeners.html
index 5004631..df31f7b 100644
--- a/documentation/the-sling-engine/request-listeners.html
+++ b/documentation/the-sling-engine/request-listeners.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Request Listeners</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Request Listeners
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Sling provides the possibility to "listen" to a request processed by the Sling Engine (<code>SlingMainServlet</code>). To get notified you implement the service interface <code>org.apache.sling.api.request.SlingRequestListener</code>.</p>
 <pre><code><!-- TODO syntax marker (#!java) disabled -->public interface SlingRequestListener {

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/request-parameters.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/request-parameters.html b/documentation/the-sling-engine/request-parameters.html
index 327dde2..4e1d98a 100644
--- a/documentation/the-sling-engine/request-parameters.html
+++ b/documentation/the-sling-engine/request-parameters.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Request Parameter Handling in 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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Request Parameter Handling in Sling
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#servlet-api" name="servlet-api">Servlet API</a></h2>
 <p>The Servlet API specification provides the following methods to access the parameters of a request</p>

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/sling-properties.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/sling-properties.html b/documentation/the-sling-engine/sling-properties.html
index b2dbd00..8772302 100644
--- a/documentation/the-sling-engine/sling-properties.html
+++ b/documentation/the-sling-engine/sling-properties.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Well-known Sling Properties</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Well-known Sling Properties
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This table lists properties which have known functionality in the OSGi and Sling frameworks.</p>
 <p>With the exception of the Sling setup properties (<code>sling.home</code>, <code>sling.launchpad</code>, and <code>sling.properties</code>) all properties can be set on the command line using the <code>-D</code> command line option or in the <code>sling.properties</code> file. Properties defined on the command line or in the <code>web.xml</code> file always overwrite properties in the <code>sling.properties</code> file.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/the-sling-launchpad.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/the-sling-launchpad.html b/documentation/the-sling-engine/the-sling-launchpad.html
index 7e4458f..8950818 100644
--- a/documentation/the-sling-engine/the-sling-launchpad.html
+++ b/documentation/the-sling-engine/the-sling-launchpad.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: The Sling Launchpad</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 The Sling Launchpad
             </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/the-sling-engine/url-decomposition.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/url-decomposition.html b/documentation/the-sling-engine/url-decomposition.html
index 9731a53..aa5eadc 100644
--- a/documentation/the-sling-engine/url-decomposition.html
+++ b/documentation/the-sling-engine/url-decomposition.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: URL decomposition</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 URL decomposition
             </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/the-sling-engine/url-to-script-resolution.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/url-to-script-resolution.html b/documentation/the-sling-engine/url-to-script-resolution.html
index 2f25c3f..ff37485 100644
--- a/documentation/the-sling-engine/url-to-script-resolution.html
+++ b/documentation/the-sling-engine/url-to-script-resolution.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: URL to Script Resolution</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 URL to Script Resolution
             </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/the-sling-engine/wrap-or-decorate-resources.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/wrap-or-decorate-resources.html b/documentation/the-sling-engine/wrap-or-decorate-resources.html
index 73db373..d39186d 100644
--- a/documentation/the-sling-engine/wrap-or-decorate-resources.html
+++ b/documentation/the-sling-engine/wrap-or-decorate-resources.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Wrap or Decorate Resources</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Wrap or Decorate Resources
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#introduction" name="introduction">Introduction</a></h2>
 <p>The Sling API provides an easy way to wrap or decorate a resource before returning. Use cases for this could for example be * overwrite resource type/resource super type (for example based on the resource path) * add metadata</p>


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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/sitemap.html
----------------------------------------------------------------------
diff --git a/sitemap.html b/sitemap.html
index d6146ed..d47c4e2 100644
--- a/sitemap.html
+++ b/sitemap.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sitemap</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,167 +67,167 @@
                 <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">
             <breadcrumbs/><h1>
                 Sitemap
-            </h1><tableOfContents/><div class="sitemap"><section class="wrap"><ul><li><a href="/ng/index.html">Apache Sling - Bringing Back the Fun!</a></li>
-                        <li><a href="/ng/contributing.html">Contributing</a></li>
-                        <li><a href="/ng/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">Accessing File System Resources (org.apache.sling.fsresource)</a></li>
-                        <li><a href="/ng/documentation/bundles/apache-sling-commons-thread-pool.html">Apache Sling Commons Thread Pool</a></li>
-                        <li><a href="/ng/documentation/bundles/apache-sling-eventing-and-job-handling.html">Apache Sling Eventing and Job Handling</a></li>
-                        <li><a href="/ng/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></li>
-                        <li><a href="/ng/documentation/bundles/caching-services.html">Sling Caching Services</a></li>
-                        <li><a href="/ng/documentation/bundles/commons-html-utilities.html">Commons HTML Utilities (org.apache.sling.commons.html)</a></li>
-                        <li><a href="/ng/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a></li>
-                        <li><a href="/ng/documentation/bundles/content-distribution.html">Content Distribution (org.apache.sling.distribution)</a></li>
-                        <li><a href="/ng/documentation/bundles/content-loading-jcr-contentloader.html">Content Loading and Nodetype Support (jcr.contentloader)</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html">Apache Sling Context-Aware Configuration - Default Implementation</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Apache Sling Context-Aware Configuration - Override</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">Apache Sling Context-Aware Configuration - SPI</a></li>
-                        <li><a href="/ng/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a></li>
-                        <li><a href="/ng/documentation/bundles/datasource-providers.html">DataSource Provider</a></li>
-                        <li><a href="/ng/documentation/bundles/discovery-api-and-impl.html">Discovery API and its implementations</a></li>
-                        <li><a href="/ng/documentation/bundles/dynamic-includes.html">Apache Sling Dynamic Include</a></li>
-                        <li><a href="/ng/documentation/bundles/file-installer-provider.html">File Installer Provider</a></li>
-                        <li><a href="/ng/documentation/bundles/internationalization-support-i18n.html">Internationalization Support (i18n)</a></li>
-                        <li><a href="/ng/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a></li>
-                        <li><a href="/ng/documentation/bundles/log-tracers.html">Log Tracer</a></li>
-                        <li><a href="/ng/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html">Managing permissions (jackrabbit.accessmanager)</a></li>
-                        <li><a href="/ng/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html">Managing users and groups (jackrabbit.usermanager)</a></li>
-                        <li><a href="/ng/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html">Manipulating Content - The SlingPostServlet (servlets.post)</a></li>
-                        <li><a href="/ng/documentation/bundles/metrics.html">Sling Metrics</a></li>
-                        <li><a href="/ng/documentation/bundles/mime-type-support-commons-mime.html">MIME Type Support (commons.mime and commons.contentdetection)</a></li>
-                        <li><a href="/ng/documentation/bundles/models.html">Sling Models</a></li>
-                        <li><a href="/ng/documentation/bundles/nosql-resource-providers.html">NoSQL Resource Providers (org.apache.sling.nosql)</a></li>
-                        <li><a href="/ng/documentation/bundles/org-apache-sling-junit-bundles.html">JUnit server-side testing support bundles</a></li>
-                        <li><a href="/ng/documentation/bundles/osgi-installer.html">OSGi Installer</a></li>
-                        <li><a href="/ng/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html">Output Rewriting Pipelines (org.apache.sling.rewriter)</a></li>
-                        <li><a href="/ng/documentation/bundles/rendering-content-default-get-servlets.html">Rendering Content - Default GET Servlets</a></li>
-                        <li><a href="/ng/documentation/bundles/repository-initialization.html"></a></li>
-                        <li><a href="/ng/documentation/bundles/request-analysis.html">Request Processing Analyzer (reqanalyzer)</a></li>
-                        <li><a href="/ng/documentation/bundles/resource-access-security.html">Resource Access Security</a></li>
-                        <li><a href="/ng/documentation/bundles/resource-editor.html">The Apache Sling Resource Editor</a></li>
-                        <li><a href="/ng/documentation/bundles/resource-merger.html">Resource Merger (org.apache.sling.resourcemerger)</a></li>
-                        <li><a href="/ng/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service (commons scheduler)</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting/scripting-htl.html">HTL Scripting Engine</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting/scripting-jsp.html">JSP Scripting Engine</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting/scripting-thymeleaf.html">Sling Scripting Thymeleaf</a></li>
-                        <li><a href="/ng/documentation/bundles/scripting.html">Sling Scripting</a></li>
-                        <li><a href="/ng/documentation/bundles/servlet-helpers.html">Sling Servlet Helpers</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-health-check-tool.html">Sling Health Check Tools</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-oak-restrictions.html">Sling Oak Restrictions</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-pipes.html">Sling Pipes</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/basic-ideas.html">Basic Ideas</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/examples.html">Examples</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/hierarchy-operators.html">Hierarchy operators</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/methods.html">Method list</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/modifiers.html">Modifiers</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/operators.html">Operators</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/selectors.html">Selectors</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query/vs-jcr.html">Sling Query vs JCR</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-query.html">Sling Query</a></li>
-                        <li><a href="/ng/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings and Run Modes (org.apache.sling.settings)</a></li>
-                        <li><a href="/ng/documentation/bundles/subsystem-installer-factory.html">Subsystems Installer Factory</a></li>
-                        <li><a href="/ng/documentation/bundles/validation.html">Sling Validation</a></li>
-                        <li><a href="/ng/documentation/bundles/web-console-extensions.html">Web Console Extensions</a></li>
-                        <li><a href="/ng/documentation/bundles/xml-support.html">XML support</a></li>
-                        <li><a href="/ng/documentation/bundles.html">Bundles</a></li>
-                        <li><a href="/ng/documentation/configuration.html">Configuration</a></li>
-                        <li><a href="/ng/documentation/development/client-request-logging.html">Client Request Logging</a></li>
-                        <li><a href="/ng/documentation/development/dependency-management.html">Dependency Management</a></li>
-                        <li><a href="/ng/documentation/development/embedding-sling.html">Embedding Sling</a></li>
-                        <li><a href="/ng/documentation/development/getting-and-building-sling.html">Getting and Building Sling</a></li>
-                        <li><a href="/ng/documentation/development/hamcrest.html">Hamcrest Integration</a></li>
-                        <li><a href="/ng/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></li>
-                        <li><a href="/ng/documentation/development/ide-tooling/ide-tooling-incremental-build.html">Incremental Builds in Sling IDE tooling for Eclipse</a></li>
-                        <li><a href="/ng/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a></li>
-                        <li><a href="/ng/documentation/development/issue-tracker.html">Issue Tracker</a></li>
-                        <li><a href="/ng/documentation/development/jcr-mock.html">JCR Mocks</a></li>
-                        <li><a href="/ng/documentation/development/jspc.html">HTL Maven Plugin</a></li>
-                        <li><a href="/ng/documentation/development/jsr-305.html">Leveraging JSR-305 null annotations to prevent NullPointerExceptions</a></li>
-                        <li><a href="/ng/documentation/development/logging.html">Logging</a></li>
-                        <li><a href="/ng/documentation/development/maven-archetypes.html">Maven Archetypes</a></li>
-                        <li><a href="/ng/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></li>
-                        <li><a href="/ng/documentation/development/maven-usage.html">Maven Usage</a></li>
-                        <li><a href="/ng/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></li>
-                        <li><a href="/ng/documentation/development/monitoring-requests.html">Monitoring Requests</a></li>
-                        <li><a href="/ng/documentation/development/osgi-mock.html">OSGi Mocks</a></li>
-                        <li><a href="/ng/documentation/development/release-management.html">Release Management</a></li>
-                        <li><a href="/ng/documentation/development/repository-based-development.html">Repository Based Development</a></li>
-                        <li><a href="/ng/documentation/development/resourceresolver-mock.html">Resource Resolver Mock</a></li>
-                        <li><a href="/ng/documentation/development/sling-mock.html">Sling Mocks</a></li>
-                        <li><a href="/ng/documentation/development/sling-testing-tools.html">Sling Testing Tools</a></li>
-                        <li><a href="/ng/documentation/development/sling.html">Maven Sling Plugin</a></li>
-                        <li><a href="/ng/documentation/development/slingstart.html">The Apache Sling Provisioning Model and Apache SlingStart</a></li>
-                        <li><a href="/ng/documentation/development/version-policy.html">Version Policy</a></li>
-                        <li><a href="/ng/documentation/development.html">Development</a></li>
-                        <li><a href="/ng/documentation/getting-started/discover-sling-in-15-minutes.html">Discover Sling in 15 minutes</a></li>
-                        <li><a href="/ng/documentation/getting-started.html">Getting Started</a></li>
-                        <li><a href="/ng/documentation/legacy/logging.html">Logging</a></li>
-                        <li><a href="/ng/documentation/pax-exam-utils.html">Sling Pax Exam Utilities</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/adapters.html">Adapters</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/architecture.html">Architecture</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-actors.html">Authentication - Actors</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html">Form Based AuthenticationHandler</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html">OpenID AuthenticationHandler</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-framework.html">Authentication - Framework</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication/authentication-tasks.html">Authentication - Tasks</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/default-mapping-and-rendering.html">Default Mapping and Rendering</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/dispatching-requests.html">Dispatching Requests</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/errorhandling.html">Errorhandling</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/featureflags.html">Feature Flags</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/filters.html">Servlet Filter Support</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/request-listeners.html">Request Listeners</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/request-parameters.html">Request Parameter Handling in Sling</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/resources.html">Resources</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/service-authentication.html">Service Authentication</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/servlets.html">Servlets and Scripts</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/sling-api-crud-support.html">Sling API CRUD Support</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/sling-properties.html">Well-known Sling Properties</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/url-decomposition.html">URL decomposition</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/url-to-script-resolution.html">URL to Script Resolution</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or Decorate Resources</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/46-line-blog.html">46 Line Blog</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html">Getting Resources and Properties in Sling</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html">How to Manage Jobs in Sling</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/jackrabbit-persistence.html">Jackrabbit Persistence</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></li>
-                        <li><a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li>
-                        <li><a href="/ng/documentation.html">Documentation</a></li>
-                        <li><a href="/ng/guides.html">Guides (retired)</a></li>
-                        <li><a href="/ng/javadoc-io.html">Sling API docs at javadoc.io</a></li>
-                        <li><a href="/ng/links.html">Links</a></li>
-                        <li><a href="/ng/media.html">Media</a></li>
-                        <li><a href="/ng/news/sling-ide-tooling-11-released.html">Apache Sling IDE Tooling 1.1 released</a></li>
-                        <li><a href="/ng/news/sling-launchpad-8-released.html">Apache Sling Launchpad 8 released</a></li>
-                        <li><a href="/ng/news/sling-launchpad-9-released.html">Apache Sling Launchpad 9 released</a></li>
-                        <li><a href="/ng/news.html">News</a></li>
-                        <li><a href="/ng/old-stuff/assembly.html">Assembly</a></li>
-                        <li><a href="/ng/old-stuff/launch-sling.html">Launch Sling</a></li>
-                        <li><a href="/ng/old-stuff/request-processing.html">Request Processing</a></li>
-                        <li><a href="/ng/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes</a></li>
-                        <li><a href="/ng/old-stuff/scriptengineintegration/groovy-support.html">Groovy Support</a></li>
-                        <li><a href="/ng/old-stuff/scriptengineintegration/xslt-processing-pipeline.html">XSLT Processing Pipeline</a></li>
-                        <li><a href="/ng/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a></li>
-                        <li><a href="/ng/old-stuff/servlet-resolution.html">Servlet Resolution</a></li>
-                        <li><a href="/ng/old-stuff/sling-api.html">Sling API</a></li>
-                        <li><a href="/ng/old-stuff.html">Old Stuff</a></li>
-                        <li><a href="/ng/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></li>
-                        <li><a href="/ng/project-information/project-license.html">Project License</a></li>
-                        <li><a href="/ng/project-information/project-team.html">Project Team</a></li>
-                        <li><a href="/ng/project-information/security.html">Security</a></li>
-                        <li><a href="/ng/project-information.html">Project Information</a></li>
-                        <li><a href="/ng/site-conversion.html">Site conversion in progress - excuse our mess...</a></li>
-                        <li><a href="/ng/sitemap.html">Sitemap</a></li>
-                        <li><a href="/ng/downloads.html">Downloads</a></li>
+            </h1><tableOfContents/><div class="sitemap"><section class="wrap"><ul><li><a href="/contributing.html">Contributing</a></li>
+                        <li><a href="/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">Accessing File System Resources (org.apache.sling.fsresource)</a></li>
+                        <li><a href="/documentation/bundles/apache-sling-commons-thread-pool.html">Apache Sling Commons Thread Pool</a></li>
+                        <li><a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Apache Sling Eventing and Job Handling</a></li>
+                        <li><a href="/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></li>
+                        <li><a href="/documentation/bundles/caching-services.html">Sling Caching Services</a></li>
+                        <li><a href="/documentation/bundles/commons-html-utilities.html">Commons HTML Utilities (org.apache.sling.commons.html)</a></li>
+                        <li><a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a></li>
+                        <li><a href="/documentation/bundles/content-distribution.html">Content Distribution (org.apache.sling.distribution)</a></li>
+                        <li><a href="/documentation/bundles/content-loading-jcr-contentloader.html">Content Loading and Nodetype Support (jcr.contentloader)</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html">Apache Sling Context-Aware Configuration - Default Implementation</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Apache Sling Context-Aware Configuration - Override</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">Apache Sling Context-Aware Configuration - SPI</a></li>
+                        <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a></li>
+                        <li><a href="/documentation/bundles/datasource-providers.html">DataSource Provider</a></li>
+                        <li><a href="/documentation/bundles/discovery-api-and-impl.html">Discovery API and its implementations</a></li>
+                        <li><a href="/documentation/bundles/dynamic-includes.html">Apache Sling Dynamic Include</a></li>
+                        <li><a href="/documentation/bundles/file-installer-provider.html">File Installer Provider</a></li>
+                        <li><a href="/documentation/bundles/internationalization-support-i18n.html">Internationalization Support (i18n)</a></li>
+                        <li><a href="/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a></li>
+                        <li><a href="/documentation/bundles/log-tracers.html">Log Tracer</a></li>
+                        <li><a href="/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html">Managing permissions (jackrabbit.accessmanager)</a></li>
+                        <li><a href="/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html">Managing users and groups (jackrabbit.usermanager)</a></li>
+                        <li><a href="/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html">Manipulating Content - The SlingPostServlet (servlets.post)</a></li>
+                        <li><a href="/documentation/bundles/metrics.html">Sling Metrics</a></li>
+                        <li><a href="/documentation/bundles/mime-type-support-commons-mime.html">MIME Type Support (commons.mime and commons.contentdetection)</a></li>
+                        <li><a href="/documentation/bundles/models.html">Sling Models</a></li>
+                        <li><a href="/documentation/bundles/nosql-resource-providers.html">NoSQL Resource Providers (org.apache.sling.nosql)</a></li>
+                        <li><a href="/documentation/bundles/org-apache-sling-junit-bundles.html">JUnit server-side testing support bundles</a></li>
+                        <li><a href="/documentation/bundles/osgi-installer.html">OSGi Installer</a></li>
+                        <li><a href="/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html">Output Rewriting Pipelines (org.apache.sling.rewriter)</a></li>
+                        <li><a href="/documentation/bundles/rendering-content-default-get-servlets.html">Rendering Content - Default GET Servlets</a></li>
+                        <li><a href="/documentation/bundles/repository-initialization.html"></a></li>
+                        <li><a href="/documentation/bundles/request-analysis.html">Request Processing Analyzer (reqanalyzer)</a></li>
+                        <li><a href="/documentation/bundles/resource-access-security.html">Resource Access Security</a></li>
+                        <li><a href="/documentation/bundles/resource-editor.html">The Apache Sling Resource Editor</a></li>
+                        <li><a href="/documentation/bundles/resource-merger.html">Resource Merger (org.apache.sling.resourcemerger)</a></li>
+                        <li><a href="/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service (commons scheduler)</a></li>
+                        <li><a href="/documentation/bundles/scripting/scripting-htl.html">HTL Scripting Engine</a></li>
+                        <li><a href="/documentation/bundles/scripting/scripting-jsp.html">JSP Scripting Engine</a></li>
+                        <li><a href="/documentation/bundles/scripting/scripting-thymeleaf.html">Sling Scripting Thymeleaf</a></li>
+                        <li><a href="/documentation/bundles/scripting.html">Sling Scripting</a></li>
+                        <li><a href="/documentation/bundles/servlet-helpers.html">Sling Servlet Helpers</a></li>
+                        <li><a href="/documentation/bundles/sling-health-check-tool.html">Sling Health Check Tools</a></li>
+                        <li><a href="/documentation/bundles/sling-oak-restrictions.html">Sling Oak Restrictions</a></li>
+                        <li><a href="/documentation/bundles/sling-pipes.html">Sling Pipes</a></li>
+                        <li><a href="/documentation/bundles/sling-query/basic-ideas.html">Basic Ideas</a></li>
+                        <li><a href="/documentation/bundles/sling-query/examples.html">Examples</a></li>
+                        <li><a href="/documentation/bundles/sling-query/hierarchy-operators.html">Hierarchy operators</a></li>
+                        <li><a href="/documentation/bundles/sling-query/methods.html">Method list</a></li>
+                        <li><a href="/documentation/bundles/sling-query/modifiers.html">Modifiers</a></li>
+                        <li><a href="/documentation/bundles/sling-query/operators.html">Operators</a></li>
+                        <li><a href="/documentation/bundles/sling-query/selectors.html">Selectors</a></li>
+                        <li><a href="/documentation/bundles/sling-query/vs-jcr.html">Sling Query vs JCR</a></li>
+                        <li><a href="/documentation/bundles/sling-query.html">Sling Query</a></li>
+                        <li><a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings and Run Modes (org.apache.sling.settings)</a></li>
+                        <li><a href="/documentation/bundles/subsystem-installer-factory.html">Subsystems Installer Factory</a></li>
+                        <li><a href="/documentation/bundles/validation.html">Sling Validation</a></li>
+                        <li><a href="/documentation/bundles/web-console-extensions.html">Web Console Extensions</a></li>
+                        <li><a href="/documentation/bundles/xml-support.html">XML support</a></li>
+                        <li><a href="/documentation/bundles.html">Bundles</a></li>
+                        <li><a href="/documentation/configuration.html">Configuration</a></li>
+                        <li><a href="/documentation/development/client-request-logging.html">Client Request Logging</a></li>
+                        <li><a href="/documentation/development/dependency-management.html">Dependency Management</a></li>
+                        <li><a href="/documentation/development/embedding-sling.html">Embedding Sling</a></li>
+                        <li><a href="/documentation/development/getting-and-building-sling.html">Getting and Building Sling</a></li>
+                        <li><a href="/documentation/development/hamcrest.html">Hamcrest Integration</a></li>
+                        <li><a href="/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></li>
+                        <li><a href="/documentation/development/ide-tooling/ide-tooling-incremental-build.html">Incremental Builds in Sling IDE tooling for Eclipse</a></li>
+                        <li><a href="/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a></li>
+                        <li><a href="/documentation/development/issue-tracker.html">Issue Tracker</a></li>
+                        <li><a href="/documentation/development/jcr-mock.html">JCR Mocks</a></li>
+                        <li><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></li>
+                        <li><a href="/documentation/development/jsr-305.html">Leveraging JSR-305 null annotations to prevent NullPointerExceptions</a></li>
+                        <li><a href="/documentation/development/logging.html">Logging</a></li>
+                        <li><a href="/documentation/development/maven-archetypes.html">Maven Archetypes</a></li>
+                        <li><a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></li>
+                        <li><a href="/documentation/development/maven-usage.html">Maven Usage</a></li>
+                        <li><a href="/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></li>
+                        <li><a href="/documentation/development/monitoring-requests.html">Monitoring Requests</a></li>
+                        <li><a href="/documentation/development/osgi-mock.html">OSGi Mocks</a></li>
+                        <li><a href="/documentation/development/release-management.html">Release Management</a></li>
+                        <li><a href="/documentation/development/repository-based-development.html">Repository Based Development</a></li>
+                        <li><a href="/documentation/development/resourceresolver-mock.html">Resource Resolver Mock</a></li>
+                        <li><a href="/documentation/development/sling-mock.html">Sling Mocks</a></li>
+                        <li><a href="/documentation/development/sling-testing-tools.html">Sling Testing Tools</a></li>
+                        <li><a href="/documentation/development/sling.html">Maven Sling Plugin</a></li>
+                        <li><a href="/documentation/development/slingstart.html">The Apache Sling Provisioning Model and Apache SlingStart</a></li>
+                        <li><a href="/documentation/development/version-policy.html">Version Policy</a></li>
+                        <li><a href="/documentation/development.html">Development</a></li>
+                        <li><a href="/documentation/getting-started/discover-sling-in-15-minutes.html">Discover Sling in 15 minutes</a></li>
+                        <li><a href="/documentation/getting-started.html">Getting Started</a></li>
+                        <li><a href="/documentation/legacy/logging.html">Logging</a></li>
+                        <li><a href="/documentation/pax-exam-utils.html">Sling Pax Exam Utilities</a></li>
+                        <li><a href="/documentation/the-sling-engine/adapters.html">Adapters</a></li>
+                        <li><a href="/documentation/the-sling-engine/architecture.html">Architecture</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-actors.html">Authentication - Actors</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html">Form Based AuthenticationHandler</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html">OpenID AuthenticationHandler</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-framework.html">Authentication - Framework</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication/authentication-tasks.html">Authentication - Tasks</a></li>
+                        <li><a href="/documentation/the-sling-engine/authentication.html">Authentication</a></li>
+                        <li><a href="/documentation/the-sling-engine/default-mapping-and-rendering.html">Default Mapping and Rendering</a></li>
+                        <li><a href="/documentation/the-sling-engine/dispatching-requests.html">Dispatching Requests</a></li>
+                        <li><a href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a></li>
+                        <li><a href="/documentation/the-sling-engine/featureflags.html">Feature Flags</a></li>
+                        <li><a href="/documentation/the-sling-engine/filters.html">Servlet Filter Support</a></li>
+                        <li><a href="/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a></li>
+                        <li><a href="/documentation/the-sling-engine/request-listeners.html">Request Listeners</a></li>
+                        <li><a href="/documentation/the-sling-engine/request-parameters.html">Request Parameter Handling in Sling</a></li>
+                        <li><a href="/documentation/the-sling-engine/resources.html">Resources</a></li>
+                        <li><a href="/documentation/the-sling-engine/service-authentication.html">Service Authentication</a></li>
+                        <li><a href="/documentation/the-sling-engine/servlets.html">Servlets and Scripts</a></li>
+                        <li><a href="/documentation/the-sling-engine/sling-api-crud-support.html">Sling API CRUD Support</a></li>
+                        <li><a href="/documentation/the-sling-engine/sling-properties.html">Well-known Sling Properties</a></li>
+                        <li><a href="/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a></li>
+                        <li><a href="/documentation/the-sling-engine/url-decomposition.html">URL decomposition</a></li>
+                        <li><a href="/documentation/the-sling-engine/url-to-script-resolution.html">URL to Script Resolution</a></li>
+                        <li><a href="/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or Decorate Resources</a></li>
+                        <li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/46-line-blog.html">46 Line Blog</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html">Getting Resources and Properties in Sling</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html">How to Manage Jobs in Sling</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/jackrabbit-persistence.html">Jackrabbit Persistence</a></li>
+                        <li><a href="/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></li>
+                        <li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li>
+                        <li><a href="/documentation.html">Documentation</a></li>
+                        <li><a href="/guides.html">Guides (retired)</a></li>
+                        <li><a href="/index.html">Apache Sling - Bringing Back the Fun!</a></li>
+                        <li><a href="/javadoc-io.html">Sling API docs at javadoc.io</a></li>
+                        <li><a href="/links.html">Links</a></li>
+                        <li><a href="/media.html">Media</a></li>
+                        <li><a href="/news/sling-ide-tooling-11-released.html">Apache Sling IDE Tooling 1.1 released</a></li>
+                        <li><a href="/news/sling-launchpad-8-released.html">Apache Sling Launchpad 8 released</a></li>
+                        <li><a href="/news/sling-launchpad-9-released.html">Apache Sling Launchpad 9 released</a></li>
+                        <li><a href="/news.html">News</a></li>
+                        <li><a href="/old-stuff/assembly.html">Assembly</a></li>
+                        <li><a href="/old-stuff/launch-sling.html">Launch Sling</a></li>
+                        <li><a href="/old-stuff/request-processing.html">Request Processing</a></li>
+                        <li><a href="/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes</a></li>
+                        <li><a href="/old-stuff/scriptengineintegration/groovy-support.html">Groovy Support</a></li>
+                        <li><a href="/old-stuff/scriptengineintegration/xslt-processing-pipeline.html">XSLT Processing Pipeline</a></li>
+                        <li><a href="/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a></li>
+                        <li><a href="/old-stuff/servlet-resolution.html">Servlet Resolution</a></li>
+                        <li><a href="/old-stuff/sling-api.html">Sling API</a></li>
+                        <li><a href="/old-stuff.html">Old Stuff</a></li>
+                        <li><a href="/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></li>
+                        <li><a href="/project-information/project-license.html">Project License</a></li>
+                        <li><a href="/project-information/project-team.html">Project Team</a></li>
+                        <li><a href="/project-information/security.html">Security</a></li>
+                        <li><a href="/project-information.html">Project Information</a></li>
+                        <li><a href="/site-conversion.html">Site conversion in progress - excuse our mess...</a></li>
+                        <li><a href="/sitemap.html">Sitemap</a></li>
+                        <li><a href="/downloads.html">Downloads</a></li>
                     </ul></section></div>
 <div class="footer">
                 <div class="trademarkFooter">


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/sling-api.html
----------------------------------------------------------------------
diff --git a/old-stuff/sling-api.html b/old-stuff/sling-api.html
index f530517..d55e1b6 100644
--- a/old-stuff/sling-api.html
+++ b/old-stuff/sling-api.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling API</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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling API
             </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"><div class="note">
 The contents of this page is being created at the moment. It contains incomplete and partially wrong information as the text is adapted from the contents of the [Component API]({{ refs.component-api.path }}) documentation page.

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/project-information.html
----------------------------------------------------------------------
diff --git a/project-information.html b/project-information.html
index 1ae0c86..af1880d 100644
--- a/project-information.html
+++ b/project-information.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Project Information</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Project Information
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This document provides an overview of the various documents and links that are part of this project's general information:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/project-information/apache-sling-community-roles-and-processes.html
----------------------------------------------------------------------
diff --git a/project-information/apache-sling-community-roles-and-processes.html b/project-information/apache-sling-community-roles-and-processes.html
index 3950a08..6405fcc 100644
--- a/project-information/apache-sling-community-roles-and-processes.html
+++ b/project-information/apache-sling-community-roles-and-processes.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Community Roles and Processes</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/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling Community Roles and Processes
             </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 Community Roles and Processes are put in effect as of 13/May/2009. Updated 7/December/2009 to reflect Sling being a top level project.</p>
 <h2><a href="#roles" name="roles">Roles</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/project-information/project-license.html
----------------------------------------------------------------------
diff --git a/project-information/project-license.html b/project-information/project-license.html
index 196c9cd..d63ef3a 100644
--- a/project-information/project-license.html
+++ b/project-information/project-license.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Project License</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/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Project License
             </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>As with all projects of the <a href="http://apache.org">Apache Software Foundation</a>, Apache Sling is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a></p></section></div></div>
 <div class="footer">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/project-information/project-team.html
----------------------------------------------------------------------
diff --git a/project-information/project-team.html b/project-information/project-team.html
index f5a7690..1987a2c 100644
--- a/project-information/project-team.html
+++ b/project-information/project-team.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Project Team</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/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Project Team
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p>
 <p>The team is comprised of Committers and Contributors. Committers have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/project-information/security.html
----------------------------------------------------------------------
diff --git a/project-information/security.html b/project-information/security.html
index 4fcdb80..3ae8005 100644
--- a/project-information/security.html
+++ b/project-information/security.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: 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/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 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"><h1><a href="#reporting-new-security-problems-with-apache-sling" name="reporting-new-security-problems-with-apache-sling">Reporting New Security Problems with Apache Sling</a></h1>
 <p>The Apache Software Foundation takes a very active stance in eliminating security problems and denial of service attacks against Apache Sling.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/site-conversion.html
----------------------------------------------------------------------
diff --git a/site-conversion.html b/site-conversion.html
index f874d69..deb78dd 100644
--- a/site-conversion.html
+++ b/site-conversion.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Site conversion in progress - excuse our mess...</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Site conversion in progress - excuse our mess...
             </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 website was recently converted to use the Apache CMS for content management, and we still have to check a number of pages for correct conversion.</p>
 <p>During this transition phase, old versions of a number of pages are still present under /site, along with their converted versions at other, more specific paths.</p>


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/ide-tooling/ide-tooling-incremental-build.html
----------------------------------------------------------------------
diff --git a/documentation/development/ide-tooling/ide-tooling-incremental-build.html b/documentation/development/ide-tooling/ide-tooling-incremental-build.html
index 4a2e70a..d113e4d 100644
--- a/documentation/development/ide-tooling/ide-tooling-incremental-build.html
+++ b/documentation/development/ide-tooling/ide-tooling-incremental-build.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Incremental Builds in Sling IDE tooling for Eclipse</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Incremental Builds in Sling IDE tooling for Eclipse
             </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/development/issue-tracker.html
----------------------------------------------------------------------
diff --git a/documentation/development/issue-tracker.html b/documentation/development/issue-tracker.html
index e16f0e1..3e05235 100644
--- a/documentation/development/issue-tracker.html
+++ b/documentation/development/issue-tracker.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Issue Tracker</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Issue Tracker
             </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 uses Jira for tracking bug reports and requests for improvements, new features, and other changes.</p>
 <p>The issue tracker is available at <a href="https://issues.apache.org/jira/browse/SLING">https://issues.apache.org/jira/browse/SLING</a> and is readable by everyone. A Jira account is needed to create new issues and to comment on existing issues. Use the <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">registration form</a> to request an account if you do not already have one.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/jcr-mock.html
----------------------------------------------------------------------
diff --git a/documentation/development/jcr-mock.html b/documentation/development/jcr-mock.html
index 95a496c..8e55708 100644
--- a/documentation/development/jcr-mock.html
+++ b/documentation/development/jcr-mock.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: JCR Mocks</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 JCR Mocks
             </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>Mock implementation of selected JCR APIs for easier testing. It stores all data in-memory in a HashMap to ensure instantly creating and destroying of the JCR repository.</p>
 <p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->

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

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/maven-archetypes.html
----------------------------------------------------------------------
diff --git a/documentation/development/maven-archetypes.html b/documentation/development/maven-archetypes.html
index 24d8893..28b2962 100644
--- a/documentation/development/maven-archetypes.html
+++ b/documentation/development/maven-archetypes.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Maven Archetypes</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Maven Archetypes
             </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 includes four Maven archetypes to quick start development. See <a href="http://maven.apache.org/archetype/maven-archetype-plugin/">http://maven.apache.org/archetype/maven-archetype-plugin/</a> for general information on using Maven archetypes. The Maven groupId for all Sling archetypes is <code>org.apache.sling</code>.</p>
 <h3><a href="#sling-launchpad-standalone-archetype" name="sling-launchpad-standalone-archetype">sling-launchpad-standalone-archetype</a></h3>

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/maven-usage.html
----------------------------------------------------------------------
diff --git a/documentation/development/maven-usage.html b/documentation/development/maven-usage.html
index 0046d81..ea1394b 100644
--- a/documentation/development/maven-usage.html
+++ b/documentation/development/maven-usage.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Maven Usage</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Maven Usage
             </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 uses Maven as a build tool. This page documents some of the choices that we made when using Maven.</p>
 <h2><a href="#parent-pom" name="parent-pom">Parent POM</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/maventipsandtricks.html
----------------------------------------------------------------------
diff --git a/documentation/development/maventipsandtricks.html b/documentation/development/maventipsandtricks.html
index 89cd417..66d4825 100644
--- a/documentation/development/maventipsandtricks.html
+++ b/documentation/development/maventipsandtricks.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: MavenTipsAndTricks</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 MavenTipsAndTricks
             </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>Here's our collection of tips and tricks for building Sling with <a href="http://maven.apache.org">Maven</a>.</p>
 <h1><a href="#maven-local-repository" name="maven-local-repository">Maven local repository</a></h1>

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

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/development/release-management.html
----------------------------------------------------------------------
diff --git a/documentation/development/release-management.html b/documentation/development/release-management.html
index 29a875f..0fb378a 100644
--- a/documentation/development/release-management.html
+++ b/documentation/development/release-management.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Release Management</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;<a href="/documentation/development.html">Development</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Release Management
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Sling releases (and SNAPSHOTS) are deployed to the <a href="http://repository.apache.org">Nexus repository</a> instead of the traditional deployment via the Maven 2 mirrors source on <code>people.apache.org</code>. This makes the release process much leaner and simpler. In addtion we can benefit from the Apache Parent POM 6, which has most of the release profile setup built-in.</p>
 <p>Most of the hard work of preparing and deploying the release is done by Maven.</p>


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/architecture.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/architecture.html b/documentation/the-sling-engine/architecture.html
index 0f5b0d8..9b3351d 100644
--- a/documentation/the-sling-engine/architecture.html
+++ b/documentation/the-sling-engine/architecture.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Architecture</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Architecture
             </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 following is a short list of high-lights of Sling:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/authentication.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication.html b/documentation/the-sling-engine/authentication.html
index 501b653..691d984 100644
--- a/documentation/the-sling-engine/authentication.html
+++ b/documentation/the-sling-engine/authentication.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Authentication</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Authentication
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This section describes the framework provided by Sling to authenticate HTTP requests.</p>
 <p>Let's look at generic request processing of Sling: Sling is linked into the outside world by registering the Sling Main Servlet &ndash; implemented by the <code>SlingMainServlet</code> class in the Sling Engine bundle &ndash; with an OSGi <code>HttpService</code>. This registration is accompanyied with an implementation instance of the OSGi <code>HttpContext</code> interface, which defines a method to authenticate requests: <code>handleSecurity</code>.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/authentication/authentication-actors.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication/authentication-actors.html b/documentation/the-sling-engine/authentication/authentication-actors.html
index 86247ba..78faccb 100644
--- a/documentation/the-sling-engine/authentication/authentication-actors.html
+++ b/documentation/the-sling-engine/authentication/authentication-actors.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Authentication - Actors</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Authentication - Actors
             </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 authentication process involves a number of actors contributing to the concepts, the API and the particular implementations.</p>
 <h2><a href="#osgi-http-service-specification" name="osgi-http-service-specification">OSGi Http Service Specification</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html b/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
index 0328d8b..ca9b7b4 100644
--- a/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
+++ b/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Authentication - AuthenticationHandler</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Authentication - AuthenticationHandler
             </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>AuthenticationHandler</code> interface defines the service API which may be implemented by authentication handlers registered as OSGi services.</p>
 <p><code>AuthenticationHandler</code> services have a single required service registration property which is used to identify requests to which the <code>AuthenticationHandler</code> service is applicable:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html b/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
index 631dfb5..bc17de5 100644
--- a/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
+++ b/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Form Based AuthenticationHandler</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Form Based AuthenticationHandler
             </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/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html b/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
index c9372d4..8cca602 100644
--- a/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
+++ b/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: OpenID AuthenticationHandler</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">Authentication - AuthenticationHandler</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 OpenID AuthenticationHandler
             </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/the-sling-engine/authentication/authentication-framework.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication/authentication-framework.html b/documentation/the-sling-engine/authentication/authentication-framework.html
index 077f1b9..ed15e02 100644
--- a/documentation/the-sling-engine/authentication/authentication-framework.html
+++ b/documentation/the-sling-engine/authentication/authentication-framework.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Authentication - Framework</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Authentication - Framework
             </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 core piece of functionality with respect to authentication in Sling is contained in the Sling Auth Core bundle. This bundle provides the API for Sling and Sling applications to make use of authentication.</p>
 <p>This support encompasses three parts:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/authentication/authentication-tasks.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication/authentication-tasks.html b/documentation/the-sling-engine/authentication/authentication-tasks.html
index fd87f4a..976acd8 100644
--- a/documentation/the-sling-engine/authentication/authentication-tasks.html
+++ b/documentation/the-sling-engine/authentication/authentication-tasks.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Authentication - Tasks</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation/the-sling-engine/authentication.html">Authentication</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;<a href="/documentation/the-sling-engine/authentication.html">Authentication</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Authentication - Tasks
             </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>Authentication of HTTP Requests is generally a two-step process: First the credentials must be extracted from the request and second the credentials must be validated. In the case of Sling this means acquiring a JCR Session.</p>
 <h2><a href="#extract-credentials-from-the-request" name="extract-credentials-from-the-request">Extract Credentials from the Request</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/default-mapping-and-rendering.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/default-mapping-and-rendering.html b/documentation/the-sling-engine/default-mapping-and-rendering.html
index 5cc1fba..4a2b21d 100644
--- a/documentation/the-sling-engine/default-mapping-and-rendering.html
+++ b/documentation/the-sling-engine/default-mapping-and-rendering.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Default Mapping and Rendering</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Default Mapping and Rendering
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This page contained obsolete content, moved it to http://cwiki.apache.org/confluence/display/SLING/Default+Mapping+and+Rendering+%28OBSOLETE%29 in case it is useful to someone.</p></section></div></div>
 <div class="footer">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/dispatching-requests.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/dispatching-requests.html b/documentation/the-sling-engine/dispatching-requests.html
index 8c94b04..f38d42b 100644
--- a/documentation/the-sling-engine/dispatching-requests.html
+++ b/documentation/the-sling-engine/dispatching-requests.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Dispatching Requests</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Dispatching Requests
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#main-process" name="main-process">Main process</a></h2>
 <p>The following steps should give you an overview how a request is processed in Sling. Details can be found under provided links.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/errorhandling.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/errorhandling.html b/documentation/the-sling-engine/errorhandling.html
index 82d9639..3e83ea5 100644
--- a/documentation/the-sling-engine/errorhandling.html
+++ b/documentation/the-sling-engine/errorhandling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Errorhandling</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Errorhandling
             </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 Engine includes support for handling uncaught <code>Throwable</code> as well as rendering custom HTTP status code pages. This is implemented by expecting a (single) <code>org.apache.sling.engine.servlets.ErrorHandler</code> service to which handling of uncaught <code>Throwable</code> and HTTP status responses are delegated.</p>
 <p>The Sling Servlet Resolver bundle implements this interface by providing an elaborate mechanism to find the correct error handling script or servlet using the same algorithms as are used to select the scripts or servlets to handle regular requests.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/the-sling-engine/featureflags.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/featureflags.html b/documentation/the-sling-engine/featureflags.html
index e39a7bf..bc27ac8 100644
--- a/documentation/the-sling-engine/featureflags.html
+++ b/documentation/the-sling-engine/featureflags.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Feature Flags</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/the-sling-engine.html">The Sling Engine</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/the-sling-engine.html">The Sling Engine</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Feature Flags
             </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>Feature Flags are used to select whether a particular feature is enabled or not. This allows to continuosly deploy new features of an application without making them globally available yet.</p>
 <p>Features may be enabled based on various contextual data:</p>


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

Posted by bd...@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>


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-oak-restrictions.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-oak-restrictions.html b/documentation/bundles/sling-oak-restrictions.html
index fa6ba0a..d4e60a8 100644
--- a/documentation/bundles/sling-oak-restrictions.html
+++ b/documentation/bundles/sling-oak-restrictions.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Oak Restrictions</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 Oak Restrictions
             </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/sling-pipes.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-pipes.html b/documentation/bundles/sling-pipes.html
index e1c5a4d..1421865 100644
--- a/documentation/bundles/sling-pipes.html
+++ b/documentation/bundles/sling-pipes.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Pipes</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 Pipes
             </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>tool set for doing extract - transform - load operations by chaining proven code bits.</p>
 <p>often one-shot data transformations need sample code to be written &amp; executed. This tiny tool set intends to provide ability to do such transformations with proven &amp; reusable blocks called pipes, streaming resources from one to the other.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query.html b/documentation/bundles/sling-query.html
index 6933ffe..712f6d0 100644
--- a/documentation/bundles/sling-query.html
+++ b/documentation/bundles/sling-query.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Query</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 Query
             </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>SlingQuery is a Sling resource tree traversal tool inspired by the <a href="http://api.jquery.com/category/traversing/tree-traversal/">jQuery</a> JavaScript API.</p>
 <h2><a href="#introduction" name="introduction">Introduction</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/basic-ideas.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/basic-ideas.html b/documentation/bundles/sling-query/basic-ideas.html
index 25a1fd8..9f68aad 100644
--- a/documentation/bundles/sling-query/basic-ideas.html
+++ b/documentation/bundles/sling-query/basic-ideas.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Basic Ideas</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Basic Ideas
             </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"><h3><a href="#collections" name="collections">Collections</a></h3>
 <p><code>SlingQuery</code> class represents a collection of resources. Basic collection can be created explicitly via a dollar method:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/examples.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/examples.html b/documentation/bundles/sling-query/examples.html
index 2d820f4..f1f4209 100644
--- a/documentation/bundles/sling-query/examples.html
+++ b/documentation/bundles/sling-query/examples.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Examples</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Examples
             </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>Get containing page (like [PageManager#getContainingPage](https://docs.adobe.com/docs/en/aem/6-3/develop/ref/javadoc/com/day/cq/wcm/api/PageManager.html#getContainingPage(org.apache.sling.api.resource.Resource)))</p>
 <pre><code>$(resource).closest(&quot;cq:Page&quot;)

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/hierarchy-operators.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/hierarchy-operators.html b/documentation/bundles/sling-query/hierarchy-operators.html
index 187c309..b1f024a 100644
--- a/documentation/bundles/sling-query/hierarchy-operators.html
+++ b/documentation/bundles/sling-query/hierarchy-operators.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Hierarchy operators</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Hierarchy operators
             </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"><h3>Child operator (<code>parent &gt; child</code>)</h3>
 <p>Select all direct child resources specified by <code>child</code> of resources specified by <code>parent</code></p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/methods.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/methods.html b/documentation/bundles/sling-query/methods.html
index dfa788c..3535648 100644
--- a/documentation/bundles/sling-query/methods.html
+++ b/documentation/bundles/sling-query/methods.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Method list</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Method list
             </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"><h3><a href="#resource-resources-" name="resource-resources-">$(Resource... resources)</a></h3>
 <p>Create a new SlingQuery object, using passed resources as an initial collection. Example:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/modifiers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/modifiers.html b/documentation/bundles/sling-query/modifiers.html
index f789995..e6b7f2b 100644
--- a/documentation/bundles/sling-query/modifiers.html
+++ b/documentation/bundles/sling-query/modifiers.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Modifiers</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Modifiers
             </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"><h3><a href="#eq-index-" name="eq-index-">:eq(index)</a></h3>
 <p>Reduce the set of matched elements to the one at the specified 0-based index. Example:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/operators.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/operators.html b/documentation/bundles/sling-query/operators.html
index ceda525..e75d642 100644
--- a/documentation/bundles/sling-query/operators.html
+++ b/documentation/bundles/sling-query/operators.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Operators</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Operators
             </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"><h3>Contains <code>[name*=value]</code></h3>
 <p>Select resources that have property <code>name</code> containing <code>value</code>:</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/selectors.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/selectors.html b/documentation/bundles/sling-query/selectors.html
index 3516997..0ead06f 100644
--- a/documentation/bundles/sling-query/selectors.html
+++ b/documentation/bundles/sling-query/selectors.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Selectors</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Selectors
             </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>Selector string are something between filters and content descriptors. Selector can filter resources by their <a href="#resource-type">type</a>, <a href="#resource-name">name</a>, <a href="#attributes">attributes</a> and <a href="#modifiers">additional modifiers</a>. They can be also <a href="#joining-selectors">chained together</a> to describe more sophisticated hierarchy structure or <a href="#combining-selectors">combined with comma</a>.</p>
 <h2><a href="#syntax" name="syntax">Syntax</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-query/vs-jcr.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query/vs-jcr.html b/documentation/bundles/sling-query/vs-jcr.html
index 08b528e..f7d190b 100644
--- a/documentation/bundles/sling-query/vs-jcr.html
+++ b/documentation/bundles/sling-query/vs-jcr.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Query vs JCR</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/sling-query.html">Sling Query</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/sling-query.html">Sling Query</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Sling Query vs JCR
             </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 Query is not meant to replace JCR queries (XPath, JCR-SQL, JCR-SQL2). It doesn't use indexes and generally in queries traversing large subtrees (like <code>/</code> or <code>/content</code> or <code>/content/mysite/en</code>) it'll be much slower than well written JCR query.</p>
 <p>Purpose of the SlingQuery is to provide a convenient way to traverse resource tree. All SlingQuery operations are eventually transformed into a series of <code>listChildren()</code> and <code>getParent()</code> operations [1].</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/documentation/bundles/sling-settings-org-apache-sling-settings.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-settings-org-apache-sling-settings.html b/documentation/bundles/sling-settings-org-apache-sling-settings.html
index aa80ec2..4e0ce42 100644
--- a/documentation/bundles/sling-settings-org-apache-sling-settings.html
+++ b/documentation/bundles/sling-settings-org-apache-sling-settings.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Sling Settings and Run Modes (org.apache.sling.settings)</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 Settings and Run Modes (org.apache.sling.settings)
             </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"><h1><a href="#overview" name="overview">Overview</a></h1>
 <p>The Sling Settings Bundle exposes the <code>SlingSettingsService</code> which allows access to the following information pertinent to a Sling instance:</p>


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

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/news.html
----------------------------------------------------------------------
diff --git a/news.html b/news.html
index 9d19382..6ffd1c8 100644
--- a/news.html
+++ b/news.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: News</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 News
             </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"><ul>
   <li>New Release: Apache Sling Pipes 1.1.0 (September 24th, 2017)</li>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/news/sling-ide-tooling-11-released.html
----------------------------------------------------------------------
diff --git a/news/sling-ide-tooling-11-released.html b/news/sling-ide-tooling-11-released.html
index b2cb607..b0392d8 100644
--- a/news/sling-ide-tooling-11-released.html
+++ b/news/sling-ide-tooling-11-released.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling IDE Tooling 1.1 released</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/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling IDE Tooling 1.1 released
             </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>Here are some of the more noteworthy things available in this release.</p>
 <h1><a href="#sightly-support" name="sightly-support">Sightly support</a></h1>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/news/sling-launchpad-8-released.html
----------------------------------------------------------------------
diff --git a/news/sling-launchpad-8-released.html b/news/sling-launchpad-8-released.html
index 0364b9b..e0e8238 100644
--- a/news/sling-launchpad-8-released.html
+++ b/news/sling-launchpad-8-released.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Launchpad 8 released</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/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling Launchpad 8 released
             </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>Here are some of the more noteworthy things available in this release.</p>
 <h2><a href="#switched-to-apache-jackrabbit-oak" name="switched-to-apache-jackrabbit-oak">Switched to Apache Jackrabbit Oak</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/news/sling-launchpad-9-released.html
----------------------------------------------------------------------
diff --git a/news/sling-launchpad-9-released.html b/news/sling-launchpad-9-released.html
index 73b9fe2..080b0eb 100644
--- a/news/sling-launchpad-9-released.html
+++ b/news/sling-launchpad-9-released.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Apache Sling Launchpad 9 released</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/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Apache Sling Launchpad 9 released
             </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>Here are some of the more noteworthy things available in this release.</p>
 <h2><a href="#updated-to-oak-1-6-1-and-segment-tar-persistence" name="updated-to-oak-1-6-1-and-segment-tar-persistence">Updated to Oak 1.6.1 and segment-tar persistence</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff.html
----------------------------------------------------------------------
diff --git a/old-stuff.html b/old-stuff.html
index 7953370..32a397c 100644
--- a/old-stuff.html
+++ b/old-stuff.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Old Stuff</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;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Old Stuff
             </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: this page points to old content that's most probably obsolete.</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/assembly.html
----------------------------------------------------------------------
diff --git a/old-stuff/assembly.html b/old-stuff/assembly.html
index 96cdaf6..bac8bea 100644
--- a/old-stuff/assembly.html
+++ b/old-stuff/assembly.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Assembly</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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Assembly
             </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 Assembly concept grew out of a need to bundle together a set of OSGi Bundles to deploy applications. The concept has been developped before the OSGi Deployment Package Service Specification has been published in the Release 4.1 Compendium Services Specification. It will have to be discussed whether the Assembly concept is dropped in favor of the Deplyoment Package Service.</p>
 <h2><a href="#introduction" name="introduction">Introduction</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/launch-sling.html
----------------------------------------------------------------------
diff --git a/old-stuff/launch-sling.html b/old-stuff/launch-sling.html
index 0862fa4..695fb90 100644
--- a/old-stuff/launch-sling.html
+++ b/old-stuff/launch-sling.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Launch 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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Launch Sling
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>Please refer to [The Sling Launchpad]({{ refs.the-sling-launchpad.path }}) for up-to-date information on launching Sling.</p></section></div></div>
 <div class="footer">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/request-processing.html
----------------------------------------------------------------------
diff --git a/old-stuff/request-processing.html b/old-stuff/request-processing.html
index be416d7..bbe41db 100644
--- a/old-stuff/request-processing.html
+++ b/old-stuff/request-processing.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Request Processing</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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Request Processing
             </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"><div class="note">
 2008-02-13: this page is *out of sync* with the current codebase, needs to be reviewed and updated.

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/run-modes-org-apache-sling-runmode.html
----------------------------------------------------------------------
diff --git a/old-stuff/run-modes-org-apache-sling-runmode.html b/old-stuff/run-modes-org-apache-sling-runmode.html
index ecc49b7..7ec494f 100644
--- a/old-stuff/run-modes-org-apache-sling-runmode.html
+++ b/old-stuff/run-modes-org-apache-sling-runmode.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Run Modes</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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Run Modes
             </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"><div markdown="1" class="note">
 As of Sling 6 the <code>org.apache.sling.runmode</code> bundle is replaced

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/scriptengineintegration.html
----------------------------------------------------------------------
diff --git a/old-stuff/scriptengineintegration.html b/old-stuff/scriptengineintegration.html
index 57150a9..62efee8 100644
--- a/old-stuff/scriptengineintegration.html
+++ b/old-stuff/scriptengineintegration.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Integrating Scripting Languages</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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Integrating Scripting Languages
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>This page should be extended with more concrete and detailed information. For now, we have the following information:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/scriptengineintegration/groovy-support.html
----------------------------------------------------------------------
diff --git a/old-stuff/scriptengineintegration/groovy-support.html b/old-stuff/scriptengineintegration/groovy-support.html
index 243726a..9707344 100644
--- a/old-stuff/scriptengineintegration/groovy-support.html
+++ b/old-stuff/scriptengineintegration/groovy-support.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Groovy Support</title>
-        <link rel="icon" href="/ng/res/favicon.ico"/>
-        <link rel="stylesheet" href="/ng/res/css/site.css"/>
+        <link rel="icon" href="/res/favicon.ico"/>
+        <link rel="stylesheet" href="/res/css/site.css"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"/>
         <script src='https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js'></script><script>
             hljs.initHighlightingOnLoad();
@@ -13,45 +13,45 @@
 <div class="title">
             <div class="logo">
                 <a href="http://sling.apache.org">
-                    <img border="0" alt="Apache Sling" src="/ng/res/logos/sling.svg"/>
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
                 </a>
             </div><div class="header">
                 <a href="http://www.apache.org">
-                    <img border="0" alt="Apache" src="/ng/res/logos/apache.png"/>
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="draft">DRAFT 2017 WEBSITE - SLING-6955</div><div class="menu">
+        </div><div class="menu">
             <p>
-                <strong><a href="/ng/documentation.html">Documentation</a></strong><br/>
-                <a href="/ng/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/ng/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/ng/documentation/development.html">Development</a><br/>
-                <a href="/ng/documentation/bundles.html">Bundles</a><br/>
-                <a href="/ng/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="/ng/documentation/configuration.html">Configuration</a>
+                <strong><a href="/documentation.html">Documentation</a></strong><br/>
+                <a href="/documentation/getting-started.html">Getting Started</a><br/>
+                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
+                <a href="/documentation/development.html">Development</a><br/>
+                <a href="/documentation/bundles.html">Bundles</a><br/>
+                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
+                <a href="/documentation/configuration.html">Configuration</a>
             </p><p>
                 <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
                 <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
                 
             </p><p>
                 <strong>API Docs</strong><br/>
-                <a href="/ng/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/ng/apidocs/sling8/index.html">Sling 8</a><br/>
-                <a href="/ng/apidocs/sling7/index.html">Sling 7</a><br/>
-                <a href="/ng/apidocs/sling6/index.html">Sling 6</a><br/>
-                <a href="/ng/apidocs/sling5/index.html">Sling 5</a><br/>
-                <a href="/ng/javadoc-io.html">Archive at javadoc.io</a><br/>
+                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
+                <a href="/apidocs/sling8/index.html">Sling 8</a><br/>
+                <a href="/apidocs/sling7/index.html">Sling 7</a><br/>
+                <a href="/apidocs/sling6/index.html">Sling 6</a><br/>
+                <a href="/apidocs/sling5/index.html">Sling 5</a><br/>
+                <a href="/javadoc-io.html">Archive at javadoc.io</a><br/>
                 
             </p><p>
                 <strong>Project info</strong><br/>
-                <a href="/ng/downloads.cgi">Downloads</a><br/>
+                <a href="/downloads.cgi">Downloads</a><br/>
                 <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/ng/contributing.html">Contributing</a><br/>
-                <a href="/ng/news.html">News</a><br/>
-                <a href="/ng/links.html">Links</a><br/>
-                <a href="/ng/project-information.html">Project Information</a><br/>
+                <a href="/contributing.html">Contributing</a><br/>
+                <a href="/news.html">News</a><br/>
+                <a href="/links.html">Links</a><br/>
+                <a href="/project-information.html">Project Information</a><br/>
                 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/ng/project-information/security.html">Security</a><br/>
+                <a href="/project-information/security.html">Security</a><br/>
                 
             </p><p>
                 <strong>Source</strong><br/>
@@ -67,10 +67,10 @@
                 <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
                 
             </p><p>
-                <strong><a href="/ng/sitemap.html">Site Map</a></strong>
+                <strong><a href="/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;<a href="/ng/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Groovy Support
             </h1><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>After meeting Paul King of the Groovy Team at Apache Con US 08 in New Orleans, I set out to take a stab at SLING-315 again to add Groovy support to Sling. It turned out, that the current Groovy 1.6 branch already contains the required setup to build the <code>groovy-all.jar</code> as an OSGi Bundle, which is directly usable with Sling by just installing that bundle.</p>
 <p>Currently the Groovy team is working hard towards the 1.6 release and many things are in flux, which is really great.</p>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
----------------------------------------------------------------------
diff --git a/old-stuff/scriptengineintegration/xslt-processing-pipeline.html b/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
index 5d42752..c647182 100644
--- a/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
+++ b/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: XSLT Processing Pipeline</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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;<a href="/ng/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 XSLT Processing Pipeline
             </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 the <em>Apache Sling Scripting W3C XML Processing Support</em> bundle, Juanjo Vàzquez has implemented XSLT processing support for Sling as another new scripting engine, based on the <a href="http://cocoon.apache.org/3.0/">Cocoon 3 pipeline engine</a>.</p>
 <h2><a href="#intro" name="intro">Intro</a></h2>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/81365130/old-stuff/servlet-resolution.html
----------------------------------------------------------------------
diff --git a/old-stuff/servlet-resolution.html b/old-stuff/servlet-resolution.html
index 71d5910..d6eda34 100644
--- a/old-stuff/servlet-resolution.html
+++ b/old-stuff/servlet-resolution.html
@@ -2,8 +2,8 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Apache Sling :: Servlet Resolution</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/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+<div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
                 Servlet Resolution
             </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"><div class="warning">
 Please note that the description on this page is out of sync with the most recent developments going on as part of implementing issue [SLING-387]({{ refs.https://issues.apache.org/jira/browse/SLING-387.path }}). See the links to integration tests at the end of this page for the Current Truth.