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 2016/11/18 09:38:33 UTC

svn commit: r1001311 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html

Author: buildbot
Date: Fri Nov 18 09:38:32 2016
New Revision: 1001311

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-default-implementation.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Nov 18 09:38:32 2016
@@ -1 +1 @@
-1769761
+1770354

Modified: websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html Fri Nov 18 09:38:32 2016
@@ -185,11 +185,11 @@ h2:hover > .headerlink, h3:hover > .head
 <p><img alt="Resource inheritance" src="resource-inheritance.png" /></p>
 <p>The result of this example is: <strong>C, A, B</strong>. It would by just <strong>C</strong> if the <code>sling:configCollectionInherit</code> is not set.</p>
 <h1 id="property-inheritance">Property inheritance<a class="headerlink" href="#property-inheritance" title="Permanent link">&para;</a></h1>
-<p>By default, no property inheritance takes place. That means only the properties that are stored in the configuration resource are mapped to the annotation class or returned as value map, regardless wither singleton or collection resources are returned, or if resource collection inheritance is enabled or not.</p>
+<p>By default, no property inheritance takes place. That means only the properties that are stored in the configuration resource are mapped to the annotation class or returned as value map, regardless whether singleton or collection resources are returned, or if resource collection inheritance is enabled or not.</p>
 <p>By defining a property <code>sling:configPropertyInherit</code> on the configuration resource, property merging is enabled between the current configuration resource and the next resource with the same name (singleton or resource collection item) in the configuration resource lookup order. That means that all properties that are not defined on the current configuration resource are inherited from the next resources and a merged value map is used for the configuration mapping.</p>
 <p>By setting the property <code>sling:configPropertyInherit</code> on multiple configuration resources that are part of the lookup order it is possible to form deeper inheritance chains following the same rules.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1764894 by sseifert on Fri, 14 Oct 2016 13:37:54 +0000
+        Rev. 1770354 by sseifert on Fri, 18 Nov 2016 09:38:15 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project