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

[buildbot]

Author: buildbot
Date: Thu Jul 20 13:06:04 2017
New Revision: 1015729

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 Thu Jul 20 13:06:04 2017
@@ -1 +1 @@
-1802291
+1802481

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 
Thu Jul 20 13:06:04 2017
@@ -179,7 +179,7 @@ It is possible to</p>
 <tr>
 <td>sling:orderBefore</td>
 <td>String</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. This is only 
necessary if the default child resource order is not sufficient (see 
below).</td>
+<td>Contains the name of the preceding 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. This is only 
necessary if the default child resource order is not sufficient (see 
below).</td>
 </tr>
 </tbody>
 </table>
@@ -311,7 +311,7 @@ For example:</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. 1798935 by kwin on Fri, 16 Jun 2017 14:54:27 +0000
+        Rev. 1802481 by sseifert on Thu, 20 Jul 2017 13:05:33 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project