You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2017/09/30 10:00:23 UTC

[2/2] sling-site git commit: Sync website

Sync website


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

Branch: refs/heads/asf-site
Commit: e2300128bfd6ff5965946b4839290998da4f28b0
Parents: 19197fc
Author: Carsten Ziegeler <cz...@adobe.com>
Authored: Sat Sep 30 12:00:15 2017 +0200
Committer: Carsten Ziegeler <cz...@adobe.com>
Committed: Sat Sep 30 12:00:15 2017 +0200

----------------------------------------------------------------------
 .htaccess                                       |   8 +
 .../development/getting-and-building-sling.html |   8 +-
 documentation/getting-started.html              |  22 +-
 feed.xml                                        |   2 +-
 index.html                                      |  10 +-
 sitemap.html                                    | 246 +++++++++----------
 sitemap.xml                                     | 246 +++++++++----------
 tags/api.html                                   |   4 +-
 tags/bundles.html                               |   4 +-
 tags/community.html                             |  12 +-
 tags/configuration.html                         |  12 +-
 tags/core.html                                  |  12 +-
 tags/development.html                           |  48 ++--
 tags/documentation.html                         |   4 +-
 tags/eclipse.html                               |   4 +-
 tags/htl.html                                   |   4 +-
 tags/installer.html                             |   8 +-
 tags/jcr.html                                   |   4 +-
 tags/launchpad.html                             |   6 +-
 tags/logging.html                               |   4 +-
 tags/maven.html                                 |  14 +-
 tags/mocks.html                                 |   4 +-
 tags/obsolete.html                              |  12 +-
 tags/operations.html                            |  12 +-
 tags/osgi.html                                  |   4 +-
 tags/pmc.html                                   |  16 +-
 tags/publishing.html                            |   4 +-
 tags/repository.html                            |   4 +-
 tags/requests.html                              |   6 +-
 tags/resourceproviders.html                     |   4 +-
 tags/resources.html                             |   8 +-
 tags/runmodes.html                              |   4 +-
 tags/scripts.html                               |  10 +-
 tags/security.html                              |   8 +-
 tags/servlets.html                              |   6 +-
 tags/slingquery.html                            |  16 +-
 tags/testing.html                               |  10 +-
 tags/tutorials.html                             |   4 +-
 tags/urls.html                                  |   4 +-
 39 files changed, 418 insertions(+), 400 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..e63d607
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,8 @@
+ErrorDocument 403 /errors/403.html
+ErrorDocument 404 /errors/404.html
+
+Redirect Permanent /downloads.html /downloads.cgi
+Redirect Permanent /media.html /
+Redirect Permanent /plugins.html /
+Redirect Permanent /documentation/the-sling-engine/eventing-and-jobs.html /documentation/bundles/apache-sling-eventing-and-job-handling.html
+Redirect Permanent /documentation/bundles/scripting/scripting-sightly.html /documentation/bundles/scripting/scripting-htl.html

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/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 73c7d3a..f143458 100644
--- a/documentation/development/getting-and-building-sling.html
+++ b/documentation/development/getting-and-building-sling.html
@@ -88,8 +88,8 @@ $ java $DBG -jar target/org.apache.sling.launchpad... # (see below)
 <h2><a href="#prerequisites" name="prerequisites">Prerequisites</a></h2>
 <p>Before you begin, you need to have the following tools installed on your system:</p>
 <ul>
-  <li>Java 7 or higher</li>
-  <li><a href="http://maven.apache.org">Maven</a> 3.0.4 or later; enforced by the Sling parent pom</li>
+  <li>Java 8 or higher</li>
+  <li><a href="http://maven.apache.org">Maven</a> 3.3.9 or later; enforced by the Sling parent pom</li>
 </ul>
 <p>If you want to set up Eclipse (not required to build Sling) you'll also need the following installed:</p>
 <ul>
@@ -227,8 +227,8 @@ $ mvn clean install sling:install
 <p>You can use remote debugging to debug Sling in Eclipse, here's a little How-To</p>
 <ol>
   <li>
-    <p>start Sling from the command line with</p>
-    <p>java -Xmx384M -agentlib:jdwp=transport=dt_socket,address=30303,server=y,suspend=n -jar org.apache.sling.launchpad.app-6-SNAPSHOT.jar</p>
+    <p>start Sling from the command line with (replace N with the actual version before running the command)</p>
+    <p>java -Xmx384M -agentlib:jdwp=transport=dt_socket,address=30303,server=y,suspend=n -jar org.apache.sling.launchpad-N.jar</p>
   </li>
   <li>
   <p>Open Menu Run-&gt; Debug configurations</p></li>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/documentation/getting-started.html
