You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/11/18 09:38:15 UTC
svn commit: r1770354 -
/sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.mdtext
Author: sseifert
Date: Fri Nov 18 09:38:15 2016
New Revision: 1770354
URL: http://svn.apache.org/viewvc?rev=1770354&view=rev
Log:
fix typo
Modified:
sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.mdtext
Modified: sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.mdtext?rev=1770354&r1=1770353&r2=1770354&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.mdtext Fri Nov 18 09:38:15 2016
@@ -89,7 +89,7 @@ The result of this example is: **C, A, B
# Property inheritance
-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.
+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.
By defining a property `sling:configPropertyInherit` 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.