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

[05/15] sling-site git commit: Adapt for sling.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>