----------------------------------------------------------------------
diff --git a/documentation/getting-started.html b/documentation/getting-started.html
index 050cc67..06af4ce 100644
--- a/documentation/getting-started.html
+++ b/documentation/getting-started.html
@@ -72,14 +72,24 @@
         </div>        <div class="main">
 <div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo;&nbsp;</div>            <h1 class="pagetitle">
                 Getting Started
-            </h1><div class="tags"><a href="/tags/tutorials.html" class="label">tutorials</a> </div><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h1[class!=pagetitle],h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p>We're on the way to update the documentation to make it more easy to get in touch with Sling. At the moment we can give you the following starting points:</p>
-<ul>
-  <li><a href="getting-started/discover-sling-in-15-minutes.html">Discover Sling in 15 minutes</a></li>
-</ul>
-<h2><a href="#where-to-head-from-here" name="where-to-head-from-here">Where to head from here</a></h2>
-<p>We recommend you read through following topics to get as fast as possible into Sling: </p>
+            </h1><div class="tags"><a href="/tags/tutorials.html" class="label">tutorials</a> </div><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h1[class!=pagetitle],h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#run-apache-sling" name="run-apache-sling">Run Apache Sling</a></h1>
+<h2><a href="#sling-docker-image" name="sling-docker-image">Sling Docker Image</a></h2>
+<p>The easiest way to get Apache Sling running is to use Docker. If you don't have Docker installed  you can skip to the next section.</p>
+<p>We maintain a docker image of our latest release at <a href="https://hub.docker.com/r/apachesling/sling">Apache Sling Docker Image</a>.</p>
+<p>The simplest command to launch Sling is:</p>
+<pre><code>docker run -p 8080:8080 apachesling/sling
+</code></pre>
+<p>This will start the latest Apache Sling distribution and you can access Sling at <a href="http://localhost:8080">http://localhost:8080</a>.</p>
+<h2><a href="#sling-download" name="sling-download">Sling Download</a></h2>
+<p>The other option is to download the latest released Apache Sling standalone application from our  <a href="/downloads.cgi">Downloads</a> section. Once you have downloaded the application make sure that you have  Java 8 or later installed and run Sling with (replace the N with the latest version number before  executing the command):</p>
+<pre><code>java -jar org.apache.sling.launchpad-N.jar
+</code></pre>
+<p>Again, once this is started have a look at http://localhost:8080](http://localhost:8080).</p>
+<h1><a href="#where-to-head-from-here" name="where-to-head-from-here">Where to head from here</a></h1>
+<p>We're on the way to update the documentation to make it more easy to get in touch with Sling. We recommend you read through following topics to get as fast as possible into Sling: </p>
 <ul>
   <li><a href="/documentation/development/getting-and-building-sling.html">Getting and building Sling</a></li>
+  <li><a href="getting-started/discover-sling-in-15-minutes.html">Discover Sling in 15 minutes</a></li>
   <li><a href="/documentation/the-sling-engine/architecture.html">Architecture</a></li>
   <li><a href="/documentation/the-sling-engine/dispatching-requests.html">Dispatching Requests</a></li>
   <li><a href="/documentation/the-sling-engine/resources.html">Resources</a></li>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 2cbeabd..31f3070 100644
--- a/feed.xml
+++ b/feed.xml
@@ -4,7 +4,7 @@
     <link href="http://sling.apache.org/"/>
     <link rel="self" type="application/atom+xml" href="http://sling.apache.org/feed.xml"/>
     <subtitle>Work in progress...</subtitle>
-    <updated>2017-09-29T16:01:04Z</updated>
+    <updated>2017-09-30T11:58:30Z</updated>
     <id>tag:localhost,2017:09</id>
     
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 97131b3..44c6cad 100644
--- a/index.html
+++ b/index.html
@@ -73,7 +73,6 @@
 <div class="breadcrumbs"><a href="/">Home</a>&nbsp;&raquo;&nbsp;</div>            <h1 class="pagetitle">
                 Apache Sling - Bringing Back the Fun!
             </h1><div class="tags"><a href="/tags/community.html" class="label">community</a> </div><div id="generatedToC"></div><script src='/res/jquery-3.2.1.min.js' type='text/javascript'></script><script src='/res/tocjs-1-1-2.js' type='text/javascript'></script><script type='text/javascript'>$(document).ready(function() { $('#generatedToC').toc({'selector':'h1[class!=pagetitle],h2,h3'}); } );</script><div class="row"><div class="small-12 columns"><section class="wrap"><p><strong>Apache Sling&trade;</strong> is an innovative web framework that is intended to bring back the fun to web development.</p>
