svn commit: r982731 - in /websites/staging/sling/trunk/content: ./ documentation/development/slingstart.html

[bu...@apache.org]

Author: buildbot
Date: Mon Mar 14 11:14:03 2016
New Revision: 982731

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/development/slingstart.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar 14 11:14:03 2016
@@ -1 +1 @@
-1734901
+1734922

Modified: websites/staging/sling/trunk/content/documentation/development/slingstart.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/slingstart.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/slingstart.html Mon Mar 14 11:14:03 2016
@@ -298,7 +298,10 @@ Each run mode is associated with a set o
 
 <p>The resulting model is a merged model, starting with the dependencies and then merging in the current model.</p>
 <h2 id="model-merging">Model Merging<a class="headerlink" href="#model-merging" title="Permanent link">&para;</a></h2>
-<p>Two models are merged feature by feature - each feature is treated as a separate unit. Within a feature each run mode is treated separately as well. Within a run mode a model can overwrite definitions from the base model. For example, it can define a different configuration or a different version and/or start level for an artifact.</p>
+<p>If two or more models are supplied, they are merged feature by feature, each feature being treated as a separate unit. </p>
+<p>Within a feature each run mode is treated separately as well. </p>
+<p>Within a run mode, a model can overwrite definitions from the base model. For example, it can define a different configuration or a different version and/or start level for an artifact.</p>
+<p>The supplied models are ordered alphanumercally by their filenames for merging.</p>
 <h3 id="removing-and-changing-of-artifacts">Removing and Changing of Artifacts<a class="headerlink" href="#removing-and-changing-of-artifacts" title="Permanent link">&para;</a></h3>
 <p>In addition, it can also remove artifacts and configurations. For this the special runmode :remove needs to be used together with all run modes the artifact or configuration is currently in.</p>
 <p>Let's look at an example base model</p>
@@ -349,7 +352,8 @@ Each run mode is associated with a set o
 </pre></div>
 
 
-<p>By default if a model inherits from another and uses the same configuration pid, the configuration is overwritten! In the above example, the configuration my.special.configuration.b contains a single property named "a". It is also possible to merge configurations:</p>
+<p>By default if a model inherits from another and uses the same configuration pid, the configuration is overwritten! In the above example, the configuration my.special.configuration.b contains a single property named "a". </p>
+<p>It is also possible to merge configurations:</p>
 <div class="codehilite"><pre><span class="k">[configurations]</span>
     <span class="na">my.special.configuration.b [mode</span><span class="o">=</span><span class="s">merge]</span>
 <span class="s">      a=&quot;b&quot;</span>
@@ -357,6 +361,7 @@ Each run mode is associated with a set o
 
 
 <p>When the merge directive is used, the configurations are merged and the properties are applied as a delta to the base configuration. Therefore the configuration my.special.configuration.b will have two properties "a" and "foo".</p>
+<p>If a merged configuration redefines a property that already exists, it overwrites it, so the last configuration supplied in a merge wins.</p>
 <h2 id="known-issues">Known Issues<a class="headerlink" href="#known-issues" title="Permanent link">&para;</a></h2>
 <h3 id="support-of-configuration-formats">Support of configuration formats<a class="headerlink" href="#support-of-configuration-formats" title="Permanent link">&para;</a></h3>
 <p>The provisioning model supports two formats to define configurations, properties and the format of the Apache Felix ConfigAdmin implementation.</p>
@@ -377,7 +382,7 @@ Each run mode is associated with a set o
 <span class="nt">&lt;/plugin&gt;</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1728194 by cziegeler on Tue, 2 Feb 2016 19:47:33 +0000
+        Rev. 1734922 by bdelacretaz on Mon, 14 Mar 2016 11:13:50 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project