Author: buildbot
Date: Tue Feb 2 19:00:25 2016
New Revision: 979302
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 2 19:00:25 2016
@@ -1 +1 @@
-1728169
+1728171
Modified:
websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html
(original)
+++
websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html
Tue Feb 2 19:00:25 2016
@@ -279,7 +279,7 @@ It is possible to</p>
<span class="o">|</span> <span class="o">+--</span> <span
class="n">property2</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">apps</span><span class="o">/</span><span
class="n">sling</span><span class="o">/</span><span
class="n">example</span><span class="o">/</span><span
class="n">child3</span>"
-<span class="o">/</span><span class="n">mnt</span><span
class="o">/</span><span class="n">overlay</span><span class="o">/</span><span
class="n">apps</span><span class="o">/</span><span class="n">sling</span><span
class="o">/</span><span class="n">example</span> <span class="p">(</span><span
class="n">sling</span><span class="p">:</span><span
class="n">Folder</span><span class="p">)</span>
+<span class="o">/</span><span class="n">mnt</span><span
class="o">/</span><span class="n">override</span><span class="o">/</span><span
class="n">apps</span><span class="o">/</span><span class="n">sling</span><span
class="o">/</span><span class="n">example</span> <span class="p">(</span><span
class="n">sling</span><span class="p">:</span><span
class="n">Folder</span><span class="p">)</span>
<span class="o">+--</span> <span class="n">sling</span><span
class="p">:</span><span class="n">resourceSuperType</span> <span
class="p">=</span> "<span class="o">/</span><span
class="n">apps</span><span class="o">/</span><span class="n">sling</span><span
class="o">/</span><span class="n">base</span>"
<span class="o">+--</span> <span class="n">property1</span> <span
class="p">=</span> "<span class="n">property</span> <span
class="n">added</span> <span class="n">in</span> <span class="o">/</span><span
class="n">apps</span><span class="o">/</span><span class="n">sling</span><span
class="o">/</span><span class="n">example</span>"
<span class="o">+--</span> <span class="n">child2</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
@@ -289,7 +289,7 @@ It is possible to</p>
<span class="o">|</span> <span class="o">+--</span> <span
class="n">property2</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">apps</span><span class="o">/</span><span
class="n">sling</span><span class="o">/</span><span
class="n">example</span><span class="o">/</span><span
class="n">child3</span>"
</pre></div>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1728169 by kwin on Tue, 2 Feb 2016 18:52:20 +0000
+ Rev. 1728171 by kwin on Tue, 2 Feb 2016 19:00:09 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