-<p>Discussions about Sling happen on our mailing lists, see the <a href="/project-information.html">Project Information</a>  page for more info.</p>
 <h1><a href="#apache-sling-in-four-bullets-points" name="apache-sling-in-four-bullets-points">Apache Sling in four bullets points</a></h1>
 <ul>
   <li>ReST based web framework</li>
@@ -81,13 +80,14 @@
   <li>Modular design</li>
   <li>Scripting inside</li>
 </ul>
-<h2><a href="#getting-started" name="getting-started">Getting started</a></h2>
+<h1><a href="#getting-started" name="getting-started">Getting started</a></h1>
 <p>If you prefer doing rather than reading, please proceed to the <a href="/documentation/getting-started.html">Getting Started</a>  section, where you can quickly get started on your own instance of Sling.</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><a href="#apache-sling-in-a-hundred-words" name="apache-sling-in-a-hundred-words">Apache Sling in a hundred words</a></h1>
-<p>Apache Sling is a web framework that uses a <a href="http://en.wikipedia.org/wiki/JSR-170">Java Content Repository</a>, such as <a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a>, to store and manage content.</p>
+<p>Apache Sling is a web framework that uses a resource oriented architecture. The content is  stored in a hierarchical resource tree which is mapped to the URL space of the web  application.</p>
 <p>Sling applications use either scripts or Java servlets, selected based on simple name conventions, to process HTTP requests in a RESTful way.</p>
-<p>The embedded <a href="http://felix.apache.org/">Apache Felix</a>  OSGi framework and console provide a dynamic runtime environment, where code and content bundles can be loaded, unloaded and reconfigured at runtime.</p>
-<p>As the first web framework dedicated to <a href="http://jcp.org/en/jsr/detail?id=170">JSR-170</a>  Java Content Repositories, Sling makes it very simple to implement simple applications, while providing an enterprise-level framework for more complex applications. </p>
+<p>The runtime environment is modular and dynamic allowing to select only the required modules  to run your Sling application. This provides a flexible extension mechanism where modules  easily can be loaded, unloaded and reconfigured</p>
+<p>Sling makes it very simple to implement simple applications, while providing an  enterprise-level framework for more complex applications. </p>
 <h2><a href="#news" name="news">News</a></h2>
 <ul id="newsExcerpt">
 </ul>

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

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

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/tags/api.html
----------------------------------------------------------------------
diff --git a/tags/api.html b/tags/api.html
index 0dc4b94..a69cadb 100644
--- a/tags/api.html
+++ b/tags/api.html
@@ -156,9 +156,9 @@
                                     </span><span><a href="/tags/webconsole.html" class="label">webconsole<span class="badge">1</span></a> 
                                     </span><span><a href="/tags/xml.html" class="label">xml<span class="badge">1</span></a> 
                                     </span><span><a href="/tags/xslt.html" class="label">xslt<span class="badge">1</span></a> 
-                                    </span></div></div></div><div class="taglinks"><div class="small-12 columns"><h2>Tagged with 'api'</h2><div class="taglink"><a href="/old-stuff/sling-api.html">Sling API</a></div>
+                                    </span></div></div></div><div class="taglinks"><div class="small-12 columns"><h2>Tagged with 'api'</h2><div class="taglink"><a href="/documentation/the-sling-engine/sling-api-crud-support.html">Sling API CRUD Support</a></div>
                                 <div class="taglink"><a href="/javadoc-io.html">Sling API docs at javadoc.io</a></div>
-                                <div class="taglink"><a href="/documentation/the-sling-engine/sling-api-crud-support.html">Sling API CRUD Support</a></div>
+                                <div class="taglink"><a href="/old-stuff/sling-api.html">Sling API</a></div>
                             </div></div></div></div></div>
 <div class="footer">
                 <div class="trademarkFooter">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/tags/bundles.html
----------------------------------------------------------------------
diff --git a/tags/bundles.html b/tags/bundles.html
index 92316b9..0100cd7 100644
--- a/tags/bundles.html
+++ b/tags/bundles.html
@@ -156,9 +156,9 @@
                                     </span><span><a href="/tags/webconsole.html" class="label">webconsole<span class="badge">1</span></a> 
                                     </span><span><a href="/tags/xml.html" class="label">xml<span class="badge">1</span></a> 
                                     </span><span><a href="/tags/xslt.html" class="label">xslt<span class="badge">1</span></a> 
