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/06/27 17:30:06 UTC

[1/6] sling-site git commit: Publish latest fixes

Repository: sling-site
Updated Branches:
  refs/heads/asf-site 5f5c8f109 -> 6120b7bb8


http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 eb423ff..e0e5c1a 100644
--- a/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
+++ b/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: XSLT Processing Pipeline</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>XSLT Processing Pipeline</h1></header><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>
+<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>
+                XSLT Processing Pipeline
+            </h1><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>Intro</h2>
 <p>An XML pipeline specifies a sequence of operations to be performed on zero or more XML documents. There are a number of advantages to using pipelines above all in terms of separation of concerns. On the other hand, we talk about XSLT processing if the operations in a pipeline are performed executing or applying XSLT stylesheets.</p>
 <p>XSLT processing support is implemented in Sling as an scripting engine bundle named <em>Apache Sling Scripting W3C XML Processing Support</em>. This bundle is based on the <a href="http://cocoon.apache.org/3.0/">Cocoon 3 pipeline engine</a> and uses the <a href="http://www.w3.org/TR/xproc/">W3C XProc language</a> in order to specify pipelines to be processed.</p>
@@ -231,7 +233,7 @@ $ curl http://admin:admin@localhost:8888/foo.html
   <li><a href="http://www.w3.org/TR/xproc/">W3C XProc language</a></li>
   <li><a href="https://issues.apache.org/jira/browse/SLING-893">SLING-893</a></li>
   <li><a href="http://markmail.org/thread/33h5nhk5e3mswrue">Mail list discussion</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff/servlet-resolution.html
----------------------------------------------------------------------
diff --git a/old-stuff/servlet-resolution.html b/old-stuff/servlet-resolution.html
index a2ae6a7..22902b5 100644
--- a/old-stuff/servlet-resolution.html
+++ b/old-stuff/servlet-resolution.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Servlet Resolution</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,12 +66,15 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Servlet Resolution</h1></header><div class="warning">
+<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>
+                Servlet Resolution
+            </h1><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.
 
 Please see the new [Servlets]({{ refs.servlets.path }}) page.
 </div>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Servlets are Resources</h2>
 <p>As explained on the [Resources]({{ refs.resources.path }}) page, the Resource is the central data abstraction of Sling. In this contexts, Servlets are of course also povided as Resources. As such Servlets may be enumerated by iterating the Resource tree and Servlets may be retrieved through the <code>ResourceResolver</code>.</p>
 <p>To show a Servlet inside the Resource tree, the <code>sling/servlet-resolver</code> project provides a <code>ServletResourceProvider</code> implementing the <code>ResourceProvider</code> interface. For each Servlet registered as an OSGi service with one or more defined service reference properties a <code>ServletResourceProvider</code> instance is registered.</p>
