svn commit: r868731 [6/6] - in /websites/staging/sling/trunk/content: ./ documentation/ documentation/bundles/ documentation/development/ documentation/getting-started/ documentation/the-sling-engine/ documentation/the-sling-engine/authentication/ docu...

[bu...@apache.org]

Modified: websites/staging/sling/trunk/content/site/.htaccess
==============================================================================
--- websites/staging/sling/trunk/content/site/.htaccess (original)
+++ websites/staging/sling/trunk/content/site/.htaccess Sun Jul  7 18:50:10 2013
@@ -1,31 +1,57 @@
 # Add redirects from /site to the CMS-managed content here, after verifying that /site pages have been converted correctly
-Redirect Permanent /site/downloads.cgi /downloads.cgi
-Redirect Permanent /site/downloads.html /downloads.cgi
-Redirect Permanent /site/news.html /news.html
-Redirect Permanent /site/project-team.html /project-information/project-team.html
-Redirect Permanent /site/how-to-manage-events-in-sling.html /documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
-Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxEventHandler.java /documentation/tutorials-how-tos/DropBoxEventHandler.java
-Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxService.java /documentation/tutorials-how-tos/DropBoxService.java
-Redirect Permanent /site/the-sling-launchpad.html /documentation/the-sling-engine/the-sling-launchpad.html
-Redirect Permanent /site/sling-settings-org-apache-sling-settings.html /documentation/bundles/sling-settings-org-apache-sling-settings.html
-Redirect Permanent /site/run-modes-org-apache-sling-runmode.html /old-stuff/run-modes-org-apache-sling-runmode.html
-Redirect Permanent /site/filters.html /documentation/the-sling-engine/filters.html
 Redirect Permanent /site/46-line-blog.html /documentation/tutorials-how-tos/46-line-blog.html
-Redirect Permanent /site/discover-sling-in-15-minutes.html /documentation/getting-started/discover-sling-in-15-minutes.html
-Redirect Permanent /site/sling-testing-tools.html /documentation/development/sling-testing-tools.html
-Redirect Permanent /site/testing-sling-based-applications.html /documentation/tutorials-how-tos/testing-sling-based-applications.html
-Redirect Permanent /site/project-license.html /project-information/project-license.html
-Redirect Permanent /site/manipulating-content-the-slingpostservlet.html /documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
 Redirect Permanent /site/accessing-filesystem-resources-extensionsfsresource.html /documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
+Redirect Permanent /site/architecture.html /documentation/the-sling-engine/architecture.html
 Redirect Permanent /site/adapters.html /documentation/the-sling-engine/adapters.html
 Redirect Permanent /site/apache-sling-commons-thread-pool.html /documentation/bundles/apache-sling-commons-thread-pool.html
 Redirect Permanent /site/apache-sling-community-roles-and-processes.html /project-information/apache-sling-community-roles-and-processes.html
+Redirect Permanent /site/authentication.html /documentation/the-sling-engine/authentication.html
 Redirect Permanent /site/authentication-actors.html /documentation/the-sling-engine/authentication/authentication-actors.html
-Redirect Permanent /site/form-based-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
-Redirect Permanent /site/openid-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
-Redirect Permanent /site/authentication-framework.html /documentation/the-sling-engine/authentication/authentication-framework.html
 Redirect Permanent /site/authentication-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
+Redirect Permanent /site/authentication-framework.html /documentation/the-sling-engine/authentication/authentication-framework.html
 Redirect Permanent /site/authentication-tasks.html /documentation/the-sling-engine/authentication/authentication-tasks.html
-Redirect Permanent /site/resources.html /documentation/the-sling-engine/resources.html
 Redirect Permanent /site/bundles.html /documentation/bundles.html
