You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2013/10/09 16:17:21 UTC
svn commit: r881855 - in /websites/staging/sling/trunk/content: ./
documentation/configuration.html site/.htaccess site/configuration.html
Author: buildbot
Date: Wed Oct 9 14:17:20 2013
New Revision: 881855
Log:
Staging update by buildbot for sling
Removed:
websites/staging/sling/trunk/content/site/configuration.html
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/configuration.html
websites/staging/sling/trunk/content/site/.htaccess
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 9 14:17:20 2013
@@ -1 +1 @@
-1530496
+1530619
Modified: websites/staging/sling/trunk/content/documentation/configuration.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/configuration.html (original)
+++ websites/staging/sling/trunk/content/documentation/configuration.html Wed Oct 9 14:17:20 2013
@@ -83,11 +83,6 @@
</div>
- <div class="tip">
- This page is a translated version of <a href="/site/configuration.html" target="sling_cwiki">/site/configuration.html</a>. In case of
- doubt you might want to refer to the old page.
- </div>
-
<h1>Configuration</h1>
<h2 id="introduction">Introduction</h2>
@@ -281,19 +276,11 @@
</tr>
<tr>
<td><code>obr.repository.url</code></td>
-<td>A comma-separated list of OSGi Bundle Repository URLs. See <em>Important Properties</em> on the page <a href="/old-stuff/launch-sling.html">Initial Provisioning and Startup</a>.</td>
-</tr>
-<tr>
-<td><code>sling.install.bundles</code></td>
-<td>A comma-separated list of start level numbers. See <em>Important Properties</em> on the page <a href="/old-stuff/launch-sling.html">Initial Provisioning and Startup</a>.</td>
-</tr>
-<tr>
-<td><code>sling.install.<n></code></td>
-<td>A comma-separated list of bundle specifications. See <em>Important Properties</em> on the page <a href="/old-stuff/launch-sling.html">Initial Provisioning and Startup</a>.</td>
+<td>A comma-separated list of OSGi Bundle Repository URLs. See <em>sling.properties</em> on the page <a href="/documentation/the-sling-engine/the-sling-launchpad.html">the Sling Launchpad</a>.</td>
</tr>
<tr>
-<td><code>org.apache.sling.osgi.log.*</code></td>
-<td>Properties providing initial configuration to the Sling Log Service. See 'Important Properties' on the page <a href="/old-stuff/launch-sling.html">Initial Provisioning and Startup</a>.</td>
+<td><code>org.apache.sling.commons.log.*</code></td>
+<td>Properties providing initial configuration to the Sling Log Service. See <em>sling.properties</em> on the page <a href="/documentation/the-sling-engine/the-sling-launchpad.html">the Sling Launchpad</a>.</td>
</tr>
</tbody>
</table>
@@ -302,7 +289,7 @@
<p>By default the Configuration Admin Service is installed when Sling is started for the first time. This service is used by the Service Component Runtime launching the OSGi components declared in the bundles with configuration values. The Sling Management Console provides a simple GUI to manage these configuration elements on the 'Configuration' page.</p>
<p>For more information on the Configuration Admin Service refer to the OSGi Configuration Admin Service Specification in the OSGi Service Platform Service Compendium book.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1530400 by dklco on Tue, 8 Oct 2013 19:25:55 +0000
+ Rev. 1530619 by dklco on Wed, 9 Oct 2013 14:17:06 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/site/.htaccess
==============================================================================
--- websites/staging/sling/trunk/content/site/.htaccess (original)
+++ websites/staging/sling/trunk/content/site/.htaccess Wed Oct 9 14:17:20 2013
@@ -64,3 +64,4 @@ Redirect Permanent /site/assembly.html /
Redirect Permanent /site/media.html /
Redirect Permanent /site/plugins.html /
Redirect Permanent /site/security.html /project-information/security.html
+Redirect Permanent /site/configuration.html /documentation/configuration.html