-                                    </span></div></div></div><div class="taglinks"><div class="small-12 columns"><h2>Tagged with 'bundles'</h2><div class="taglink"><a href="/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</a></div>
+                                    </span></div></div></div><div class="taglinks"><div class="small-12 columns"><h2>Tagged with 'bundles'</h2><div class="taglink"><a href="/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></div>
                                 <div class="taglink"><a href="/documentation/bundles.html">Bundles</a></div>
-                                <div class="taglink"><a href="/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></div>
+                                <div class="taglink"><a href="/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html">Installing and Upgrading Bundles</a></div>
                             </div></div></div></div></div>
 <div class="footer">
                 <div class="trademarkFooter">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/tags/community.html
----------------------------------------------------------------------
diff --git a/tags/community.html b/tags/community.html
index 3ce9323..1d64170 100644
--- a/tags/community.html
+++ b/tags/community.html
@@ -157,13 +157,13 @@
                                     </span><span><a href="/tags/xml.html" class="label">xml<span class="badge">1</span></a> 
                                     </span><span><a href="/tags/xslt.html" class="label">xslt<span class="badge">1</span></a> 
                                     </span></div></div></div><div class="taglinks"><div class="small-12 columns"><h2>Tagged with 'community'</h2><div class="taglink"><a href="/index.html">Apache Sling - Bringing Back the Fun!</a></div>
-                                <div class="taglink"><a href="/project-information/project-team.html">Project Team</a></div>
-                                <div class="taglink"><a href="/project-information/project-license.html">Project License</a></div>
-                                <div class="taglink"><a href="/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></div>
-                                <div class="taglink"><a href="/links.html">Links</a></div>
-                                <div class="taglink"><a href="/documentation.html">Documentation</a></div>
-                                <div class="taglink"><a href="/documentation/development/issue-tracker.html">Issue Tracker</a></div>
                                 <div class="taglink"><a href="/contributing.html">Contributing</a></div>
+                                <div class="taglink"><a href="/documentation/development/issue-tracker.html">Issue Tracker</a></div>
+                                <div class="taglink"><a href="/documentation.html">Documentation</a></div>
+                                <div class="taglink"><a href="/links.html">Links</a></div>
+                                <div class="taglink"><a href="/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></div>
+                                <div class="taglink"><a href="/project-information/project-license.html">Project License</a></div>
+                                <div class="taglink"><a href="/project-information/project-team.html">Project Team</a></div>
                                 <div class="taglink"><a href="/downloads.html">Downloads</a></div>
                             </div></div></div></div></div>
 <div class="footer">

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/tags/configuration.html
----------------------------------------------------------------------
diff --git a/tags/configuration.html b/tags/configuration.html
index 9e3b25b..9dfd2df 100644
--- a/tags/configuration.html
+++ b/tags/configuration.html
@@ -156,14 +156,14 @@
                                     </span><span><a href="/tags/webconsole.html" class="label">webconsole<span class="badge">1</span></a> 
                                     </span><span><a href="/tags/xml.html" class="label">xml<span class="badge">1</span></a> 
                                     </span><span><a href="/tags/xslt.html" class="label">xslt<span class="badge">1</span></a> 
-                                    </span></div></div></div><div class="taglinks"><div class="small-12 columns"><h2>Tagged with 'configuration'</h2><div class="taglink"><a href="/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes</a></div>
-                                <div class="taglink"><a href="/documentation/configuration.html">Configuration</a></div>
-                                <div class="taglink"><a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings and Run Modes (org.apache.sling.settings)</a></div>
-                                <div class="taglink"><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a></div>
-                                <div class="taglink"><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">Apache Sling Context-Aware Configuration - SPI</a></div>
+                                    </span></div></div></div><div class="taglinks"><div class="small-12 columns"><h2>Tagged with 'configuration'</h2><div class="taglink"><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html">Apache Sling Context-Aware Configuration - Default Implementation</a></div>
                                 <div class="taglink"><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Apache Sling Context-Aware Configuration - Override</a></div>
-                                <div class="taglink"><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html">Apache Sling Context-Aware Configuration - Default Implementation</a></div>
+                                <div class="taglink"><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">Apache Sling Context-Aware Configuration - SPI</a></div>
+                                <div class="taglink"><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Apache Sling Context-Aware Configuration</a></div>
+                                <div class="taglink"><a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings and Run Modes (org.apache.sling.settings)</a></div>
+                                <div class="taglink"><a href="/documentation/configuration.html">Configuration</a></div>
                                 <div class="taglink"><a href="/documentation/the-sling-engine/sling-properties.html">Well-known Sling Properties</a></div>
+                                <div class="taglink"><a href="/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes</a></div>
                             </div></div></div></div></div>
 <div class="footer">
                 <div class="trademarkFooter">