svn commit: r1012454 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/context-aware-configuration/context-aware-configuration-override.html documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html

[bu...@apache.org]

Author: buildbot
Date: Thu May 18 14:30:05 2017
New Revision: 1012454

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
    websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 18 14:30:05 2017
@@ -1 +1 @@
-1795511
+1795539

Modified: websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html Thu May 18 14:30:05 2017
@@ -126,7 +126,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 </div>
 <h1 id="about">About<a class="headerlink" href="#about" title="Permanent link">&para;</a></h1>
-<p>Using overrides it is possible to override context-aware configuration globally or for specific content paths (and their subtrees) within an instance. This overrides the configuration read and inherited by the default ways.</p>
+<p>Using overrides it is possible to override context-aware configuration values globally or for specific content paths (and their subtrees) within an instance. If an override is active the Configuration API returns the overridden values instead of the values from the configuration resources.</p>
 <p>An example use case is to overwrite the Site URLs on your staging system which has a copy of the configuration content of the production system installed.</p>
 <p>Via the <a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html">SPI</a> you can add your own override providers - but in most cases the built-in ones described in this page are sufficient. All override providers use the same override syntax.</p>
 <h1 id="override-syntax">Override syntax<a class="headerlink" href="#override-syntax" title="Permanent link">&para;</a></h1>
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Allows to define configuration property overrides from OSGi configuration.</p>
 <p>You can provide multiple providers using a factory configuration ("Apache Sling Context-Aware OSGi Configuration Override Provider"), each of them provides list of override strings.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1788163 by sseifert on Wed, 22 Mar 2017 21:35:08 +0000
+        Rev. 1795539 by sseifert on Thu, 18 May 2017 14:29:49 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html Thu May 18 14:30:05 2017
@@ -143,17 +143,17 @@ h2:hover > .headerlink, h3:hover > .head
 <h1 id="configuration-resource-resolver-strategy">Configuration Resource Resolver Strategy<a class="headerlink" href="#configuration-resource-resolver-strategy" title="Permanent link">&para;</a></h1>
 <p>By providing an implementation of <code>org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy</code> you can define where configuration data is looked up, and how resource and property inheritance is handled.</p>
 <h1 id="configuration-inheritance-strategy">Configuration Inheritance Strategy<a class="headerlink" href="#configuration-inheritance-strategy" title="Permanent link">&para;</a></h1>
-<p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationInheritanceStrategy</code> you can define if and how resource are inherited across the inheritance chain.</p>
+<p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationInheritanceStrategy</code> you can define if and how resources are inherited across the inheritance chain.</p>
 <h1 id="configuration-persistence-strategy">Configuration Persistence Strategy<a class="headerlink" href="#configuration-persistence-strategy" title="Permanent link">&para;</a></h1>
-<p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy2</code> you can define the peristence structure of the configuration within the configuration resources.</p>
+<p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy2</code> you can define the persistence structure of the configuration within the configuration resources.</p>
 <p>E.g. you could use a specific JCR node type or slightly different content structure to store the configuration data.</p>
 <h1 id="configuration-metadata-provider">Configuration Metadata Provider<a class="headerlink" href="#configuration-metadata-provider" title="Permanent link">&para;</a></h1>
 <p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationMetadataProvider</code> you can provide information about configuration metadata from other sources than annotation classes.</p>
 <h1 id="configuration-override-provider">Configuration Override Provider<a class="headerlink" href="#configuration-override-provider" title="Permanent link">&para;</a></h1>
-<p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationOverrideProvider</code> you can provide your own overrides - if the built-in override provider do not fit your needs.</p>
+<p>By providing an implementation of <code>org.apache.sling.caconfig.spi.ConfigurationOverrideProvider</code> you can provide your own overrides - if the built-in override providers do not fit your needs.</p>
 <p>See <a href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html">Override</a> for the list of built-in providers and the override syntax.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1790055 by sseifert on Mon, 3 Apr 2017 22:32:56 +0000
+        Rev. 1795539 by sseifert on Thu, 18 May 2017 14:29:49 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project