svn commit: r980040 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/resource-merger.html

[bu...@apache.org]

Author: buildbot
Date: Wed Feb 10 16:52:54 2016
New Revision: 980040

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 Wed Feb 10 16:52:54 2016
@@ -1 +1 @@
-1729318
+1729653

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 Wed Feb 10 16:52:54 2016
@@ -162,12 +162,12 @@ It is possible to</p>
 <tr>
 <td>sling:hideProperties</td>
 <td>String[]</td>
-<td>Allows to hide the properties with the given names from the underlying resource. <code>*</code> hides all properties.</td>
+<td>Hides the properties with the given names from the underlying resource. <code>*</code> hides all properties.</td>
 </tr>
 <tr>
 <td>sling:hideChildren</td>
 <td>String[]</td>
-<td>Allows to hide the child resources with the given names from the underlying resource. <code>*</code> hides all child resources.</td>
+<td>Hides the child resources with the given names from the underlying resource. <code>*</code> hides all child resources. If one value starts with <code>!</code> this is a negation (which means the property with the given value should not be hidden). Since by default nothing is hidden the negation is only useful if you specify multiple values for this property. E.g. giving the values <code>[!child1,*]</code> hides all children except for the one with the name <code>child1</code>. If you have a resource name starting with <code>!</code> you must escape it with an additional <code>!</code> in front if you want to reference it in <code>sling:hideChildren</code>, e.g. <code>!!child1</code> means that the resource with the name <code>!child1</code> should be hidden.</td>
 </tr>
 <tr>
 <td>sling:hideResource</td>
@@ -177,7 +177,7 @@ It is possible to</p>
 <tr>
 <td>sling:orderBefore</td>
 <td>String</td>
-<td>Contains the name of the preceeding sibling resource. This order is considered when calling e.g. <code>Resource.listChildren()</code> or <code>Resource.getChildren()</code> on the merged resource.</td>
+<td>Contains the name of the preceeding sibling resource. This is influencing the order of resources when calling e.g. <code>Resource.listChildren()</code> or <code>Resource.getChildren()</code> on the merged resource.</td>
 </tr>
 </tbody>
 </table>
@@ -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> &quot;<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>&quot;
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1728171 by kwin on Tue, 2 Feb 2016 19:00:09 +0000
+        Rev. 1729653 by kwin on Wed, 10 Feb 2016 16:52:31 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project