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/19 12:41:36 UTC

[30/53] sling-site git commit: asf-site branch created for published content

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/news/sling-launchpad-9-released.html
----------------------------------------------------------------------
diff --git a/news/sling-launchpad-9-released.html b/news/sling-launchpad-9-released.html
new file mode 100644
index 0000000..5f9508c
--- /dev/null
+++ b/news/sling-launchpad-9-released.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </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>
+<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>
+<h2>The Sling Explorer is replaced with Composum</h2>
+<p>The Sling Launchpad ships with a new repository explorer and administration tool - <a href="https://github.com/ist-dresden/composum">Composum</a>. Composum is more reliable and featureful compared to the previous Sling explorer.</p>
+<h2>The Slingshot sample is included</h2>
+<p>The default Sling configuration now includes the Slingshot sample. Slingshot exemplifies how to build and deploy a Sling application.</p>
+<h2>New Resource Provider and Observation API</h2>
+<p>The Resource Provider API has been replaced with a new implementation, which is more performant and better suited for future evolution. Existing ResourceProvider will be able to work using a backwards-compatible layer, but developers are nonetheless encouraged to move to the new implementation.</p>
+<p>In the same manner, the Observation API has been refreshed.</p>
+<h2>New modules added: Validation, Context-Aware Configuration, Repository Initialization Language</h2>
+<p>A number of new general-purpose modules have been added to the Sling Launchpad:</p>
+<ul>
+  <li><a href="/documentation/bundles/validation.html">Validation</a></li>
+  <li><a href="/documentation/bundles/context-aware-configuration/context-aware-configuration.html">Context-Aware configuration</a></li>
+  <li><a href="/documentation/bundles/repository-initialization.html">Repository Initialization Language</a></li>
+</ul>
+<h2>Tooling: HTL Maven Plugin</h2>
+<p>The <a href="http://sling.apache.org/components/htl-maven-plugin/">HTL Maven Plugin</a> provides build-time validation for projects using HTL. Furthermore, the HTL engine has been modularised into an HTL Compiler, an HTL Java Compiler and an HTL Script Engine, with the first two allowing to build other HTL tools in a Sling-independent way.</p>
+<h2>Streaming Upload Support</h2>
+<p>The version of the Sling Engine shipped in the Launchpad now supports streaming uploads, for better I/O throughput. Streaming uploads are opt-in via setting the following HTTP Header:</p>
+<p>Sling-UploadMode: stream</p>
+<h2>Discovery: added Oak-based discovery implementation</h2>
+<p>The Sling discovery mechanism has been augmented with a mechanism which delegates instance discovery to Oak. When working with a DocumentNodeStore-based Oak implementation, this information is already available to Oak so there is no point in duplicating the work.</p>
+<h2>Security: loginAdministrative deprecation</h2>
+<p>We believe that the vast majority of bundles performing background work do not require administrative access to the repository via <code>loginAdministrative</code>. We have removed many usages of <code>loginAdministrative</code> in the Sling code and replaced then with a service-based approach - <code>loginService</code>. We encourage you to do the same.</p>
+<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>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/old-stuff.html
----------------------------------------------------------------------
diff --git a/old-stuff.html b/old-stuff.html
new file mode 100644
index 0000000..80d1228
--- /dev/null
+++ b/old-stuff.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </div>        <div class="main">
+<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Old Stuff</h1></header><p>translation_pending: true</p>
+<p>Should either be deleted or reviewed and updated to match the current code:</p>
+<p>{% for label, page in children %}* [{{ page.headers.title }}]({{ page.path }}) {% endfor %}</p></section></div></div>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
new file mode 100644
index 0000000..e4a03af
--- /dev/null
+++ b/plugins.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </div>        <div class="main">
+<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Plugins</h1></header><p>translation_pending: true</p>
+<p>These pages present the various Maven Plugins of Sling:</p>
+<p>{% for label, page in children %}* [{{ page.headers.title }}]({{ page.path }}) {% endfor %}</p></section></div></div>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/project-information.html
----------------------------------------------------------------------
diff --git a/project-information.html b/project-information.html
new file mode 100644
index 0000000..9b6cdc2
--- /dev/null
+++ b/project-information.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </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>
+<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>
+  <li><a href="#mailing-lists">Mailing Lists</a></li>
+  <li><a href="#issue-tracking">Issue Tracking</a></li>
+  <li><a href="#source-repository">Source Repository</a></li>
+  <li><a href="#continuous-integration">Continuous Integration</a></li>
+  <li><a href="/project-information/project-license.html">Project License</a></li>
+  <li><a href="#documentation-repository">Documentation Repository</a></li>
+</ul>
+<h2>Mailing Lists</h2>
+<p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p>
+<p>The Sling Users List is the preferred way of getting help with Sling. However, you can also <a href="http://stackoverflow.com/questions/ask?tags=sling">Ask a Sling question on StackOverflow</a> if you prefer.</p>
+<table>
+  <thead>
+    <tr>
+      <th>Name </th>
+      <th>Subscribe </th>
+      <th>Unsubscribe </th>
+      <th>Post </th>
+      <th>Archive </th>
+      <th>Other Archives </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Sling Users List </td>
+      <td><a href="mailto:users-subscribe@sling.apache.org">Subscribe</a> </td>
+      <td><a href="mailto:users-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
+      <td>users at sling.apache.org </td>
+      <td><a href="https://lists.apache.org/list.html?users@sling.apache.org">lists.apache.org</a> </td>
+      <td><a href="http://www.mail-archive.com/users@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> <a href="http://apache-sling.73963.n3.nabble.com/Sling-Users-f73968.html">Nabble</a> </td>
+    </tr>
+    <tr>
+      <td>Sling Developers List </td>
+      <td><a href="mailto:dev-subscribe@sling.apache.org">Subscribe</a> </td>
+      <td><a href="mailto:dev-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
+      <td>dev at sling.apache.org </td>
+      <td><a href="https://lists.apache.org/list.html?dev@sling.apache.org">lists.apache.org</a> </td>
+      <td><a href="http://www.mail-archive.com/dev@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> <a href="http://apache-sling.73963.n3.nabble.com/Sling-Dev-f73966.html">Nabble</a> </td>
+    </tr>
+    <tr>
+      <td>Sling Source Control List </td>
+      <td><a href="mailto:commits-subscribe@sling.apache.org">Subscribe</a> </td>
+      <td><a href="mailto:commits-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
+      <td> </td>
+      <td><a href="https://lists.apache.org/list.html?commits@sling.apache.org">lists.apache.org</a> </td>
+      <td><a href="http://www.mail-archive.com/commits@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> </td>
+    </tr>
+  </tbody>
+</table>
+<h2>Issue Tracking</h2>
+<p>This project uses JIRA a J2EE-based, issue tracking and project management application. Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.</p>
+<p>The issue tracker can be found at <a href="http://issues.apache.org/jira/browse/SLING">http://issues.apache.org/jira/browse/SLING</a></p>
+<h2>Source Repository</h2>
+<p>This project uses Subversion to manage its source code. Instructions on Subversion use can be found at <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</p>
+<h3>Web Access</h3>
+<p>The following is a link to the online source repository.</p>
+<p>http://svn.apache.org/viewvc/sling/trunk</p>
+<h3>Anonymous access</h3>
+<p>The source can be checked out anonymously from SVN with this command:</p>
+<p>$ svn checkout http://svn.apache.org/repos/asf/sling/trunk sling</p>
+<h3>Developer access</h3>
+<p>Everyone can access the Subversion repository via HTTPS, but Committers must checkout the Subversion repository via HTTPS.</p>
+<p>$ svn checkout https://svn.apache.org/repos/asf/sling/trunk sling</p>
+<p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p>
+<p>$ svn commit --username your-username -m "A message"</p>
+<h3>Access from behind a firewall</h3>
+<p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via the developer connection:</p>
+<p>$ svn checkout https://svn.apache.org/repos/asf/sling/trunk sling</p>
+<h3>Access through a proxy</h3>
+<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
+<p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p>
+<p>Example : Edit the 'servers' file and add something like :</p>
+<p>[global] http-proxy-host = your.proxy.name http-proxy-port = 3128</p>
+<h2>Continuous Integration</h2>
+<p>Sling builds run automatically on the <a href="https://builds.apache.org/">ASF's Jenkins instance</a>, triggered by commits.</p>
+<p>We maintain multiple build jobs, typically one or two per module. These are grouped into two views:</p>
+<ul>
+  <li><a href="https://builds.apache.org/view/S-Z/view/Sling/">Sling</a>, which holds all Sling-related jobs</li>
+  <li><a href="https://builds.apache.org/view/S-Z/view/Sling-Dashboard/">Sling-Dashboard</a>, which holds all Sling jobs needing attention, such as failed jobs.</li>
+</ul>
+<p>More documentation regarding the Jenkins setup is available as wiki links from the views mentioned above.</p>
+<h2>Documentation Repository</h2>
+<p>The documentation website, in fact the very page that you are reading right now, is located at <a href="https://cms.apache.org/sling/">The ASF Content Management System’s Sling project</a>. You can contribute without being an official project committer.</p>
+<h3>Save your changes as an SVN patch:</h3>
+<ol>
+  <li>Log in as username <em>anonymous</em> and leave the password blank.</li>
+  <li>Click <em>Get sling Working Copy</em> to check out a local branch through the browser.</li>
+  <li>Navigate to a document and click <em>edit</em>.</li>
+  <li>Edit the page in the online markdown editor.</li>
+  <li>Uncheck <em>Quick Mail</em>.</li>
+  <li>Click <em>submit</em>.</li>
+  <li>Click <em>Diff</em>, then <em>Download Diff</em> and save the SVN patch to your computer.</li>
+</ol>
+<h3>Submit your changes:</h3>
+<ol>
+  <li>Navigate to the <a href="https://issues.apache.org/jira/browse/SLING">Jira issue tracker</a>.</li>
+  <li>Create an account and/or login.</li>
+  <li>Create a ticket, enter a description and choose <em>Documentation</em> for <em>Components</em>.</li>
+  <li>Select the ticket, click <em>more</em>, select <em>attach files</em> and attach your SVN patch.</li>
+</ol>
+<h3>Further resources:</h3>
+<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>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/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
new file mode 100644
index 0000000..898ae7a
--- /dev/null
+++ b/project-information/apache-sling-community-roles-and-processes.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </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>
+<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>
+<p>The roles defined here conform to the ASF's <a href="http://www.apache.org/foundation/how-it-works.html#roles">definition of roles</a>.</p>
+<h3>Users</h3>
+<p>Users are the people who use any of the products of the Sling project. People in this role are not contributing code, but they are using the products, reporting bugs, making feature requests, testing code, and such. This is by far the most important category of people, since without users there is no reason for Sling. When a user starts to contribute code or documentation patches, they become a <em>Contributor</em>.</p>
+<h3>Contributors</h3>
+<p>Contributors are the people who write code or documentation patches or contribute positively to the project in other ways. A volunteer's contribution is always recognized.</p>
+<h3>Committers</h3>
+<p>Contributors who give frequent and valuable contributions to a subproject of Sling can have their status promoted to that of a <em><a href="http://www.apache.org/dev/committers.html">Committer</a></em>. A Committer has write access to Sling's source code repository. Contributors of documentation are eligible as committers in the same way as contributors of pure code.</p>
+<h3>PMC Members</h3>
+<p>Committers showing continued interest in the project and taking an active part in the evolution of the project may be elected as <em><a href="http://www.apache.org/dev/pmc.html">PMC</a> members</em>. The PMC (Project Management Committee) is the official managing body of project and is responsible for setting its overall direction.</p>
+<h2>Processes</h2>
+<h3>Becoming a User or Contributor</h3>
+<p>There is no requirement for becoming a User or Contributor; these roles are open to everyone.</p>
+<h3>Becoming a Committer</h3>
+<p>In order for a Contributor to become a Committer, a member of the PMC can nominate that Contributor to the PMC. Once a Contributor 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>Upon a positive vote result, the Contributor will be emailed by the PMC to invite him/her to become a Committer. If the invitation is accepted, an announcement about the new Committer is made to the developer mailing list and he/she is given write access to the source code repository. A Contributor will not officially become a Committer member until the appropriate legal paperwork is submitted.</p>
+<h3>Becoming a PMC Member</h3>
+<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>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/project-information/project-license.html
----------------------------------------------------------------------
diff --git a/project-information/project-license.html b/project-information/project-license.html
new file mode 100644
index 0000000..60bef2e
--- /dev/null
+++ b/project-information/project-license.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </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="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/project-information/project-team.html
----------------------------------------------------------------------
diff --git a/project-information/project-team.html b/project-information/project-team.html
new file mode 100644
index 0000000..0a9deed
--- /dev/null
+++ b/project-information/project-team.html
@@ -0,0 +1,330 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </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>
+<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>
+<p>Committers marked with an asterisk (*) are also members of the Sling Project Management Commitee (<a href="http://www.apache.org/dev/pmc.html">PMC</a>) as defined in <a href="/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></p>
+<p>This page is currently maintained manually, the ASF's LDAP information is the ultimate reference.</p>
+<table>
+  <thead>
+    <tr>
+      <th>Id </th>
+      <th>Name </th>
+      <th>Organization </th>
+      <th>Roles </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>aheimoz </td>
+      <td>Alison Heimoz </td>
+      <td>Adobe </td>
+      <td>Technical Writer </td>
+    </tr>
+    <tr>
+      <td>amitgupt </td>
+      <td>Amit Gupta </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>apopescu (*) </td>
+      <td>Alexandru Popescu </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>asanso (*) </td>
+      <td>Antonio Sanso </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>bdelacretaz (*) </td>
+      <td>Bertrand Delacretaz </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>clemens </td>
+      <td>Clemens Wyss </td>
+      <td>MySign AG </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>chetanm (*) </td>
+      <td>Chetan Mehrotra </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>clombart (*) </td>
+      <td>Christophe Lombart </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>cziegeler (*) </td>
+      <td>Carsten Ziegeler </td>
+      <td>Adobe </td>
+      <td>Chair, Java Developer </td>
+    </tr>
+    <tr>
+      <td>dklco (*) </td>
+      <td>Dan Klco </td>
+      <td>Six Dimensions </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>dulvac </td>
+      <td>Andrei Dulvac </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>fmeschbe (*) </td>
+      <td>Felix Meschberger </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>enorman </td>
+      <td>Eric Norman </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>gianugo (*) </td>
+      <td>Gianugo Rabellino </td>
+      <td> </td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td>ghenzler </td>
+      <td>Georg Henzler </td>
+      <td>Netcentric </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>jckautzmann </td>
+      <td>Jean-Christophe Kautzmann </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>jsedding </td>
+      <td>Julian Sedding </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>justin (*) </td>
+      <td>Justin Edelson </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>hannonpi (*) </td>
+      <td>Padraic Hannon </td>
+      <td>Edmunds Inc. </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>ieb (*) </td>
+      <td>Ian Boston </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>juanjo (*) </td>
+      <td>Juan José Vázquez Delgado </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>kwin (*) </td>
+      <td>Konrad Windszus </td>
+      <td>Netcentric </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>mduerig </td>
+      <td>Michael Dürig </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>mykee (*) </td>
+      <td>Mike Müller </td>
+      <td>MySign AG </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>npeltier </td>
+      <td>Nicolas Peltier </td>
+      <td> Adobe </td>
+      <td> Java Developer </td>
+    </tr>
+    <tr>
+      <td>olli (*) </td>
+      <td>Oliver Lietz </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>pauls (*) </td>
+      <td>Karl Pauls </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>radu (*) </td>
+      <td>Radu Cotescu </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>rombert (*) </td>
+      <td>Robert Munteanu </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>sboehme </td>
+      <td>Sandro Boehme </td>
+      <td>inovex GmbH </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>sseifert (*) </td>
+      <td>Stefan Seifert </td>
+      <td>pro!vision GmbH </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>stefanegli (*) </td>
+      <td>Stefan Egli </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>thecarlhall </td>
+      <td>Carl Hall </td>
+      <td>Hallway Technologies </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>tmaret </td>
+      <td>Timothee Maret </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>tommaso </td>
+      <td>Tommaso Teofili </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>tomekr </td>
+      <td>Tomek Rękawek </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>vramdal </td>
+      <td>Vidar Ramdal </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+    <tr>
+      <td>mpetria </td>
+      <td>Marius Petria </td>
+      <td>Adobe </td>
+      <td>Java Developer </td>
+    </tr>
+  </tbody>
+</table>
+<h2>Emeritus Committers and PMC members</h2>
+<p>The following list of former committers and PMC members have chosen to go emeritus. We are still thankful for their help and guidance during earlier phases of the Sling project.</p>
+<table>
+  <thead>
+    <tr>
+      <th>Id </th>
+      <th>Name </th>
+      <th>Organization </th>
+      <th>Roles </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>farra </td>
+      <td><strong>J Aaron Farr</strong> </td>
+      <td> </td>
+      <td>Mentor </td>
+    </tr>
+    <tr>
+      <td>jukka </td>
+      <td><strong>Jukka Zitting</strong> </td>
+      <td>Adobe </td>
+      <td>Champion, Mentor </td>
+    </tr>
+  </tbody>
+</table>
+<p>Committers with their names printed in bold face have also been members of the PMC (or PPMC during Sling incubation) as defined in <a href="/project-information/apache-sling-community-roles-and-processes.html">Apache Sling Community Roles and Processes</a></p>
+<h2>Emeritus PMC members</h2>
+<p>The following list of former PMC members have chosen to go emeritus as a PMC member but stay active as a committer. We are still thankful for their help and guidance.</p>
+<table>
+  <thead>
+    <tr>
+      <th>Id </th>
+      <th>Name </th>
+      <th>Organization </th>
+      <th>Roles </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>vramdal </td>
+      <td>Vidar Ramdal </td>
+      <td> </td>
+      <td>Java Developer </td>
+    </tr>
+  </tbody>
+</table>
+<h2>Special Thanks</h2>
+<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>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/project-information/security.html
----------------------------------------------------------------------
diff --git a/project-information/security.html b/project-information/security.html
new file mode 100644
index 0000000..c8de846
--- /dev/null
+++ b/project-information/security.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </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>
+<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>
+<p>If you need to report a bug that isn't an undisclosed security vulnerability, please use our <a href="https://issues.apache.org/jira/browse/SLING">public issue tracker</a>.</p>
+<p>Questions about:</p>
+<ul>
+  <li>how to configure Sling securely</li>
+  <li>whether a published vulnerability applies to your particular application</li>
+  <li>obtaining further information on a published vulnerability</li>
+  <li>availability of patches and/or new releases</li>
+</ul>
+<p>should be addressed to our public users mailing list. Please see the <a href="/project-information.html">Project Information</a> page for details of how to subscribe.</p>
+<p>The private security mailing address is: security(at)sling.apache.org.</p>
+<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>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/res/css/codehilite.css
----------------------------------------------------------------------
diff --git a/res/css/codehilite.css b/res/css/codehilite.css
new file mode 100644
index 0000000..93ce023
--- /dev/null
+++ b/res/css/codehilite.css
@@ -0,0 +1,429 @@
+/*************************************************************************
+
+    For reference: classes defined by the Confluence batch.css
+    
+.code {
+    border-width: 1px;
+    border-style: dashed;
+    overflow: auto;
+}
+
+.code,.preformatted {
+    background-color: #fff;
+}
+
+.code pre,.preformatted pre {
+    font-family: "Courier New", Courier, monospace;
+    line-height: 1.3;
+}
+
+.code-keyword {
+    color: #000091;
+    background-color: inherit;
+}
+
+.code-object {
+    color: #910091;
+    background-color: inherit;
+}
+
+.code-quote {
+    color: #009100;
+    background-color: inherit;
+}
+
+.code-comment {
+    color: #808080;
+    background-color: inherit;
+}
+
+.code-xml .code-keyword {
+    color: inherit;
+    font-weight: bold;
+}
+
+.code-tag {
+    color: #000091;
+    background-color: inherit;
+}
+
+*/
+
+/*************************************************************************
+
+    For reference: classes defined by the old Sling Site CSS
+
+.codehilite {
+    color: black;
+    background-color: #f0f0f0;
+    border: solid 1px black;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    padding: 0.5em
+}
+
+.codeHeader {
+    text-align: center;
+    font-family: monospace;
+    border-bottom: 1px solid black;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+    margin-bottom: 0.5em;
+}
+
+
+.codehilite pre {
+    margin: 0em
+}
+
+.code-keyword {
+    color: #880000
+}
+
+.code-quote {
+    color: #008800
+}
+
+.code-object {
+    color: #0000dd
+}
+
+.code-java {
+    margin: 0em
+}
+
+*/
+
+/**
+  Apache CMS Code High Lighting
+
+  HTML structure for default (:::, un-numbered code)
+  
+  <div class="codehilite">
+    <pre>
+    ... span-tagged code ...
+    </pre>
+  </div>
+
+
+  HTML structure for #! (line numbered code)
+  
+  <table class="codehilitetable">
+    <tr>
+        <td class="linenos">
+            <div class="linenodiv">
+                <pre>
+                ... line numbers ...
+                </pre>
+            </div>
+        </td>
+        <td class="code">
+            <div class="codehilite">
+                <pre>
+                ... span-tagged code ...
+                </pre>
+            </div>
+        </td>
+    </tr>
+  </table>
+*/
+
+.codehilitetable, .codehilite {
+    color: black;
+    background-color: #f4f4f4;
+    border: solid 1px #DDD;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    padding: 0.5em;
+}
+
+.codehilitetable .linenos {
+    border: none;
+}
+
+.codehilitetable .linenos .linenodiv {
+}
+
+.codehilitetable .linenos .linenodiv pre {
+    margin: 0px;
+    padding: 0px;
+}
+
+.codehilitetable .code {
+    border: none;
+}
+
+.codehilitetable .code .codehilite {
+    /** overwrite from .codehilite class above */
+    border: none;
+    margin: 0px;
+    padding: 0px;
+}
+
+.codehilite pre {
+    /* Applies to both .codehilite divs, top level and in table */
+    margin: 0px;
+    padding: 0px;
+    overflow: auto;
+}
+
+
+/**
+ * Pygments Code Formatter Styles
+ */
+ 
+/** Whitespace */
+.codehilite .w {
+}
+/** Error */
+.codehilite .err {
+}
+/** Other */
+.codehilite .x {
+}
+
+/** Keyword */
+.codehilite .k {
+    color: #880000
+}
+/** Keyword.Constant */
+.codehilite .kc {
+    color: #880000
+}
+/** Keyword.Declaration */
+.codehilite .kd {
+    color: #880000
+}
+/** Keyword.Namespace */
+.codehilite .kn {
+    color: #880000
+}
+/** Keyword.Pseudo */
+.codehilite .kp {
+    color: #880000
+}
+/** Keyword.Reserved */
+.codehilite .kr {
+    color: #880000
+}
+/** Keyword.Type */
+.codehilite .kt {
+    color: #880000
+}
+    
+/** Name */
+.codehilite .n {
+    color: #0000dd
+}
+/** Name.Attribute */
+.codehilite .na {
+    color: #0000dd
+}
+/** Name.Builtin */
+.codehilite .nb {
+    color: #0000dd
+}
+/** Name.Builtin.Pseudo */
+.codehilite .bp {
+    color: #0000dd
+}
+/** Name.Class */
+.codehilite .nc {
+    color: #0000dd
+}
+/** Name.Constant */
+.codehilite .no {
+    color: #0000dd
+}
+/** Name.Decorator */
+.codehilite .nd {
+    color: #0000dd
+}
+/** Name.Entity */
+.codehilite .ni {
+    color: #0000dd
+}
+/** Name.Exception */
+.codehilite .ne {
+    color: #0000dd
+}
+/** Name.Function */
+.codehilite .nf {
+    color: #0000dd
+}
+/** Name.Property */
+.codehilite .py {
+    color: #0000dd
+}
+/** Name.Label */
+.codehilite .nl {
+    color: #0000dd
+}
+/** Name.Namespace */
+.codehilite .nn {
+    color: #0000dd
+}
+/** Name.Other */
+.codehilite .nx {
+    color: #0000dd
+}
+/** Name.Tag */
+.codehilite .nt {
+    color: #0000dd
+}
+/** Name.Variable */
+.codehilite .nv {
+    color: #0000dd
+}
+/** Name.Variable.Class */
+.codehilite .vc {
+    color: #0000dd
+}
+/** Name.Variable.Global */
+.codehilite .vg {
+    color: #0000dd
+}
+/** Name.Variable.Instance */
+.codehilite .vi {
+    color: #0000dd
+}
+    
+/** Literal */
+.codehilite .l {
+}
+/** Literal.Date */
+.codehilite .ld {
+}
+
+/** String */
+.codehilite .s {
+    color: #008800
+}
+/** String.Backtick */
+.codehilite .sb {
+    color: #008800
+}
+/** String.Char */
+.codehilite .sc {
+    color: #008800
+}
+/** String.Doc */
+.codehilite .sd {
+    color: #008800
+}
+/** String.Double */
+.codehilite .s2 {
+    color: #008800
+}
+/** String.Escape */
+.codehilite .se {
+    color: #008800
+}
+/** String.Heredoc */
+.codehilite .sh {
+    color: #008800
+}
+/** String.Interpol */
+.codehilite .si {
+    color: #008800
+}
+/** String.Other */
+.codehilite .sx {
+    color: #008800
+}
+/** String.Regex */
+.codehilite .sr {
+    color: #008800
+}
+/** String.Single */
+.codehilite .s1 {
+    color: #008800
+}
+/** String.Symbol */
+.codehilite .ss {
+    color: #008800
+}
+    
+/** Number */
+.codehilite .m {
+}
+/** Number.Float */
+.codehilite .mf {
+}
+/** Number.Hex */
+.codehilite .mh {
+}
+/** Number.Integer */
+.codehilite .mi {
+}
+/** Number.Integer.Long */
+.codehilite .il {
+}
+/** Number.Oct */
+.codehilite .mo {
+}
+/** Operator */
+.codehilite .o {
+}
+/** Operator.Word */
+.codehilite .ow {
+}
+/** Punctuation */
+.codehilite .p {
+}
+
+/** Comment */
+.codehilite .c {
+    color: #808080;
+}
+/** Comment.Multiline */
+.codehilite .cm {
+    color: #808080;
+}
+/** Comment.Preproc */
+.codehilite .cp {
+    color: #808080;
+}
+/** Comment.Single */
+.codehilite .c1 {
+    color: #808080;
+}
+/** Comment.Special */
+.codehilite .cs {
+    color: #808080;
+}
+    
+/** Generic */
+.codehilite .g {
+}
+/** Generic.Deleted */
+.codehilite .gd {
+}
+/** Generic.Emph */
+.codehilite .ge {
+}
+/** Generic.Error */
+.codehilite .gr {
+}
+/** Generic.Heading */
+.codehilite .gh {
+}
+/** Generic.Inserted */
+.codehilite .gi {
+}
+/** Generic.Output */
+.codehilite .go {
+}
+/** Generic.Prompt */
+.codehilite .gp {
+}
+/** Generic.Strong */
+.codehilite .gs {
+}
+/** Generic.Subheading */
+.codehilite .gu {
+}
+/** Generic.Traceback */
+.codehilite .gt {
+}
+

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/res/css/site.css
----------------------------------------------------------------------
diff --git a/res/css/site.css b/res/css/site.css
new file mode 100644
index 0000000..a626a5a
--- /dev/null
+++ b/res/css/site.css
@@ -0,0 +1,263 @@
+body {
+    background-color: #ffffff;
+    color: #3b3b3b;
+    font-family: Tahoma, Arial, sans-serif;
+    font-size: 10pt;
+    line-height: 140%
+}
+
+h1,h2,h3,h4,h5,h6 {
+    font-weight: normal;
+    color: #000000;
+    line-height: 100%;
+}
+
+h1 {
+    font-size: 200%;
+    font-weight: bold;
+    border-bottom: solid #EEE 1px;
+    border-top: solid #EEE 1px;
+    padding-top:.2em;
+    padding-bottom:.2em;
+}
+
+h2 {
+    font-size: 200%;
+    margin-top: 1em;
+    font-weight: normal;
+    border-top: solid rgb(155, 155, 155) 2px;
+    padding-top: 0.45em;
+}
+
+h3 {
+    font-size: 150%
+}
+
+h4 {
+    font-size: 140%
+}
+
+h5 {
+    font-size: 130%
+}
+
+h6 {
+    font-size: 120%
+}
+
+a {
+    color: #1980af
+}
+
+a:visited {
+    color: #1980af
+}
+
+a:hover {
+    color: #1faae9
+}
+
+img {
+    max-width: 100%;
+    border: solid 1px #EEE;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    padding: 0.5em
+}
+
+.title {
+    position: absolute;
+    left: 1px;
+    right: 1px;
+    top: 25px;
+    height: 81px;
+    background:
+        url(https://sling.apache.org/site/media.data/gradient.png)
+        repeat-x;
+    background-position: bottom;
+}
+
+.title img {
+    width: auto;
+    border: none;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding: 0px;    
+}
+
+.logo {
+    position: absolute;
+    width: 15em;
+    height: 81px;
+    text-align: center;
+}
+
+.logo img {
+    height: 63px;
+}
+
+.header {
+    text-align: right;
+    margin-right: 20pt;
+}
+
+.menu {
+    border-top: 10px solid #f9bb00;
+    position: absolute;
+    top: 107px;
+    left: 1px;
+    width: 15em;
+    bottom: 0px;
+    padding: 0px;
+    background-color: #fcfcfc
+}
+
+.menu ul,.menu p {
+    background-color: #fdf5d9;
+    list-style: none;
+    padding-left: 4em;
+    margin-top: 0px;
+    padding-top: 2em;
+    padding-bottom: 2em;
+    margin-left: 0px;
+    color: #4a4a43
+}
+
+.menu p {
+    font-size: 90%;
+    margin: 0px;
+    padding: 1px;
+    padding-left: 1em;
+    padding-bottom: 1em;
+}
+
+.menu a {
+    text-decoration: none;
+    color: #4a4a43
+}
+
+.main {
+    position: absolute;
+    border-top: 10px solid #cde0ea;
+    top: 107px;
+    left: 15em;
+    right: 1px;
+    margin-left: 2px;
+    padding-right: 4em;
+    padding-left: 1em;
+    padding-top: 1em;
+}
+
+.preformatted {
+    color: black;
+    background-color: #eeeeee;
+    border: solid 1px black;
+    padding: 0.5em
+}
+
+.preformattedContent pre {
+    margin: 0em
+}
+
+table {
+    border-collapse: collapse;
+    margin: 5px;
+}
+
+th {
+    background-color: #FDF5D9;
+    border: 1px solid #DDD;
+    padding: 3px 4px;
+    text-align: left;
+    font-weight:bold;
+    font-size:90%;
+    padding: 3px 4px;
+}
+
+td {
+    border: 1px solid #DDD;
+    padding: 3px 4px;
+}
+
+.note
+{
+/*
+    background-color: #FFFFCE;
+    border: 1px solid #F0C000;
+*/
+    border: 1px solid #f0c000;
+	background: #ffffce url('icons/warning.gif') no-repeat 5px 5px;
+	text-align: left;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	padding: 5px 5px 5px 28px;
+}
+
+.warning
+{
+/*
+    background-color: #FFCCCC;
+    border: 1px solid #CC0000;
+*/
+    border: 1px solid #f0c000;
+	background: #ffffce url('icons/forbidden.gif') no-repeat 5px 5px;
+	text-align: left;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	padding: 5px 5px 5px 28px;
+}
+
+.info
+{
+/*
+    background-color: #D8E4F1;
+    border: 1px solid #3C78B5;
+*/
+    border: 1px solid #3c78b5;
+	background: #D8E4F1 url('icons/information.gif') no-repeat 5px 5px;
+	text-align: left;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	padding: 5px 5px 5px 28px;
+}
+
+.tip
+{
+/*
+    background-color: #DDFFDD;
+    border: 1px solid #009900;
+*/
+	border: 1px solid #090;
+	background: #dfd url('/res/icons/check.gif') no-repeat 5px 5px;
+	text-align: left;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	padding: 5px 5px 5px 28px;
+}
+
+/** Breadcrump at the top of each page */
+.breadcrump {
+    font-size: 80%;
+}
+
+/** Last modification information at the botton of each page */
+.timestamp {
+    margin-top: 30px;
+    font-size: 80%;
+    text-align: right;
+}
+
+/** Trademark text at the bottom of each page */
+.trademarkFooter {
+    font-size: 80%;
+    font-style: italic;
+    margin-top: 10px;
+    text-align: left;
+}
+
+blockquote {
+    font-style: italic;
+    margin: 0;
+    padding-left: 1em;
+    border-left: 1px solid black;
+}

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/res/logos/apache.png
----------------------------------------------------------------------
diff --git a/res/logos/apache.png b/res/logos/apache.png
new file mode 100644
index 0000000..fc3f667
Binary files /dev/null and b/res/logos/apache.png differ

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/res/logos/sling.png
----------------------------------------------------------------------
diff --git a/res/logos/sling.png b/res/logos/sling.png
new file mode 100644
index 0000000..69163d9
Binary files /dev/null and b/res/logos/sling.png differ

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/res/logos/sling.svg
----------------------------------------------------------------------
diff --git a/res/logos/sling.svg b/res/logos/sling.svg
new file mode 100644
index 0000000..ac3c0e7
--- /dev/null
+++ b/res/logos/sling.svg
@@ -0,0 +1,19 @@
+<!--
+  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.
+-->
+<svg id="Sling_Logo" data-name="Sling Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 768 392"><defs><linearGradient id="linear-gradient" x1="-8576.57" y1="2068.26" x2="-8523.42" y2="2006.11" gradientTransform="matrix(-1, -0.01, -0.01, 1, -8384.13, -1821.1)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f69923"/><stop offset="0.31" stop-color="#f79a23"/><stop offset="0.84" stop-color="#e97826"/></linearGradient><linearGradient id="linear-gradient-2" x1="-8969.97" y1="2075.12" x2="-8590.74" y2="2075.12" gradientTransform="matrix(-1, -0.01, -0.01, 1, -8384.13, -1821.1)" gradientUnits="userSpaceOnUse"><stop offset="0.32" stop-color="#9e2064"/><stop offset="0.63" stop-color="#c92037"/><stop offset="0.75" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><linearGradient id="linear-gradient-3" x1="-8924.2" y1="2037.09" x2="-8698.21" y2="2037.09" gradientTransform="matrix(-1, -0.01, -0.01, 1, -8384.
 13, -1821.1)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#282662"/><stop offset="0.1" stop-color="#662e8d"/><stop offset="0.79" stop-color="#9f2064"/><stop offset="0.95" stop-color="#cd2032"/></linearGradient><linearGradient id="linear-gradient-4" x1="-8948.67" y1="2078.65" x2="-8569.44" y2="2078.65" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-5" x1="-8921.02" y1="2073.54" x2="-8721.72" y2="2073.54" xlink:href="#linear-gradient-3"/><linearGradient id="linear-gradient-6" x1="-8948.67" y1="2039.41" x2="-8569.45" y2="2039.41" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-7" x1="-8972.2" y1="2041.35" x2="-8592.97" y2="2041.35" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-8" x1="-8948.67" y1="2027.74" x2="-8569.45" y2="2027.74" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-9" x1="-8948.67" y1="2029.08" x2="-8569.45" y2="2029.08" xlink:href="#linear-gradient-2"/><linearGradient 
 id="linear-gradient-10" x1="-8735.63" y1="2029.35" x2="-8692.34" y2="2029.35" xlink:href="#linear-gradient-2"/></defs><title>Logo - Close Crop</title><path d="M223.41,235.88V63l-36.64-.32V251.7q0,33.89,24.93,33.89c13.7,0,18.88-5.26,24.53-15.93C224.68,266.15,223.41,254.84,223.41,235.88Z" style="fill:#00678c"/><polygon points="260.96 158.86 275.98 158.86 275.98 283.36 311.94 283.36 311.94 129.39 260.96 129.39 260.96 158.86" style="fill:#00678c"/><path d="M294.3,69.73a19.91,19.91,0,0,0-14.58,6.09,21,21,0,0,0,0,29.47,20.43,20.43,0,0,0,28.89.26l.26-.26a21,21,0,0,0,0-29.47A19.91,19.91,0,0,0,294.3,69.73Z" style="fill:#00678c"/><path d="M431.14,125.93q-28.59,0-43.25,17V128.75H355.27V281.09h35.84V171a39,39,0,0,1,14.14-11,38.47,38.47,0,0,1,16.89-4.42q17.08,0,24.65,9T454.31,193v88h35.84V187.66q0-29.15-15.93-45.44T431.14,125.93Z" style="fill:#00678c"/><path d="M154.85,385l-2.77-.73-.18,0-1.25-.34c-21.81-5.87-37-11.75-45.1-17.46a33.85,33.85,0,0,1-7-6.59h-67V311.43A170.49,170.49,0,0,1,.15,298.89V
 392H185.77c-4.64-.92-9.31-1.89-14-2.92C165.58,387.68,160,386.35,154.85,385Z" style="fill:#00678c"/><path d="M129.72,354.16c5.61,4,18.63,8.84,36.46,13.64l14.09-18.15a264,264,0,0,1-35.69-9.1l-1.26-.43,1.26.43c3.54,1.14,14.73,4.43,35.49,7.65-5-9.83-14.05-24.37-21.89-36-22.71,5.71-29,17.47-29,17.47S118.18,346,129.72,354.16Z" style="fill:url(#linear-gradient)"/><path d="M242.78,323.18a1.49,1.49,0,0,0-.14-.19l.79,1.34.23.19C243.37,324.08,243.08,323.62,242.78,323.18Z" style="fill:none"/><path d="M280.45,318.26c.54.73,1,1.48,1.55,2.25C281.5,319.74,281,319,280.45,318.26Z" style="fill:none"/><path d="M385.47,352.77l-1,.06q-10,.61-19.52,1.08-10.69.52-20.78.89-10.65.38-20.62.59-10.49.22-20.27.28-8,0-15.48,0l-5-.05c-3.26,0-6.44-.09-9.57-.15-2.89-.06-5.71-.13-8.5-.21l-2.76-.09h-.44l.67,1.14-1.46,1.81.67,0q6.29.28,12.66.45l7.38.18q10.24.22,20.58.24t20.86-.13q10.24-.15,20.39-.45c6.76-.2,13.48-.43,20.12-.71,6.94-.29,13.82-.63,20.57-1l4.57-.25q8.19-.47,16.13-1l2.31-2.85-.76-1.28-.48,0Q395.4,352.16,38
 5.47,352.77Z" style="fill:none"/><path d="M282.36,321.09h0l0,0Z" style="fill:none"/><path d="M300,317.05c.78,1.15,1.6,2.34,2.42,3.56l0,0c-.39-.62-.8-1.24-1.2-1.83S300.42,317.63,300,317.05Z" style="fill:#be202e"/><path d="M300,317.05c.78,1.15,1.6,2.34,2.42,3.56l0,0c-.39-.62-.8-1.24-1.2-1.83S300.42,317.63,300,317.05Z" style="fill:#be202e;opacity:0.349999994039536;isolation:isolate"/><path d="M282.34,321.07h0l0,0c-.12-.2-.24-.38-.37-.58-.49-.78-1-1.54-1.55-2.25l1.9,2.81Z" style="fill:#be202e"/><path d="M282.34,321.07h0l0,0c-.12-.2-.24-.38-.37-.58-.49-.78-1-1.54-1.55-2.25l1.9,2.81Z" style="fill:#be202e;opacity:0.349999994039536;isolation:isolate"/><path d="M241.13,357c-6.91-.48-13.72-1-20.39-1.7q-10.4-1-20.33-2.4l-1.17-.16c-6.5-.91-12.83-1.95-18.95-3.11L166.2,367.79l3.76,1c4.8,1.25,9.91,2.47,15.29,3.67,6.07,1.35,12.47,2.67,19.15,3.92,6.16,1.16,12.57,2.26,19.16,3.29q8.4,1.33,17.17,2.46l.65.08,19.46-24.12Q250.85,357.66,241.13,357Z" style="fill:url(#linear-gradient-2)"/><path d="M409.33,35
 1.14q8.1-.6,16.48-1.31l.24,0,2.38-.2c3.77-.32,7.15-.64,14.85-1.36,0-4.53,3.17-9.58,7-14.74a22.55,22.55,0,0,0-11.14,13c-7.51-18.92-19.4-32.77-36.66-34.91a40.68,40.68,0,0,0-4.74-.31c6.45,1.61,10.56,5.34,14,14.33l0,0,0,0c-11.58-10.3-20-14.26-31.79-15.85-2.79-.37-5.76-.62-9-.78,16.66,6,25.83,17.64,29.54,32.52l5.78,9.81Z" style="fill:url(#linear-gradient-3)"/><path d="M384,356.74q-10.15.55-20.57,1-10,.41-20.12.71t-20.39.45q-10.41.15-20.86.13t-20.58-.24l-7.38-.18q-6.36-.19-12.66-.45l-.67,0-19.46,24.12,1.31.17c6.19.79,12.49,1.51,18.87,2.13s13,1.16,19.53,1.58q8.31.55,16.65.86l3.36.1q10.46.29,20,.1c7.19-.14,14-.47,20.31-.94q6.27-.47,12-1.1c3.25-.38,6.47-.83,9.68-1.29q11.31-1.66,22.19-4.11l19.53-24.22q-7.93.52-16.13,1C387.12,356.58,385.58,356.65,384,356.74Z" style="fill:url(#linear-gradient-4)"/><path d="M386.18,379.5a214.44,214.44,0,0,0,25.68-7.57l.87-.31c-4.61,6.89-6,20.43-6,20.38,7.66-12.68,16.08-23.48,26.53-29.23,2.69,3.73,4,9.91,4.55,17.48,3.17-9.58,2.6-15.45,2.17-17.64,3.19,6.05,10.39,1
 0.61,18.27,14.93-8.2-7.81-13.23-14.82-14.46-20.92,28.78-2.42,60.13-6,93.19-10.28a8.39,8.39,0,0,0-7.4-2.92c-6,.81-45.23,6-98,10.16l-4.53.36-1.27.1c-5.54.42-11.21.83-17,1.22l-4,.26h-.08L385.2,379.73C385.53,379.64,385.86,379.58,386.18,379.5Z" style="fill:url(#linear-gradient-5)"/><path d="M262,355.16l2.76.09q4.16.12,8.5.21c3.13.06,6.31.12,9.57.15l5,.05q7.52.06,15.48,0,9.78-.05,20.27-.28,10-.21,20.62-.59,10.09-.36,20.78-.89,9.53-.47,19.52-1.08l1-.06q9.93-.6,20.34-1.37l.48,0-5.78-9.81c.06.23.13.43.17.67-7.1-11.64-23.7-23.9-39.86-29.37a107.71,107.71,0,0,0-24.72-5,176.41,176.41,0,0,0-21.88-.54c-6.86.22-14.14.75-21.92,1.6a40.76,40.76,0,0,1,7.7,8.16c.41.57.83,1.16,1.23,1.74s.81,1.21,1.2,1.83h0l0,0c-9.61-9.52-21.42-12.92-34.27-13.47a44.67,44.67,0,0,1,12.3,11.11c.54.73,1,1.48,1.55,2.25.13.19.25.38.37.58h0l0,0h0a51.59,51.59,0,0,0-10.38-7.7c-.76-.41-1.51-.81-2.29-1.16-1.17-.55-2.37-1-3.59-1.46-.78-.27-1.57-.53-2.37-.74a43.86,43.86,0,0,0-5.88-1.22l-1.9-.24-2.67-.13c-4-.15-7.41-.14-10.41,0-1.49.05
 -2.87.14-4.13.25-.5,0-1,.08-1.45.14-1.4.14-2.63.3-3.69.46a36.5,36.5,0,0,0-3.71.76h0a12.78,12.78,0,0,1,1.51.93c3.64,2.54,8.22,7.65,11.27,12.05l-5.31-9,5.31,9a1.49,1.49,0,0,0,.14.19l.88,1.34-.23-.19,18.16,30.82A2,2,0,0,0,262,355.16Z" style="fill:url(#linear-gradient-6)"/><path d="M180.07,348.2c5.72.89,12.16,1.77,19.38,2.6l1.14.13Q210,352,221,352.9c6.39.52,13.2,1,20.47,1.38q9.51.51,20.07.86l-18.16-30.82c-8.59-7.49-14.43-9.94-22-11.47-2.05-.38-4.19-.74-6.37-1.06-6.7-1-13.9-1.68-20.89-2a186.88,186.88,0,0,0-19.1-.07,87.87,87.87,0,0,0-9.87,1c-2.52.42-4.86.93-7.06,1.48C166,323.83,175,338.37,180.07,348.2Z" style="fill:url(#linear-gradient-7)"/><path d="M301.23,318.8c.41.6.81,1.21,1.2,1.83h0C302,320,301.64,319.4,301.23,318.8Z" style="fill:#be202e"/><path d="M301.23,318.8c.41.6.81,1.21,1.2,1.83h0C302,320,301.64,319.4,301.23,318.8Z" style="fill:#be202e;opacity:0.349999994039536;isolation:isolate"/><path d="M301.23,318.8c.41.6.81,1.21,1.2,1.83h0C302,320,301.64,319.4,301.23,318.8Z" style="fill:ur
 l(#linear-gradient-8)"/><path d="M282.36,321.09c-.12-.2-.24-.38-.37-.58.13.19.25.38.37.58Z" style="fill:#be202e"/><path d="M282.36,321.09c-.12-.2-.24-.38-.37-.58.13.19.25.38.37.58Z" style="fill:#be202e;opacity:0.349999994039536;isolation:isolate"/><path d="M282.36,321.09c-.12-.2-.24-.38-.37-.58.13.19.25.38.37.58Z" style="fill:url(#linear-gradient-9)"/><path d="M282.35,321.08Z" style="fill:#be202e"/><path d="M282.35,321.08Z" style="fill:#be202e;opacity:0.349999994039536;isolation:isolate"/><path d="M282.35,321.08Z" style="fill:url(#linear-gradient-10)"/><path d="M600.39,249.82a39.59,39.59,0,0,0,31.86-13.62c7.49-9,11.47-25.25,11.47-39.83a45,45,0,0,0-12.39-31.86,40.7,40.7,0,0,0-30.94-13.18,43,43,0,0,0-32.74,13.18,44.64,44.64,0,0,0-12.39,32c0,14.06,4.22,30.19,12.19,39.43A41.62,41.62,0,0,0,600.39,249.82Z" style="fill:none"/><rect width="768" height="392" style="fill:none"/><path d="M623.13,292.79c-5.77.68-11.51,1.59-17.24,2.47-12.74,2-25.45,4.54-38.23,6.25-4,.52-9.24,1.08-11.95-2.59-3.78
 -5.54,5.93-11.71,9.28-14.18,4-2.95,12.31-6.61,12.82-7.13a67.43,67.43,0,0,1,7.33.52,95.86,95.86,0,0,0,52.41-8.32,79.66,79.66,0,0,0,18-11.95A61.61,61.61,0,0,0,668.77,241a92.09,92.09,0,0,0,7.37-23.58,112.68,112.68,0,0,0,1.63-25.85,75.07,75.07,0,0,0-4.5-21.86,130.22,130.22,0,0,0-9.16-17.44l19.47-19.63V0H76.93Q43.72.68,22.29,20.47A67.42,67.42,0,0,0,.15,72.24,81.36,81.36,0,0,0,11.5,116.05q11.35,18.24,39.83,31.54l22.74,10.63q30.39,14.26,37.91,26.32a48.39,48.39,0,0,1,7.53,26.13,39.83,39.83,0,0,1-13.58,31,51.77,51.77,0,0,1-35.84,12.15,92.75,92.75,0,0,1-28.55-5.22A95.3,95.3,0,0,1,15,235.41L1,270.37a112.55,112.55,0,0,0,63.72,17.48q42.41,0,67.7-21.86a67.7,67.7,0,0,0,25.09-53.21q0-28.87-11.55-47.79t-40.22-32.18l-23.1-10.63a166.78,166.78,0,0,1-29.31-16.53A40.46,40.46,0,0,1,42.16,91a45.8,45.8,0,0,1-4-19.39A38,38,0,0,1,49.37,43.33a34.77,34.77,0,0,1,27.4-11.95H652.17v88.33l-11.71,11.95a28.32,28.32,0,0,0-5.5-2.87A96.14,96.14,0,0,0,602.15,122a93.39,93.39,0,0,0-33.29,4.38A77,77,0,0,0,542,144.21a80.93,8
 0.93,0,0,0-15,21.7,87.14,87.14,0,0,0-6.85,26,85.11,85.11,0,0,0,1,26.68,75.39,75.39,0,0,0,8.64,22.9,78.86,78.86,0,0,0,14.34,16.29,99.57,99.57,0,0,0,10.31,8.72c-4,2.51-7.73,5.3-11.43,8-9.8,7.41-19.08,19.55-14.34,33.29s20.15,17.68,33.05,18.76a134.77,134.77,0,0,0,35.13-2.71c8.72-1.59,17.6-2.31,26.44-3.15,3.66-.36,7.25-1,11-1.08A21.11,21.11,0,0,1,651.33,326a13.32,13.32,0,0,1,1.13,2l0,.1c7.5,18.4-22.1,26.47-44.63,29.16-12.64,1.51-41,3.55-60.63,2.13-.68,13.23-6.45,24.89-15.74,32.55,15.74,0,38.51-.12,51.52-.91,11.1-.67,21.88-1,33.42-2.69,40-5.13,71.64-26.27,71.64-51C688,308.74,663.92,287.06,623.13,292.79ZM567.66,164.52a43,43,0,0,1,32.74-13.18,40.7,40.7,0,0,1,30.94,13.18,45,45,0,0,1,12.39,31.86c0,14.58-4,30.82-11.47,39.83a39.59,39.59,0,0,1-31.86,13.62A41.62,41.62,0,0,1,567.46,236c-8-9.24-12.19-25.37-12.19-39.43A44.64,44.64,0,0,1,567.66,164.52Z" style="fill:#00678c"/><path d="M728.16,3.74H716.93V34h-4V3.74H701.66V0h26.5Z" style="fill:#6d6e71"/><path d="M732.91,0h6l11.52,26.64h.1L762.14,0H768V
 34h-4V5.47h-.1L751.68,34h-2.45L737,5.47h-.09V34h-4Z" style="fill:#6d6e71"/></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/sling-site/blob/a6129baf/site-conversion.html
----------------------------------------------------------------------
diff --git a/site-conversion.html b/site-conversion.html
new file mode 100644
index 0000000..4198179
--- /dev/null
+++ b/site-conversion.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html><html lang="en">
+    <head>
+<meta charset="utf-8"/>
+        <title>Apache Sling on JBake</title>
+        <link rel="stylesheet" href="/res/css/site.css"/>
+        <link rel="stylesheet" href="/res/css/codehilite.css"/>
+        <div class="title">
+            <div class="logo">
+                <a href="http://sling.apache.org">
+                    <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+                </a>
+            </div><div class="header">
+                <a href="http://www.apache.org">
+                    <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+                </a>
+            </div>
+        </div>        
+    </head><body>
+<div class="menu">
+            <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
 ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
 dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+        </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>
+<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>            
+<div class="footer">
+                <div class="timestamp">
+                    TODO display revision number here
+                </div><div class="trademarkFooter">
+                    Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                </div>
+            </div>            
+            
+        </div>
+    </body>
+</html>