svn commit: r948317 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/scripting/scripting-thymeleaf.html

[bu...@apache.org]

Author: buildbot
Date: Sun Apr 19 20:31:52 2015
New Revision: 948317

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr 19 20:31:52 2015
@@ -1 +1 @@
-1674675
+1674688

Modified: websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html Sun Apr 19 20:31:52 2015
@@ -98,7 +98,10 @@
 <li><a href="#installation">Installation</a></li>
 <li><a href="#configuration">Configuration</a></li>
 <li><a href="#sling-dialect">Sling Dialect</a><ul>
-<li><a href="#include">include</a></li>
+<li><a href="#include">include</a><ul>
+<li><a href="#supported-options-requestdispatcher-option">supported options (* = RequestDispatcher option)</a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li><a href="#sample">Sample</a></li>
@@ -140,21 +143,24 @@
 <h1 id="sling-dialect">Sling Dialect</h1>
 <p>Sling Scripting Thymeleaf comes with its own dialect using the <code>sling</code> prefix/namespace currently supporting the <em>include</em> feature known from <a href="/documentation/bundles/sling-scripting-jsp-taglib.html">Sling Scripting JSP Taglib</a>.</p>
 <h2 id="include">include</h2>
-<p>The resource object or the path to the resource object to include in the current request processing. If this path is relative it is appended to the path of the current resource whose script is including the given resource.</p>
+<p>The resource object (<a href="http://sling.apache.org/apidocs/sling7/org/apache/sling/api/resource/Resource.html"><code>Resource</code></a>) or the path (<code>String</code>) to the resource object to include in the current request processing. If this path is relative it is appended to the path of the current resource whose script is including the given resource.</p>
+<h3 id="supported-options-requestdispatcher-option">supported options (* = <a href="http://sling.apache.org/apidocs/sling7/org/apache/sling/api/request/RequestDispatcherOptions.html">RequestDispatcher option</a>)</h3>
 <ul>
-<li><code>data-sling-include</code> in HTML5, <code>sling:include</code> in XHTML (<code>Resource</code> or <code>String</code>)</li>
-<li>supported options (* = <a href="http://sling.apache.org/apidocs/sling7/org/apache/sling/api/request/RequestDispatcherOptions.html">RequestDispatcher option</a>):</li>
 <li><code>addSelectors</code> (<code>String</code>) *: When dispatching, add the value provided by this option to the selectors.</li>
 <li><code>replaceSelectors</code> (<code>String</code>) *: When dispatching, replace selectors by the value provided by this option.</li>
 <li><code>replaceSuffix</code> (<code>String</code>) *: When dispatching, replace the suffix by the value provided by this option.</li>
 <li><code>resourceType</code> (<code>String</code>) *: The resource type of a resource to include. If the resource to be included is specified with the path attribute, which cannot be resolved to a resource, the tag may create a synthetic resource object out of the path and this resource type. If the resource type is set the path must be the exact path to a resource object. That is, adding parameters, selectors and extensions to the path is not supported if the resource type is set.</li>
-<li><code>unwrap</code> (<code>Boolean</code>): removes the host element</li>
+<li>
+<p><code>unwrap</code> (<code>Boolean</code>): removes the host element</p>
+<header data-sling-include="${resource}" resourceType="'/apps/example/page/header'" unwrap="true"/>
+
+</li>
 </ul>
 <h1 id="sample">Sample</h1>
 <p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/samples/fling/">Sling Fling Sample</a> is a sample using Sling Scripting Thymeleaf with <a href="/documentation/bundles/models.html">Sling Models</a> and <a href="/documentation/bundles/sling-query.html">Sling Query</a>.</p>
 <p><img alt="Sling Fling Sample" src="sling-fling-sample.png" /></p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1674675 by olli on Sun, 19 Apr 2015 19:15:16 +0000
+        Rev. 1674687 by olli on Sun, 19 Apr 2015 20:31:42 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project