+Redirect Permanent /site/discover-sling-in-15-minutes.html /documentation/getting-started/discover-sling-in-15-minutes.html
+Redirect Permanent /site/dispatching-requests.html /documentation/the-sling-engine/dispatching-requests.html
+Redirect Permanent /site/downloads.cgi /downloads.cgi
+Redirect Permanent /site/downloads.html /downloads.cgi
+Redirect Permanent /site/errorhandling.html /documentation/the-sling-engine/errorhandling.html
+Redirect Permanent /site/eventing-and-jobs.html /documentation/the-sling-engine/eventing-and-jobs.html
+Redirect Permanent /site/filters.html /documentation/the-sling-engine/filters.html
+Redirect Permanent /site/form-based-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
+Redirect Permanent /site/getting-resources-and-properties-in-sling.html /documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
+Redirect Permanent /site/how-to-manage-events-in-sling.html /documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
+Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxEventHandler.java /documentation/tutorials-how-tos/DropBoxEventHandler.java
+Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxService.java /documentation/tutorials-how-tos/DropBoxService.java
+Redirect Permanent /site/index.html /index.html
+Redirect Permanent /site/installing-and-upgrading-bundles.html /documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
+Redirect Permanent /site/jackrabbit-persistence.html /documentation/tutorials-how-tos/jackrabbit-persistence.html
+Redirect Permanent /site/manipulating-content-the-slingpostservlet.html /documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
+Redirect Permanent /site/mappings-for-resource-resolution.html /documentation/the-sling-engine/mappings-for-resource-resolution.html
 Redirect Permanent /site/monitoring-requests.html /documentation/development/monitoring-requests.html
+Redirect Permanent /site/news.html /news.html
+Redirect Permanent /site/openid-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
+Redirect Permanent /site/project-license.html /project-information/project-license.html
+Redirect Permanent /site/project-team.html /project-information/project-team.html
+Redirect Permanent /site/request-listeners.html /documentation/the-sling-engine/request-listeners.html
+Redirect Permanent /site/request-parameters.html /documentation/the-sling-engine/request-parameters.html
+Redirect Permanent /site/resources.html /documentation/the-sling-engine/resources.html
+Redirect Permanent /site/run-modes-org-apache-sling-runmode.html /old-stuff/run-modes-org-apache-sling-runmode.html
+Redirect Permanent /site/servlets.html /documentation/the-sling-engine/servlets.html
+Redirect Permanent /site/sling-settings-org-apache-sling-settings.html /documentation/bundles/sling-settings-org-apache-sling-settings.html
+Redirect Permanent /site/sling-testing-tools.html /documentation/development/sling-testing-tools.html
+Redirect Permanent /site/testing-sling-based-applications.html /documentation/tutorials-how-tos/testing-sling-based-applications.html
+Redirect Permanent /site/the-sling-engine.html /documentation/the-sling-engine.html
+Redirect Permanent /site/the-sling-launchpad.html /documentation/the-sling-engine/the-sling-launchpad.html
+Redirect Permanent /site/thoughts-on-release-management.html https://cwiki.apache.org/confluence/x/FyAB
+Redirect Permanent /site/tutorials-how-tos.html /documentation/tutorials-how-tos.html
+Redirect Permanent /site/thread-handling.html /documentation/bundles/apache-sling-commons-thread-pool.html
+Redirect Permanent /site/url-decomposition.html /documentation/the-sling-engine/url-decomposition.html
+Redirect Permanent /site/usecases.html /index.html
+Redirect Permanent /site/version-policy.html /documentation/development/version-policy.html
+Redirect Permanent /site/web-console-extensions.html /documentation/bundles/web-console-extensions.html
+Redirect Permanent /site/webdav.html /documentation/development/repository-based-development.html
+Redirect Permanent /site/wiki.html http://s.apache.org/sling.wiki
+Redirect Permanent /site/wrap-or-decorate-resources.html /documentation/the-sling-engine/wrap-or-decorate-resources.html
+Redirect Permanent /site/xslt-processing-pipeline.html /old-stuff/scriptengineintegration/xslt-processing-pipeline.html
+Redirect Permanent /site/xstl-processing-pipeline.html /old-stuff/scriptengineintegration/xslt-processing-pipeline.html

Modified: websites/staging/sling/trunk/content/sitemap.html
==============================================================================
--- websites/staging/sling/trunk/content/sitemap.html (original)
+++ websites/staging/sling/trunk/content/sitemap.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <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://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </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="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"