Author: dklco
Date: Wed Oct  9 14:17:06 2013
New Revision: 1530619

URL: http://svn.apache.org/r1530619
Log:
Updating the well known properties section to remove the sling.install.* 
properties since there's much better ways to install bundles, updating the 
property name for configuring logging, fixed the links to link to the launchpad 
page and migrated the page from the legacy site

Removed:
    sling/site/trunk/content/site/configuration.html
Modified:
    sling/site/trunk/content/documentation/configuration.mdtext
    sling/site/trunk/content/site/.htaccess

Modified: sling/site/trunk/content/documentation/configuration.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/configuration.mdtext?rev=1530619&r1=1530618&r2=1530619&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/configuration.mdtext (original)
+++ sling/site/trunk/content/documentation/configuration.mdtext Wed Oct  9 
14:17:06 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Configuration
 
 
@@ -167,10 +166,8 @@ The following table is a collection of w
 | `sling.home` | Defines the file system location where Project Sling will 
write copies of the initial configuration. This property should also be used to 
define other local file system locations such as the directory to use for the 
Apache Felix Bundle Cache (`${sling.home}/felix` by default). If this property 
is not set it defaults to `${user.dir}/sling`. |
 | `sling.home.url` | Contains the Sling directory set in the `sling.home` 
property as a valid URL. This property may be used in situations where the 
Sling directory is required as an URL. This property is automatically set by 
the Sling application and may not be modified by configuration files. |
 | `sling.ignoreSystemProperties` | Whether to overwrite any configuration 
properties with Java system properties or not. By default this property is set 
to `true` by the Sling Servlet but not set by the Sling main class. The reason 
to set this by default in the Sling Servlet is to not induce values from the 
environment, which may not be appropriate in the Web Application case. |
-| `obr.repository.url` | A comma-separated list of OSGi Bundle Repository 
URLs. See *Important Properties* on the page [Initial Provisioning and 
Startup]({{ refs.launch-sling.path }}). |
-| `sling.install.bundles` | A comma-separated list of start level numbers. See 
*Important Properties* on the page [Initial Provisioning and Startup]({{ 
refs.launch-sling.path }}). |
-| `sling.install.<n>` | A comma-separated list of bundle specifications. See 
*Important Properties* on the page [Initial Provisioning and Startup]({{ 
refs.launch-sling.path }}). |
-| `org.apache.sling.osgi.log.*` | Properties providing initial configuration 
to the Sling Log Service. See 'Important Properties' on the page [Initial 
Provisioning and Startup]({{ refs.launch-sling.path }}). |
+| `obr.repository.url` | A comma-separated list of OSGi Bundle Repository 
URLs. See *sling.properties* on the page [the Sling Launchpad]({{ 
refs.the-sling-launchpad.path }}). |
+| `org.apache.sling.commons.log.*` | Properties providing initial 
configuration to the Sling Log Service. See *sling.properties* on the page [the 
Sling Launchpad]({{ refs.the-sling-launchpad.path }}). |
 
 
 

Modified: sling/site/trunk/content/site/.htaccess
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/site/.htaccess?rev=1530619&r1=1530618&r2=1530619&view=diff
==============================================================================
--- sling/site/trunk/content/site/.htaccess (original)
+++ sling/site/trunk/content/site/.htaccess Wed Oct  9 14:17:06 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


Reply via email to