@@ -219,7 +222,7 @@ Servlet findScriptFor(path) {
 <h2>Integration tests</h2>
 <p>A set of simple example servlets is available in the [launchpad/test-services module]({{ refs.http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/test-services.path }}). </p>
 <p>Integration tests in the [launchpad/testing module]({{ refs.http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution.path }}) verify that these examples are correct.</p>
-<p>Contributions to these tests and examples are welcome, of course!</p></section></div></div>            
+<p>Contributions to these tests and examples are welcome, of course!</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff/sling-api.html
----------------------------------------------------------------------
diff --git a/old-stuff/sling-api.html b/old-stuff/sling-api.html
index e146aba..ddbc29a 100644
--- a/old-stuff/sling-api.html
+++ b/old-stuff/sling-api.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling API</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling API</h1></header><div class="note">
+<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>
+                Sling API
+            </h1><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.
 </div>
 <h2>Introduction</h2>
@@ -344,7 +346,7 @@ The [SlingRequestPathInfoTest]({{ refs.http://svn.apache.org/repos/asf/sling/tru
 <ul>
   <li>If the Component Framework decides to not handle the error itself, the exception must be forwarded to the servlet container as a <code>ComponentException</code> wrapping the original exception as its root cause.</li>
 </ul>
-<p>This specification does not define, how error handlers are configured and used if the Component Framework provides error handling support. Likewise the Component Framework may or may not implement support to handle calls to the <code>ComponentResponse.sendError</code> method. The Component Framework may also use its own error handling also for errors resulting from request processing failures, for example if authentication is required or if the request URL cannot be resolved to a Content object.</p></section></div></div>            
+<p>This specification does not define, how error handlers are configured and used if the Component Framework provides error handling support. Likewise the Component Framework may or may not implement support to handle calls to the <code>ComponentResponse.sendError</code> method. The Component Framework may also use its own error handling also for errors resulting from request processing failures, for example if authentication is required or if the request URL cannot be resolved to a Content object.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/project-information.html
----------------------------------------------------------------------
diff --git a/project-information.html b/project-information.html
index 269bd9c..1f2c31b 100644
--- a/project-information.html
+++ b/project-information.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Project Information</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Project Information</h1></header><p>This document provides an overview of the various documents and links that are part of this project's general information:</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Project Information
+            </h1><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>
   <li><a href="/project-information/apache-sling-community-roles-and-processes.html">Community Roles and Processes</a></li>
   <li><a href="/project-information/project-team.html">Project Team</a></li>
@@ -181,7 +183,7 @@ http-proxy-port = 3128
 <ol>
   <li>Read the <a href="http://www.apache.org/dev/cmsref#non-committer">ASF CMS reference for non-committers</a>.</li>
   <li>Watch a <a href="http://s.apache.org/cms-anonymous-tutorial">video tutorial by Rob Weir for anonymous users</a>.</li>
-</ol></section></div></div>            
+</ol></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 b0cd0b1..9c1e0b6 100644
--- a/project-information/apache-sling-community-roles-and-processes.html
+++ b/project-information/apache-sling-community-roles-and-processes.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Community Roles and Processes</h1></header><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>
+<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>
+                Apache Sling Community Roles and Processes
+            </h1><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>Roles</h2>
 <p>There are different roles with which Sling community members may be associated: User, Contributor, Committer, and PMC (Project Management Committee) Member. These roles are assigned and assumed based on merit. </p>
 <p>The User and Contributor roles are acquired by using the software and participating in the community, but the Committer and PMC member roles can only be granted by a PMC vote.</p>
@@ -90,7 +92,7 @@
 <p>In order for a Committer to become a member of the PMC, a member of the PMC can nominate that Committer to the PMC. Once a Committer is nominated, the PMC calls a vote on the PMC private mailing list.</p>
 <p>If there are at least three positive votes and no negative votes after three days (72 hours), the results are posted to the PMC private mailing list.</p>
 <p>To have the Committer being accepted as a PMC member, the ASF Board has acknowledge the addition to the PMC. The Committer should not be consulted about his/her desire to become a PMC member before the board acknowledgement, or be informed that they are being considered, since this could create hard feelings if the vote does not pass.</p>
-<p>Upon a positive vote result, the PMC member will be emailed by the PMC to invite him/her to become a PMC member. If the invitation is accepted, an announcement about the new PMC member is made to the developer mailing list.</p></section></div></div>            
+<p>Upon a positive vote result, the PMC member will be emailed by the PMC to invite him/her to become a PMC member. If the invitation is accepted, an announcement about the new PMC member is made to the developer mailing list.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/project-information/project-license.html
----------------------------------------------------------------------
diff --git a/project-information/project-license.html b/project-information/project-license.html
index c4b991f..97feea7 100644
--- a/project-information/project-license.html
+++ b/project-information/project-license.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Project License</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Project License</h1></header><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="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/project-information.html">Project Information</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Project License
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/project-information/project-team.html
----------------------------------------------------------------------
diff --git a/project-information/project-team.html b/project-information/project-team.html
index 5f49b11..6f54f4f 100644
--- a/project-information/project-team.html
+++ b/project-information/project-team.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Project Team</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Project Team</h1></header><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>
+<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>
+                Project Team
+            </h1><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>
 <h2>Committers and PMC members</h2>
 <p>The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.</p>
@@ -363,7 +365,7 @@
 <p>Special thanks go to <strong>Chris Millar</strong> who provided the new Apache Sling Logo in 2017.</p>
 <p>The original Sling logo was created by Paul Walker in 2008 as part of the Google Highly Open Participation contest.</p>
 <h2>Contributors</h2>
-<p>There are no contributors listed for this project.</p></section></div></div>            
+<p>There are no contributors listed for this project.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/project-information/security.html
----------------------------------------------------------------------
diff --git a/project-information/security.html b/project-information/security.html
index 29b5914..33369c7 100644
--- a/project-information/security.html
+++ b/project-information/security.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Security</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Security</h1></header><h1>Reporting New Security Problems with Apache Sling</h1>
+<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>
+                Security
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h1>Reporting New Security Problems with Apache Sling</h1>
 <p>The Apache Software Foundation takes a very active stance in eliminating security problems and denial of service attacks against Apache Sling.</p>
 <p>We strongly encourage folks to report such problems to our private security mailing list first, before disclosing them in a public forum.</p>
 <p><em>Please note that the security mailing list should only be used for reporting undisclosed security vulnerabilities in Apache Sling and managing the process of fixing such vulnerabilities. We cannot accept regular bug reports or other queries at this address. All mail sent to this address that does not relate to an undisclosed security problem in the Apache Sling source code will be ignored.</em></p>
@@ -83,7 +85,7 @@
 <p>Note that all networked servers are subject to denial of service attacks, and we cannot promise magic workarounds to generic problems (such as a client streaming lots of data to your server, or re-requesting the same URL repeatedly). In general our philosophy is to avoid any attacks which can cause the server to consume resources in a non-linear relationship to the size of inputs.</p>
 <p>For more information on handling security issues at the Apache Software Foundation please refer to the <a href="http://www.apache.org/security/">ASF Security Team</a> page and to the <a href="http://www.apache.org/security/committers.html">security process description for committers</a>.</p>
 <h1>Errors and omissions</h1>
-<p>Please report any errors or omissions to security(at)sling.apache.org.</p></section></div></div>            
+<p>Please report any errors or omissions to security(at)sling.apache.org.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/site-conversion.html
----------------------------------------------------------------------
diff --git a/site-conversion.html b/site-conversion.html
index 1c12050..c836d1a 100644
--- a/site-conversion.html
+++ b/site-conversion.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,10 +66,12 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Site conversion in progress - excuse our mess...</h1></header><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>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Site conversion in progress - excuse our mess...
+            </h1><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>
 <p>To find the new pages, you can use the site navigation or search the Web for phrases that are present in the old pages, and select results that do not contain /site/ in their URLs.</p>
-<p>If you see new pages that look good and match the contents of the corresponding old pages, feel free to let us know, via the Sling users mailing list or the <a href="https://issues.apache.org/jira/browse/SLING-2002">SLING-2002</a> issue.</p></section></div></div>            
+<p>If you see new pages that look good and match the contents of the corresponding old pages, feel free to let us know, via the Sling users mailing list or the <a href="https://issues.apache.org/jira/browse/SLING-2002">SLING-2002</a> issue.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/sitemap.html
----------------------------------------------------------------------
diff --git a/sitemap.html b/sitemap.html
index 5c642b0..91f5709 100644
--- a/sitemap.html
+++ b/sitemap.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sitemap</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,41 +66,29 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="sitemap"><section class="wrap"><header><h1>Sitemap</h1></header><ul><li><a href="/ng/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</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/web-console-extensions.html">Web Console Extensions</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/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li>
-                        <li><a href="/ng/documentation/getting-started.html">Getting Started</a></li>
-                        <li><a href="/ng/guides.html">Guides (retired)</a></li>
-                        <li><a href="/ng/documentation.html">Documentation</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/the-sling-engine.html">The Sling Engine</a></li>
+            <breadcrumbs/><h1>
+                Sitemap
+            </h1><div class="sitemap"><section class="wrap"><header><h1>Sitemap</h1></header><ul><li><a href="/ng/news.html">News</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/bundles/discovery-api-and-impl.html">Discovery API and its implementations</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/resources.html">Resources</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/mappings-for-resource-resolution.html">Mappings for Resource Resolution</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/authentication.html">Authentication</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/architecture.html">Architecture</a></li>
-                        <li><a href="/ng/documentation/legacy/logging.html">Logging</a></li>
-                        <li><a href="/ng/documentation/development/logging.html">Logging</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/authentication-framework.html">Authentication - Framework</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-actors.html">Authentication - Actors</a></li>
+                        <li><a href="/ng/documentation/development/version-policy.html">Version Policy</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/dependency-management.html">Dependency Management</a></li>
+                        <li><a href="/ng/documentation/bundles/xml-support.html">XML support</a></li>
+                        <li><a href="/ng/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></li>
+                        <li><a href="/ng/media.html">Media</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/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></li>
+                        <li><a href="/ng/documentation/development/maven-archetypes.html">Maven Archetypes</a></li>
                         <li><a href="/ng/documentation/development/embedding-sling.html">Embedding Sling</a></li>
-                        <li><a href="/ng/documentation/development/client-request-logging.html">Client Request Logging</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/jcr-installer-provider.html">JCR Installer Provider</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>
@@ -113,13 +101,14 @@
                         <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>
@@ -143,13 +132,12 @@
                         <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.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/xml-support.html">XML support</a></li>
-                        <li><a href="/ng/documentation/bundles.html">Bundles</a></li>
+                        <li><a href="/ng/documentation/bundles/web-console-extensions.html">Web Console Extensions</a></li>
                         <li><a href="/ng/documentation/configuration.html">Configuration</a></li>
-                        <li><a href="/ng/documentation/development/dependency-management.html">Dependency Management</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/client-request-logging.html">Client Request Logging</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>
@@ -158,10 +146,8 @@
                         <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/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/logging.html">Logging</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>
@@ -171,50 +157,66 @@
                         <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/authentication/authentication-actors.html">Authentication - Actors</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-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/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/resources.html">Resources</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/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</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/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/index.html">Apache Sling - Bringing Back the Fun!</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/documentation/bundles.html">Bundles</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/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/index.html">Apache Sling - Bringing Back the Fun!</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/sitemap.html">Sitemap</a></li>
                         <li><a href="/ng/downloads.html">Downloads</a></li>
-                    </ul></section></div>            
+                    </ul></section></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/sitemap.xml
----------------------------------------------------------------------
diff --git a/sitemap.xml b/sitemap.xml
index ed35d4d..2339a25 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: null</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,41 +66,29 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="sitemap"><section class="wrap"><header><h1>null</h1></header><ul><li><a href="/ng/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</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/web-console-extensions.html">Web Console Extensions</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/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li>
-                        <li><a href="/ng/documentation/getting-started.html">Getting Started</a></li>
-                        <li><a href="/ng/guides.html">Guides (retired)</a></li>
-                        <li><a href="/ng/documentation.html">Documentation</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/the-sling-engine.html">The Sling Engine</a></li>
+            <breadcrumbs/><h1>
+                null
+            </h1><div class="sitemap"><section class="wrap"><header><h1>null</h1></header><ul><li><a href="/ng/news.html">News</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/bundles/discovery-api-and-impl.html">Discovery API and its implementations</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/resources.html">Resources</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/mappings-for-resource-resolution.html">Mappings for Resource Resolution</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/authentication.html">Authentication</a></li>
-                        <li><a href="/ng/documentation/the-sling-engine/architecture.html">Architecture</a></li>
-                        <li><a href="/ng/documentation/legacy/logging.html">Logging</a></li>
-                        <li><a href="/ng/documentation/development/logging.html">Logging</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/authentication-framework.html">Authentication - Framework</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-actors.html">Authentication - Actors</a></li>
+                        <li><a href="/ng/documentation/development/version-policy.html">Version Policy</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/dependency-management.html">Dependency Management</a></li>
+                        <li><a href="/ng/documentation/bundles/xml-support.html">XML support</a></li>
+                        <li><a href="/ng/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></li>
+                        <li><a href="/ng/media.html">Media</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/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></li>
+                        <li><a href="/ng/documentation/development/maven-archetypes.html">Maven Archetypes</a></li>
                         <li><a href="/ng/documentation/development/embedding-sling.html">Embedding Sling</a></li>
-                        <li><a href="/ng/documentation/development/client-request-logging.html">Client Request Logging</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/jcr-installer-provider.html">JCR Installer Provider</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>
@@ -113,13 +101,14 @@
                         <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>
@@ -143,13 +132,12 @@
                         <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.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/xml-support.html">XML support</a></li>
-                        <li><a href="/ng/documentation/bundles.html">Bundles</a></li>
+                        <li><a href="/ng/documentation/bundles/web-console-extensions.html">Web Console Extensions</a></li>
                         <li><a href="/ng/documentation/configuration.html">Configuration</a></li>
-                        <li><a href="/ng/documentation/development/dependency-management.html">Dependency Management</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/client-request-logging.html">Client Request Logging</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>
@@ -158,10 +146,8 @@
                         <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/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/logging.html">Logging</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>
@@ -171,50 +157,66 @@
                         <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/authentication/authentication-actors.html">Authentication - Actors</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-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/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/resources.html">Resources</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/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</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/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/index.html">Apache Sling - Bringing Back the Fun!</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/documentation/bundles.html">Bundles</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/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/index.html">Apache Sling - Bringing Back the Fun!</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/sitemap.html">Sitemap</a></li>
                         <li><a href="/ng/downloads.html">Downloads</a></li>
-                    </ul></section></div>            
+                    </ul></section></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here


[4/6] sling-site git commit: Publish latest fixes

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/web-console-extensions.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/web-console-extensions.html b/documentation/bundles/web-console-extensions.html
index b022250..17e928d 100644
--- a/documentation/bundles/web-console-extensions.html
+++ b/documentation/bundles/web-console-extensions.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Web Console Extensions</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Web Console Extensions</h1></header><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>[TOC]</p>
+<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>
+                Web Console Extensions
+            </h1><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 -->
+</p>
 <h2>Branding (org.apache.sling.extensions.webconsolebranding)</h2>
 <p>The Apache Sling Web Console Branding provided by Apache Sling is currently just for the product logo displayed in the upper right corner of the Web Console and some titles and strings.</p>
 <p>This bundle will attach as a fragment bundle to the Apache Felix Web Console bundle. To enable it after installation into a running system, you might have to refresh the package imports of the Apache Felix Web Console bundle. If you install using the Apache Felix Web Console bundle installation functionality, this will be taken care of by the Web Console.</p>
@@ -107,7 +110,7 @@
 </table>
 <p>Note, that while the default value explicitly grants the <em>admin</em> user to access the Web Console it is suggested that system administrators define a special group and assign users with Web Console access to this group.</p>
 <h3>Authentication Handling</h3>
-<p>As long as the web console security provider bundle is not activate and has not installed one of the above mentioned services, the default authentication of the web console is used. Once the bundle is active and a JCR repository service is available, the repository is used for authentication as explained above. But still the login form of the web console is used which is usually basic authentication. Once startup is finished and a Sling authentication service is available as well, the security provider replaces the JCR repository based auth provider with a Sling based auth provider. Both authenticate against the JCR repository, however the Sling based one using Sling to render the login form. Therefore, this provider is not registered until startup is finished</p></section></div></div>            
+<p>As long as the web console security provider bundle is not activate and has not installed one of the above mentioned services, the default authentication of the web console is used. Once the bundle is active and a JCR repository service is available, the repository is used for authentication as explained above. But still the login form of the web console is used which is usually basic authentication. Once startup is finished and a Sling authentication service is available as well, the security provider replaces the JCR repository based auth provider with a Sling based auth provider. Both authenticate against the JCR repository, however the Sling based one using Sling to render the login form. Therefore, this provider is not registered until startup is finished</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/xml-support.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/xml-support.html b/documentation/bundles/xml-support.html
index 62956d9..929b028 100644
--- a/documentation/bundles/xml-support.html
+++ b/documentation/bundles/xml-support.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: XML support</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,13 +66,14 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>XML support</h1></header><p>Excerpt: XML mechanisms supported by Sling</p>
-<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>
+<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>
+                XML support
+            </h1><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>
   <li>XPath ( see the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/XpathServlet.java">XPathServlet</a> )</li>
   <li>SAX ( see the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java">SaxServlet</a> )</li>
   <li>DOM ( see the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java">DomServlet</a> )</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/configuration.html
----------------------------------------------------------------------
diff --git a/documentation/configuration.html b/documentation/configuration.html
index 494804c..aa26ed7 100644
--- a/documentation/configuration.html
+++ b/documentation/configuration.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Configuration</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Configuration</h1></header><h2>Introduction</h2>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Configuration
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2>Introduction</h2>
 <p>Configuration in Sling is aligned with respective support by the OSGi specification:</p>
 <ul>
   <li>Framework and Java system properties are available through the <code>BundleContext.getProperty(String)</code> method. These properties are provided in Sling through the Sling launcher.</li>
@@ -254,7 +256,7 @@
 <h2>Configuration Admin Service</h2>
 <p>Configuration of the system entities, such as services and components, by the system administrator is supported the Configuration Admin Service. The Configuration Admin Service acts as the center for the management of the configuration data, to which GUI-based tools will connect to retrieve and update configuration data. The Configuration Admin Service is responsible for persisting the configuration data and for providing configuration consumers with the configuration data. Specifically services registered with the <code>ManagedService</code> or <code>ManagedServiceFactory</code> interfaces are updated with the configuration upon updated. The Service Component Runtime on the other hand recognizes updated configuration and provides it to the managed components as defined in the OSGi Declarative Services Specification.</p>
 <p>By default the Configuration Admin Service is installed when Sling is started for the first time. This service is used by the Service Component Runtime launching the OSGi components declared in the bundles with configuration values. The Sling Management Console provides a simple GUI to manage these configuration elements on the 'Configuration' page.</p>
-<p>For more information on the Configuration Admin Service refer to the OSGi Configuration Admin Service Specification in the OSGi Service Platform Service Compendium book.</p></section></div></div>            
+<p>For more information on the Configuration Admin Service refer to the OSGi Configuration Admin Service Specification in the OSGi Service Platform Service Compendium book.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development.html
----------------------------------------------------------------------
diff --git a/documentation/development.html b/documentation/development.html
index ed246f4..f3b98bb 100644
--- a/documentation/development.html
+++ b/documentation/development.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Development</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Development</h1></header><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>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Development
+            </h1><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>Using Sling as your Development Framework</h2>
 <p>Look here for more information on developper support when your are using Sling to build your own applications.</p>
 <ul>
@@ -111,7 +113,7 @@
   <li><a href="/documentation/development/maven-usage.html">Maven Usage</a></li>
   <li>To run our integration tests suite see the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/README.txt">launchpad/testing module README</a> and the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/README.txt">launchpad/integration-tests README</a> for how to run individual integration tests. We use the <a href="https://issues.apache.org/jira/issues/?jql=labels%20%3D%20sling-IT">sling-IT</a> label in JIRA for known issues with our integration tests.</li>
   <li>A Sonar analysis is available on the <a href="https://analysis.apache.org/dashboard/index/org.apache.sling:sling-builder">analysis.apache.org</a> server.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/client-request-logging.html
----------------------------------------------------------------------
diff --git a/documentation/development/client-request-logging.html b/documentation/development/client-request-logging.html
index 830f86d..e1cd1a4 100644
--- a/documentation/development/client-request-logging.html
+++ b/documentation/development/client-request-logging.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Client Request Logging</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Client Request Logging</h1></header><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>
+<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>
+                Client Request Logging
+            </h1><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>Traditional access.log and request.log Files</h2>
 <p>In the Web Console configure the <em>Apache Sling Request Logger</em> (PID=<code>org.apache.sling.engine.impl.log.RequestLogger</code>) configuration.</p>
 <p>In the Sling Web Console locate the Configuration page (<code>/system/console/configMgr</code>) and click on the pencil (edit) symbol on the <em>Apache Sling Request Logger</em> line. This opens a dialog to enter the configuration whose properties can be configured as follows:</p>
@@ -357,7 +359,7 @@
     </ul>
   </li>
   <li>Optionally, you may create an <em>Apache Sling Logging Writer Configuration</em> for the log file defined in the previous step to better control rotation setup. See the corresponding docs for full details.</li>
-</ol></section></div></div>            
+</ol></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/dependency-management.html
----------------------------------------------------------------------
diff --git a/documentation/development/dependency-management.html b/documentation/development/dependency-management.html
index 71b7fa1..ce2077b 100644
--- a/documentation/development/dependency-management.html
+++ b/documentation/development/dependency-management.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Dependency Management</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,9 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Dependency Management</h1></header><p>Excerpt: This page is about how we do and don't do dependency management in the Sling project.</p>
-<p>This page is about how we do and don't do dependency management in the Sling project.</p>
-<p>[TOC]</p>
+<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>
+                Dependency Management
+            </h1><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 -->
+</p>
 <h2>Introduction</h2>
 <p>Maven provides projects with a nice feature called dependency management. In Sling we currently use this feature to declare the non-Sling dependencies of modules in the parent POM.</p>
 <p>After working with this some time and trying to upgrade various dependencies we came to the conclusion, that using Maven dependency management is not going to work out in the Sling scenario.</p>
@@ -165,7 +167,7 @@
 <ul>
   <li><a href="http://markmail.org/message/5qpmsukdk4mdacdy">Dependency Management</a> -- Discussion thread about reducing Maven Dependency Management</li>
   <li><a href="https://issues.apache.org/jira/browse/SLING-811">SLING-811</a> -- The actual issue governing the changes to the project descriptors</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/embedding-sling.html
----------------------------------------------------------------------
diff --git a/documentation/development/embedding-sling.html b/documentation/development/embedding-sling.html
index 702afdc..318d4b3 100644
--- a/documentation/development/embedding-sling.html
+++ b/documentation/development/embedding-sling.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Embedding Sling</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Embedding Sling</h1></header><p>translation_pending: true</p>
-<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>
+<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>
+                Embedding Sling
+            </h1><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>
   <li>Builds three artifacts:
     <ul>
@@ -302,7 +303,7 @@ This work is being done as part of [SLING-2225](https://issues.apache.org/jira/b
     </tr>
   </tbody>
 </table>
-<p>At the moment these classes, particularly the <code>SlingServlet</code> class, are not particularly well suited to be extended by a servlet slightly modifying the launcher.</p></section></div></div>            
+<p>At the moment these classes, particularly the <code>SlingServlet</code> class, are not particularly well suited to be extended by a servlet slightly modifying the launcher.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 3e18b23..61f676b 100644
--- a/documentation/development/getting-and-building-sling.html
+++ b/documentation/development/getting-and-building-sling.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Getting and Building Sling</h1></header><p>Excerpt: A quick guide for getting the Sling source, then building and running the resulting Sling instance; either without or with Eclipse.</p>
-<p>A quick guide for getting the Sling source, then building and running the resulting Sling instance; either without or with Eclipse.</p>
+<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>
+                Getting and Building Sling
+            </h1><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>
 <p>Rather than performing a full build of Sling, which can take 5-10 minutes on a recent computer once your local Maven repository is up to date, it's recommended to build only the launchpad and the modules you're interested in.</p>
 <h2>tl:dr - Short form build + run instructions</h2>
@@ -254,7 +255,7 @@ $ mvn clean install sling:install
   <li>To create the bundle jar and install it, just use the command line "mvn clean install" in the project directory</li>
   <li>If you have a running Sling app you can install the bundle from the command line with "mvn -P autoInstallBundle clean install -Dsling.url=http://localhost:8080/system/console"</li>
 </ul>
-<p>If adding dependencies to the poms, run mvn eclipse:eclipse again and refresh the project in Eclipse. Debugging works as described above.</p></section></div></div>            
+<p>If adding dependencies to the poms, run mvn eclipse:eclipse again and refresh the project in Eclipse. Debugging works as described above.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/hamcrest.html
----------------------------------------------------------------------
diff --git a/documentation/development/hamcrest.html b/documentation/development/hamcrest.html
index c85a917..390ee91 100644
--- a/documentation/development/hamcrest.html
+++ b/documentation/development/hamcrest.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Hamcrest Integration</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Hamcrest Integration</h1></header><p>Deeper integration with the <a href="http://hamcrest.org/">Hamcrest matcher library</a>.</p>
+<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>
+                Hamcrest Integration
+            </h1><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>Maven Dependency</h2>
 <div class="warning">
 This module has not yet been officially released.
@@ -98,7 +100,7 @@ public void MyServiceTest {
 
 }
 </code></pre>
-<p>The Slingshot sample application uses these matchers, see <a href="http://svn.apache.org/repos/asf/sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java">SetupServiceTest.java</a> for an example.</p></section></div></div>            
+<p>The Slingshot sample application uses these matchers, see <a href="http://svn.apache.org/repos/asf/sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java">SetupServiceTest.java</a> for an example.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/htl-maven-plugin.html
----------------------------------------------------------------------
diff --git a/documentation/development/htl-maven-plugin.html b/documentation/development/htl-maven-plugin.html
index d68d9ba..2cf076d 100644
--- a/documentation/development/htl-maven-plugin.html
+++ b/documentation/development/htl-maven-plugin.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: HTL Maven Plugin</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>HTL Maven Plugin</h1></header><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="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>
+                HTL Maven Plugin
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/ide-tooling.html
----------------------------------------------------------------------
diff --git a/documentation/development/ide-tooling.html b/documentation/development/ide-tooling.html
index a1d862e..35a3ea9 100644
--- a/documentation/development/ide-tooling.html
+++ b/documentation/development/ide-tooling.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling IDE tooling for Eclipse User Guide</h1></header><p>[TOC]</p>
+<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>
+                Sling IDE tooling for Eclipse User Guide
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Installation</h2>
 <h3>Prerequisites</h3>
 <p>The Sling IDE tooling is known to work on Eclipse versions starting with Kepler. There is a hard dependency on the faceted project framework, which is included in the 'Eclipse IDE for Java EE Developers' package. If you're running a different package, you can always install it from the main Eclipse update site.</p>
@@ -227,7 +230,7 @@
 <ul>
   <li><a href="https://issues.apache.org/jira/browse/SLING-3591">SLING-3591 - Unable to delete all nodes of a full coverage aggregate</a> . The workaround is to manually delete the child nodes .</li>
   <li><a href="https://issues.apache.org/jira/browse/SLING-3644">SLING-3644 - Improve handling of binary properties outside nt:file file nodes</a> . Currently there is no workaround, but in practice this is not an often-encountered situation.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 052de6c..07b17dc 100644
--- a/documentation/development/ide-tooling/ide-tooling-incremental-build.html
+++ b/documentation/development/ide-tooling/ide-tooling-incremental-build.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Incremental Builds in Sling IDE tooling for Eclipse</h1></header><p>[TOC]</p>
+<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>
+                Incremental Builds in Sling IDE tooling for Eclipse
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Overview</h2>
 <p>The Sling IDE Tooling relies on the <a href="https://wiki.eclipse.org/M2E_compatible_maven_plugins">m2e incremental build support</a> for the generation of the bundle's manifest, the component descriptions as well as the metatype resources (the latter two being generated through OSGi 6 <a href="https://osgi.org/javadoc/r6/cmpn/org/osgi/service/component/annotations/package-summary.html">component annotations</a> and <a href="https://osgi.org/javadoc/r6/cmpn/org/osgi/service/metatype/annotations/package-summary.html">metatype annotations</a> or through <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.html">Apache Felix SCR annotations</a>). That means whenever at least one java class is touched and the auto-build in Eclipse is enabled the annotations on that class should be reevaluated. This may lead to a modification of the bundle's manifest and/or generation/modification of service description XMLs and/or Metatype resource 
 files. Depending on which maven plugins you use you must adjust their configuration accordingly to properly support incremental builds.</p>
 <h2>Manifest Generation</h2>
@@ -80,7 +83,7 @@
 <p>The <a href="https://github.com/bndtools/bnd/tree/master/maven/bnd-maven-plugin">bnd-maven-plugin</a> is developed from the bnd team and is based on bnd as well. It is versioned in parallel with bnd and bndtools. It natively supports incremental builds since version 3.1.0 (<a href="https://github.com/bndtools/bnd/issues/1180">issue 1180</a>).</p>
 <h2>Service Description and Metatype Resources</h2>
 <p>OSGi component and metatype annotations (for OSGi 6) are natively supported through bnd (and therefore automatically generated through both maven-bundle-plugin and bnd-maven-plugin). You don't need to configure anything explicitly since version 3.0.0 of bnd (<a href="https://github.com/bndtools/bnd/issues/1041">issue 1041</a>).</p>
-<p>The maven-bundle-plugin can be optionally coupled with the <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.html">maven-scr-plugin</a>. Both maven-bundle-plugin as well as bnd-maven-plugin can be optionally coupled with the <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.html">scr-bnd-plugin</a>. Both approaches can be used to generate components descriptions and metatype resources out of the <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.html">Felix SCR annotations</a>. The recommended way for new projects though is to rely on OSGi 6 annotations. However if you need to rely on Felix SCR annotations though it is recommended to rather use the scr-bnd-plugin over the maven-scr-plugin, as the former is nicely integrated into bnd and therefore means less overhead during the build.</p>
 </section></div></div>            
+<p>The maven-bundle-plugin can be optionally coupled with the <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.html">maven-scr-plugin</a>. Both maven-bundle-plugin as well as bnd-maven-plugin can be optionally coupled with the <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.html">scr-bnd-plugin</a>. Both approaches can be used to generate components descriptions and metatype resources out of the <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.html">Felix SCR annotations</a>. The recommended way for new projects though is to rely on OSGi 6 annotations. However if you need to rely on Felix SCR annotations though it is recommended to rather use the scr-bnd-plugin over the maven-scr-plugin, as the former is nicely integrated into bnd and therefore means less overhead during the build.</p>
 </section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/issue-tracker.html
----------------------------------------------------------------------
diff --git a/documentation/development/issue-tracker.html b/documentation/development/issue-tracker.html
index 6290c05..9c43bf3 100644
--- a/documentation/development/issue-tracker.html
+++ b/documentation/development/issue-tracker.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Issue Tracker</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Issue Tracker</h1></header><p>Apache Sling uses Jira for tracking bug reports and requests for improvements, new features, and other changes.</p>
+<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>
+                Issue Tracker
+            </h1><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>
 <p>See below for guidelines on creating and managing issues.</p>
 <h2>Issue type</h2>
@@ -188,7 +190,7 @@
 <p>Developers transition the issue through the workflow while working on it. When done with the issue, they mark the issue resolved with the appropriate resolution and ask the reporting user to confirm.</p>
 <p>Issues are closed once the project against which it has been reported has been released. Issues once closed cannot be opened again. Rather new issues should be created against the new release to have broken implementations fixed or extended.</p>
 <h2>Patches</h2>
-<p>When reporting a bug, requesting a feature or propose an improvement, it is a good thing to attach a patch to the issue. This may speed up issue processing and helps you being recognized as a good community member leading to closer involvement with Sling.</p></section></div></div>            
+<p>When reporting a bug, requesting a feature or propose an improvement, it is a good thing to attach a patch to the issue. This may speed up issue processing and helps you being recognized as a good community member leading to closer involvement with Sling.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/jcr-mock.html
----------------------------------------------------------------------
diff --git a/documentation/development/jcr-mock.html b/documentation/development/jcr-mock.html
index 499d299..6cf5e4d 100644
--- a/documentation/development/jcr-mock.html
+++ b/documentation/development/jcr-mock.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: JCR Mocks</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>JCR Mocks</h1></header><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>[TOC]</p>
+<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>
+                JCR Mocks
+            </h1><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 -->
+</p>
 <h2>Maven Dependency</h2>
 <pre><code>#!xml
 &lt;dependency&gt;
@@ -119,7 +122,7 @@ MockJcr.setQueryResult(session, resultNodes);
 // return this result for a specific query
 MockJcr.setQueryResult(session, &quot;your query statement&quot;, Query.JCR_SQL2, resultNodes);
 </code></pre>
-<p>Alternatively you can use the <code>MockJcr.addQueryResultHandler</code> method to pass a callback object that allows you to return a query result after inspecting the given query object.</p></section></div></div>            
+<p>Alternatively you can use the <code>MockJcr.addQueryResultHandler</code> method to pass a callback object that allows you to return a query result after inspecting the given query object.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/jspc.html
----------------------------------------------------------------------
diff --git a/documentation/development/jspc.html b/documentation/development/jspc.html
index e7dcfd0..db942a0 100644
--- a/documentation/development/jspc.html
+++ b/documentation/development/jspc.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: HTL Maven Plugin</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>HTL Maven Plugin</h1></header><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="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>
+                HTL Maven Plugin
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/jsr-305.html
----------------------------------------------------------------------
diff --git a/documentation/development/jsr-305.html b/documentation/development/jsr-305.html
index f7de933..f9d6cb7 100644
--- a/documentation/development/jsr-305.html
+++ b/documentation/development/jsr-305.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Leveraging JSR-305 null annotations to prevent NullPointerExceptions</h1></header><p>[TOC]</p>
+<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>
+                Leveraging JSR-305 null annotations to prevent NullPointerExceptions
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>Introduction</h1>
 <p>The Sling API forces developers to sometimes check for <code>null</code> return values. Most prominently this is the case for <a href="https://sling.apache.org/apidocs/sling8/org/apache/sling/api/adapter/Adaptable.html#adaptTo-java.lang.Class-"><code>Adaptable.adaptTo</code></a> and <a href="https://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/ResourceResolver.html#getResource-java.lang.String-"><code>ResourceResolver.getResource</code></a>. This is often forgotten, which may lead to <code>NullPointerException</code>s. Sling API 2.9.0 introduced the JSR-305 annotations (<a href="https://issues.apache.org/jira/browse/SLING-4377">SLING-4377</a>) which allow tools to check automatically for missing null checks in the code.</p>
 <h1>Annotations</h1>
@@ -149,7 +152,7 @@
 <p>A complete list of visitors class names in Findbugs can be found in the <a href="https://code.google.com/p/findbugs/source/browse/#git%2Ffindbugs%2Fsrc%2Fjava%2Fedu%2Fumd%2Fcs%2Ffindbugs%2Fdetect%253Fstate%253Dclosed">sourcecode</a>. The according <a href="http://findbugs.sourceforge.net/bugDescriptions.html">bug patterns</a> have an identifier (in parenthesis) for which you can search in the according Java classes, in case you want to extend the checks.</p>
 <p>Findbugs is also integrated in <a href="http://docs.sonarqube.org/display/SONAR/Findbugs+Plugin">SonarQube</a> but for SonarQube you should now rather use the native Java plugin (look at <a href="#use-with-sonarqube">Use with SonarQube</a>).</p>
 <h1>Use with SonarQube</h1>
-<p>At least rule <a href="https://sonarqube.com/coding_rules#rule_key=squid%3AS2259">squid:S2259</a> in SonarQube supports JSR-305 annotations as well for null checks.</p></section></div></div>            
+<p>At least rule <a href="https://sonarqube.com/coding_rules#rule_key=squid%3AS2259">squid:S2259</a> in SonarQube supports JSR-305 annotations as well for null checks.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/logging.html
----------------------------------------------------------------------
diff --git a/documentation/development/logging.html b/documentation/development/logging.html
index 18548c2..5be98ed 100644
--- a/documentation/development/logging.html
+++ b/documentation/development/logging.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Logging</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,11 +66,14 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Logging</h1></header><div class="note">
+<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>
+                Logging
+            </h1><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
 <a href="http://sling.apache.org/documentation/legacy/logging.html">Logging 3.x</a> for older versions.
 </div>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>Logging in Sling is supported by the <code>org.apache.sling.commons.log</code> bundle, which is one of the first bundles installed and started by the Sling Launcher. This bundle along with other bundles manages the Sling Logging and provides the following features:</p>
 <ul>
@@ -582,7 +585,7 @@ org.apache.sling.commons.log.pattern=&quot;{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}
 <h5>Q. How to start Sling with an external logback.xml file</h5>
 <p>You need to specify the location of logback.xml via <code>org.apache.sling.commons.log.configurationFile</code></p>
 <pre><code>    java -jar org.apache.sling.launchpad-XXX-standalone.jar -Dorg.apache.sling.commons.log.configurationFile=/path/to/logback
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/maven-archetypes.html
----------------------------------------------------------------------
diff --git a/documentation/development/maven-archetypes.html b/documentation/development/maven-archetypes.html
index c7512c3..166986b 100644
--- a/documentation/development/maven-archetypes.html
+++ b/documentation/development/maven-archetypes.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Maven Archetypes</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Maven Archetypes</h1></header><p>translation_pending: true</p>
-<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>
+<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>
+                Maven Archetypes
+            </h1><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>sling-launchpad-standalone-archetype</h3>
 <p>This archetype generates a Maven project which will build a standalone Launchpad JAR file using the default bundle set. For demonstration purposes, the generated project includes an extra bundle list file (<code>src/main/bundles/list</code>) which includes Apache Felix FileInstall as well as a test configuration file (<code>src/test/config/sling.properties</code>).</p>
 <h3>sling-launchpad-webapp-archetype</h3>
@@ -79,7 +80,7 @@
 <h3>sling-bundle-archetype</h3>
 <p>This archetype generates a Maven project which will build a basic OSGi bundle including support for the Felix SCR Annotations. It is pre-configured to install using the Felix Web Console when the profile <code>autoInstallBundle</code> is activated.</p>
 <h3>sling-jcrinstall-bundle-archetype</h3>
-<p>This archetype generates a Maven project which will build a basic OSGi bundle including support for the Felix SCR Annotations. It is pre-configured to install using a WebDAV PUT into the JCR when the profile <code>autoInstallBundle</code> is activated.</p></section></div></div>            
+<p>This archetype generates a Maven project which will build a basic OSGi bundle including support for the Felix SCR Annotations. It is pre-configured to install using a WebDAV PUT into the JCR when the profile <code>autoInstallBundle</code> is activated.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/maven-launchpad-plugin.html
----------------------------------------------------------------------
diff --git a/documentation/development/maven-launchpad-plugin.html b/documentation/development/maven-launchpad-plugin.html
index df9e0cf..6d40f9f 100644
--- a/documentation/development/maven-launchpad-plugin.html
+++ b/documentation/development/maven-launchpad-plugin.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Maven Launchpad Plugin</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Maven Launchpad Plugin</h1></header><p>translation_pending: true</p>
-<div class="note">
+<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>
+                Maven Launchpad Plugin
+            </h1><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,
 refer to the source code and the launchpad/builder and launchpad/testing modules for more information.
 </div>
@@ -228,7 +229,7 @@ refer to the source code and the launchpad/builder and launchpad/testing modules
 <ul>
   <li><code>mavenSession</code> - an instance of <code>org.apache.maven.execution.MavenSession</code>.</li>
   <li><code>mavenProject</code> - an instance of <code>org.apache.maven.project.MavenProject</code>.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/maven-usage.html
----------------------------------------------------------------------
diff --git a/documentation/development/maven-usage.html b/documentation/development/maven-usage.html
index df2b28e..9249245 100644
--- a/documentation/development/maven-usage.html
+++ b/documentation/development/maven-usage.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Maven Usage</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Maven Usage</h1></header><p>Apache Sling uses Maven as a build tool. This page documents some of the choices that we made when using Maven.</p>
+<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>
+                Maven Usage
+            </h1><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>Parent POM</h2>
 <p>We separate the reactor POM from the parent POM. While the reactor POM functions as a simple aggregator, the parent POM, currently located at <a href="http://svn.apache.org/repos/asf/sling/trunk/parent/pom.xml">parent/pom.xml</a>, holds the common build configuration for all modules.</p>
 <p>The reference to the parent POM is usually set to a released version since we don't deploy it as a SNAPSHOT during the build process. That reference must also contain an empty parentPath element, otherwise recent version of Maven will try to find it in the local filesystem, disregarding the version if the groupId and artifactId match. An example of how to reference the parent POM is</p>
@@ -87,7 +89,7 @@
   <li>maven-bundle-plugin: value of the Bundle-RequiredExecutionEnvironment header</li>
 </ul>
 <h2>Dependency management</h2>
-<p>See <a href="/documentation/development/dependency-management.html">Dependency Management</a></p></section></div></div>            
+<p>See <a href="/documentation/development/dependency-management.html">Dependency Management</a></p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/maventipsandtricks.html
----------------------------------------------------------------------
diff --git a/documentation/development/maventipsandtricks.html b/documentation/development/maventipsandtricks.html
index 42d98c5..dfa0558 100644
--- a/documentation/development/maventipsandtricks.html
+++ b/documentation/development/maventipsandtricks.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: MavenTipsAndTricks</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>MavenTipsAndTricks</h1></header><p>translation_pending: true</p>
-<p>Here's our collection of tips and tricks for building Sling with <a href="http://maven.apache.org">Maven</a>.</p>
+<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>
+                MavenTipsAndTricks
+            </h1><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>Maven local repository</h1>
 <p>The first time you run a Maven build, or when Maven needs additional build components, it downloads plugins and dependencies under its <em>local repository</em> folder on your computer. By default, this folder is named <em>.m2/repository</em> in your home directory.</p>
 <p>Maven uses this repository as a cache for artifacts that it might need for future builds, which means that the first Sling build usually takes much longer than usual, as Maven needs to download many tools and dependencies into its local repository while the build progresses.</p>
@@ -83,7 +84,6 @@
 <div class="note">
 Does anyone have a similar command-line option that works under Windows?
 </div>
-<p># </p>
 <h1>MAVEN_OPTS</h1>
 <p>The MAVEN_OPTS environment variable defines options for the JVM that executes Maven.</p>
 <p>Set it according to your platform, i.e. <code>export MAVEN*OPTS=...</code> on unixish systems or <code>set MAVEN*OPTS=...</code> on Windows.</p>
@@ -98,7 +98,7 @@ Does anyone have a similar command-line option that works under Windows?
 </code></pre>
 <p>And then connect to port 30303 with a remote JVM debugger (most IDEs do this).</p>
 <h2>Avoid spaces in Maven repository and workspace paths</h2>
-<p>Some Maven plugins do not like spaces in paths. It is better to avoid putting your Maven repository, or your code, under paths like <em>Documents and Settings</em>, for example.</p></section></div></div>            
+<p>Some Maven plugins do not like spaces in paths. It is better to avoid putting your Maven repository, or your code, under paths like <em>Documents and Settings</em>, for example.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/monitoring-requests.html
----------------------------------------------------------------------
diff --git a/documentation/development/monitoring-requests.html b/documentation/development/monitoring-requests.html
index c9bbca7..241e726 100644
--- a/documentation/development/monitoring-requests.html
+++ b/documentation/development/monitoring-requests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Monitoring Requests</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,11 +66,13 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Monitoring Requests</h1></header><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>
+<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>
+                Monitoring Requests
+            </h1><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>
 <p>The plugin keeps track of the latest 20 requests processed by Sling, and displays the information provided by the RequestProgressTracker, for the selected request. The screenshot below shows an example.</p>
 <p>Any information that's added to the RequestProgressTracker (which is available from the SlingHttpServletRequest object) during request processing will be displayed by this plugin.</p>
-<p><img src="sling-requests-plugin.jpg" /></p></section></div></div>            
+<p><img src="sling-requests-plugin.jpg" /></p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/osgi-mock.html
----------------------------------------------------------------------
diff --git a/documentation/development/osgi-mock.html b/documentation/development/osgi-mock.html
index 64425b5..d468f55 100644
--- a/documentation/development/osgi-mock.html
+++ b/documentation/development/osgi-mock.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: OSGi Mocks</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>OSGi Mocks</h1></header><p>Mock implementation of selected OSGi APIs for easier testing.</p>
-<p>[TOC]</p>
+<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>
+                OSGi Mocks
+            </h1><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 -->
+</p>
 <h2>Maven Dependency</h2>
 <pre><code>#!xml
 &lt;dependency&gt;
@@ -204,7 +207,7 @@ public OsgiContext context = new OsgiContextBuilder().plugin(MY_PLUGIN).build();
 <ul>
   <li><a href="https://github.com/apache/sling/blob/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java">Apache Sling Context-Aware Configuration Mock Plugin</a></li>
   <li><a href="https://github.com/apache/sling/blob/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java">Apache Sling Context-Aware Configuration Mock Plugin Test</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/release-management.html
----------------------------------------------------------------------
diff --git a/documentation/development/release-management.html b/documentation/development/release-management.html
index d578536..4e996b0 100644
--- a/documentation/development/release-management.html
+++ b/documentation/development/release-management.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Release Management</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,9 +66,12 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Release Management</h1></header><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>
+<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>
+                Release Management
+            </h1><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>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Prerequisites</h2>
 <ul>
   <li>To prepare or perform a release you <em>MUST BE</em> at least be an Apache Sling Committer.</li>
@@ -503,7 +506,7 @@ $ rm the_module-version.jar the_module-version.pom
   <li>
   <p>Check the results at <a href="http://sling.apache.org/components/">http://sling.apache.org/components/</a></p></li>
 </ol>
-<p>For background information about this process see the <a href="http://maven.apache.org/developers/website/deploy-component-reference-documentation.html">Maven components reference documentation</a>.</p></section></div></div>            
+<p>For background information about this process see the <a href="http://maven.apache.org/developers/website/deploy-component-reference-documentation.html">Maven components reference documentation</a>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/repository-based-development.html
----------------------------------------------------------------------
diff --git a/documentation/development/repository-based-development.html b/documentation/development/repository-based-development.html
index 737485d..b7477a7 100644
--- a/documentation/development/repository-based-development.html
+++ b/documentation/development/repository-based-development.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Repository Based Development</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Repository Based Development</h1></header><p>[TOC]</p>
+<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>
+                Repository Based Development
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>WebDAV Support</h1>
 <p>WebDAV support in Sling is based on the <a href="http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#Simple_Webdav_Server">Simple WebDAV</a> implementation of Apache Jackrabbit which is integrated in the <code>jcr/webdav</code> project. This bundle provides WebDAV access to Sling's repository in two flavours: </p>
 <ol>
@@ -134,7 +137,7 @@
 <h1>DavEx Support</h1>
 <p><a href="https://wiki.apache.org/jackrabbit/RemoteAccess">DavEx</a> (WebDAV with JCR Extensions) allows to remotely access a JCR repository. Sling provides support based on the <a href="http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#JCR_Webdav_Server">JCR WebDAV Server</a> implementation of Apache Jackrabbit which is integrated in the <code>jcr/davex</code> project. By default the server listens on request urls starting with <code>/server</code>.</p>
 <h1>Eclipse plugin for JCR</h1>
-<p>see <a href="/documentation/development/ide-tooling.html">Sling IDE Tooling</a></p></section></div></div>            
+<p>see <a href="/documentation/development/ide-tooling.html">Sling IDE Tooling</a></p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/resourceresolver-mock.html
----------------------------------------------------------------------
diff --git a/documentation/development/resourceresolver-mock.html b/documentation/development/resourceresolver-mock.html
index 279f404..e5cfce2 100644
--- a/documentation/development/resourceresolver-mock.html
+++ b/documentation/development/resourceresolver-mock.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Resource Resolver Mock</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Resource Resolver Mock</h1></header><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>[TOC]</p>
+<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>
+                Resource Resolver Mock
+            </h1><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 -->
+</p>
 <h2>Maven Dependency</h2>
 <pre><code>#!xml
 &lt;dependency&gt;
@@ -98,7 +101,7 @@ MockResourceResolverFactory factory = new MockResourceResolverFactory();
 ResourceResolver resolver = factory.getResourceResolver(null);
 </code></pre>
 <p>With the resolver you can use all Sling Resource features including reading and writing data using the Sling API.</p>
-<p>You cannot do any operations that require the JCR API because no JCR is underlying and adapting to JCR objects will just return null.</p></section></div></div>            
+<p>You cannot do any operations that require the JCR API because no JCR is underlying and adapting to JCR objects will just return null.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/sling-mock.html
----------------------------------------------------------------------
diff --git a/documentation/development/sling-mock.html b/documentation/development/sling-mock.html
index 5a62220..8e11901 100644
--- a/documentation/development/sling-mock.html
+++ b/documentation/development/sling-mock.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Mocks</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Mocks</h1></header><p>Mock implementation of selected Sling APIs for easier testing.</p>
-<p>[TOC]</p>
+<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>
+                Sling Mocks
+            </h1><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 -->
+</p>
 <h2>Maven Dependency</h2>
 <pre><code>#!xml
 &lt;dependency&gt;
@@ -419,7 +422,7 @@ public SlingContext context = new SlingContextBuilder().plugin(MY_PLUGIN).build(
 <ul>
   <li><a href="https://github.com/apache/sling/blob/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java">Apache Sling Context-Aware Configuration Mock Plugin</a></li>
   <li><a href="https://github.com/apache/sling/blob/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java">Apache Sling Context-Aware Configuration Mock Plugin Test</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/sling-testing-tools.html
----------------------------------------------------------------------
diff --git a/documentation/development/sling-testing-tools.html b/documentation/development/sling-testing-tools.html
index 0444cd2..6fa9d7e 100644
--- a/documentation/development/sling-testing-tools.html
+++ b/documentation/development/sling-testing-tools.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Testing Tools</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Testing Tools</h1></header><div class="warning">
+<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>
+                Sling Testing Tools
+            </h1><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
 in the newer "Junit Server-Side Tests Support" page instead, see link below. 
 </div>
@@ -179,7 +181,7 @@ TEST_PASSED
 <p>Then the <code>JarExecutor</code> is forking the VM a second time to start the server (this does not happen if connecting to an already running instance). The system environment variable <code>jar.executor.vm.options</code> can be used to start that VM with debug options. All debug options are described at the <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html#Invocation">JPDA documentation</a>. If running </p>
 <pre><code>mvn test -Djar.executor.vm.options=&quot;-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000&quot;
 </code></pre>
-<p>the server start is interrupted until a debugger is connected on port 8000.</p></section></div></div>            
+<p>the server start is interrupted until a debugger is connected on port 8000.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/sling.html
----------------------------------------------------------------------
diff --git a/documentation/development/sling.html b/documentation/development/sling.html
index f551262..a3460ff 100644
--- a/documentation/development/sling.html
+++ b/documentation/development/sling.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Maven Sling Plugin</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Maven Sling Plugin</h1></header><p>See <a href="http://sling.apache.org/components/maven-sling-plugin/">Apache Maven Sling Plugin documentation</a>.</p></section></div></div>            
+<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>
+                Maven Sling Plugin
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here


[5/6] sling-site git commit: Publish latest fixes

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 d18e5a4..b664252 100644
--- a/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
+++ b/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,9 +66,12 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Managing users and groups (jackrabbit.usermanager)</h1></header><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>
+<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>
+                Managing users and groups (jackrabbit.usermanager)
+            </h1><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>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>List users</h2>
 <p>To list existing users a GET request to the <code>/system/userManager/user</code> resource can be issued. Depending on the configuration of the <a href="/documentation/bundles/rendering-content-default-get-servlets.html">Default GET Servlet</a>  and/or the availability of a Servlet or Script handling the <code>sling/users</code> resource type, a result may be delivered/</p>
 <p>Example with curl and the default JSON rendering:</p>
@@ -561,7 +564,7 @@
 </code></pre>
 <h2>Sample User Interface Implementation</h2>
 <p><em>Since Version 2.1.1</em></p>
-<p>A sample implementation of ui pages for user/group management is provided @ <a href="http://svn.apache.org/viewvc/sling/trunk/samples/usermanager-ui/">http://svn.apache.org/viewvc/sling/trunk/samples/usermanager-ui/</a>.</p></section></div></div>            
+<p>A sample implementation of ui pages for user/group management is provided @ <a href="http://svn.apache.org/viewvc/sling/trunk/samples/usermanager-ui/">http://svn.apache.org/viewvc/sling/trunk/samples/usermanager-ui/</a>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 75962bc..0bd6ae8 100644
--- a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
+++ b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Manipulating Content - The SlingPostServlet (servlets.post)</h1></header><p>[TOC]</p>
+<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>
+                Manipulating Content - The SlingPostServlet (servlets.post)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Multiple Ways to Modify Content</h2>
 <p>As always in life there is more than one way to do it. So to modify content in a JCR repository underlying Sling, you have multiple options, two of which are WebDAV and the Sling default POST Servlet also called the <em>SlingPostServlet</em>. This page is about how you can modify - create, modify, copy, move, delete, import - content through the <em>SlingPostServlet</em>. In addition it also explains how to extend the SlingPostServlet with new operations.</p>
 <p>What is Content anyway? In the following discussion, I use the terms <em>Content</em> and <em>Item</em> interchangeably. With <em>Content</em> I just mean some data to be stored in the JCR repository to be later used as the basis for some presentation. In this sense <em>Content</em> is a rather conceptual term. <em>Item</em> is the name of the parent interface of the JCR <em>Node</em> and <em>Property</em> interfaces. When speaking of <em>Items</em> we mean some actual data stored in the repository ignoring whether the data is actually stored as a <em>Node</em> with child nodes and properties or just a single <em>Property</em>.</p>
@@ -908,7 +911,7 @@ of a resource without having to specify the path of each individual child resour
 <h3>SlingPostProcessor</h3>
 <p>OSGi services of the <code>org.apache.sling.servlets.post.SlingPostOperation</code> type can be used to post process <code>PostOperation</code>s. They are called after the operation has performed its changes but before the changes are persisted (via commit). All registered SlingPostProcessors are always called in the reverse order of their service ranking (i.e. the one with the highest service ranking first).</p>
 <p>A <code>SlingPostProcessor</code> may perform additional changes or revert previous ones. It is important that the <code>SlingPostProcessor</code> does not commit its changes but rather only performs the changes in the transient space (with the resource resolver bound to the current request) and in addition reports the changes through the 2nd parameter of the method <code>process(SlingHttpServletRequest, List&lt;Modification&gt;)</code>.</p>
-<p>Two examples of SlingPostProcessors are found in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/">test-services</a> module, with the corresponding test code in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingPostProcessorTest">integration-tests</a> module.</p></section></div></div>            
+<p>Two examples of SlingPostProcessors are found in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/">test-services</a> module, with the corresponding test code in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingPostProcessorTest">integration-tests</a> module.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/metrics.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/metrics.html b/documentation/bundles/metrics.html
index 532b81d..94e5779 100644
--- a/documentation/bundles/metrics.html
+++ b/documentation/bundles/metrics.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Metrics</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Metrics</h1></header><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>
+<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>
+                Sling Metrics
+            </h1><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>Features</h2>
 <ul>
   <li>Registers a <a href="https://github.com/apache/sling/blob/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/MetricsService.java">MetricsService</a> which can be used to create various types of Metric  instances</li>
@@ -145,7 +147,7 @@ com.codahale.metrics.Counter = counter.adaptTo(com.codahale.metrics.Counter.clas
     &lt;version&gt;1.0.0&lt;/version&gt;
 &lt;/dependency&gt;
 </code></pre>
-<p>Or download from <a href="http://sling.apache.org/downloads.cgi">here</a></p></section></div></div>            
+<p>Or download from <a href="http://sling.apache.org/downloads.cgi">here</a></p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 b5f3f76..2bcfc6b 100644
--- a/documentation/bundles/mime-type-support-commons-mime.html
+++ b/documentation/bundles/mime-type-support-commons-mime.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>MIME Type Support (commons.mime and commons.contentdetection)</h1></header><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>[TOC]</p>
+<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>
+                MIME Type Support (commons.mime and commons.contentdetection)
+            </h1><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 -->
+</p>
 <h2>Servlet API Support</h2>
 <p>The Servlet API specification provides a limited support for MIME type mappings :</p>
 <ul>
@@ -128,7 +131,7 @@
 <p>THe data line format described here also applies to configuration provided by the values of the <code>mime.types</code> property of the MIME type service configuration. The file format description applies to all <code>META-INF/mime.types</code> files provided by the bundles as well as input streams supplied to the <code>MimeTypeService.registerMimeType(InputStream)</code> method.</p>
 <h2>Web Console Plugin</h2>
 <p>The Apache Sling MIME type mapping support bundle implements a plugin for the Apache Felix Web Console which may be consulted to investigate the current contents of the MIME type mapping tables.</p>
-<p><img src="/documentation/bundles/mimetypes.png" alt="Mime Types Web Console Plugin" /></p></section></div></div>            
+<p><img src="/documentation/bundles/mimetypes.png" alt="Mime Types Web Console Plugin" /></p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/models.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/models.html b/documentation/bundles/models.html
index 8a20326..7fd7125 100644
--- a/documentation/bundles/models.html
+++ b/documentation/bundles/models.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Models</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Models</h1></header><p>[TOC]</p>
+<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>
+                Sling Models
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>Many Sling projects want to be able to create model objects - POJOs which are automatically mapped from Sling objects, typically resources, but also request objects. Sometimes these POJOs need OSGi services as well.</p>
 <h1>Design Goals</h1>
 <ul>
@@ -630,7 +633,7 @@ public class MyModel implements MyService {
         &lt;_plugin&gt;org.apache.sling.bnd.models.ModelsScannerPlugin;generatePackagesHeader=true&lt;/_plugin&gt;
     &lt;/instructions&gt;
 &lt;/configuration&gt;
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/nosql-resource-providers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/nosql-resource-providers.html b/documentation/bundles/nosql-resource-providers.html
index 2ffa380..9544135 100644
--- a/documentation/bundles/nosql-resource-providers.html
+++ b/documentation/bundles/nosql-resource-providers.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>NoSQL Resource Providers (org.apache.sling.nosql)</h1></header><p>[TOC]</p>
+<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>
+                NoSQL Resource Providers (org.apache.sling.nosql)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>Apache Sling provides resource-based access to NoSQL document stores like MongoDB and Couchbase via its Resource API using the NoSQL resource providers. This is possible in combination with a JCR-based repository (e.g. only on a special path in the resource tree), or a only persistence for the whole resource tree depending on the resource provider configuration.</p>
 <p>The general concept of retrieving from and storing resource data in NoSQL document stores is the same independently from the NoSQL product used:</p>
@@ -112,7 +115,7 @@ org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default
 <h2>Example Launchpad</h2>
 <p>An example launchpad is provided that contains the NoSQL resource providers configured as main resource provider at <code>/</code>.</p>
 <p>Source code: <a href="https://github.com/apache/sling/tree/trunk/contrib/nosql/launchpad">Apache Sling NoSQL Launchpad</a></p>
-<p>See README for details how to start the launchpad.</p></section></div></div>            
+<p>See README for details how to start the launchpad.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 ab5bf6a..8bb06f3 100644
--- a/documentation/bundles/org-apache-sling-junit-bundles.html
+++ b/documentation/bundles/org-apache-sling-junit-bundles.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>JUnit server-side testing support bundles</h1></header><p>This is an overview of the Sling bundles that provide support for server-side JUnit tests. </p>
+<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>
+                JUnit server-side testing support bundles
+            </h1><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>
 <h2>org.apache.sling.junit.core: server-side JUnit tests support</h2>
 <p>This bundle provides a <code>JUnitServlet</code> that runs JUnit tests found in bundles. </p>
@@ -291,7 +293,7 @@ TEST_PASSED
 </code></pre>
 <p>Test failures would be included in this JSON representation - you can test that by modifying the script to fail and making the same request again. </p>
 <h2>org.apache.sling.junit.remote: obsolete</h2>
-<p>The <code>org.apache.sling.junit.remote</code> bundle provides utilities to run server-side JUnit tests, but using the newer <code>TeleporterRule</code> described above is much simpler. As a result, this bundle should only be needed for existing tests that were written using its mechanisms. </p></section></div></div>            
+<p>The <code>org.apache.sling.junit.remote</code> bundle provides utilities to run server-side JUnit tests, but using the newer <code>TeleporterRule</code> described above is much simpler. As a result, this bundle should only be needed for existing tests that were written using its mechanisms. </p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/osgi-installer.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/osgi-installer.html b/documentation/bundles/osgi-installer.html
index 51a160d..005f9e4 100644
--- a/documentation/bundles/osgi-installer.html
+++ b/documentation/bundles/osgi-installer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: OSGi Installer</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>OSGi Installer</h1></header><h1>Overview</h1>
+<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>
+                OSGi Installer
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h1>Overview</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>
 <p><img src="/documentation/bundles/Slide14.jpg" alt="Apache Sling OSGI Installer Diagram" /></p>
 <p>The OSGi installer itself is "just" the central service managing the tasks and states of the artifacts. The artifacts can be provided through various providers, e.g. through a file system provider reading artifacts from configured directories or the jcr provider reading artifacts from a JCR repository.</p>
@@ -114,7 +116,7 @@
 <h3>Bundles Installation Failure</h3>
 <p>The checked bundle was not installed because it has been installed in a newer version through some other means (e.g. manually through the Felix Web Console or by another provider. For further details please review the OSGi Installer console at <code>/system/console/osgi-installer</code> and check for all bundles with the given symbolic name (=OSGi installers resource id) and the according URL.</p>
 <h3>Configuration Installation Failure</h3>
-<p>The checked configuration was not installed because it has either been overwritten manually in the Felix Web Console or is installed by some non-checked provider (which has a higher priority). To revert manually overwritten configurations just go to <code>/system/console/configMgr</code> and delete the according configuration. That way the OSGi installer should automatically create a new configuration for the same PID based on the configuration provided by some provider with the highest prio. In case another non-checked provider has provided already a configuration you can see from where it has been installed by looking at the OSGi Installer console at <code>/system/console/osgi-installer</code> and look for all configurations with the given PID.</p></section></div></div>            
+<p>The checked configuration was not installed because it has either been overwritten manually in the Felix Web Console or is installed by some non-checked provider (which has a higher priority). To revert manually overwritten configurations just go to <code>/system/console/configMgr</code> and delete the according configuration. That way the OSGi installer should automatically create a new configuration for the same PID based on the configuration provided by some provider with the highest prio. In case another non-checked provider has provided already a configuration you can see from where it has been installed by looking at the OSGi Installer console at <code>/system/console/osgi-installer</code> and look for all configurations with the given PID.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 7ddcc1d..a134e13 100644
--- a/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
+++ b/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Output Rewriting Pipelines (org.apache.sling.rewriter)</h1></header><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>
+<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>
+                Output Rewriting Pipelines (org.apache.sling.rewriter)
+            </h1><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>
 <h2>SAX Pipelines</h2>
 <p>The rewriter allows to configure a pipeline for post processing of the generated response. Depending on how the pipeline is assembled the rewriting process might buffer the whole output in order to do proper post processing - for example this is required if an HTML response is "transformed" to XHTML or if XSLT is used to process the response.</p>
@@ -132,7 +134,7 @@
   <li>selectors (multi value string) - a set of selectors the pipeline should be used for (optional, since 1.1.0)</li>
   <li>order (long) - the configurations are sorted by this order, order must be higher or equal to 0. The configuration with the highest order is tried first.</li>
   <li>enabled (boolean) - Is this configuration active? (default yes)</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 bd2f3e1..87020db 100644
--- a/documentation/bundles/rendering-content-default-get-servlets.html
+++ b/documentation/bundles/rendering-content-default-get-servlets.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Rendering Content - Default GET Servlets</h1></header><p>[TOC]</p>
+<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>
+                Rendering Content - Default GET Servlets
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <div class="note">
 Not all features of the <b>org.apache.sling.servlets.get</b> bundle are described below - this
 page needs more work.
@@ -100,7 +103,7 @@ page needs more work.
 <p>This is not to be confused with the <code>sling:redirect</code> property used under <code>/etc/map</code>, which is described in <a href="/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a></p>
 <h2>SlingInfoServlet</h2>
 <p>The <code>SlingInfoServlet</code> provides info on the current JCR session, for requests that map to JCR nodes.</p>
-<p>It is available at <code>/system/sling/info.sessionInfo</code> by default, and supports <code>.json</code> and <code>.txt</code> extensions. </p></section></div></div>            
+<p>It is available at <code>/system/sling/info.sessionInfo</code> by default, and supports <code>.json</code> and <code>.txt</code> extensions. </p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/repository-initialization.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/repository-initialization.html b/documentation/bundles/repository-initialization.html
index f22e876..f7fb00a 100644
--- a/documentation/bundles/repository-initialization.html
+++ b/documentation/bundles/repository-initialization.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: </title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1></h1></header><p>The <code>SlingRepositoryInitializer</code> mechanism allows for running code before the <code>SlingRepository</code> service is registered.</p>
+<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>
+                
+            </h1><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>
 <p>Please be aware of potential clustering and coordination issues when using this mechanism, if your environment lets several Sling instances access the same content repository you'll need to implement a synchronization mechanism for such operations.</p>
 <h2>SlingRepositoryInitializer</h2>
@@ -175,7 +177,7 @@ create service user provisioningModelUser
 <p>Using a <code>RepositoryInitializer</code> reference like in this example, with the <em>raw</em> prefix, means that its content is passed as is to the repoinit parser:</p>
 <pre><code>raw:classpath://some-repoinit-file.txt
 </code></pre>
-<p>Which points to a <code>classpath:</code> URL to provide the raw repoinit statements in this example, but again any valid URL scheme can be used.</p></section></div></div>            
+<p>Which points to a <code>classpath:</code> URL to provide the raw repoinit statements in this example, but again any valid URL scheme can be used.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/request-analysis.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/request-analysis.html b/documentation/bundles/request-analysis.html
index c3afa21..d0d6c9d 100644
--- a/documentation/bundles/request-analysis.html
+++ b/documentation/bundles/request-analysis.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Request Processing Analyzer (reqanalyzer)</h1></header><p>[TOC]</p>
+<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>
+                Request Processing Analyzer (reqanalyzer)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>Sling provides a helpful functionality to track progress of requests being processed: The <a href="http://sling.apache.org/apidocs/sling6/org/apache/sling/api/request/RequestProgressTracker.html">RequestProgressTracker</a> which is available through the <a href="http://sling.apache.org/apidocs/sling6/org/apache/sling/api/SlingHttpServletRequest.html#getRequestProgressTracker%28%29">SlingHttpServletRequest</a>.</p>
 <p>This tool provides mechanims to record states of request processing and a simple mechanism to time periods of processing. By default Sling itself uses this tool to track progress through Sling like script resolution and calling scripts.</p>
@@ -102,7 +105,7 @@
 <p><img src="requesttracker.png" alt="Recorded Requests" /></p>
 <p>Clicking on any row opens a second window displaying the detail request progress information as recorded before with the <code>RequestProgressTracker</code>.</p>
 <p><img src="requesttracker-details.png" alt="Details of a recorded Request" /></p>
-<p>The size, location, and the widths of the table columns are persisted with the Java Preferences API and thus when starting the application again, these settings are preserved.</p></section></div></div>            
+<p>The size, location, and the widths of the table columns are persisted with the Java Preferences API and thus when starting the application again, these settings are preserved.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/resource-access-security.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/resource-access-security.html b/documentation/bundles/resource-access-security.html
index 628b600..0cfec70 100644
--- a/documentation/bundles/resource-access-security.html
+++ b/documentation/bundles/resource-access-security.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Resource Access Security</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Resource Access Security</h1></header><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>
+<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>
+                Resource Access Security
+            </h1><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>Summary</h2>
 <p>The ResourceAccessSecurity service allows it to restrict access to resources. The access can be granted or denied for read, create, update and delete actions.</p>
 <p>The ResourceAccessSecurity defines a service API which is used in two different context: for securing resource providers which have no own access control and on the application level to further restrict the access to resources in general. </p>
@@ -136,7 +138,7 @@ public GateResult canRead(final Resource resource) {
 </ul>
 <p>The first two of them are self-explanatory. CANT_DECIDE means that the actual gate neither can grant nor deny the access. If no other gate does return GRANTED or DENIED the access to the resource will be denied for security reasons. CANT-DECIDE comes handy if you declare finaloperations (where no other gate will be called after this gate). If such a gate returns CANT_DECIDE, further gates will be called regardless of the setted finaloperations property.</p>
 <h2>Actual state of ResourceAccessSecurity</h2>
-<p>By now the implementation is complete for securing access on resource level for CRUD operations. It is not yet ready to allow fine granular access rights on values of a resource. So at the moment the <code>canReadValue, canUpdateValue, canDeleteValue</code> and <code>canCreateValue</code> on <code>ResourceAccessGate</code> methods are ignored.</p></section></div></div>            
+<p>By now the implementation is complete for securing access on resource level for CRUD operations. It is not yet ready to allow fine granular access rights on values of a resource. So at the moment the <code>canReadValue, canUpdateValue, canDeleteValue</code> and <code>canCreateValue</code> on <code>ResourceAccessGate</code> methods are ignored.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/resource-editor.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/resource-editor.html b/documentation/bundles/resource-editor.html
index ad0141d..6d2a6ee 100644
--- a/documentation/bundles/resource-editor.html
+++ b/documentation/bundles/resource-editor.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>The Apache Sling Resource Editor</h1></header><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>
+<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>
+                The Apache Sling Resource Editor
+            </h1><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>
 <h1>Features</h1>
 <p>Currently it allows to display the node properties and edit nodes.</p>
@@ -85,7 +87,7 @@
   <li>The <code>contrib/explorers/resourceeditor/README</code> file in SVN tells you how to install the Resource Editor.</li>
   <li>Open <code>http://localhost:8080/reseditor/.html</code> in your browser.</li>
   <li>Enjoy!</li>
-</ol></section></div></div>            
+</ol></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/resource-merger.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/resource-merger.html b/documentation/bundles/resource-merger.html
index 7da1f49..dffc957 100644
--- a/documentation/bundles/resource-merger.html
+++ b/documentation/bundles/resource-merger.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Resource Merger (org.apache.sling.resourcemerger)</h1></header><p>[TOC]</p>
+<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>
+                Resource Merger (org.apache.sling.resourcemerger)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>Introduction</h1>
 <p><strong>This documentation only applies to versions &gt;= 1.2 (due to major changes done in <a href="https://issues.apache.org/jira/browse/SLING-3423">SLING-3423</a>)</strong></p>
 <p>The Resource Merger bundle provides two resource provider factories</p>
@@ -236,7 +239,7 @@ resulting order: child1, child4, child2, child3
      +-- child3 (nt:folder)
      |   +-- property1 = &quot;property from /libs/sling/example/child3&quot;
      |   +-- property2 = &quot;property from /apps/sling/example/child3&quot;
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 ab44091..3d34a84 100644
--- a/documentation/bundles/scheduler-service-commons-scheduler.html
+++ b/documentation/bundles/scheduler-service-commons-scheduler.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Scheduler Service (commons scheduler)</h1></header><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="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>
+                Scheduler Service (commons scheduler)
+            </h1><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">
 The notion of Job used in this context is a different one than the one used for <a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Sling Jobs</a>. The main difference is that a scheduler's job is not persisted.
 </div>
@@ -248,7 +250,7 @@ public class HelloWorldScheduledService {
     }
 
 }
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/scripting.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting.html b/documentation/bundles/scripting.html
index ab3a3fa..d87da5c 100644
--- a/documentation/bundles/scripting.html
+++ b/documentation/bundles/scripting.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Scripting</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Scripting</h1></header><p>[TOC]</p>
+<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>
+                Sling Scripting
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>Sling Scripting allows the easy development and usage of different scripting (aka templating) engines.</p>
 <h1>Sling Scripting Engines</h1>
 <ul>
@@ -84,7 +87,7 @@
   <li>Velocity *</li>
   <li>XProc *</li>
 </ul>
-<p>* in contrib</p></section></div></div>            
+<p>* in contrib</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/scripting/scripting-htl.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting/scripting-htl.html b/documentation/bundles/scripting/scripting-htl.html
index 9c60bd2..37c6ef1 100644
--- a/documentation/bundles/scripting/scripting-htl.html
+++ b/documentation/bundles/scripting/scripting-htl.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: HTL Scripting Engine</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>HTL Scripting Engine</h1></header><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>[TOC]</p>
+<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>
+                HTL Scripting Engine
+            </h1><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 -->
+</p>
 <h1>Modules</h1>
 <p>The Sling implementation is comprised of the following modules:</p>
 <ol>
@@ -513,7 +516,7 @@ use             // the use function
             </ul>
         </td>
     </tr>
-</table></section></div></div>            
+</table></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/scripting/scripting-jsp.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting/scripting-jsp.html b/documentation/bundles/scripting/scripting-jsp.html
index ce8d316..09860c4 100644
--- a/documentation/bundles/scripting/scripting-jsp.html
+++ b/documentation/bundles/scripting/scripting-jsp.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: JSP Scripting Engine</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>JSP Scripting Engine</h1></header><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>
+<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>
+                JSP Scripting Engine
+            </h1><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>
 <p>The Sling Scripting JSP Taglib supports the use of Sling as an application in JSP pages. The Sling Taglib provides the  ability to invoke JSP scripts, include Resources and interact with the Sling Repository, all with JSP tags and  <a href="http://docs.oracle.com/javaee/6/tutorial/doc/gjddd.html">Expression Language (EL)</a> functions.</p>
 <h2>Use</h2>
@@ -417,7 +419,7 @@
 </ul>
 <p><em>Example Usage</em></p>
 <pre><code>&lt;sling:listChildren resource=&quot;${resource}&quot; var=&quot;children&quot; /&gt;
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/scripting/scripting-thymeleaf.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scripting/scripting-thymeleaf.html b/documentation/bundles/scripting/scripting-thymeleaf.html
index 3b85132..fb9dbb6 100644
--- a/documentation/bundles/scripting/scripting-thymeleaf.html
+++ b/documentation/bundles/scripting/scripting-thymeleaf.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Scripting Thymeleaf</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Scripting Thymeleaf</h1></header><p>Sling Scripting Thymeleaf is the scripting engine for <a href="http://www.thymeleaf.org"><em>Thymeleaf</em></a> (3.0) templates.</p>
-<p>[TOC]</p>
+<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>
+                Sling Scripting Thymeleaf
+            </h1><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 -->
+</p>
 <h1>Features</h1>
 <ul>
   <li>Supporting all of Thymeleaf's extension points: <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/templateresolver/ITemplateResolver.html"><em>TemplateResolver</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/messageresolver/IMessageResolver.html"><em>MessageResolver</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/dialect/IDialect.html"><em>Dialect</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/linkbuilder/ILinkBuilder.html"><em>LinkBuilder</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/templateparser/markup/decoupled/IDecoupledTemplateLogicResolver.html"><em>DecoupledTemplateLogicResolver</em></a>, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/cache/ICacheManager.html"><em>CacheManager</em></a> and <a href="http://www.thymeleaf.org
 /apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/context/IEngineContext.html"><em>EngineContextFactory</em></a></li>
@@ -122,7 +125,7 @@ mvn:org.javassist/javassist/3.20.0-GA
 <p><a href="Scripting-Thymeleaf-Class-Diagram.png"><img src="Scripting-Thymeleaf-Class-Diagram.png" alt="Class Diagram" /></a></p>
 <h1>Sample</h1>
 <p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/samples/fling/">Sling Fling Sample</a> is a sample using Sling Scripting Thymeleaf with <a href="/documentation/bundles/models.html">Sling Models</a> and <a href="/documentation/bundles/sling-query.html">Sling Query</a>.</p>
-<p><img src="sling-fling-sample.png" alt="Sling Fling Sample" /></p></section></div></div>            
+<p><img src="sling-fling-sample.png" alt="Sling Fling Sample" /></p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/servlet-helpers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/servlet-helpers.html b/documentation/bundles/servlet-helpers.html
index 3fbbaa4..fe1f9df 100644
--- a/documentation/bundles/servlet-helpers.html
+++ b/documentation/bundles/servlet-helpers.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Servlet Helpers</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Servlet Helpers</h1></header><p>The Sling Servlet Helpers bundle provides mock implementations of the <code>SlingHttpServletRequest</code>, <code>SlingHttpServletResponse</code> and related classes.</p>
+<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>
+                Sling Servlet Helpers
+            </h1><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>
 <p>See the <a href="https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers">automated tests</a> of the <code>servlet-helpers</code> module for more info.</p>
 <h2>Usage</h2>
@@ -130,7 +132,7 @@ assertEquals(TEST_CONTENT, response.getOutputAsString());
 
 // validate response body as binary data
 assertArrayEquals(TEST_DATA, response.getOutput());
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 005240b..8bbca23 100644
--- a/documentation/bundles/sling-health-check-tool.html
+++ b/documentation/bundles/sling-health-check-tool.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Health Check Tools</h1></header><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>
+<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>
+                Sling Health Check Tools
+            </h1><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>
 <p>However for simple setups, the out of the box health checks are often sufficient. <a href="#executing-health-checks">Executing Health Checks</a> is a good starting point to run existing checks and to get familiar with how health checks work.</p>
 <p>See also:</p>
@@ -272,7 +274,7 @@ servletPath = /system/health
 <p>It requires the <code>org.apache.sling.junit.core bundle</code> which provides the server-side JUnit tests infrastructure.</p>
 <p>The idea is to implement the smoke tests of your system, for example, as health checks. You can then run them as part of integration testing, using the <a href="/documentation/development/sling-testing-tools.html">Sling Testing Tools</a><br/>remote testing utilities, and also as plain Health Checks for monitoring or troubleshooting Sling instances.</p>
 <p>To use this module, configure sets of tags at <code>/system/console/configMgr/org.apache.sling.hc.junitbridge.HealthCheckTestsProvider</code> using the standard <code>includeThisTag,-omitThatTag</code> syntax, and JUnit tests will be available at /system/sling/junit/HealthChecks.html to run the corresponding Health Checks.</p>
-<p>To run the Health Check tests at build time, see the <a href="http://svn.apache.org/repos/asf/sling/trunk/testing/samples/integration-tests">testing/samples/integration-tests</a> sample module.</p></section></div></div>            
+<p>To run the Health Check tests at build time, see the <a href="http://svn.apache.org/repos/asf/sling/trunk/testing/samples/integration-tests">testing/samples/integration-tests</a> sample module.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/sling-oak-restrictions.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-oak-restrictions.html b/documentation/bundles/sling-oak-restrictions.html
index f17a4a1..25e2775 100644
--- a/documentation/bundles/sling-oak-restrictions.html
+++ b/documentation/bundles/sling-oak-restrictions.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Oak Restrictions</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Oak Restrictions</h1></header><p>[TOC]</p>
+<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>
+                Sling Oak Restrictions
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>Oak introduced plugability of restrictions as described in <a href="https://jackrabbit.apache.org/oak/docs/security/authorization/restriction.html#Pluggability">Oak Restriction Management</a>. The bundle sling-oak-restrictions provides additional restrictions that generally make sense for sling applications. Currently sling restrictions for exact resource type match and resource type match including all descendants are supplied.</p>
 <p><strong>Important:</strong> Using the sling restrictions (as well as standard oak restrictions) is not as performant as simple path based ACE entries without any restrictions. Permission setups should always mostly work with path based ACEs and only use ACEs with restrictions for special cases. </p>
@@ -146,7 +149,7 @@
 <ul>
   <li><code>/content/myprj</code></li>
   <li><code>/content/myprj/mynode2</code></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/sling-pipes.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-pipes.html b/documentation/bundles/sling-pipes.html
index f432562..eea40f7 100644
--- a/documentation/bundles/sling-pipes.html
+++ b/documentation/bundles/sling-pipes.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Pipes</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Pipes</h1></header><p>tool for doing extract - transform - load operations through a resource tree configuration.</p>
+<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>
+                Sling Pipes
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p>tool for doing extract - transform - load operations through a resource tree configuration.</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>
 <h2>What is a pipe</h2>
 <pre><code>         getOutputBinding
@@ -374,7 +376,7 @@
   <li>java 8 (Nashorn is used for expression)</li>
   <li>slingQuery (3.0.0) (used in SlingQueryPipe)</li>
   <li>jackrabbit api (2.7.5+) (used in AuthorizablePipe)</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/sling-query.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/sling-query.html b/documentation/bundles/sling-query.html
index 1a8eef5..4958be4 100644
--- a/documentation/bundles/sling-query.html
+++ b/documentation/bundles/sling-query.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Query</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Query</h1></header><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>
+<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>
+                Sling Query
+            </h1><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>Introduction</h2>
 <p>The recommended way to find resources in the Sling repository is using tree-traversal methods, like <code>listChildren()</code> and <code>getParent()</code> rather than JCR queries. The latter are great for listing resources with given properties, but we can't leverage the repository tree structure with such queries. On the other hand, using tree-traversal method is quite verbose. Consider following code that takes an resource and returns its first ancestor, being <code>cq:Page</code>, with given <code>jcr:content/cq:template</code> attribute:</p>
 <pre><code>Resource resource = ...;
@@ -124,7 +126,7 @@ $(resource).closest(&quot;cq:Page[jcr:content/cq:template=my/template]&quot;)
 <ul>
   <li>See the <a href="http://sling.apache.org/">Apache Sling website</a> for the Sling reference documentation. Apache Sling, Apache and Sling are trademarks of the <a href="http://apache.org">Apache Software Foundation</a>.</li>
   <li>Method names, selector syntax and some parts of documentation are inspired by the <a href="http://jquery.com/">jQuery</a> library.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 cd48239..12f528d 100644
--- a/documentation/bundles/sling-settings-org-apache-sling-settings.html
+++ b/documentation/bundles/sling-settings-org-apache-sling-settings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Settings and Run Modes (org.apache.sling.settings)</h1></header><h1>Overview</h1>
+<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>
+                Sling Settings and Run Modes (org.apache.sling.settings)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h1>Overview</h1>
 <p>The Sling Settings Bundle exposes the <code>SlingSettingsService</code> which allows access to the following information pertinent to a Sling instance:</p>
 <table>
   <thead>
@@ -175,7 +177,7 @@ if(expectedRunModes.removeAll(currentRunModes)) {
   // is active
 }
 </code></pre>
-<p>Getting run modes in this way is usually not needed, it's better to define bundles or configurations that are only valid in specific run modes, rather than making decisions in code based on run modes.</p></section></div></div>            
+<p>Getting run modes in this way is usually not needed, it's better to define bundles or configurations that are only valid in specific run modes, rather than making decisions in code based on run modes.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/subsystem-installer-factory.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/subsystem-installer-factory.html b/documentation/bundles/subsystem-installer-factory.html
index 41878c7..67b470a 100644
--- a/documentation/bundles/subsystem-installer-factory.html
+++ b/documentation/bundles/subsystem-installer-factory.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Subsystems Installer Factory</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,13 +66,15 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Subsystems Installer Factory</h1></header><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>
+<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>
+                Subsystems Installer Factory
+            </h1><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>Subsystems</h2>
 <p>The subsystem file must end with ".esa" and the manifest must at least contain the subsystem symbolic name "Subsystem-SymbolicName" header.</p>
 <h1>Project Info</h1>
 <ul>
   <li>Subsystems installer factory (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/factories/subsystems">org.apache.sling.installer.factory.subsystems</a>)</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/validation.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/validation.html b/documentation/bundles/validation.html
index 4088bcf..5b0548e 100644
--- a/documentation/bundles/validation.html
+++ b/documentation/bundles/validation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Validation</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Validation</h1></header><p>[TOC]</p>
+<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>
+                Sling Validation
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>Many Sling projects want to be able to validate both Resources and request parameters. Through the Sling Validation framework this is possible with the help of validation model resources which define validation rules for a certain resourceType.</p>
 <h1>Prerequisites</h1>
 <p>To use this validation framework the following bundles need to be deployed</p>
@@ -221,7 +224,7 @@ public void validate() {
 <h1>References</h1>
 <ol>
   <li><a href="http://www.slideshare.net/raducotescu/apache-sling-generic-validation-framework">Apache Sling Generic Validation Framework, adaptTo 2014</a></li>
-</ol></section></div></div>            
+</ol></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here


[6/6] sling-site git commit: Publish latest fixes

Posted by bd...@apache.org.
Publish latest fixes


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

Branch: refs/heads/asf-site
Commit: 6120b7bb85d06feb23d7261ef36431fee4a48d4a
Parents: 5f5c8f1
Author: Bertrand Delacretaz <bd...@apache.org>
Authored: Tue Jun 27 19:29:44 2017 +0200
Committer: Bertrand Delacretaz <bd...@apache.org>
Committed: Tue Jun 27 19:29:44 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/archive.html
----------------------------------------------------------------------
diff --git a/archive.html b/archive.html
index 18fda85..0fe0fd2 100644
--- a/archive.html
+++ b/archive.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: null</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><h1>Blog Archive</h1>&lt;/ul&gt;</section></div></div>            
+            <breadcrumbs/><h1>
+                null
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h1>Blog Archive</h1>&lt;/ul&gt;</section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/contributing.html
----------------------------------------------------------------------
diff --git a/contributing.html b/contributing.html
index 4b7882f..6a79342 100644
--- a/contributing.html
+++ b/contributing.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Contributing</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,14 +66,16 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Contributing</h1></header><p>See <a href="/project-information.html">Project Information</a> for details about the tools mentioned below.</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Contributing
+            </h1><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>
 <p>The Sling project organizes its "to do" list using the JIRA issue tracking system. Specific items from Sling's JIRA issue tracking system are highlighted on this page, but are not limited to it. The purpose of the list here is to highlight issues that are either more important or serve as good entry points for new contributors.</p>
 <p>It is important to point out that you do not need to be a programmer to contribute to Sling. As such, we will break out the list of issues below for non-programmers and programmers.</p>
 <h2>Non-Programmers</h2>
 <p>Improve web site or documentation (e.g., create/propose FAQ entries). There is no specific JIRA issue for this task, but any contributions could be posted as new JIRA issues for the Documentation component.</p>
 <h2>Programmers</h2>
-<p>Implement support for various rendering technologies in Sling. Examples coming to mind are JSF and Wicket.</p></section></div></div>            
+<p>Implement support for various rendering technologies in Sling. Examples coming to mind are JSF and Wicket.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation.html
----------------------------------------------------------------------
diff --git a/documentation.html b/documentation.html
index dff4331..44e771b 100644
--- a/documentation.html
+++ b/documentation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Documentation</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Documentation</h1></header><p>[TOC]</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Documentation
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>Overview</h1>
 <p>The documentation is split into different parts:</p>
 <ul>
@@ -98,7 +101,7 @@
 <p>With every major release of Sling the JavaDoc of all containing bundles are published below <a href="http://sling.apache.org/apidocs/">http://sling.apache.org/apidocs/</a>. The script for generating this aggregation JavaDoc is at <a href="http://svn.apache.org/repos/asf/sling/trunk/tooling/release/">http://svn.apache.org/repos/asf/sling/trunk/tooling/release/</a> in <code>generate_javadoc_for_release.sh</code></p>
 <p>In addition every released bundle is released together with its JavaDoc (which is also pushed to Maven Central).</p>
 <h2>The Maven Plugin Documentation</h2>
-<p>For the most important Maven Plugins the according Maven Sites (generated with the <code>maven-site-plugin</code>) are published at <a href="http://sling.apache.org/components/">http://sling.apache.org/components/</a>. The description on how to publish can be found at <a href="/documentation/development/release-management.html">Release Management</a>.</p></section></div></div>            
+<p>For the most important Maven Plugins the according Maven Sites (generated with the <code>maven-site-plugin</code>) are published at <a href="http://sling.apache.org/components/">http://sling.apache.org/components/</a>. The description on how to publish can be found at <a href="/documentation/development/release-management.html">Release Management</a>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles.html
----------------------------------------------------------------------
diff --git a/documentation/bundles.html b/documentation/bundles.html
index c4b7a0d..2902c78 100644
--- a/documentation/bundles.html
+++ b/documentation/bundles.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Bundles</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Bundles</h1></header><h2>Content</h2>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Bundles
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2>Content</h2>
 <ul>
   <li><a href="/documentation/bundles/content-loading-jcr-contentloader.html">Content Loading (jcr.contentloader)</a></li>
   <li><a href="/documentation/bundles/internationalization-support-i18n.html">Internationalization Support (i18n)</a></li>
@@ -136,7 +138,7 @@
   <li><a href="/documentation/bundles/discovery-api-and-impl.html">Discovery API and its Implementations (discovery.api, discovery.impl)</a></li>
   <li><a href="/documentation/bundles/datasource-providers.html">Datasource Provider</a></li>
   <li><a href="/documentation/bundles/log-tracers.html">Log Tracer</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 7dac865..2a27c5c 100644
--- a/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
+++ b/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Accessing File System Resources (org.apache.sling.fsresource)</h1></header><p>[TOC]</p>
+<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>
+                Accessing File System Resources (org.apache.sling.fsresource)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>The Apache Sling File System Resource Provider provides access to the operating system's file system through the Sling <code>ResourceResolver</code>. Multiple locations may be mapped into the resource tree by configuring the file system location and the resource tree root path for each location to be mapped. The provider supports mapping folders and files as binaries, and content structures stored in JSON files or FileVault XML format.</p>
 <p>To activate this feature, install the <code>org.apache.sling.fsresource</code> bundle. You can get it from the Sling downloads page or from <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.sling%22%20AND%20a%3A%22org.apache.sling.fsresource%22">Maven Central</a>.</p>
@@ -183,7 +186,7 @@
   <li>The content of .content.xml files is cached in-memory until it changes.</li>
   <li>Resource events are sent when file oder folder changes are detected. When a JSON or jcr.xml file is changed resource events are sent for each resource contained in this file.</li>
   <li>Content excluded by the filter definition is not mounted by the resource provider, if a resource of the relevant path is requested the resource provider falls back to the parent resource provider (e.g. JCR repository).</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 3abb31f..2ac46b1 100644
--- a/documentation/bundles/apache-sling-commons-thread-pool.html
+++ b/documentation/bundles/apache-sling-commons-thread-pool.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,10 +66,12 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Commons Thread Pool</h1></header><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>
+<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>
+                Apache Sling Commons Thread Pool
+            </h1><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>
 <p>The thread pools are actually wrappers around the thread pool support (executer) from the Java library. The advantage of using this thread pool service is, that the pools can be configured and managed through OSGi configurations. In addition the bundle contains a plugin for the Apache Felix Web Console.</p>
-<p>When using the <code>ThreadPoolMananger</code> it is important to release a thread pool using the manager after it has been used.</p></section></div></div>            
+<p>When using the <code>ThreadPoolMananger</code> it is important to release a thread pool using the manager after it has been used.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 1ebfc62..6570822 100644
--- a/documentation/bundles/apache-sling-eventing-and-job-handling.html
+++ b/documentation/bundles/apache-sling-eventing-and-job-handling.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Eventing and Job Handling</h1></header><h2>Overview</h2>
+<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>
+                Apache Sling Eventing and Job Handling
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2>Overview</h2>
 <p>The Apache Sling Event Support bundle adds additional features to the OSGi Event Admin and for distributed event processing.</p>
 <p>The bundle provides the following features</p>
 <ul>
@@ -233,7 +235,7 @@ public class MyComponent {
 <p>The (local) event admin is the service distributing events locally. The Sling Distributing Event Handler is a registered event handler that is listening for events to be distributed. It distributes the events to remote application notes, Sling's resource tree is used for distribution. The distributing event handler writes the events into the resource tree, the distributing event handlers on other application nodes get notified through observation and then distribute the read events locally.</p>
 <p>As mentioned above, the client sending an event has to mark an event to be distributed in a cluster by setting the <em>event.distribute</em> in the event properties (through <em>EventUtil</em>). This distribution mechanism has the advantage that the application nodes do not need to know each other and the distribution mechanism is independent from the used event admin implementation.</p>
 <h2>Sending Scheduled Events</h2>
-<p>Scheduled events are OSGi events that have been created by the environemnt. They are generated on each application node of the cluster through an own scheduler instance. Sending these events works the same as sending events based on JCR events (see above).</p></section></div></div>            
+<p>Scheduled events are OSGi events that have been created by the environemnt. They are generated on each application node of the cluster through an own scheduler instance. Sending these events works the same as sending events based on JCR events (see above).</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 ecd4f4d..ac3397f 100644
--- a/documentation/bundles/bundle-resources-extensions-bundleresource.html
+++ b/documentation/bundles/bundle-resources-extensions-bundleresource.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Bundle Resources (extensions.bundleresource)</h1></header><p>[TOC]</p>
+<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>
+                Bundle Resources (extensions.bundleresource)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>The Bundle Resource Provider provides access to files/directories included in an OSGi bundle through the Sling <code>ResourceResolver</code>. </p>
 <h2>Resource Types</h2>
@@ -94,7 +97,7 @@ Sling-Bundle-Resources: /libs/sling/explorer,
 Sling-Bundle-Resources: /somepath/inthe/resourcetree;path:=/path/inthe/bundle
 ...
 </code></pre>
-<p>The Bundle Resource Provider also has a web console plugin through which the currently installed bundles can be seen.</p></section></div></div>            
+<p>The Bundle Resource Provider also has a web console plugin through which the currently installed bundles can be seen.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/caching-services.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/caching-services.html b/documentation/bundles/caching-services.html
index b18434c..cd0e80a 100644
--- a/documentation/bundles/caching-services.html
+++ b/documentation/bundles/caching-services.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Sling Caching Services</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,9 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Caching Services</h1></header><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>
+<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>
+                Sling Caching Services
+            </h1><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>
-<p>A portal cache provider API implementation is provided, that depends on the whiteboard portal modules found under <a href="https://svn.apache.org/repos/asf/sling/whiteboard/portal">https://svn.apache.org/repos/asf/sling/whiteboard/portal</a></p></section></div></div>            
+<p>A portal cache provider API implementation is provided, that depends on the whiteboard portal modules found under <a href="https://svn.apache.org/repos/asf/sling/whiteboard/portal">https://svn.apache.org/repos/asf/sling/whiteboard/portal</a></p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/commons-html-utilities.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/commons-html-utilities.html b/documentation/bundles/commons-html-utilities.html
index 98aac93..e077b85 100644
--- a/documentation/bundles/commons-html-utilities.html
+++ b/documentation/bundles/commons-html-utilities.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Commons HTML Utilities (org.apache.sling.commons.html)</h1></header><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="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>
+                Commons HTML Utilities (org.apache.sling.commons.html)
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/configuration-installer-factory.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/configuration-installer-factory.html b/documentation/bundles/configuration-installer-factory.html
index 4b141ea..04c7e47 100644
--- a/documentation/bundles/configuration-installer-factory.html
+++ b/documentation/bundles/configuration-installer-factory.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Configuration Installer Factory</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Configuration Installer Factory</h1></header><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>
+<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>
+                Configuration Installer Factory
+            </h1><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>Configurations</h2>
 <p>Configuration file names are related to the PID and factory PID. The structure of the file name is as follows:</p>
 <pre><code>filename ::= &lt;pid&gt; ( &#39;-&#39; &lt;subname&gt; )? (&#39;.cfg&#39;|&#39;.config&#39;)
@@ -122,7 +124,7 @@ stringsimple ::= &lt;quoted string representation of the value where both &#39;&
 <h1>Project Info</h1>
 <ul>
   <li>Configuration installer factory (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration">org.apache.sling.installer.factory.configuration</a>)</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/content-distribution.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/content-distribution.html b/documentation/bundles/content-distribution.html
index 9866a68..4235b9e 100644
--- a/documentation/bundles/content-distribution.html
+++ b/documentation/bundles/content-distribution.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Content Distribution (org.apache.sling.distribution)</h1></header><p>[TOC]</p>
+<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>
+                Content Distribution (org.apache.sling.distribution)
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>The Sling Content Distribution (SCD) module allows one to distribute Sling resources between different Sling instances. The API works at path level and the distribution agents basically enable distribution of specific paths between instances. There are several main usecases in which SCD can help. Typically the distribution is done from one or more source instances to one or more target instances.</p>
 <h2>Distribution usecases</h2>
@@ -243,7 +246,7 @@ org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageIm
 <h3>How to trigger distribution over HTTP?</h3>
 <h3>How to configure binary-less distribution?</h3>
 <h3>How to configure priority paths?</h3>
-<h3>How to configure error queues?</h3></section></div></div>            
+<h3>How to configure error queues?</h3></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 c63ab17..3edc3d1 100644
--- a/documentation/bundles/content-loading-jcr-contentloader.html
+++ b/documentation/bundles/content-loading-jcr-contentloader.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Content Loading and Nodetype Support (jcr.contentloader)</h1></header><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>
+<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>
+                Content Loading and Nodetype Support (jcr.contentloader)
+            </h1><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>Initial Content Loading</h2>
 <p>Bundles can provide initial content, which is loaded into the repository when the bundle has entered the <em>started</em> state. Such content is expected to be contained in the bundles accessible through the Bundle entry API methods. Content to be loaded is declared in the <code>Sling-Initial-Content</code> bundle manifest header. This header takes a comma-separated list of bundle entry paths. Each entry and all its child entries are accessed and entered into starting with the child entries of the listed entries.</p>
 <p>Adding this content preserves the paths of the entries as shown in this table, which assumes a <code>Sling-Initial-Content</code> header entry of <code>SLING-INF/content</code> (with no further directives):</p>
@@ -374,7 +376,7 @@ Support for re-registration of node types is relatively limited. In Jackrabbit,
 </div>
 <h3>Automated tests</h3>
 <p>The initial content found in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/content/src/main/resources/content/sling-test">sling-test folder of the launchpad initial content</a> is verified by the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java">InitialContentTest</a> when running the <em>launchpad/testing</em> integration tests.</p>
-<p>Those tests can be used as verified examples of initial content loading. Contributions are welcome to improve the coverage of those tests.</p></section></div></div>            
+<p>Those tests can be used as verified examples of initial content loading. Contributions are welcome to improve the coverage of those tests.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 f149d77..24f4b8c 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
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Context-Aware Configuration - Default Implementation</h1></header><p>[TOC]</p>
+<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>
+                Apache Sling Context-Aware Configuration - Default Implementation
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>About</h1>
 <p>By default the 'default implementation' us used by the Context-Aware Configuration concerning lookup and persistence of configuration data, resource and property inheritance and context path detection. Using the <a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">SPI</a> it is possible to overlay, extend or replace this functionality.</p>
 <p>This page documents the details of the default implementation.</p>
@@ -129,7 +132,7 @@
 <h1>Property inheritance</h1>
 <p>By default, no property inheritance takes place. That means only the properties that are stored in the configuration resource are mapped to the annotation class or returned as value map, regardless whether singleton or collection resources are returned, or if resource collection inheritance is enabled or not.</p>
 <p>By defining a property <code>sling:configPropertyInherit</code> on the configuration resource, property merging is enabled between the current configuration resource and the next resource with the same name (singleton or resource collection item) in the configuration resource lookup order. That means that all properties that are not defined on the current configuration resource are inherited from the next resources and a merged value map is used for the configuration mapping.</p>
-<p>By setting the property <code>sling:configPropertyInherit</code> on multiple configuration resources that are part of the lookup order it is possible to form deeper inheritance chains following the same rules.</p></section></div></div>            
+<p>By setting the property <code>sling:configPropertyInherit</code> on multiple configuration resources that are part of the lookup order it is possible to form deeper inheritance chains following the same rules.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 204f447..77de8ed 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Context-Aware Configuration - Override</h1></header><p>[TOC]</p>
+<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>
+                Apache Sling Context-Aware Configuration - Override
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>About</h1>
 <p>Using overrides it is possible to override context-aware configuration values globally or for specific content paths (and their subtrees) within an instance. If an override is active the Configuration API returns the overridden values instead of the values from the configuration resources.</p>
 <p>An example use case is to overwrite the Site URLs on your staging system which has a copy of the configuration content of the production system installed.</p>
@@ -109,7 +112,7 @@ x.y.z.MyConfig={&quot;prop1&quot;=&quot;value1&quot;,&quot;prop2&quot;=[1,2,3],&
 <p>This provider is not active by default, it has to be activated via OSGi configuration ("Apache Sling Context-Aware System Property Configuration Override Provider").</p>
 <h2>Override via OSGi configuration</h2>
 <p>Allows to define configuration property overrides from OSGi configuration.</p>
-<p>You can provide multiple providers using a factory configuration ("Apache Sling Context-Aware OSGi Configuration Override Provider"), each of them provides list of override strings.</p></section></div></div>            
+<p>You can provide multiple providers using a factory configuration ("Apache Sling Context-Aware OSGi Configuration Override Provider"), each of them provides list of override strings.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 16b72f1..af70b23 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Context-Aware Configuration - SPI</h1></header><p>[TOC]</p>
+<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>
+                Apache Sling Context-Aware Configuration - SPI
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>About</h1>
 <p>The Context-Aware Configuration implementation provides a set of Service Provider Interfaces (SPI) that allows you to overlay, enhance or replace the default implementation and adapt it to your needs.</p>
 <p>Please use the SPI with care, and first check if the <a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html">Default Implementation</a> does not already fulfill your needs.</p>
@@ -92,7 +95,7 @@
 <p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationMetadataProvider</code> you can provide information about configuration metadata from other sources than annotation classes.</p>
 <h1>Configuration Override Provider</h1>
 <p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationOverrideProvider</code> you can provide your own overrides - if the built-in override providers do not fit your needs.</p>
-<p>See <a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Override</a> for the list of built-in providers and the override syntax.</p></section></div></div>            
+<p>See <a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Override</a> for the list of built-in providers and the override syntax.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 b830bf1..9c3c4c6 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Context-Aware Configuration</h1></header><p>[TOC]</p>
+<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>
+                Apache Sling Context-Aware Configuration
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>About</h1>
 <p>These bundles provide a service API that can be used to get context-aware configurations. Context-aware configurations are configurations that are related to a content resource or a resource tree, e.g. a web site or a tenant site.</p>
 <p>Here is an example how your content structure may look like:</p>
@@ -210,7 +213,7 @@ public class MyTest {
   <li><a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">Context-Aware Configuration - SPI</a></li>
   <li><a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Context-Aware Configuration - Override</a></li>
   <li><a href="https://adapt.to/2016/en/schedule/sling-context-aware-configuration.html">Sling Context-Aware Configuration - Talk from adaptTo() 2016</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/datasource-providers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/datasource-providers.html b/documentation/bundles/datasource-providers.html
index 42fb07b..a171061 100644
--- a/documentation/bundles/datasource-providers.html
+++ b/documentation/bundles/datasource-providers.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: DataSource Provider</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>DataSource Provider</h1></header><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>[TOC]</p>
+<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>
+                DataSource Provider
+            </h1><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 -->
+</p>
 <h2>Pooled Connection DataSource Provider</h2>
 <p>This bundle enables creating and configuring JDBC DataSource in OSGi environment based on OSGi configuration. It uses <a href="http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html">Tomcat JDBC Pool</a> as the JDBC Connection Pool provider.</p>
 <ol>
@@ -140,7 +143,7 @@ public class DSExample {
     &lt;artifactId&gt;org.apache.sling.datasource&lt;/artifactId&gt;
     &lt;version&gt;1.0.0&lt;/version&gt;
 &lt;/dependency&gt;
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 f0e5d0c..4c4cafd 100644
--- a/documentation/bundles/discovery-api-and-impl.html
+++ b/documentation/bundles/discovery-api-and-impl.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,9 +66,12 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Discovery API and its implementations</h1></header><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>
+<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>
+                Discovery API and its implementations
+            </h1><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>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Discovery Entities</h2>
 <p>The Discovery API defines the following entities</p>
 <h3>Instance, InstanceDescription</h3>
@@ -267,7 +270,7 @@ public class SamplePropertyProvider implements PropertyProvider {
 <h4>discovery.commons</h4>
 <p>This is a bundle usable by any implementation of discovery and contains very basic, implementation-independent functionality</p>
 <h4>discovery.base</h4>
-<p>This is the base bundle solely used by discovery.impl and discovery.oak and contains exactly the mentioned properties and announcement handling.</p></section></div></div>            
+<p>This is the base bundle solely used by discovery.impl and discovery.oak and contains exactly the mentioned properties and announcement handling.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/dynamic-includes.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/dynamic-includes.html b/documentation/bundles/dynamic-includes.html
index 349f75d..25a2b17 100644
--- a/documentation/bundles/dynamic-includes.html
+++ b/documentation/bundles/dynamic-includes.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,9 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Dynamic Include</h1></header><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>
+<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>
+                Apache Sling Dynamic Include
+            </h1><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>Sling Dynamic Include (org.apache.sling.dynamic-include)</h1>
-<p>For now the Sling Dynamic Include documentation can be found <a href="https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-dynamic-include/README.md">in the Sling codebase</a> or <a href="https://github.com/apache/sling/tree/trunk/contrib/extensions/sling-dynamic-include">on our GitHub mirror</a> if that's in sync.</p></section></div></div>            
+<p>For now the Sling Dynamic Include documentation can be found <a href="https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-dynamic-include/README.md">in the Sling codebase</a> or <a href="https://github.com/apache/sling/tree/trunk/contrib/extensions/sling-dynamic-include">on our GitHub mirror</a> if that's in sync.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/file-installer-provider.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/file-installer-provider.html b/documentation/bundles/file-installer-provider.html
index 8ae7ce4..358d4a1 100644
--- a/documentation/bundles/file-installer-provider.html
+++ b/documentation/bundles/file-installer-provider.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: File Installer Provider</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>File Installer Provider</h1></header><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>
+<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>
+                File Installer Provider
+            </h1><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>Setup</h2>
 <p>The file installer can be configured with these framework (system) properties:</p>
 <table>
@@ -108,7 +110,7 @@
 <h1>Project Info</h1>
 <ul>
   <li>File installer provider (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/providers/file">org.apache.sling.installer.provider.file</a>)</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/internationalization-support-i18n.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/internationalization-support-i18n.html b/documentation/bundles/internationalization-support-i18n.html
index ffba8c3..778c93d 100644
--- a/documentation/bundles/internationalization-support-i18n.html
+++ b/documentation/bundles/internationalization-support-i18n.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Internationalization Support (i18n)</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Internationalization Support (i18n)</h1></header><p>Internationalization support in Sling consists of four methods in the <code>SlingHttpServletRequest</code> interface:</p>
+<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>
+                Internationalization Support (i18n)
+            </h1><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>
   <li><code>getLocale()</code> -- Returns the primary <code>Locale</code> for the current request. This method is inherited from the <code>javax.servlet.ServletRequest</code> interface.</li>
   <li><code>getLocales()</code> -- Returns the <code>Locale</code> instances for the current request. This method is inherited from the <code>javax.servlet.ServletRequest</code> interface.</li>
@@ -213,7 +215,7 @@
   <li><code>de</code></li>
   <li><code>en</code></li>
 </ol>
-<p>In case there is a resource bundle requested for a locale without country or variant, there is only 1 fallback (i.e. the default locale). The last resort (root resource bundle in all hierarchies) is always the bundle which returns the requested key as the value.</p></section></div></div>            
+<p>In case there is a resource bundle requested for a locale without country or variant, there is only 1 fallback (i.e. the default locale). The last resort (root resource bundle in all hierarchies) is always the bundle which returns the requested key as the value.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/jcr-installer-provider.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/jcr-installer-provider.html b/documentation/bundles/jcr-installer-provider.html
index eead1ec..8e7c0a1 100644
--- a/documentation/bundles/jcr-installer-provider.html
+++ b/documentation/bundles/jcr-installer-provider.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: JCR Installer Provider</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>JCR Installer Provider</h1></header><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>
+<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>
+                JCR Installer Provider
+            </h1><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>Configuration and Scanning</h2>
 <p>The JCR installer provider can be configured with weighted paths which are scanned. By default, the installer scans in <em>/apps</em> and <em>/libs</em> where artifacts found in <em>/apps</em> get a higher priority. The installer does a deep scan and uses a regular expression to detect folders containing artifacts to be installed. By default, artifacts from within a folder named <em>install</em> are provided to the OSGi installer.</p>
 <p>If such an install folder contains a binary artifact (e.g. a bundle or a config file as described in <a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a>) this is provided to the OSGi installer. </p>
@@ -163,7 +165,7 @@ curl -X MKCOL  http://admin:admin@localhost:8888/apps/jcrtest/install
 <h1>Project Info</h1>
 <ul>
   <li>JCR installer provider (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/providers/jcr">org.apache.sling.installer.provider.jcr</a>)</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/bundles/log-tracers.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/log-tracers.html b/documentation/bundles/log-tracers.html
index 5d0f101..48ced93 100644
--- a/documentation/bundles/log-tracers.html
+++ b/documentation/bundles/log-tracers.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Log Tracer</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Log Tracer</h1></header><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>
+<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>
+                Log Tracer
+            </h1><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>
 <p>For e.g. determining what nodes are written for a given POST request can be simply done by including an extra request parameters.</p>
 <pre><code>curl -D - -u admin:admin \
@@ -264,7 +266,7 @@ Transfer-Encoding: chunked
     &lt;artifactId&gt;org.apache.sling.tracer&lt;/artifactId&gt;
     &lt;version&gt;1.0.0&lt;/version&gt;
 &lt;/dependency&gt;
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 51be764..9ea2049 100644
--- a/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
+++ b/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Managing permissions (jackrabbit.accessmanager)</h1></header><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>. [TOC]</p>
+<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>
+                Managing permissions (jackrabbit.accessmanager)
+            </h1><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>
 <h2>Privileges</h2>
 <table>
   <thead>
@@ -163,7 +166,7 @@ See section 16.3 of the JCR 2.0 specification for an explanation of the differen
 </div>
 <h2>Sample User Interface Implementation</h2>
 <p><em>Since Version 2.1.1</em></p>
-<p>A sample implementation of ui pages for permissions management is provided @ http://svn.apache.org/viewvc/sling/trunk/samples/accessmanager-ui/</p></section></div></div>            
+<p>A sample implementation of ui pages for permissions management is provided @ http://svn.apache.org/viewvc/sling/trunk/samples/accessmanager-ui/</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here


[2/6] sling-site git commit: Publish latest fixes

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 07c65ee..0505e03 100644
--- a/documentation/the-sling-engine/sling-properties.html
+++ b/documentation/the-sling-engine/sling-properties.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,9 +66,12 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Well-known Sling Properties</h1></header><p>This table lists properties which have known functionality in the OSGi and Sling frameworks.</p>
+<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>
+                Well-known Sling Properties
+            </h1><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>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Sling Setup Properties</h2>
 <table>
   <thead>
@@ -188,7 +191,7 @@
       <td>The port to listen on for HTTP requests. This property requires support by the Http Service bundle. </td>
     </tr>
   </tbody>
-</table></section></div></div>            
+</table></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 290e434..b7cac3f 100644
--- a/documentation/the-sling-engine/the-sling-launchpad.html
+++ b/documentation/the-sling-engine/the-sling-launchpad.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: The Sling Launchpad</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>The Sling Launchpad</h1></header><p>[TOC]</p>
+<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>
+                The Sling Launchpad
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>This tries to explain how exactly the Sling Launchpad works, what constitutes the Sling Launchpad and how you can use the Sling Launchpad to custom create you Sling launchers. For a view behind the scenes of the Sling Launchpad Base module (the actual launcher) you might want to refer to the <a href="/documentation/development/embedding-sling.html">Embedding Sling</a> page.</p>
 <h2>Sling Home</h2>
 <p>Since Sling requires some space on the filesystem to store various files Sling has to know where this filesystem space is located.</p>
@@ -299,7 +302,7 @@ Connection closed by foreign host.
   <li><code>oak</code>: configures and starts up an Apache Jackrabbit Oak repository implementation with a SegmentNodeStore ( TarMK ) implementation</li>
   <li><code>oak,oak_mongo</code>: configures and starts up an Apache Jackrabbit Oak repository implementation with a DocumentNodeStore implementation connected to a MongoDB database. The default configuration points to a MongoDB instance at mongodb://localhost:27017 and a database named sling.</li>
 </ul>
-<p>That's it. The resulting artifact may be directly used to launch the Standalone Java Application or may directly be deployed into any Servlet API 3.0 (or later) compliant servlet container.</p></section></div></div>            
+<p>That's it. The resulting artifact may be directly used to launch the Standalone Java Application or may directly be deployed into any Servlet API 3.0 (or later) compliant servlet container.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 855b296..36945e0 100644
--- a/documentation/the-sling-engine/url-decomposition.html
+++ b/documentation/the-sling-engine/url-decomposition.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: URL decomposition</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>URL decomposition</h1></header><p>[TOC]</p>
+<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>
+                URL decomposition
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h1>Overview</h1>
 <p>During the <em>Resource Resolution</em> step, the client request URI (as being returned by [HttpServletRequest.getRequestURI()](http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getRequestURI())) is decomposed into the following parts (in exactly this order):</p>
 <ol>
@@ -211,7 +214,7 @@
   <li><a href="http://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java">ResourceResolverImplTest</a> shows the split between resource path and the rest. Mostly in the method <code>testBasicAPIAssumptions</code>.</li>
   <li><a href="http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java">SlingRequestPathInfoTest</a> demonstrates the decomposition after the resource path part.</li>
 </ul>
-<p>Feel free to suggest additional tests that help clarify how this works!</p></section></div></div>            
+<p>Feel free to suggest additional tests that help clarify how this works!</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 f65277c..38f3598 100644
--- a/documentation/the-sling-engine/url-to-script-resolution.html
+++ b/documentation/the-sling-engine/url-to-script-resolution.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>URL to Script Resolution</h1></header><p>[TOC]</p>
+<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>
+                URL to Script Resolution
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>This page explains how Sling maps URLs to a script or and servlet. </p>
 <p>See also <a href="/documentation/the-sling-engine/servlets.html">Servlets and Scripts</a> which provides detailed info about how to register servlets.</p>
 <p>First of all Sling looks up the resource identified by the URL - typically a path inside the JCR repository, which is annotated by the <code>sling:resourceType</code> property which defines the resource type of that resource. Using this resource type (which is kind of a relative path, eg. "myblog/comment"), scripts or servlets are looked up. For more details about how the initial resource is identified for a specific request URL look at <a href="/documentation/the-sling-engine/url-decomposition.html">URL decomposition</a>.</p>
@@ -138,7 +141,7 @@ while (type != null) {
   <li>(7) a4.html.esp</li>
   <li>(8) a4/print.html.esp</li>
 </ul>
-<p>The priority of script selection would be (starting with the best one): (6) - (4) - (5) - (3) - (2) - (1) - (0). Note that (4) is a better match than (5) because it matches more selectors even though (5) has an extension match where (4) does not. (7) is not a candidate because it does not include the first selector (print) and (8) is not a candidate because it has the wrong order of selectors.</p></section></div></div>            
+<p>The priority of script selection would be (starting with the best one): (6) - (4) - (5) - (3) - (2) - (1) - (0). Note that (4) is a better match than (5) because it matches more selectors even though (5) has an extension match where (4) does not. (7) is not a candidate because it does not include the first selector (print) and (8) is not a candidate because it has the wrong order of selectors.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 4efeafe..69cc869 100644
--- a/documentation/the-sling-engine/wrap-or-decorate-resources.html
+++ b/documentation/the-sling-engine/wrap-or-decorate-resources.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Wrap or Decorate Resources</h1></header><h2>Introduction</h2>
+<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>
+                Wrap or Decorate Resources
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2>Introduction</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>
 <p>## </p>
 <p>To add a resource decorator just register one or more services which implement the interface <code>ResourceDecorator</code></p>
@@ -87,7 +89,7 @@ public Resource decorate(Resource resource, HttpServletRequest request) {
     return this.decorate(resource);
 }
 </code></pre>
-<p>And use some other mechanism (e.g. a <code>ThreadLocal</code>) to obtain the current request if necessary.</p></section></div></div>            
+<p>And use some other mechanism (e.g. a <code>ThreadLocal</code>) to obtain the current request if necessary.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/tutorials-how-tos.html
----------------------------------------------------------------------
diff --git a/documentation/tutorials-how-tos.html b/documentation/tutorials-how-tos.html
index d5e0eff..4826420 100644
--- a/documentation/tutorials-how-tos.html
+++ b/documentation/tutorials-how-tos.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Tutorials & How-Tos</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,14 +66,16 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Tutorials & How-Tos</h1></header><ul>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Tutorials &amp; How-Tos
+            </h1><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>
   <li><a href="tutorials-how-tos/getting-resources-and-properties-in-sling.html">Getting Resources and Properties in Sling</a></li>
   <li><a href="tutorials-how-tos/how-to-manage-events-in-sling.html">How to Manage Jobs in Sling</a></li>
   <li><a href="tutorials-how-tos/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</a></li>
   <li><a href="tutorials-how-tos/jackrabbit-persistence.html">Jackrabbit Persistence</a></li>
   <li><a href="tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 13cfd79..7a22ad1 100644
--- a/documentation/tutorials-how-tos/46-line-blog.html
+++ b/documentation/tutorials-how-tos/46-line-blog.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: 46 Line Blog</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>46 Line Blog</h1></header><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>
+<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>
+                46 Line Blog
+            </h1><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>
 <p>I used this example in my <a href="http://www.slideshare.net/bdelacretaz/rapid-jcr-applications-development-with-sling-1196003">Rapid JCR application development with Apache Sling</a> presentation at ApacheCon US 09 in Oakland (slides will be available soon), and I think it's a good testimony to the power and simplicity of Sling.</p>
 <h2>Audience</h2>
@@ -165,7 +167,7 @@ If you get an error saying _javax.jcr.AccessDeniedException: ...not allowed to a
 <p>To keep things simple, we'll refrain from adding ESP-based features at this point, but you can of course use any ESP code in the <em>blog.esp</em> "script".</p>
 <h2>That's the power of Sling</h2>
 <p>The 46-line blog is a good example of the power of Sling. It leverages the <a href="/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html">SlingPostServlet</a>, which handles POST requests in a form-friendly way, and the <a href="http://svn.apache.org/repos/asf/sling/trunk/bundles/servlets/post/src/main/resources/system/sling.js"><code>sling.js</code></a> client library, which provides high-level functionality on the client side.</p>
-<p>///Footnotes Go Here///</p></section></div></div>            
+<p>///Footnotes Go Here///</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 709ebbf..76c0d96 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
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Getting Resources and Properties in Sling</h1></header><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>
+<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>
+                Getting Resources and Properties in Sling
+            </h1><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>
 <p>The whole game consists in first getting a <code>ResourceResolver</code> and then getting the <code>Resource</code> itself.</p>
 <h2>Within an OSGI Service/Compoment</h2>
@@ -131,7 +133,7 @@ ValueMap properties = ResourceUtil.getValueMap(res);
 <pre><code>#!java
 String rule = properties.get(propName, (String) null);
 </code></pre>
-<p>For more details about resources and how to access them in Sling, you can refer to the <a href="/documentation/the-sling-engine/resources.html">Sling documentation about Resources</a>.</p></section></div></div>            
+<p>For more details about resources and how to access them in Sling, you can refer to the <a href="/documentation/the-sling-engine/resources.html">Sling documentation about Resources</a>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 6538c7b..0c0fcff 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
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>How to Manage Jobs in Sling</h1></header><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>
+<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>
+                How to Manage Jobs in Sling
+            </h1><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>
 <ul>
   <li><a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Eventing and Job Handling</a> to get detailed information on the eventing mechanisms in Sling.</li>
@@ -242,7 +244,7 @@ public JobResult process(final Job job) {
     }
 }
 </code></pre>
-<p>The complete code for the <strong>DropBoxEventHandler</strong> service is available <a href="DropBoxEventHandler.java">here</a>.</p></section></div></div>            
+<p>The complete code for the <strong>DropBoxEventHandler</strong> service is available <a href="DropBoxEventHandler.java">here</a>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 c6f05b0..81fc9a5 100644
--- a/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
+++ b/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Installing and Upgrading Bundles</h1></header><p>Excerpt: Explains how to install, upgrade and uninstall Bundles using the Sling Management console.</p>
-<div class="note">
+<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>
+                Installing and Upgrading Bundles
+            </h1><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>.
 </div>
 <p>OSGi bundles installed in the OSGi framework, which is provided by Sling, may be upgraded or removed and new bundles may be installed by using the Sling Management Console. This page is about using the Sling Management Console for those tasks.</p>
@@ -99,10 +100,9 @@ We recommend to use the Apache Felix Web Console. The documentation below descri
 <p>Currently management of known OSGi Bundle Repositories is very simple. If a configured bundle repository is not available on startup, it will be marked as being inactive. If you know the repository is now available, you may click on the <em>Refresh</em> button, to activate it. Similarly, the contents of the repository may be modified by for example adding new bundles or updating bundles in the repository, these changes will be made known to Sling by clicking the <em>Refresh</em> button.</p>
 <p>There exists no GUI functionality yet to add a new repository to the list of known repositories. Instead you may submit a request with parameters <code>action</code> whose value must be <code>refreshOBR</code> and <code>repository</code> whose value must be the URL to the repository descriptor file generally called <code>repository.xml</code>.</p>
 <p>For example, if you run Sling on <code>http://localhost:7402/sample</code> with default location of the Sling Management Console, the following request would add a repository at <code>/tmp/repo/repository.xml</code> in the filesystem:</p>
-<pre><code>:::html
-http://localhost:7402/sample/system/console/bundlerepo?action=refreshOBR&amp;repository=file:///tmp/repo/repository.xml
+<pre><code>http://localhost:7402/sample/system/console/bundlerepo?action=refreshOBR&amp;repository=file:///tmp/repo/repository.xml
 </code></pre>
-<p>Note: Only use <code>file:</code> URLs if you know Sling has access to the named file !</p></section></div></div>            
+<p>Note: Only use <code>file:</code> URLs if you know Sling has access to the named file !</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 1e75379..14b6108 100644
--- a/documentation/tutorials-how-tos/jackrabbit-persistence.html
+++ b/documentation/tutorials-how-tos/jackrabbit-persistence.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Jackrabbit Persistence</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Jackrabbit Persistence</h1></header><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>
+<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>
+                Jackrabbit Persistence
+            </h1><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>
 <h2>Management Summary</h2>
 <p>To replace Derby as the persistence manager for Jackrabbit the following steps are required:</p>
@@ -148,7 +150,7 @@ $ mvn install:install-file \
 <p>If you reconfigure Jackrabbit to use the new persistence manager, the existing repository data in the <code>sling/jackrabbit</code> directory, except the <code>repository.xml</code> file, of course, should now be removed.</p>
 <p>Finally either start Sling or start the Jackrabbit Embedded Repository bundle.</p>
 <h2>Credits</h2>
-<p>This description is based on Tony Giaccone's description <a href="http://markmail.org/message/wlbfrukmjjsl33hh">Swapping Postgres for Derby</a> sent to the Sling Users mailing list.</p></section></div></div>            
+<p>This description is based on Tony Giaccone's description <a href="http://markmail.org/message/wlbfrukmjjsl33hh">Swapping Postgres for Derby</a> sent to the Sling Users mailing list.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 684c771..47f9654 100644
--- a/documentation/tutorials-how-tos/testing-sling-based-applications.html
+++ b/documentation/tutorials-how-tos/testing-sling-based-applications.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,9 +66,12 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Testing Sling-based applications</h1></header><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>
+<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>
+                Testing Sling-based applications
+            </h1><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>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Unit tests</h2>
 <p>When possible, unit tests are obviously the fastest executing ones, and it's easy to keep them close to the code that they're testing. </p>
 <p>We have quite a lot of those in Sling, the older use the JUnit3 TestCase base class, and later ones use JUnit4 annotations. Mixing both approaches is possible, there's no need to rewrite existing tests.</p>
@@ -133,7 +136,7 @@ public class MySimpleIT {
 } 
 </code></pre>
 <h2>Summary</h2>
-<p>Combining the above testing techniques has worked well for us in creating and testing Sling. Being able to test things at different levels of integration has proved an efficient way to get good test coverage without having to write too much boring test code.</p></section></div></div>            
+<p>Combining the above testing techniques has worked well for us in creating and testing Sling. Being able to test things at different levels of integration has proved an efficient way to get good test coverage without having to write too much boring test code.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/downloads.html
----------------------------------------------------------------------
diff --git a/downloads.html b/downloads.html
index a2dd4a3..154e61f 100644
--- a/downloads.html
+++ b/downloads.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Downloads</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Downloads</h1></header><p>To get the latest development release of Apache Sling, you can check out the Source Code and Getting and Building Sling yourself. Otherwise, the releases below are available for download. To install, just download and extract. The PGP keys at <a href="./https%3A%2F%2Fpeople.apache.org%2Fkeys%2Fgroup%2Fsling.asc.html">https://people.apache.org/keys/group/sling.asc</a> can be used to verify the integrity of the release archives.</p>
+            <breadcrumbs/><h1>
+                Downloads
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Downloads</h1></header><p>To get the latest development release of Apache Sling, you can check out the Source Code and Getting and Building Sling yourself. Otherwise, the releases below are available for download. To install, just download and extract. The PGP keys at <a href="./https%3A%2F%2Fpeople.apache.org%2Fkeys%2Fgroup%2Fsling.asc.html">https://people.apache.org/keys/group/sling.asc</a> can be used to verify the integrity of the release archives.</p>
 <p>All Apache Sling products are distributed under the terms of The Apache Software License (version 2.0). See our license, or the LICENSE file included in each distribution. </p>
 <p>TODO ToC ??</p>
 <h1>Mirrors</h1>
@@ -101,7 +103,7 @@
                                 <tr>
                                     <th>Artifact</th><th>Version</th><th>Binary</th><th>Source</th>
                                 </tr>
-                            </thead><tbody><tr><td>Maven JSPC Plugin</td><td>2.0.8</td><td><a href="[preferred]sling/maven-jspc-plugin-2.0.8.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8.jar.md5">md5</a>)</td><td><a href="[preferred]sling/maven-jspc-plugin-2.0.8-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8-source-release.zip.md5">md5</a>)</td></tr><tr><td>Maven Launchpad Plugin</td><td>2.3.4</td><td><a href="[preferred]sling/maven-launchpad-plugin-2.3.4.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4.jar.md5">md5</a>)</td><td><a href="[preferred]sling/maven-launchpad-plugi
 n-2.3.4-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4-source-release.zip.md5">md5</a>)</td></tr><tr><td>Maven Sling Plugin</td><td>2.3.0</td><td><a href="[preferred]sling/maven-sling-plugin-2.3.0.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0.jar.md5">md5</a>)</td><td><a href="[preferred]sling/maven-sling-plugin-2.3.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0-source-release.zip.md5">md5</a>)</td></tr><tr><td>Slingstart Maven Plugin</td><td>1.7.6</td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.6.jar">Maven Plugin</a> (<a hre
 f="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6.jar.md5">md5</a>)</td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.6-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6-source-release.zip.md5">md5</a>)</td></tr><tr><td>HTL Maven Plugin</td><td>1.0.6</td><td><a href="[preferred]sling/htl-maven-plugin-1.0.6.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.0.6.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.0.6.jar.md5">md5</a>)</td><td><a href="[preferred]sling/htl-maven-plugin-1.0.6-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.0.6-source-release.zip.asc">asc</a>, <a href="http://www.apache.o
 rg/dist/sling/htl-maven-plugin-1.0.6-source-release.zip.md5">md5</a>)</td></tr></tbody></table></section></div></div>            
+                            </thead><tbody><tr><td>Maven JSPC Plugin</td><td>2.0.8</td><td><a href="[preferred]sling/maven-jspc-plugin-2.0.8.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8.jar.md5">md5</a>)</td><td><a href="[preferred]sling/maven-jspc-plugin-2.0.8-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-jspc-plugin-2.0.8-source-release.zip.md5">md5</a>)</td></tr><tr><td>Maven Launchpad Plugin</td><td>2.3.4</td><td><a href="[preferred]sling/maven-launchpad-plugin-2.3.4.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4.jar.md5">md5</a>)</td><td><a href="[preferred]sling/maven-launchpad-plugi
 n-2.3.4-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4-source-release.zip.md5">md5</a>)</td></tr><tr><td>Maven Sling Plugin</td><td>2.3.0</td><td><a href="[preferred]sling/maven-sling-plugin-2.3.0.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0.jar.md5">md5</a>)</td><td><a href="[preferred]sling/maven-sling-plugin-2.3.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.0-source-release.zip.md5">md5</a>)</td></tr><tr><td>Slingstart Maven Plugin</td><td>1.7.6</td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.6.jar">Maven Plugin</a> (<a hre
 f="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6.jar.md5">md5</a>)</td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.6-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.6-source-release.zip.md5">md5</a>)</td></tr><tr><td>HTL Maven Plugin</td><td>1.0.6</td><td><a href="[preferred]sling/htl-maven-plugin-1.0.6.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.0.6.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.0.6.jar.md5">md5</a>)</td><td><a href="[preferred]sling/htl-maven-plugin-1.0.6-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.0.6-source-release.zip.asc">asc</a>, <a href="http://www.apache.o
 rg/dist/sling/htl-maven-plugin-1.0.6-source-release.zip.md5">md5</a>)</td></tr></tbody></table></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 98d0e09..b254ae9 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 on JBake</title>
+    <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"/>
     <subtitle>Work in progress...</subtitle>
-    <updated>2017-06-26T15:26:14Z</updated>
+    <updated>2017-06-27T19:28:14Z</updated>
     <id>tag:localhost,2017:06</id>
     
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/guides.html
----------------------------------------------------------------------
diff --git a/guides.html b/guides.html
index 0c956e7..2f9eece 100644
--- a/guides.html
+++ b/guides.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Guides (retired)</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Guides (retired)</h1></header><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="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Guides (retired)
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index c55f27e..9a3df5b 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling - Bringing Back the Fun!</h1></header><p><strong>Apache Sling&trade;</strong> is an innovative web framework that is intended to bring back the fun to web development.</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Apache Sling - Bringing Back the Fun!
+            </h1><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>
 <h1>Apache Sling in five bullets points</h1>
 <ul>
@@ -119,7 +121,7 @@
                 $('#newsExcerpt').append($newsExcerpt);
             });
         });
-</script></section></div></div>            
+</script></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/javadoc-io.html
----------------------------------------------------------------------
diff --git a/javadoc-io.html b/javadoc-io.html
index 9519833..5df34e2 100644
--- a/javadoc-io.html
+++ b/javadoc-io.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,8 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling API docs at javadoc.io</h1></header><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>            
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Sling API docs at javadoc.io
+            </h1><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>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/links.html
----------------------------------------------------------------------
diff --git a/links.html b/links.html
index 5d0c855..a0f7cef 100644
--- a/links.html
+++ b/links.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Links</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Links</h1></header><p>Here are some links to other resources</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Links
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p>Here are some links to other resources</p>
 <h2>Articles</h2>
 <ul>
   <li><a href="http://java.dzone.com/articles/java-content-repository-best">Java Content Repository: The Best Of Both Worlds</a> - by Bertrand Delacretaz on Javalobby - uses the Sling HTTP interface to demonstrate JCR features.</li>
@@ -111,7 +113,7 @@
   <li><a href="http://www.jcp.org/en/jsr/detail?id=170">JSR 170: Content Repository for Java{tm} technology API</a> - The specification of the repository API.</li>
   <li><a href="http://felix.apache.org">Apache Felix</a> - The OSGi Framework implementation we use in Sling.</li>
   <li><a href="http://www.osgi.org">The OSGi Alliance</a> - The OSGi Alliance is the specification body defining the OSGi Core and Compendium Services. These specifications are at the center of making Sling possible.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/media.html
----------------------------------------------------------------------
diff --git a/media.html b/media.html
index bc77c90..3a3aeab 100644
--- a/media.html
+++ b/media.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Media</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,10 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Media</h1></header><p>translation_pending: true</p>
-<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>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Media
+            </h1><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>
-<p>{attachments}</p></section></div></div>            
+<p>{attachments}</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/news.html
----------------------------------------------------------------------
diff --git a/news.html b/news.html
index eba0e8c..4a7a789 100644
--- a/news.html
+++ b/news.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: News</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>News</h1></header><ul>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                News
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><ul>
   <li>New Releases: <a href="/news/sling-launchpad-9-released.html">Apache Sling 9</a>, Apache Sling Launchpad Testing 9, Apache Sling Launchpad Testing WAR version 9, Apache Sling Launchpad Testing Fragment Bundle 2.0.12, Apache Sling Launchpad Testing Services 2.0.12, Apache Sling Launchpad Test Bundles 0.0.2, Apache Sling Launchpad Testing Services WAR 2.0.12, Apache Sling Integration Tests 1.0.4 ( June 12S , 2017 )</li>
   <li>New Releases: Apache Sling JUnit Core 1.0.26, Testing Clients 1.1.0, JUnit Remote Test Runners 1.0.12, Tooling Support Install 1.0.4, and Tooling Support Source 1.0.4 (June 6th, 2017)</li>
   <li>New Releases: Apache Sling Resource Inventory 1.0.8, Content Distribution Core 0.2.8, Testing Sling Mock 2.2.12, Log Tracer 1.0.4, and Commons Metrics 1.2.2 (June 6th, 2017)</li>
@@ -548,7 +550,7 @@
   <li>Mailing lists moved to dev(a)sling.apache.org and commits(a)sling.apache.org (June 29, 2009)</li>
   <li>SVN moved to http://svn.apache.org/repos/asf/sling (June 18, 2009)</li>
   <li>Apache Sling has graduated into a top level project! (June 17, 2009)</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 60e097f..79866de 100644
--- a/news/sling-ide-tooling-11-released.html
+++ b/news/sling-ide-tooling-11-released.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling IDE Tooling 1.1 released</h1></header><p>Here are some of the more noteworthy things available in this release.</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Apache Sling IDE Tooling 1.1 released
+            </h1><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>
 <p>Sightly support ==</p>
 <p>Sightly support has been added through an additional, optional, feature named <em>Sling IDE Tools - Sightly Integration</em>.</p>
 <p>This feature provides the following enhancements:</p>
@@ -88,7 +90,7 @@
   <li>Keyboard shortcuts now work in the content navigator</li>
   <li>When creating a new server in the project creation wizard, sensible defaults are filled in</li>
   <li>When connecting to a server, all support bundles are automatically installed</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/news/sling-launchpad-8-released.html
----------------------------------------------------------------------
diff --git a/news/sling-launchpad-8-released.html b/news/sling-launchpad-8-released.html
index 8cf5af7..b71d69d 100644
--- a/news/sling-launchpad-8-released.html
+++ b/news/sling-launchpad-8-released.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Launchpad 8 released</h1></header><p>Here are some of the more noteworthy things available in this release.</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Apache Sling Launchpad 8 released
+            </h1><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>Switched to Apache Jackrabbit Oak</h2>
 <p>The Sling launchpad has switched from Apache Jackrabbit 2.7.5 to Apache Jackrabbit Oak 1.3.7 as a persistence engine. Apache Jackrabbit Oak is now supported in Sling with two persistence modes: SegmentNodeStore ( file-based ) and DocumentNodeStore ( MongoDB-based ). See <a href="http://jackrabbit.apache.org/oak/docs/index.html">the Oak documentation</a> for more details about the Oak persistence modes and <a href="https://sling.apache.org/documentation/the-sling-engine/the-sling-launchpad.html#launchpad-app-and-launchpad-webapp">the Sling Launchpad documentation</a> for details about configuring the persistence mode.</p>
 <h2>Provisioning model</h2>
@@ -94,7 +96,7 @@
   <li>Apache Felix has been upgraded to version 5.2.0</li>
   <li>Apache Tika has been updated to version 1.10</li>
   <li>Apache HttpClient 4.4 has been added</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/news/sling-launchpad-9-released.html
----------------------------------------------------------------------
diff --git a/news/sling-launchpad-9-released.html b/news/sling-launchpad-9-released.html
index c3775d9..ed4a73a 100644
--- a/news/sling-launchpad-9-released.html
+++ b/news/sling-launchpad-9-released.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Apache Sling Launchpad 9 released</h1></header><p>Here are some of the more noteworthy things available in this release.</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/news.html">News</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Apache Sling Launchpad 9 released
+            </h1><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>Updated to Oak 1.6.1 and segment-tar persistence</h2>
 <p>We now include the latest stable version of Oak and have switched to the latest form of the disk-based persitence - oak-segment-tar. This module provides better runtime characteristics when compared to the oak-segment persistence and also allows reliable online compaction of the repository.</p>
 <p>If you're upgrading from a previous version of Sling you will need to manually upgrade the repository. See the <a href="http://jackrabbit.apache.org/oak/docs/migration.html">Oak documentation on Repository migration</a> for more details.</p>
@@ -97,7 +99,7 @@
 <p>Documentation available at <a href="/documentation/the-sling-engine/service-authentication.html">Service Authentication</a>.</p>
 <h2>Removed org.apache.sling.commons.json and org.json bundles</h2>
 <p>Apache projects are no longer allowed, for legal reasons, to ship code which uses or links to the JSON.org Java implementation. As a consequence we have removed all code which references that API.</p>
-<p>If you need to use these bundles, you can always retrieve then from Maven Central and incorporate them in your launchpad.</p></section></div></div>            
+<p>If you need to use these bundles, you can always retrieve then from Maven Central and incorporate them in your launchpad.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff.html
----------------------------------------------------------------------
diff --git a/old-stuff.html b/old-stuff.html
index b822bc4..447919e 100644
--- a/old-stuff.html
+++ b/old-stuff.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Old Stuff</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Old Stuff</h1></header><p>TODO: this page points to old content that's most probably obsolete.</p>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Old Stuff
+            </h1><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>
 <li><a href="/old-stuff/assembly.html">Assembly</a></li>
 <li><a href="/old-stuff/launch-sling.html">Launch Sling</a></li>
@@ -75,7 +77,7 @@
 <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>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff/assembly.html
----------------------------------------------------------------------
diff --git a/old-stuff/assembly.html b/old-stuff/assembly.html
index ac6ecd9..3efa754 100644
--- a/old-stuff/assembly.html
+++ b/old-stuff/assembly.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Assembly</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Assembly</h1></header><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>
+<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>
+                Assembly
+            </h1><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>Introduction</h2>
 <p>This chapter discusses the units of deployment as well as the units of functionality. The following contents is based on the Module and Service specifications of the OSGi Service Platform Core Specification, Release 4 but enhances functionality for ease of use and in terms of best practices.</p>
 <p>The term <em>Units of Deployment</em> describes the idea of packaging up functionality implemented by Java Classes into modules, so called <em>Bundles</em>. For bigger and more complicated applications the fine grained modularity of <em>Bundles</em> may be to complicated, so this chapter proposes an extension called <em>Assembly</em>. The goal of the <em>Assembly</em> specification presented below is to provide functionality to delivery a collection of bundles belonging together.</p>
@@ -142,7 +144,7 @@ Parameter = ParameterName &quot;=&quot; ParameterValue .
   <li>Use similar heuristics to decide on the contents of a bundle as you would for the contents of a plain old JAR file.</li>
 </ul>
 <h3>Nomen est Omen</h3>
-<p>The symbolic name of a bundle should reflect its contents. A bundle should generally only contain a single subtree in the virtual package tree. The symbolic name of the bundle should be the root package contained within. For example, consider a bundle containing the packages <code>org.apache.sling.sample</code>, <code>org.apache.sling.sample.impl</code>, <code>org.apache.sling.more</code>. The bundle would the be named <code>org.apache.sling.sample</code>.</p></section></div></div>            
+<p>The symbolic name of a bundle should reflect its contents. A bundle should generally only contain a single subtree in the virtual package tree. The symbolic name of the bundle should be the root package contained within. For example, consider a bundle containing the packages <code>org.apache.sling.sample</code>, <code>org.apache.sling.sample.impl</code>, <code>org.apache.sling.more</code>. The bundle would the be named <code>org.apache.sling.sample</code>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff/launch-sling.html
----------------------------------------------------------------------
diff --git a/old-stuff/launch-sling.html b/old-stuff/launch-sling.html
index 3ccc199..d4402d8 100644
--- a/old-stuff/launch-sling.html
+++ b/old-stuff/launch-sling.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Launch Sling</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Launch Sling</h1></header><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="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/old-stuff.html">Old Stuff</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Launch Sling
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff/request-processing.html
----------------------------------------------------------------------
diff --git a/old-stuff/request-processing.html b/old-stuff/request-processing.html
index a9dfa6d..3ec9de7 100644
--- a/old-stuff/request-processing.html
+++ b/old-stuff/request-processing.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Request Processing</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Request Processing</h1></header><div class="note">
+<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>
+                Request Processing
+            </h1><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.
 </div>
 <p>One of the core problems towards understanding how Sling works is knowing how a Client Request is processed by Sling. This page describes the flow of processing requests inside Sling.</p>
@@ -169,7 +171,7 @@ if (navigation == null) {
 RequestDispatcher rd = request.getRequestDispatcher(navigation);
 rd.include(request, response);
 </code></pre>
-<p>This could for example be used to fall back to a default navigation setup while providing for specialized navigation configuration in an optional <code>navigation</code> child node.</p></section></div></div>            
+<p>This could for example be used to fall back to a default navigation setup while providing for specialized navigation configuration in an optional <code>navigation</code> child node.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 3322c7f..67935ab 100644
--- a/old-stuff/run-modes-org-apache-sling-runmode.html
+++ b/old-stuff/run-modes-org-apache-sling-runmode.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Run Modes</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Run Modes</h1></header><div markdown="1" class="note">
+<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>
+                Run Modes
+            </h1><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
 by the new <a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings (org.apache.sling.settings)</a>
 Bundle. For backwards compatibility this bundle may still exist in your environment. New code should use the API of the new
@@ -95,7 +97,7 @@ if(r.isActive(expectedRunModes)) {
 }
 </code></pre>
 <h1>See also</h1>
-<p>The RunMode service is used by the [jcrinstall]({{ refs.jcr-installer-provider.path }}) services.</p></section></div></div>            
+<p>The RunMode service is used by the [jcrinstall]({{ refs.jcr-installer-provider.path }}) services.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff/scriptengineintegration.html
----------------------------------------------------------------------
diff --git a/old-stuff/scriptengineintegration.html b/old-stuff/scriptengineintegration.html
index dc6c8fd..d29f706 100644
--- a/old-stuff/scriptengineintegration.html
+++ b/old-stuff/scriptengineintegration.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Integrating Scripting Languages</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Integrating Scripting Languages</h1></header><p>This page should be extended with more concrete and detailed information. For now, we have the following information:</p>
+<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>
+                Integrating Scripting Languages
+            </h1><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>
   <li>There will be a talk at ApacheCon US 08 in New Orleans about creating JSR-223 ScriptEngineFactory and ScriptEngine implementaitons as well as how to integrate such implementations with Sling.</li>
   <li>From a mail on the mailing list, this is a very condensed how-to:
@@ -76,7 +78,7 @@
       <li>Create the <code>META-INF/services/javax.script.ScriptEngineFactory</code> file listing the fully qualified name of your ScriptEngineFactory implementaiton</li>
     </ul>
   </li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/old-stuff/scriptengineintegration/groovy-support.html
----------------------------------------------------------------------
diff --git a/old-stuff/scriptengineintegration/groovy-support.html b/old-stuff/scriptengineintegration/groovy-support.html
index 4d15136..9b82a64 100644
--- a/old-stuff/scriptengineintegration/groovy-support.html
+++ b/old-stuff/scriptengineintegration/groovy-support.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Groovy Support</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Groovy Support</h1></header><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>
+<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>
+                Groovy Support
+            </h1><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>
 <p>So, on 11. Dec. 2008 Paul King of the Groovy Team has deployed a [first RC1 Snapshot of Groovy 1.6]({{ refs.http://snapshots.repository.codehaus.org/org/codehaus/groovy/groovy-all/1.6-RC-1-SNAPSHOT/groovy-all-1.6-RC-1-20081211.113737-1.jar.path }}) which contains all the required OSGi bundle manifest headers as well das the JSR-233 <code>ScriptEngine</code> to use the <code>groovy-all.jar</code> unmodified with Sling. So just go ahead, grab the Groovy-All 1.6 RC 1 SNAPSHOT deploy it into your Sling instance and enjoy the fun of Groovy.</p>
 <p>If you want to be on verge of development, you might want to go for Groovy 1.7: The second SNAPSHOT of beta-1 also contains the required headers and classes and may as well be used unmodified in Sling. You may download it here: <code>[groovy-all-1.7-beta-1-20081210.120632-2.jar]({{ refs.http://snapshots.repository.codehaus.org/org/codehaus/groovy/groovy-all/1.7-beta-1-SNAPSHOT/groovy-all-1.7-beta-1-20081210.120632-2.jar.path }})</code>.</p>
@@ -104,7 +106,7 @@ You requested Resource JcrNodeResource, type=nt:folder, path=/sample (yes, this
   <li>[SLING-315]({{ refs.https://issues.apache.org/jira/browse/SLING-315.path }}) -- The initial Sling issue proposing the addition of a Groovy ScriptEngine to Sling.</li>
   <li>[Groovy Support in Apache Sling]({{ refs.http://markmail.org/message/7sqscr5y2mbk6jko.path }}) -- A short thread on turning the Groovy <code>groovy-all.jar</code> into an OSGi Bundle.</li>
   <li>[Groovy in Apache Sling]({{ refs.http://markmail.org/message/47n2ow2jlo553jvk.path }}) -- Thread on adding the <code>DynamicImport-Package</code> header to the Groovy bundle manifest.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here


[3/6] sling-site git commit: Publish latest fixes

Posted by bd...@apache.org.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/slingstart.html
----------------------------------------------------------------------
diff --git a/documentation/development/slingstart.html b/documentation/development/slingstart.html
index 2528b40..3d095b7 100644
--- a/documentation/development/slingstart.html
+++ b/documentation/development/slingstart.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>The Apache Sling Provisioning Model and Apache SlingStart</h1></header><p>[TOC]</p>
+<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>
+                The Apache Sling Provisioning Model and Apache SlingStart
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>The Apache Sling provisioning model is a model to describe OSGi based application. It can also be used to define a partial application aka feature (or subsystem in OSGi terms).</p>
 <p>The model is describing an instance, it is not directly related to any particular tooling or packaging/provisioning vehicle.</p>
 <p>For Apache Maven users, the <code>slingstart-maven-plugin</code> uses the model to create an executable application and/or a web application based on the model. Sling's Launchpad is defined using the model and built by this Maven plugin. See <a href="http://sling.apache.org/components/slingstart-maven-plugin/">SlingStart Maven Plugin</a> for a documentation of the supported goals and parameters.</p>
@@ -402,7 +405,7 @@ stringsimple ::= &lt;quoted string representation of the value&gt; (see below)
         &lt;/dependency&gt;
     &lt;/dependencies&gt;
 &lt;/plugin&gt;
-</code></pre></section></div></div>            
+</code></pre></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/development/version-policy.html
----------------------------------------------------------------------
diff --git a/documentation/development/version-policy.html b/documentation/development/version-policy.html
index 5b71c06..9db3901 100644
--- a/documentation/development/version-policy.html
+++ b/documentation/development/version-policy.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Version Policy</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,12 +66,14 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Version Policy</h1></header><p>Excerpt: 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>
-<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="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>
+                Version Policy
+            </h1><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">
 Please note that this page is currently in draft stage and still being discussed.
 </div>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Introduction</h2>
 <p>In comments to <a href="https://issues.apache.org/jira/browse/SLING-2944">SLING-1176</a> Ian Boston wrote:</p>
 <blockquote>
@@ -273,7 +275,7 @@ import aQute.bnd.annotation.Export;
   <li><a href="http://wiki.eclipse.org/index.php/Version_Numbering">Version Numbering</a> -- An Eclipse paper on assigning version numbers. Very good read.</li>
   <li><a href="http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf">Semantic Versioning</a> -- An OSGi Alliance paper on semantic versioning.</li>
   <li><a href="http://bnd.bndtools.org/chapters/170-versioning.html">bnd Versioning</a> -- Describes how the bnd library used by the Maven Bundle plugin supports package versioning</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/getting-started.html
----------------------------------------------------------------------
diff --git a/documentation/getting-started.html b/documentation/getting-started.html
index 1f2e372..71c2049 100644
--- a/documentation/getting-started.html
+++ b/documentation/getting-started.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Getting Started</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Getting Started</h1></header><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>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Getting Started
+            </h1><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>
   <li><a href="getting-started/discover-sling-in-15-minutes.html">Discover Sling in 15 minutes</a></li>
 </ul>
@@ -82,7 +84,7 @@
   <li><a href="/documentation/the-sling-engine/request-parameters.html">Request Parameters</a></li>
   <li><a href="/documentation/the-sling-engine/authentication.html">Authentication</a></li>
   <li><a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Eventing and Jobs</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 3af1ed4..619c559 100644
--- a/documentation/getting-started/discover-sling-in-15-minutes.html
+++ b/documentation/getting-started/discover-sling-in-15-minutes.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,10 +66,13 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Discover Sling in 15 minutes</h1></header><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>
+<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>
+                Discover Sling in 15 minutes
+            </h1><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>
 <p>While simple to run and understand, the Launchpad is a full-featured instance of Sling, an example configuration that we have created with the most common modules and configurations. The full functionality of Sling is available by loading additional Sling (or custom) OSGi bundles as needed, using the Launchpad's web-based OSGi management console.</p>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>See Also</h2>
 <p>More Sling samples can be found under <a href="http://svn.apache.org/repos/asf/sling/trunk/samples/">http://svn.apache.org/repos/asf/sling/trunk/samples/</a></p>
 <p>Once you grok the basic examples of this page, we recommend studying the <em>slingbucks</em> and <em>espblog</em> samples. Both have README files with more info.</p>
@@ -181,7 +184,7 @@ curl -u admin:admin -T sling.jpg http://localhost:8080/images/sling.jpg
 <p>And upload it again to replace the previous version:</p>
 <pre><code>curl -u admin:admin -T html.esp http://localhost:8080/apps/foo/bar/html.esp
 </code></pre>
-<p>The <a href="http://localhost:8080/content/mynode.html">http://localhost:8080/content/mynode.html</a>, once refreshed, now shows the blue headline and logo, and this layout also applies to any node created with <em>sling:resourceType=foo/bar</em>.</p></section></div></div>            
+<p>The <a href="http://localhost:8080/content/mynode.html">http://localhost:8080/content/mynode.html</a>, once refreshed, now shows the blue headline and logo, and this layout also applies to any node created with <em>sling:resourceType=foo/bar</em>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/legacy/logging.html
----------------------------------------------------------------------
diff --git a/documentation/legacy/logging.html b/documentation/legacy/logging.html
index b6013d5..8b2f563 100644
--- a/documentation/legacy/logging.html
+++ b/documentation/legacy/logging.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Logging</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Logging</h1></header><div class="note">
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Logging
+            </h1><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
 <a href="http://sling.apache.org/documentation/development/logging.html">Logging</a> for documentation related
 to newer version.
@@ -247,7 +249,7 @@ to newer version.
 <p>Note that Scheduled Rotation ignores the <code>org.apache.sling.commons.log.file.number</code> property since the old log files are not numbered but "dated".</p>
 <h3>Size Rotation</h3>
 <p>Log file rotation by size is specified by setting the <code>org.apache.sling.commons.log.file.size</code> property to a plain number or a number plus a size multiplier. The size multiplier may be any of <code>K</code>, <code>KB</code>, <code>M</code>, <code>MB</code>, <code>G</code>, or <code>GB</code> where the case is ignored and the meaning is probably obvious.</p>
-<p>When using Size Rotation, the <code>org.apache.sling.commons.log.file.number</code> defines the number of old log file generations to keep. For example to keep 5 old log files indexed by 0 through 4, set the <code>org.apache.sling.commons.log.file.number</code> to <code>5</code> (which happens to be the default).</p></section></div></div>            
+<p>When using Size Rotation, the <code>org.apache.sling.commons.log.file.number</code> defines the number of old log file generations to keep. For example to keep 5 old log files indexed by 0 through 4, set the <code>org.apache.sling.commons.log.file.number</code> to <code>5</code> (which happens to be the default).</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/pax-exam-utils.html
----------------------------------------------------------------------
diff --git a/documentation/pax-exam-utils.html b/documentation/pax-exam-utils.html
index 0031933..aad8cb2 100644
--- a/documentation/pax-exam-utils.html
+++ b/documentation/pax-exam-utils.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,9 +66,11 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling Pax Exam Utilities</h1></header><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>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                Sling Pax Exam Utilities
+            </h1><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>
-<p>See the <a href="https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java">SlingRepositoryTest</a> class for an example test.</p></section></div></div>            
+<p>See the <a href="https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java">SlingRepositoryTest</a> class for an example test.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine.html b/documentation/the-sling-engine.html
index 0c5f504..6accd85 100644
--- a/documentation/the-sling-engine.html
+++ b/documentation/the-sling-engine.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: The Sling Engine</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>The Sling Engine</h1></header><h2>General</h2>
+<div class="breadcrumbs"><a href="/ng/">Home</a>&nbsp;&raquo;&nbsp;<a href="/ng/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1>
+                The Sling Engine
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2>General</h2>
 <ul>
   <li><a href="/documentation/the-sling-engine/architecture.html">Architecture</a></li>
   <li><a href="/documentation/the-sling-engine/authentication.html">Authentication</a></li>
@@ -94,7 +96,7 @@
 <ul>
   <li><a href="/documentation/the-sling-engine/adapters.html">Adapters</a></li>
   <li><a href="/documentation/the-sling-engine/featureflags.html">Feature Flags</a></li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/adapters.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/adapters.html b/documentation/the-sling-engine/adapters.html
index 080858f..3fb12ea 100644
--- a/documentation/the-sling-engine/adapters.html
+++ b/documentation/the-sling-engine/adapters.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Adapters</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Adapters</h1></header><p>[TOC]</p>
+<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>
+                Adapters
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>The <code>Resource</code> and <code>ResourceResolver</code> interfaces are defined with a method <code>adaptTo</code>, which adapts the object to other classes. Using this mechanism the JCR session of the resource resolver calling the <code>adaptTo</code> method with the <code>javax.jcr.Session</code> class object. Likewise the JCR node on which a resource is based can be retrieved by calling the <code>Resource.adaptTo</code> method with the <code>javax.jcr.Node</code> class object.</p>
 <p>To use resources as scripts, the <code>Resource.adaptTo</code> method must support being called with the <code>org.apache.sling.api.script.SlingScript</code> class object. But of course, we do not want to integrate the script manager with the resource resolver. To enable adapting objects to classes which are not foreseen by the original implementation, a factory mechanism is used. This way, the script manager can provide an adapter factory to adapt <code>Resource</code> to <code>SlingScript</code> objects.</p>
 <h1>Adaptable</h1>
@@ -179,7 +182,7 @@
 <p>Any object can theoretically be adapted to any class even if it does not implement the <code>Adaptable</code> interface, if an <code>AdapterFactory</code> service delivers a <code>getAdapter()</code> method which adapts an object to another one. To check if there's any existing <code>AdapterFactory</code> which can adapt a given object to another one the <code>AdapterManager</code> service with its <code>getAdapter()</code> method does the job. So the <code>Adaptable</code> interface merely is an indicator that the object provides built-in support for being adapted.</p>
 <h2>SlingAdaptable</h2>
 <p>The <code>SlingAdaptable</code> class is an implementation of the <code>Adaptable</code> interface which provides built-in support to call the <code>AdapterManager</code> to provide an adapter from the <code>Adaptable</code> object to the requested class.</p>
-<p>An example of extending the <code>SlingAdaptable</code> class will be the Sling JCR based <code>Resource</code> implementation. This way, such a resource may be adapted to a <code>SlingScript</code> by means of an appropriately programmed <code>AdapterFactory</code> (see below).</p></section></div></div>            
+<p>An example of extending the <code>SlingAdaptable</code> class will be the Sling JCR based <code>Resource</code> implementation. This way, such a resource may be adapted to a <code>SlingScript</code> by means of an appropriately programmed <code>AdapterFactory</code> (see below).</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/architecture.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/architecture.html b/documentation/the-sling-engine/architecture.html
index c83d758..09b580f 100644
--- a/documentation/the-sling-engine/architecture.html
+++ b/documentation/the-sling-engine/architecture.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Architecture</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Architecture</h1></header><p>The following is a short list of high-lights of Sling:</p>
+<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>
+                Architecture
+            </h1><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>
   <li><strong><a href="#osgi">OSGi</a></strong> &mdash; The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.</li>
   <li><strong><a href="#sling-api">Sling API</a></strong> &mdash; To implement content based Web applications with Sling, an API has been defined, this extends the Servlet API and provides more functionality to work on the content.</li>
@@ -118,7 +120,7 @@
 <p>The Sling Servlet is equally small as the Sling Application. It uses the Felix <code>HttpService</code> bridge as the glue between the servlet container and the OSGi framework.</p>
 <p>As we have seen, Sling may be launched as a standalone Java Application or as a Web Application inside any compliant Servlet Container. To hide the differences of the launching mechanism, Sling internally registers a Servlet with an OSGi <code>HttpService</code>. Regardless of how Sling is launched, the Felix implementation of the OSGi <code>HttpService</code> specification is used. When Sling is launched as a standalone Java Application, Felix HttpService uses an embedded version of the Jetty servlet container. When Sling is launched as a Web Application, the Felix HttpService Bridge is used.</p>
 <p>Optionally, PAX Web's implementation of HttpService can be used when Sling is launched as a standalone Java Application. See the <a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a> page for information on how to do this.</p>
-<p>See <a href="/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a> for more information.</p></section></div></div>            
+<p>See <a href="/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a> for more information.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/authentication.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/authentication.html b/documentation/the-sling-engine/authentication.html
index eac82a4..14ba550 100644
--- a/documentation/the-sling-engine/authentication.html
+++ b/documentation/the-sling-engine/authentication.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Authentication</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Authentication</h1></header><p>Excerpt: How requests are authenticated.</p>
-<p>This section describes the framework provided by Sling to authenticate HTTP requests.</p>
+<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>
+                Authentication
+            </h1><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>
 <p>This method is called by the OSGi HTTP Service implementation after the servlet has been selected to handle the request but before actually calling the servlet's <code>service</code> method.</p>
 <a href="authentication.png" style="float:left;padding-right:5%">
@@ -85,7 +86,7 @@
   <li><a href="/documentation/the-sling-engine/authentication/authentication-actors.html">Actors</a>: Authentication actors and process</li>
   <li><a href="/documentation/the-sling-engine/authentication/authentication-framework.html">Framework</a>: Authentication Framework, Auth Core bundle etc.</li>
   <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">AuthenticationHandler</a>: Authentication Handler service API.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 ce9977b..63bc2e4 100644
--- a/documentation/the-sling-engine/authentication/authentication-actors.html
+++ b/documentation/the-sling-engine/authentication/authentication-actors.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Authentication - Actors</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Authentication - Actors</h1></header><p>Excerpt: The authentication process involves a number of actors contributing to the concepts, the API and the particular implementations.</p>
-<p>The authentication process involves a number of actors contributing to the concepts, the API and the particular implementations.</p>
+<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>
+                Authentication - Actors
+            </h1><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>OSGi Http Service Specification</h2>
 <p>The main support for authentication is defined by the OSGi Http Service specification. This specification defines how an OSGi application can register servlets and resources to build web applications. As part of the servlet and/or resource registration a <code>HttpContext</code> may be provided, which allows for additional support.</p>
 <p>The main method of interest to the authentication process is the <code>handleSecurity</code> method. This is called by the OSGi Http Service implementation before the registered servlet is called. Its intent is to authenticate the request and to provide authentication information for the request object: the authentication type and the remote user name.</p>
@@ -106,7 +107,7 @@
 <p>Sling Applications should never directly use any knowledge of any authentication handler or directly call into an authentication handler. This will certainly break the application and cause unexpected behaviour.</p>
 <div class="info">
 If you want to know whether a request is authenticated or not, you can inspect the result of the <code>HttpServletRequest.getAuthType</code> method: If this method returns <code>null</code> the request is not authenticated.
-</div></section></div></div>            
+</div></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 3e869a7..14eb620 100644
--- a/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
+++ b/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Authentication - AuthenticationHandler</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Authentication - AuthenticationHandler</h1></header><p>Excerpt: The <code>AuthenticationHandler</code> interface defines the service API which may be implemented by authentication handlers registered as OSGi services.</p>
-<p>The <code>AuthenticationHandler</code> interface defines the service API which may be implemented by authentication handlers registered as OSGi services.</p>
+<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>
+                Authentication - AuthenticationHandler
+            </h1><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>
 <table>
   <thead>
@@ -140,7 +141,7 @@
   <li><code>requestCredentials</code> -- Send the login form for the user to provide the login parameters.</li>
   <li><code>dropCredentials</code> -- Clear the authentication cookie and internal store.</li>
 </ul>
-<p>///Footnotes Go Here///</p></section></div></div>            
+<p>///Footnotes Go Here///</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 820b6a3..4fe2d97 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
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Form Based AuthenticationHandler</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Form Based AuthenticationHandler</h1></header><p>[TOC]</p>
+<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>
+                Form Based AuthenticationHandler
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>The Form Based AuthenticationHandler has two authentication phases: The first phase is presenting a login form to the user and passing the entered user name and password to the server. The second phase is storing successful authentication in a Cookie or an HTTP Session.</p>
 <p>The implementation of the Form Based Authentication Handler follows the guidelines of the Servlet API 2.4 specification for <em>Form Based Authentication</em> in section SRV.12.5.3. Specifically the following requirements are implemented:</p>
 <ul>
@@ -214,7 +217,7 @@
   <li>User name and password are transmitted in plain text in the initial form submission.</li>
   <li>The Cookie used to provide the authentication state or the HTTP Session ID may be stolen.</li>
 </ol>
-<p>To prevent eavesdroppers from sniffing the credentials or stealing the Cookie a secure transport layer should be used such as TLS/SSL, VPN or IPSec.</p></section></div></div>            
+<p>To prevent eavesdroppers from sniffing the credentials or stealing the Cookie a secure transport layer should be used such as TLS/SSL, VPN or IPSec.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 390e63b..65449c3 100644
--- a/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
+++ b/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: OpenID AuthenticationHandler</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>OpenID AuthenticationHandler</h1></header><p>[TOC]</p>
+<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>
+                OpenID AuthenticationHandler
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>The OpenID Authentication Handler supports authentication of request users using the <a href="http://www.openid.net">OpenID</a> authentication protocol. If the user has successfully authenticated with his OpenID provider a signed OpenID identity is further used to identify the user.</p>
 <p>Since generally an OpenID identity is an URL and URLs may not be used as JCR user names, an association mechanism is used by the OpenID authentication handler to associate an OpenID identity with an existing JCR user: The OpenID identity URL is set as the value of a JCR user property. When a user authenticates with his OpenID identity the matching user searched for by looking for a match in this property.</p>
 <p><em>NOTE:</em> This association currently only works with Jackrabbit (or Jackrabbit based repositories) because user management is not part of the JCR 2 specification and the OpenID authentication handler uses the Jackrabbit <code>UserManager</code> to find users by a user property value.</p>
@@ -174,7 +177,7 @@
   <li>The Cookie used to provide the authentication state or the HTTP Session ID may be stolen.</li>
   <li>When using the <code>trusted_credentials_attribute</code> mechanism, any intruder knowing the attribute name may log into the repository as any existing JCR user. The better option is to be based on the <code>LoginModulePlugin</code> mechanism.</li>
 </ol>
-<p>To prevent eavesdroppers from sniffing the credentials or stealing the Cookie a secure transport layer should be used such as TLS/SSL, VPN or IPSec.</p></section></div></div>            
+<p>To prevent eavesdroppers from sniffing the credentials or stealing the Cookie a secure transport layer should be used such as TLS/SSL, VPN or IPSec.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 ee7d9e7..d38de48 100644
--- a/documentation/the-sling-engine/authentication/authentication-framework.html
+++ b/documentation/the-sling-engine/authentication/authentication-framework.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Authentication - Framework</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Authentication - Framework</h1></header><p>Excerpt: 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>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>
+<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>
+                Authentication - Framework
+            </h1><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>
 <ul>
   <li>The <code>AuthenticationSupport</code> service provided by the <code>SlingAuthenticator</code> class. This service can be used by implementations of the OSGi <code>HttpContext</code> interface to delegate authentication.</li>
@@ -220,7 +221,7 @@
   <li>Select one or more <code>AuthenticationHandler</code> for the request according to the request URL's scheme and authorization part.</li>
   <li>Call the <code>dropCredentials</code> method of each authentication handler, where the order of handler call is defined by the length of the registered path: handlers registered with longer paths are called before handlers with shorter paths. The goal is to call the handlers in order from longest request path match to shortest match. Handlers not matching the request path at all are not called.</li>
 </ol>
-<p>Unlike for the <code>login</code> method in the <code>logout</code> method case all <code>AuthenticationHandler</code> services selected in the first step are called. If none can be selected or none can actually handle the <code>dropCredentials</code> request, the <code>logout</code> silently returns.</p></section></div></div>            
+<p>Unlike for the <code>login</code> method in the <code>logout</code> method case all <code>AuthenticationHandler</code> services selected in the first step are called. If none can be selected or none can actually handle the <code>dropCredentials</code> request, the <code>logout</code> silently returns.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 cae077e..a6a85af 100644
--- a/documentation/the-sling-engine/authentication/authentication-tasks.html
+++ b/documentation/the-sling-engine/authentication/authentication-tasks.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Authentication - Tasks</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Authentication - Tasks</h1></header><p>Excerpt: 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>
-<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>
+<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>
+                Authentication - Tasks
+            </h1><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>Extract Credentials from the Request</h2>
 <ul>
   <li>Implemented and controlled by the Sling Auth Core bundle</li>
@@ -82,7 +83,7 @@
   <li>Provides a JCR <code>Session</code></li>
   <li>Implementation dependent process. Jackrabbit provides extensibility based on <code>LoginModules</code>; Sling's Embedded Jackrabbit Repository bundle provides extensibility with <code>LoginModulePlugin</code> services.</li>
 </ul>
-<p>Currently the credentials are always verified by trying to login to the JCR repository. Once an <a href="http://cwiki.apache.org/SLING/add-resourceresolverfactory-service-interface.html">ResourceResolverFactory</a> API has been added, the process of validating the credentials and logging in is actualy replaced by a process of requesting a <code>ResourceResolver</code> from the <code>ResourceResolverFactory</code>. Of course, the JCR Repository will still be the main underlying repository and as such be used to validate the credentials and get a JCR Session.</p></section></div></div>            
+<p>Currently the credentials are always verified by trying to login to the JCR repository. Once an <a href="http://cwiki.apache.org/SLING/add-resourceresolverfactory-service-interface.html">ResourceResolverFactory</a> API has been added, the process of validating the credentials and logging in is actualy replaced by a process of requesting a <code>ResourceResolver</code> from the <code>ResourceResolverFactory</code>. Of course, the JCR Repository will still be the main underlying repository and as such be used to validate the credentials and get a JCR Session.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 691d777..fa3bade 100644
--- a/documentation/the-sling-engine/default-mapping-and-rendering.html
+++ b/documentation/the-sling-engine/default-mapping-and-rendering.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Default Mapping and Rendering</h1></header><p>translation_pending: true</p>
-<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="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>
+                Default Mapping and Rendering
+            </h1><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">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 926970d..c37901e 100644
--- a/documentation/the-sling-engine/dispatching-requests.html
+++ b/documentation/the-sling-engine/dispatching-requests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Dispatching Requests</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Dispatching Requests</h1></header><h2>Main process</h2>
+<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>
+                Dispatching Requests
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2>Main process</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>
 <ol>
   <li>
@@ -165,7 +167,7 @@
   </tbody>
 </table>
 <p>Constants are defined in the <code>org.apache.sling.api.SlingConstants</code> class for these request attributes.</p>
-<p><strong>Note:</strong> These request attributes are not set if the servlet or script is called to handle the request or as a result of <code>RequestDispatcher.forward</code>.</p></section></div></div>            
+<p><strong>Note:</strong> These request attributes are not set if the servlet or script is called to handle the request or as a result of <code>RequestDispatcher.forward</code>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/errorhandling.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/errorhandling.html b/documentation/the-sling-engine/errorhandling.html
index aa209ac..78db68e 100644
--- a/documentation/the-sling-engine/errorhandling.html
+++ b/documentation/the-sling-engine/errorhandling.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Errorhandling</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,11 +66,14 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Errorhandling</h1></header><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>
+<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>
+                Errorhandling
+            </h1><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>
 <p>This page provides more information on how error handler scripts are selected and what is provided out of the box.</p>
 <p>The <a href="https://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java">ErrorHandlingTest</a> in our integration tests suite provides working examples of various error handling scenarios.</p>
-<p>[TOC]</p>
+<p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Resetting the Response</h2>
 <p>Errorhandler scripts and servlets are script with the current response. Before setting the status and writing to the response such handlers should do the following:</p>
 <ul>
@@ -113,7 +116,7 @@
   <li>Dump the request progress tracker</li>
 </ul>
 <p>Starting with Sling Servlet Resolver version 2.0.10 the default error handler servlet is looked up using the string <code>default</code> as the request extension and the provided default servlet is registered as <code>&lt;prefix&gt;/sling/servlet/errorhandler/default.servlet</code> where <prefix> is the last entry in the resource resolver search path, <code>/libs</code> by default.</p>
-<p>Thus to overwrite the default error handler servlet provide a servlet or script for the <code>default</code> extension, for example <code>/apps/sling/servlet/errorhandler/default.groovy</code>.</p></section></div></div>            
+<p>Thus to overwrite the default error handler servlet provide a servlet or script for the <code>default</code> extension, for example <code>/apps/sling/servlet/errorhandler/default.groovy</code>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/featureflags.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/featureflags.html b/documentation/the-sling-engine/featureflags.html
index adfbfea..b3092b7 100644
--- a/documentation/the-sling-engine/featureflags.html
+++ b/documentation/the-sling-engine/featureflags.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Feature Flags</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Feature Flags</h1></header><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>
+<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>
+                Feature Flags
+            </h1><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>
 <ul>
   <li>Time of Day</li>
@@ -98,7 +100,7 @@
       <td>Boolean flag indicating whether the feature is enabled or not by this configuration</td>
     </tr>
   </tbody>
-</table></section></div></div>            
+</table></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/filters.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/filters.html b/documentation/the-sling-engine/filters.html
index ac4a3c3..6bd4018 100644
--- a/documentation/the-sling-engine/filters.html
+++ b/documentation/the-sling-engine/filters.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Servlet Filter Support</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Servlet Filter Support</h1></header><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="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>
+                Servlet Filter Support
+            </h1><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">
 See <a href="https://issues.apache.org/jira/browse/SLING-1213">SLING-1213</a>,
 <a href="https://issues.apache.org/jira/browse/SLING-1734">SLING-1734</a>, and
@@ -230,7 +232,7 @@ Component Filters:
   <li>Any <code>javax.servlet.Filter</code> service is accepted as a filter for Sling unless the <code>pattern</code> property used by the <a href="http://felix.apache.org/site/apache-felix-http-service.html#ApacheFelixHTTPService-UsingtheWhiteboard">Apache Felix HttpService whiteboard support</a> is set in the service registration properties.</li>
   <li>The <code>filter.scope</code> property is optional and supports the case-sensitive values <code>request</code> and <code>component</code>.</li>
   <li>Filter ordering is defined by the <code>filter.order</code> property whose default value is <code>Integer.MAX_VALUE</code> where smaller values have higher priority over higher values.</li>
-</ul></section></div></div>            
+</ul></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 9101026..6f230d7 100644
--- a/documentation/the-sling-engine/mappings-for-resource-resolution.html
+++ b/documentation/the-sling-engine/mappings-for-resource-resolution.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Mappings for Resource Resolution</h1></header><p>[TOC]</p>
+<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>
+                Mappings for Resource Resolution
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Configuration</h2>
 <h3>Properties</h3>
 <p>The mapping of request URLs to resources is mainly configured in a configuration tree which is (by default) located below <code>/etc/map</code>. The actual location can be configured with the <code>resource.resolver.map.location</code> property of the <code>org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl</code> configuration. That way you can even make it run mode specific, by taking advantage of the Sling OSGi Installer's run mode awareness.</p>
@@ -287,7 +290,7 @@ for (String segment: segments) {
   <li>start Apache Sling (this might take few minutes, depending on how many vanity path entries are present)</li>
 </ul>
 <h2>Debugging Issues</h2>
-<p>Use the Felix Web Console Plugin provided at <code>/system/console/jcrresolver</code> to inspect both the mapping and the resolver map entries. Also you can check what either <code>ResourceResolver.map(...)</code> or <code>ResourceResolver.resolve(...)</code> would return for a given URL/path.</p></section></div></div>            
+<p>Use the Felix Web Console Plugin provided at <code>/system/console/jcrresolver</code> to inspect both the mapping and the resolver map entries. Also you can check what either <code>ResourceResolver.map(...)</code> or <code>ResourceResolver.resolve(...)</code> would return for a given URL/path.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 1f1381b..5c239e8 100644
--- a/documentation/the-sling-engine/request-listeners.html
+++ b/documentation/the-sling-engine/request-listeners.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Request Listeners</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Request Listeners</h1></header><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>
+<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>
+                Request Listeners
+            </h1><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>#!java
 public interface SlingRequestListener {
 
@@ -104,7 +106,7 @@ public interface SlingRequestListener {
       <td>at the end of the <code>service</code> method in <code>SlingMainServlet</code> </td>
     </tr>
   </tbody>
-</table></section></div></div>            
+</table></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 3cb5577..f9f5ac7 100644
--- a/documentation/the-sling-engine/request-parameters.html
+++ b/documentation/the-sling-engine/request-parameters.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,8 +66,9 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Request Parameter Handling in Sling</h1></header><p>Excerpt: Explains how Sling provides request parameters to the <code>Component</code>.</p>
-<h2>Servlet API</h2>
+<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>
+                Request Parameter Handling in Sling
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2>Servlet API</h2>
 <p>The Servlet API specification provides the following methods to access the parameters of a request</p>
 <table>
   <thead>
@@ -190,7 +191,7 @@
 <div class="info">
 Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the <code>_charset_</code> request parameter is missing. As of Sling Engine 2.2.4 the <code>_charset_</code> request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the <code>_charset_</code> request parameter is missing. 
 To enable this functionality set the <code>sling.default.parameter.encoding</code> parameter of the Sling Main Servlet (PID <code>org.apache.sling.engine.impl.SlingMainServlet</code>) configuration (for Sling Engine < 2.3.0) or the same parameter of the Sling Request Parameter Handling (PID <code>org.apache.sling.engine.parameters</code>) configuration (for Sling Engine >= 2.3.0 ) to the desired encoding, which of course must be supported by the actual Java Platform.
-</div></section></div></div>            
+</div></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/resources.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/resources.html b/documentation/the-sling-engine/resources.html
index 82a6882..ba8ac75 100644
--- a/documentation/the-sling-engine/resources.html
+++ b/documentation/the-sling-engine/resources.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Resources</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Resources</h1></header><p>[TOC]</p>
+<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>
+                Resources
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>What is a Resource</h2>
 <p>The Resource is one of the central parts of Sling. Extending from JCR's <em>Everything is Content</em>, Sling assumes <em>Everthing is a Resource</em>. 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 paradigma of the REST architecture.</p>
 <h3>Resource Properties</h3>
@@ -216,7 +219,7 @@
 <h3>OSGi Event Admin</h3>
 <p>Resource events are sent out via the OSGi Event Admin. You can subscribe to those event by registering an OSGi service for <a href="https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/EventHandler.html"><code>org.osgi.service.event.EventHandler</code></a>. Several properties should be used to restrict the subscription to only the relevant event. The event topics which are used for resources are listed as constants in <a href="http://sling.apache.org/apidocs/sling8/org/apache/sling/api/SlingConstants.html"><code>org.apache.sling.api.SlingConstants</code></a> starting with the prefix <code>TOPIC_</code>.</p>
 <h2>Wrap/Decorate Resources</h2>
-<p>The Sling API provides an easy way to wrap or decorate a resource before returning. Details see <a href="/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or Decorate Resources</a>.</p></section></div></div>            
+<p>The Sling API provides an easy way to wrap or decorate a resource before returning. Details see <a href="/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or Decorate Resources</a>.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 12307bd..d1c63ee 100644
--- a/documentation/the-sling-engine/service-authentication.html
+++ b/documentation/the-sling-engine/service-authentication.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Service Authentication</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,8 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Service Authentication</h1></header><p>Excerpt: Introduce new service level authentication to replace <code>loginAdministrative</code></p>
-<p>[TOC]</p>
+<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>
+                Service Authentication
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Problem</h2>
 <p>To access the data storage in the Resource Tree and/or the JCR Repository authentication is required to properly setup access control and guard sensitive data from unauthorized access. For regular request processing this authentication step is handled by the Sling <a href="/documentation/the-sling-engine/authentication.html">Authentication</a> subsystem.</p>
 <p>On the other hand there are also some background tasks to be executed with access to the resources. Such tasks cannot in general be configured with user names and passwords: Neither hard coding the passwords in the code nor having the passwords in &ndash; more or less &ndash; plain text in some configuration is considered good practice.</p>
@@ -225,7 +227,7 @@ whitelist.bundles.regexp=&quot;^PAXEXAM.*$&quot;
       <td>A regular expression that whitelists all matching bundle symbolic names. This is <strong>NOT</strong> recommended for production and warnings will be logged. </td>
     </tr>
   </tbody>
-</table></section></div></div>            
+</table></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/documentation/the-sling-engine/servlets.html
----------------------------------------------------------------------
diff --git a/documentation/the-sling-engine/servlets.html b/documentation/the-sling-engine/servlets.html
index e784481..716af6a 100644
--- a/documentation/the-sling-engine/servlets.html
+++ b/documentation/the-sling-engine/servlets.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <title>Apache Sling :: Servlets and Scripts</title>
         <link rel="icon" href="/ng/res/favicon.ico"/>
         <link rel="stylesheet" href="/ng/res/css/site.css"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Servlets and Scripts</h1></header><p>[TOC]</p>
+<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>
+                Servlets and Scripts
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <p>See also <a href="/documentation/the-sling-engine/url-to-script-resolution.html">URL to Script Resolution</a> which explains how Sling maps URLs to a script or and servlet.</p>
 <h2>Servlet Registration</h2>
 <p>Servlets can be registered as OSGi services. The following service reference properties are evaluated for Servlets defined as OSGi services of type <code>javax.servlet.Servlet</code> (all those property names are defined in <code>org.apache.sling.api.servlets.ServletResolverConstants</code> (since API 2.15.2) or <code>org.apache.sling.servlets.resolver.internal.ServletResolverConstants</code> (before API 2.15.2)):</p>
@@ -225,7 +228,7 @@ sling.servlet.extensions = [ &quot;html&quot;, &quot;txt&quot;, &quot;json&quot;
 <p>In this case, the servlet is only selected for processing the current request if its <code>accept</code> method returns true.</p>
 <p>While an opting servlet seems to be a nice way of picking the right servlet to process the request, the use of an opting servlet is not recommended: the main reason is that it complicates the request processing, makes it less transparent what is going on during a request and prevents optimizations like caching the script resolution in an optimal manner. The other static options are usually sufficient for all use cases.</p>
 <h2>Error Handler Servlet(s) or Scripts</h2>
-<p>Error handling support is described on the <a href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a> page.</p></section></div></div>            
+<p>Error handling support is described on the <a href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a> page.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6120b7bb/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 fc27a98..3342d59 100644
--- a/documentation/the-sling-engine/sling-api-crud-support.html
+++ b/documentation/the-sling-engine/sling-api-crud-support.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html lang="en">
 <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Apache Sling on JBake</title>
+        <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"/>
         
@@ -66,7 +66,10 @@
                 <strong><a href="/ng/sitemap.html">Site Map</a></strong>
             </p>
         </div>        <div class="main">
-<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Sling API CRUD Support</h1></header><p>[TOC]</p>
+<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>
+                Sling API CRUD Support
+            </h1><div class="row"><div class="small-12 columns"><section class="wrap"><p><!-- TODO reactivate TOC once JBake moves to flexmark-java -->
+</p>
 <h2>Apache Sling API Support</h2>
 <p>As of version 2.3.0, the Sling API provides full Create Read Update Delete (CRUD) features. CRUD support is provided by the addition of the following methods to the ResourceResolver:</p>
 <ul>
@@ -196,7 +199,7 @@ resourceResolver.commit();
   <li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html">Boolean</a></li>
   <li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</a></li>
 </ul>
-<p>As well as the corresponding primitive types. Any object which implements the Serializable interface will be serialized and the result of the serialization will be saved as a binary value for the property.</p></section></div></div>            
+<p>As well as the corresponding primitive types. Any object which implements the Serializable interface will be serialized and the result of the serialization will be saved as a binary value for the property.</p></section></div></div>
 <div class="footer">
                 <div class="timestamp">
                     TODO display revision number here